[pkgsrc/trunk]: pkgsrc/mk Handle MANINSTALL correctly for packages that USE_B...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/615042e65a67
branches:  trunk
changeset: 572113:615042e65a67
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Feb 20 07:05:52 2010 +0000

description:
Handle MANINSTALL correctly for packages that USE_BSD_MAKEFILE.

Fixes PR 42714.

diffstat:

 mk/bsd.pkg.mk          |   3 ++-
 mk/plist/plist-man.awk |  14 +++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r fd6000a7838d -r 615042e65a67 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Feb 20 04:40:03 2010 +0000
+++ b/mk/bsd.pkg.mk     Sat Feb 20 07:05:52 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1960 2009/11/03 02:14:32 joerg Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1961 2010/02/20 07:05:52 rillig Exp $
 #
 # This file is in the public domain.
 #
@@ -218,6 +218,7 @@
 BSD_MAKE_ENV+= LIBDIR=${PREFIX}/lib
 BSD_MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}
 BSD_MAKE_ENV+= STRIPFLAG=${_STRIPFLAG_INSTALL:Q}
+BSD_MAKE_ENV+= MANINSTALL=${MANINSTALL:Q}
 BSD_MAKE_ENV+= MKHTML=no
 
 _BUILD_DEFS=           ${BUILD_DEFS}
diff -r fd6000a7838d -r 615042e65a67 mk/plist/plist-man.awk
--- a/mk/plist/plist-man.awk    Sat Feb 20 04:40:03 2010 +0000
+++ b/mk/plist/plist-man.awk    Sat Feb 20 07:05:52 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: plist-man.awk,v 1.7 2009/06/14 23:10:39 joerg Exp $
+# $NetBSD: plist-man.awk,v 1.8 2010/02/20 07:05:52 rillig Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -63,11 +63,15 @@
 ###
 ### PKGMANDIR is the ${PREFIX}-relative path to the installed man pages.
 ###
+function getenv(varname, defval) {
+       return varname in ENVIRON ? ENVIRON[varname] : defval;
+}
+
 BEGIN {
-       IMAKE_MANINSTALL = ENVIRON["IMAKE_MANINSTALL"] ? ENVIRON["IMAKE_MANINSTALL"] : "maninstall catinstall"
-       MANINSTALL = ENVIRON["MANINSTALL"] ? ENVIRON["MANINSTALL"] : "maninstall catinstall"
-       MANZ = ENVIRON["MANZ"] ? ENVIRON["MANZ"] : "no"
-       PKGMANDIR = ENVIRON["PKGMANDIR"] ? ENVIRON["PKGMANDIR"] : "man"
+       IMAKE_MANINSTALL = getenv("IMAKE_MANINSTALL", "maninstall catinstall")
+       MANINSTALL = getenv("MANINSTALL", "maninstall catinstall")
+       MANZ = getenv("MANZ", "no")
+       PKGMANDIR = getenv("PKGMANDIR", "man")
 }
 
 ###