[pkgsrc/trunk]: pkgsrc/graphics/netpbm honour PKGMANDIR

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6627b04fa41e
branches:  trunk
changeset: 648123:6627b04fa41e
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Mar 11 23:19:58 2015 +0000

description:
honour PKGMANDIR

diffstat:

 graphics/netpbm/Makefile                |   5 ++++-
 graphics/netpbm/distinfo                |   5 +++--
 graphics/netpbm/patches/patch-common.mk |  11 ++++++++++-
 graphics/netpbm/patches/patch-config.mk |  15 +++++++++++++++
 4 files changed, 32 insertions(+), 4 deletions(-)

diffs (89 lines):

diff -r 8c4d592c830f -r 6627b04fa41e graphics/netpbm/Makefile
--- a/graphics/netpbm/Makefile  Wed Mar 11 23:02:50 2015 +0000
+++ b/graphics/netpbm/Makefile  Wed Mar 11 23:19:58 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.201 2015/03/11 23:02:50 tnn Exp $
+# $NetBSD: Makefile,v 1.202 2015/03/11 23:19:58 tnn Exp $
 
 DISTNAME=      netpbm-10.68.02
 CATEGORIES=    graphics
@@ -25,6 +25,7 @@
 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_FILE=     GNUmakefile
 REPLACE_PERL+= converter/pbm/pbmtox10bm
 REPLACE_PERL+= editor/pnmflip
@@ -80,9 +81,11 @@
 
 pre-install:
        ${RM} -fr ${STAGEDIR}
+       ${MKDIR} -p ${STAGEDIR}/man/web
 
 post-install:
        cd ${STAGEDIR} &&                                       \
+       ${RM} -rf ${PKGMANDIR}/web &&                           \
        ${RM} -rf man/web &&                                    \
        ${MKDIR} share &&                                       \
        ${MV} misc share/netpbm &&                              \
diff -r 8c4d592c830f -r 6627b04fa41e graphics/netpbm/distinfo
--- a/graphics/netpbm/distinfo  Wed Mar 11 23:02:50 2015 +0000
+++ b/graphics/netpbm/distinfo  Wed Mar 11 23:19:58 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.98 2015/01/25 15:01:48 jperkin Exp $
+$NetBSD: distinfo,v 1.99 2015/03/11 23:19:58 tnn Exp $
 
 SHA1 (netpbm-10.68.02.tar.gz) = 90fa87549dc7fb33bd7f9f29abad09fe99faf3e1
 RMD160 (netpbm-10.68.02.tar.gz) = 7567eb6c38f06ad89b995b9315deec91db94bfb0
@@ -6,7 +6,8 @@
 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) = f590cc66e0fe6a07e848b9b46662bca350557bea
+SHA1 (patch-common.mk) = efde1a07e01babab396f2b20d3f720ae3b26af49
+SHA1 (patch-config.mk) = 3727ea7f25b3a3e655cf64df965c76db5ee98115
 SHA1 (patch-converter_other_giftopnm.c) = d64d645307e12b32d3a9ce56885bbfb3a4a80d23
 SHA1 (patch-lib_Makefile) = 3f93bd24c53aa1f22aa43545d7ca5422af8e78ca
 SHA1 (patch-pm__config.in.h) = 9cb3084371be4b354832581d47d552bfe9ff1ce1
diff -r 8c4d592c830f -r 6627b04fa41e graphics/netpbm/patches/patch-common.mk
--- a/graphics/netpbm/patches/patch-common.mk   Wed Mar 11 23:02:50 2015 +0000
+++ b/graphics/netpbm/patches/patch-common.mk   Wed Mar 11 23:19:58 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-common.mk,v 1.1 2014/10/23 23:41:32 fhajny Exp $
+$NetBSD: patch-common.mk,v 1.2 2015/03/11 23:19:58 tnn Exp $
 
 Simplify install target.
 --- common.mk.orig     2014-09-08 21:26:50.000000000 +0000
@@ -12,3 +12,12 @@
    $(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 -r 8c4d592c830f -r 6627b04fa41e graphics/netpbm/patches/patch-config.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/patches/patch-config.mk   Wed Mar 11 23:19:58 2015 +0000
@@ -0,0 +1,15 @@
+$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