kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Alter the configuration so that:

Browse source 
$(prefix) == $(siteprefix) == $(vendorprefix)

so that if a perl module is configured with "perl Makefile.PL PREFIX=...",
then that single PREFIX definition will override all three of the
above, and files will be properly installed into the correct relative
path.  Also, patch a test so that it understands the different behavior
of the pkgsrc ExtUtils::MakeMaker module.  Bump the PKGREVISION to 2.
This commit is contained in:
jlam 2005-08-08 16:39:58 +00:00
parent 51a055db51
commit d2d692d4e6
3 changed files with 58 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lang/perl5/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.98 2005/08/07 21:47:24 jlam Exp $
# $NetBSD: Makefile,v 1.99 2005/08/08 16:39:58 jlam Exp $
# The following two variables should have empty values unless we're
# building a perl snapshot or release candidate.
@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
.if empty(PERL5_SNAPSHOT) && empty(PERL5_RC_VERS)
DISTNAME= perl-${PERL5_VERS}
PKGNAME= perl-${PERL5_VERS}
PKGREVISION= 1
PKGREVISION= 2
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,}
.else
. if !empty(PERL5_SNAPSHOT)
@ -56,14 +56,25 @@ PERL5_API_VERS= ${PERL5_API_VERS_cmd:sh}
.endif
PERL5_PREFIX= ${PREFIX}
PERL5_VENDORPREFIX= ${PERL5_PERLBASE}/vendor_perl
PERL5_SITEPREFIX?= ${PERL5_PERLBASE}/site_perl
PERL5_VENDORPREFIX= ${PERL5_PREFIX}
PERL5_SITEPREFIX?= ${PERL5_PREFIX}
BUILD_DEFS+= PERL5_SITEPREFIX
PERL5= ${PERL5_PREFIX}/bin/perl
PERL5_PERLBASE= ${PERL5_PREFIX}/lib/perl5
PERL5_VENDORBASE= ${PERL5_VENDORPREFIX}
PERL5_VENDORBASE= ${PERL5_VENDORPREFIX}/lib/perl5/vendor_perl
#
# The unusual check for empty(PERL5_SITEPREFIX) is because ${PREFIX} isn't
# defined until bsd.pkg.mk is included, so when we inspect its value at
# this point, it's empty.
#
.if empty(PERL5_SITEPREFIX) || \
!empty(PERL5_SITEPREFIX:M${LOCALBASE}) || \
!empty(PERL5_SITEPREFIX:M${LOCALBASE}/*)
PERL5_SITEBASE= ${PERL5_SITEPREFIX}/lib/perl5/site_perl
.else
PERL5_SITEBASE= ${PERL5_SITEPREFIX}
.endif
PERL5_PRIVLIB= ${PERL5_PERLBASE}/${PERL5_API_VERS}
PERL5_VENDORLIB= ${PERL5_VENDORBASE}/${PERL5_API_VERS}

3
lang/perl5/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.25 2005/08/07 21:47:24 jlam Exp $
$NetBSD: distinfo,v 1.26 2005/08/08 16:39:58 jlam Exp $
SHA1 (perl-5.8.7.tar.bz2) = c9477c6fe76b200033694bdc555a0276523d4228
RMD160 (perl-5.8.7.tar.bz2) = 110c286d73fd89e25da8ea394e763f209a76d283
@ -9,6 +9,7 @@ SHA1 (patch-ah) = 7847562d35cd4834a45139b6a8cfe766aa45fa0a
SHA1 (patch-al) = 7b86ec658c09077bec513eadc02006525a548d6f
SHA1 (patch-am) = f82f8fd7fa372f1d47b057b6051613d66dc4bc23
SHA1 (patch-an) = 25c0991dba16ebe11422a97f544cb100e8da56b8
SHA1 (patch-ao) = 2f9ed4f04bac7349ca3ce4ee41c66bd7656c7962
SHA1 (patch-ba) = 096835f71a69f29e50bdad47944afa838dba5aec
SHA1 (patch-bd) = 9f96ba1912f2a8db93db31f7a63c0b49a045318d
SHA1 (patch-ca) = 8eef6a9f96b8f1c6a7c34b521b7c633d396757e3

40
lang/perl5/patches/patch-ao Normal file
View file

@ -0,0 +1,40 @@
$NetBSD: patch-ao,v 1.1 2005/08/08 16:39:58 jlam Exp $
--- lib/ExtUtils/t/basic.t.orig 2004-01-05 17:34:59.000000000 -0500
+++ lib/ExtUtils/t/basic.t
@@ -118,7 +118,7 @@ is( $?, 0,
diag $test_out;
-my $install_out = run("$make install");
+my $install_out = run("$make install doc_install");
is( $?, 0, 'install' ) || diag $install_out;
like( $install_out, qr/^Installing /m );
like( $install_out, qr/^Writing /m );
@@ -138,7 +138,7 @@ ok( $files{'perllocal.pod'},' perllocal
SKIP: {
skip "VMS install targets do not preserve $(PREFIX)", 8 if $Is_VMS;
- $install_out = run("$make install PREFIX=elsewhere");
+ $install_out = run("$make install doc_install PREFIX=elsewhere");
is( $?, 0, 'install with PREFIX override' ) || diag $install_out;
like( $install_out, qr/^Installing /m );
like( $install_out, qr/^Writing /m );
@@ -157,7 +157,7 @@ SKIP: {
SKIP: {
skip "VMS install targets do not preserve $(DESTDIR)", 10 if $Is_VMS;
- $install_out = run("$make install PREFIX= DESTDIR=other");
+ $install_out = run("$make install doc_install PREFIX= DESTDIR=other");
is( $?, 0, 'install with DESTDIR' ) ||
diag $install_out;
like( $install_out, qr/^Installing /m );
@@ -197,7 +197,7 @@ SKIP: {
SKIP: {
skip "VMS install targets do not preserve $(PREFIX)", 9 if $Is_VMS;
- $install_out = run("$make install PREFIX=elsewhere DESTDIR=other/");
+ $install_out = run("$make install doc_install PREFIX=elsewhere DESTDIR=other/");
is( $?, 0, 'install with PREFIX override and DESTDIR' ) ||
diag $install_out;
like( $install_out, qr/^Installing /m );