pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/perl5 Allow sitebin to be overridden by PERL5_SIT...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d0347d6f408b
branches:  trunk
changeset: 588678:d0347d6f408b
user:      abs <abs%pkgsrc.org@localhost>
date:      Mon May 16 07:59:04 2011 +0000

description:
Allow sitebin to be overridden by PERL5_SITEBIN. No change to default build

diffstat:

 lang/perl5/Makefile        |  3 ++-
 lang/perl5/dirs.mk         |  4 +++-
 lang/perl5/files/Policy.sh |  4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r 61330f679049 -r d0347d6f408b lang/perl5/Makefile
--- a/lang/perl5/Makefile       Mon May 16 06:18:31 2011 +0000
+++ b/lang/perl5/Makefile       Mon May 16 07:59:04 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.171 2011/04/07 04:03:57 taca Exp $
+# $NetBSD: Makefile,v 1.172 2011/05/16 07:59:04 abs Exp $
 
 .include "license.mk"
 .include "Makefile.common"
@@ -70,6 +70,7 @@
 SUBST_VARS.policysh+=  PERL5_SCRIPTDIR
 SUBST_VARS.policysh+=  PERL5_PERLBASE
 SUBST_VARS.policysh+=  PERL5_SITEBASE
+SUBST_VARS.policysh+=  PERL5_SITEBIN
 SUBST_VARS.policysh+=  PERL5_VENDORBASE
 SUBST_VARS.policysh+=  PERL5_PRIVLIB
 SUBST_VARS.policysh+=  PERL5_SITELIB
diff -r 61330f679049 -r d0347d6f408b lang/perl5/dirs.mk
--- a/lang/perl5/dirs.mk        Mon May 16 06:18:31 2011 +0000
+++ b/lang/perl5/dirs.mk        Mon May 16 07:59:04 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.1 2010/08/27 05:27:37 sno Exp $
+# $NetBSD: dirs.mk,v 1.2 2011/05/16 07:59:04 abs Exp $
 #
 # Provide typical required Perl directories
 
@@ -28,6 +28,8 @@
 PERL5_SITEBASE=                ${PERL5_SITEPREFIX}
 .endif
 
+PERL5_SITEBIN?=                ${PERL5_SITEBASE}/bin
+
 PERL5_PRIVLIB=         ${PERL5_PERLBASE}/${PERL5_API_VERS}
 PERL5_VENDORLIB=       ${PERL5_VENDORBASE}/${PERL5_API_VERS}
 .if !empty(PERL5_SITEBASE:M*lib/perl5/site_perl)
diff -r 61330f679049 -r d0347d6f408b lang/perl5/files/Policy.sh
--- a/lang/perl5/files/Policy.sh        Mon May 16 06:18:31 2011 +0000
+++ b/lang/perl5/files/Policy.sh        Mon May 16 07:59:04 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Policy.sh,v 1.1 2010/08/19 20:47:10 seb Exp $
+# $NetBSD: Policy.sh,v 1.2 2011/05/16 07:59:04 abs Exp $
 #
 # Site-wide policy settings for pkgsrc Perl
 #
@@ -35,7 +35,7 @@
 # Put any compiled binaries into vendor- and site-specific locations to
 # avoid conflicts with each other.  The perllink script will handle all
 # the appropriate symlinking.
-sitebin='@PERL5_SITEBASE@/bin'
+sitebin='@PERL5_SITEBIN@'
 vendorbin='@PERL5_VENDORBASE@/bin'
 
 # Put the API-specific files into API-specific directories instead



Home | Main Index | Thread Index | Old Index