[pkgsrc/trunk]: pkgsrc/lang Forcibly set the locations for the version-specif...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/054cd21c2f0b
branches:  trunk
changeset: 491372:054cd21c2f0b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Mar 23 16:52:01 2005 +0000

description:
Forcibly set the locations for the version-specific directories.
Before, we were possibly using the values gleaned from a pre-existing
perl binary via perl5/vars.mk (pulled in by bsd.pkg.use.mk), which
would lead to the new perl using the pre-existing perl's version-specific
libraries.  Bump the PKGREVISION of lang/perl5 to 11 and lang/perl58
to 4.

diffstat:

 lang/perl5/Makefile  |  10 +++++-----
 lang/perl58/Makefile |  10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (59 lines):

diff -r 7c17da09804c -r 054cd21c2f0b lang/perl5/Makefile
--- a/lang/perl5/Makefile       Wed Mar 23 16:49:39 2005 +0000
+++ b/lang/perl5/Makefile       Wed Mar 23 16:52:01 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.89 2005/01/03 03:37:08 jlam Exp $
+# $NetBSD: Makefile,v 1.90 2005/03/23 16:52:01 jlam Exp $
 
 .include "../../lang/perl5/Makefile.common"
 
-PKGREVISION=           10
+PKGREVISION=           11
 CATEGORIES+=           lang devel
 
 MAINTAINER=            tech-pkg%NetBSD.org@localhost
@@ -122,10 +122,10 @@
 .endif
 
 PERL5=                 ${PREFIX}/bin/perl${PERL5_DIST_VERS}
-PERL5_PRIVLIB?=                ${PREFIX}/lib/perl5/${PERL5_DIST_VERS}
+PERL5_PRIVLIB=         ${PREFIX}/lib/perl5/${PERL5_DIST_VERS}
 PERL5_ARCHLIB=         ${PREFIX}/lib/perl5/${PERL5_DIST_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
-PERL5_SITEPERL?=       ${VIEWBASE}/lib/perl5/site_perl
-PERL5_SITELIB?=                ${VIEWBASE}/lib/perl5/site_perl/${PERL5_DIST_VERS}
+PERL5_SITEPERL=                ${VIEWBASE}/lib/perl5/site_perl
+PERL5_SITELIB=         ${VIEWBASE}/lib/perl5/site_perl/${PERL5_DIST_VERS}
 PERL5_SITEARCH=                ${VIEWBASE}/lib/perl5/site_perl/${PERL5_DIST_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
 PERL5_PACKLIST=                ${PERL5_ARCHLIB}/.packlist
 PLIST_SUBST+=          PERL5_SITEPERL=${PERL5_SITEPERL:S/^${PREFIX}\///}
diff -r 7c17da09804c -r 054cd21c2f0b lang/perl58/Makefile
--- a/lang/perl58/Makefile      Wed Mar 23 16:49:39 2005 +0000
+++ b/lang/perl58/Makefile      Wed Mar 23 16:52:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2005/02/02 19:09:52 jlam Exp $
+# $NetBSD: Makefile,v 1.76 2005/03/23 16:52:02 jlam Exp $
 
 # The following two variables should have empty values unless we're
 # building a perl snapshot or release candidate.
@@ -13,7 +13,7 @@
 .if empty(PERL5_SNAPSHOT) && empty(PERL5_RC_VERS)
 DISTNAME=      perl-${PERL5_VERS}
 PKGNAME=       perl-${PERL5_VERS}
-PKGREVISION=   3
+PKGREVISION=   4
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,}
 .else
 .  if !empty(PERL5_SNAPSHOT)
@@ -182,9 +182,9 @@
 .endif
 
 PERL5=                 ${PREFIX}/bin/perl${PERL5_VERS}
-PERL5_PRIVLIB?=                ${PREFIX}/lib/perl5/${PERL5_VERS}
-PERL5_SITEPERL?=       ${VIEWBASE}/lib/perl5/site_perl
-PERL5_SITELIB?=                ${VIEWBASE}/lib/perl5/site_perl/${PERL5_VERS}
+PERL5_PRIVLIB=         ${PREFIX}/lib/perl5/${PERL5_VERS}
+PERL5_SITEPERL=                ${VIEWBASE}/lib/perl5/site_perl
+PERL5_SITELIB=         ${VIEWBASE}/lib/perl5/site_perl/${PERL5_VERS}
 PLIST_SUBST+=          PERL5_SITEPERL=${PERL5_SITEPERL:S/^${PREFIX}\///}
 PLIST_SUBST+=          PERL5_SITELIB=${PERL5_SITELIB:S/^${PREFIX}\///}
 MESSAGE_SUBST+=                PERL5_SITELIB=${PERL5_SITELIB}