diff options
author | tnn <tnn> | 2015-03-12 12:35:42 +0000 |
---|---|---|
committer | tnn <tnn> | 2015-03-12 12:35:42 +0000 |
commit | 23168d33dee8bca6b7eb13329d57245d702939c2 (patch) | |
tree | 56e6880292c9f7b0ab22191a57885ae9c7eba4bf /graphics | |
parent | be009d21dc942c583dfb98e76e25ecfc96c4f3c9 (diff) | |
download | pkgsrc-23168d33dee8bca6b7eb13329d57245d702939c2.tar.gz |
simplify PKGMANDIR fix
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/netpbm/Makefile | 4 | ||||
-rw-r--r-- | graphics/netpbm/distinfo | 5 | ||||
-rw-r--r-- | graphics/netpbm/patches/patch-common.mk | 11 | ||||
-rw-r--r-- | graphics/netpbm/patches/patch-config.mk | 15 |
4 files changed, 5 insertions, 30 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index f2705f5763e..2a29e67623a 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.202 2015/03/11 23:19:58 tnn Exp $ +# $NetBSD: Makefile,v 1.203 2015/03/12 12:35:42 tnn Exp $ DISTNAME= netpbm-10.68.02 CATEGORIES= graphics @@ -25,7 +25,7 @@ USE_FEATURES= snprintf INSTALL_TARGET= install-dev install-run MAKE_ENV+= INSTALL=${INSTALL:Q} STRIPFLAG=${_STRIPFLAG_INSTALL:Q} \ pkgdir=${STAGEDIR:Q} MACHINE=${MACHINE:Q} -INSTALL_ENV+= PKGMANDIR=${PKGMANDIR:Q} +MAKE_FLAGS+= PKGMANDIR=${PKGMANDIR:Q} MAKE_FILE= GNUmakefile REPLACE_PERL+= converter/pbm/pbmtox10bm REPLACE_PERL+= editor/pnmflip diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 6aca4434a0a..4b53af87476 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.99 2015/03/11 23:19:58 tnn Exp $ +$NetBSD: distinfo,v 1.100 2015/03/12 12:35:42 tnn Exp $ SHA1 (netpbm-10.68.02.tar.gz) = 90fa87549dc7fb33bd7f9f29abad09fe99faf3e1 RMD160 (netpbm-10.68.02.tar.gz) = 7567eb6c38f06ad89b995b9315deec91db94bfb0 @@ -6,8 +6,7 @@ Size (netpbm-10.68.02.tar.gz) = 2703809 bytes SHA1 (netpbm-docs-r2313.tar.gz) = 8c36b17b1d2dca6ab7bd34666a8929b9ea665743 RMD160 (netpbm-docs-r2313.tar.gz) = 03854f545c7c0f4c825ee08bc779b62da0ea05c3 Size (netpbm-docs-r2313.tar.gz) = 447907 bytes -SHA1 (patch-common.mk) = efde1a07e01babab396f2b20d3f720ae3b26af49 -SHA1 (patch-config.mk) = 3727ea7f25b3a3e655cf64df965c76db5ee98115 +SHA1 (patch-common.mk) = f590cc66e0fe6a07e848b9b46662bca350557bea SHA1 (patch-converter_other_giftopnm.c) = d64d645307e12b32d3a9ce56885bbfb3a4a80d23 SHA1 (patch-lib_Makefile) = 3f93bd24c53aa1f22aa43545d7ca5422af8e78ca SHA1 (patch-pm__config.in.h) = 9cb3084371be4b354832581d47d552bfe9ff1ce1 diff --git a/graphics/netpbm/patches/patch-common.mk b/graphics/netpbm/patches/patch-common.mk index 3c5cd311cf6..791775ae1e9 100644 --- a/graphics/netpbm/patches/patch-common.mk +++ b/graphics/netpbm/patches/patch-common.mk @@ -1,4 +1,4 @@ -$NetBSD: patch-common.mk,v 1.2 2015/03/11 23:19:58 tnn Exp $ +$NetBSD: patch-common.mk,v 1.3 2015/03/12 12:35:42 tnn Exp $ Simplify install target. --- common.mk.orig 2014-09-08 21:26:50.000000000 +0000 @@ -12,12 +12,3 @@ Simplify install target. $(PKGMANSUBDIRS:%=$(PKGMANDIR)/%) $(PKGSUBDIRS:%=$(PKGDIR)/%): -@@ -510,7 +510,7 @@ install.man: install.man1 install.man3 i - - MANUALS1 = $(BINARIES) $(SCRIPTS) - --PKGMANDIR = man -+PKGMANDIR? = man - - install.man1: $(MANUALS1:%=%_installman1) - diff --git a/graphics/netpbm/patches/patch-config.mk b/graphics/netpbm/patches/patch-config.mk deleted file mode 100644 index ff24972ac7e..00000000000 --- a/graphics/netpbm/patches/patch-config.mk +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-config.mk,v 1.1 2015/03/11 23:19:58 tnn Exp $ - -Honour PKGMANDIR - ---- config.mk.orig 2015-03-11 23:13:16.000000000 +0000 -+++ config.mk -@@ -548,7 +548,7 @@ RESULTDIR_DEFAULT = /tmp/netpbm-test - - # Subdirectory of the package directory ($(pkgdir)) in which man pages - # go. --PKGMANDIR = man -+PKGMANDIR? = man - - # File permissions for installed files. - # Note that on some systems (e.g. Solaris), 'install' can't use the |