[pkgsrc/trunk]: pkgsrc/mk Make sure PKGDIRMODE is always set in bsd.prefs.mk ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b92521f7a547
branches:  trunk
changeset: 474138:b92521f7a547
user:      tv <tv%pkgsrc.org@localhost>
date:      Sun Apr 25 22:42:51 2004 +0000

description:
Make sure PKGDIRMODE is always set in bsd.prefs.mk so it can be checked
in lang/perl58/Makefile.  (It had been set previously only in bsd.pkg.mk.)

diffstat:

 lang/perl58/Makefile |  8 ++++----
 mk/bsd.pkg.mk        |  3 +--
 mk/bsd.prefs.mk      |  3 ++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (60 lines):

diff -r 6afd9774e1d3 -r b92521f7a547 lang/perl58/Makefile
--- a/lang/perl58/Makefile      Sun Apr 25 22:21:35 2004 +0000
+++ b/lang/perl58/Makefile      Sun Apr 25 22:42:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2004/04/24 22:54:45 xtraeme Exp $
+# $NetBSD: Makefile,v 1.43 2004/04/25 22:42:51 tv Exp $
 
 # The following two variables should have empty values unless we're
 # building a perl snapshot or release candidate.
@@ -216,13 +216,13 @@
 # unfortunately, hardcoded in quite a few places in Perl.  So let's substitute
 # what pkgsrc said instead.
 post-patch:
-.if defined(PKGDIRMODE) && empty(PKGDIRMODE:M755)
-.  for f in installhtml installman installperl lib/ExtUtils/Install.pm
+.if ${PKGDIRMODE} != "755"
+.for f in installhtml installman installperl lib/ExtUtils/Install.pm
        cd ${WRKSRC} && \
                ${MV} -f $f $f.dirmode && \
                ${SED} -e 's/755/${PKGDIRMODE}/g;/umask(/d' \
                $f.dirmode >$f
-.  endfor
+.endfor
 .endif
 
 # It's tough to guess which hints file will be used, so add our modifications
diff -r 6afd9774e1d3 -r b92521f7a547 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun Apr 25 22:21:35 2004 +0000
+++ b/mk/bsd.pkg.mk     Sun Apr 25 22:42:51 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1449 2004/04/24 11:31:57 grant Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1450 2004/04/25 22:42:51 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -571,7 +571,6 @@
 .endif # NO_WRKSUBDIR
 
 # A few aliases for *-install targets
-PKGDIRMODE?=   755
 .if !defined(INSTALL_UNSTRIPPED) || empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])
 INSTALL_PROGRAM?= \
        ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
diff -r 6afd9774e1d3 -r b92521f7a547 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Sun Apr 25 22:21:35 2004 +0000
+++ b/mk/bsd.prefs.mk   Sun Apr 25 22:42:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.158 2004/04/04 07:09:38 agc Exp $
+# $NetBSD: bsd.prefs.mk,v 1.159 2004/04/25 22:42:51 tv Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -235,6 +235,7 @@
 .  endif
 .endif
 
+PKGDIRMODE?=           755
 SHAREOWN?=             ${DOCOWN}
 SHAREGRP?=             ${DOCGRP}
 SHAREMODE?=            ${DOCMODE}