diff options
| author | skv <skv@FreeBSD.org> | 2010-07-15 01:24:21 +0800 |
|---|---|---|
| committer | skv <skv@FreeBSD.org> | 2010-07-15 01:24:21 +0800 |
| commit | 348cce1e6de93ab99548b8562917c3758c86c2c0 (patch) | |
| tree | bcfd7ee2922fc48d6bdf1483ae2cb1e534895d22 /lang/perl5.12 | |
| parent | ceb6ee3b0273070d5eb71085866fb7994101fb33 (diff) | |
| download | freebsd-ports-gnome-348cce1e6de93ab99548b8562917c3758c86c2c0.tar.gz freebsd-ports-gnome-348cce1e6de93ab99548b8562917c3758c86c2c0.tar.zst freebsd-ports-gnome-348cce1e6de93ab99548b8562917c3758c86c2c0.zip | |
- Fix generation of '+CONTENTS' file for 'bsdpan-*' packages [1]
- Don't remove '/usr/local/lib' from path $libpth
if this dir does not exist [2]
PR: ports/116908 [1]
Submitted by: Steve Wills <steve@mouf.net> [1],
Kukushkin Konstantin <dark@ramtel.ru> [2]
Diffstat (limited to 'lang/perl5.12')
| -rw-r--r-- | lang/perl5.12/Makefile | 5 | ||||
| -rw-r--r-- | lang/perl5.12/distinfo | 6 | ||||
| -rw-r--r-- | lang/perl5.12/files/patch-Configure | 11 |
3 files changed, 17 insertions, 5 deletions
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile index 1a13018a753c..0837347fd0a3 100644 --- a/lang/perl5.12/Makefile +++ b/lang/perl5.12/Makefile @@ -7,7 +7,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 1 +PORTREVISON= 2 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -160,7 +160,7 @@ BSDPAN_FILES= BSDPAN.pm BSDPAN/Override.pm Config.pm \ ExtUtils/MM_Unix.pm \ ExtUtils/MakeMaker.pm \ ExtUtils/Packlist.pm -BSDPAN_VERSION= 5.12.0_20100422 +BSDPAN_VERSION= 5.12.1_20100713 BSDPAN_WRKSRC= ${WRKDIR}/BSDPAN-${BSDPAN_VERSION} PKGINSTALL= ${WRKDIR}/pkg-install @@ -180,6 +180,7 @@ post-patch: ${CP} ${WRKDIR}/use.perl ${PKGINSTALL} ${CP} ${WRKDIR}/use.perl ${PKGDEINSTALL} ${SED} -i '' -e 's|%%PERL_PKGNAME%%|${PKGNAME}|g; s|%%PERL_VER%%|5.10|g;' \ + -e 's!%%BSDPAN_VERSION%%!${BSDPAN_VERSION}!g;' \ ${BSDPAN_WRKSRC}/ExtUtils/*.pm ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh diff --git a/lang/perl5.12/distinfo b/lang/perl5.12/distinfo index 2aad41e9f7a9..4c620220c222 100644 --- a/lang/perl5.12/distinfo +++ b/lang/perl5.12/distinfo @@ -1,6 +1,6 @@ MD5 (perl/perl-5.10.1.tar.bz2) = 82400c6d34f7b7b43d0196c76cd2bbb1 SHA256 (perl/perl-5.10.1.tar.bz2) = 9385f2c8c2ca8b1dc4a7c31903f1f8dc8f2ba867dc2a9e5c93012ed6b564e826 SIZE (perl/perl-5.10.1.tar.bz2) = 11608061 -MD5 (perl/BSDPAN-5.12.0_20100422.tar.bz2) = 16918568ae943b416b36196f47015a34 -SHA256 (perl/BSDPAN-5.12.0_20100422.tar.bz2) = 9bbcb4056c9c80c572acdff24319fa9a3b9a2c368ea59dfecb84e965d82f93d9 -SIZE (perl/BSDPAN-5.12.0_20100422.tar.bz2) = 8301 +MD5 (perl/BSDPAN-5.12.1_20100713.tar.bz2) = 2dcad380d91c60aaa4ac6db29d997712 +SHA256 (perl/BSDPAN-5.12.1_20100713.tar.bz2) = f700acc5ca29c6ef94460d23acffde77834e883cdb7cd043dbdb7c7d709a9392 +SIZE (perl/BSDPAN-5.12.1_20100713.tar.bz2) = 8430 diff --git a/lang/perl5.12/files/patch-Configure b/lang/perl5.12/files/patch-Configure new file mode 100644 index 000000000000..0abb559cbc33 --- /dev/null +++ b/lang/perl5.12/files/patch-Configure @@ -0,0 +1,11 @@ +--- Configure.orig 2010-07-14 15:28:45.000000000 +0000 ++++ Configure 2010-07-14 15:29:23.000000000 +0000 +@@ -4780,7 +4780,7 @@ + libpth='' + for xxx in $dlist + do +- if $test -d $xxx; then ++ if $test -d $xxx || [ $xxx = $prefix/lib ]; then + case " $libpth " in + *" $xxx "*) ;; + *) libpth="$libpth $xxx";; |