diff options
| author | tv <tv@pkgsrc.org> | 2004-04-25 22:42:51 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-04-25 22:42:51 +0000 |
| commit | 88a69154365f01515bb0b93483ff4f4ef73c3be3 (patch) | |
| tree | 758d883c4350596e0417e374e953b188781f8515 | |
| parent | a7d1b08315f8946cc12160b7341f7fee2cc3db72 (diff) | |
| download | pkgsrc-88a69154365f01515bb0b93483ff4f4ef73c3be3.tar.gz | |
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.)
| -rw-r--r-- | lang/perl58/Makefile | 8 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 3 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile index 8993ad85422..303ccde57e6 100644 --- a/lang/perl58/Makefile +++ b/lang/perl58/Makefile @@ -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 @@ MESSAGE_SUBST+= PERL5_SITELIB=${PERL5_SITELIB} # 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 --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 505fdd24dcb..7753de0a643 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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 @@ PKG_FAIL_REASON+='assignment of WRKSRC= $${WRKDIR}' .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 --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 07c24b59214..0146e303739 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -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 @@ APPEND_ELF= elf . endif .endif +PKGDIRMODE?= 755 SHAREOWN?= ${DOCOWN} SHAREGRP?= ${DOCGRP} SHAREMODE?= ${DOCMODE} |