Date: Sunday, November 7, 2010 @ 23:15:22 Author: kevin Revision: 98351
upgpkg: in_bin - Updated to 5.12.2 Modified: perl/trunk/ChangeLog perl/trunk/PKGBUILD perl/trunk/perl.install perl/trunk/perlbin.sh --------------+ ChangeLog | 11 +++++++++++ PKGBUILD | 18 +++++++++--------- perl.install | 6 +++--- perlbin.sh | 22 +++++++++++++--------- 4 files changed, 36 insertions(+), 21 deletions(-) Modified: ChangeLog =================================================================== --- ChangeLog 2010-11-07 23:57:51 UTC (rev 98350) +++ ChangeLog 2010-11-08 04:15:22 UTC (rev 98351) @@ -1,4 +1,15 @@ +2010-11-07 kevin <ke...@archlinux.org> + * perl 5.12.2-1 + - Using /usr/bin/*_perl for script directories + +2010-11-06 kevin <ke...@archlinux.org> + + - Removed otherlibdirs directive from Configure + - Removed /usr/*/perl5/site_perl/5.10.1 from INC + - Finally removed legacy dirs /usr/lib/perl5/current and + /usr/lib/perl5/site_perl/current from @INC + 2010-05-23 kevin <ke...@archlinux.org> * perl 5.12.1-2 Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-11-07 23:57:51 UTC (rev 98350) +++ PKGBUILD 2010-11-08 04:15:22 UTC (rev 98351) @@ -3,14 +3,15 @@ # Contributor: judd <jvinet.zeroflux.org> # Contributor: francois <francois.archlinux.org> pkgname=perl -pkgver=5.12.1 -pkgrel=3 +pkgver=5.12.2 +pkgrel=1 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') url="http://www.perl.org" groups=('base') depends=('gdbm' 'db>=4.8' 'coreutils' 'glibc' 'sh') +changelog=ChangeLog source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perlbin.sh) install=perl.install provides=( @@ -149,12 +150,12 @@ -Dsitearch=/usr/lib/perl5/site_perl \ -Dvendorlib=/usr/share/perl5/vendor_perl \ -Dvendorarch=/usr/lib/perl5/vendor_perl \ - -Dotherlibdirs=/usr/lib/perl5/site_perl/5.10.1:/usr/share/perl5/site_perl/5.10.1:/usr/lib/perl5/current:/usr/lib/perl5/site_perl/current \ - -Dscriptdir=/usr/lib/perl5/core_perl/bin \ - -Dsitescript=/usr/lib/perl5/site_perl/bin \ - -Dvendorscript=/usr/lib/perl5/vendor_perl/bin \ + -Dscriptdir=/usr/bin/core_perl \ + -Dsitescript=/usr/bin/site_perl \ + -Dvendorscript=/usr/bin/vendor_perl \ -Dinc_version_list=none \ -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} + #-Dotherlibdirs=/usr/lib/perl5/site_perl/5.10.1:/usr/share/perl5/site_perl/5.10.1:/usr/lib/perl5/current:/usr/lib/perl5/site_perl/current \ make || return 1 make install @@ -184,8 +185,7 @@ ${pkgdir}/etc/profile.d/perlbin.sh (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) - (cd ${pkgdir}/usr/lib/perl5/core_perl/bin; \ - ln -sf c2ph pstruct; ln -sf s2p psed) + (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) grep -Rl "${pkgdir}" ${pkgdir}/usr | \ xargs sed -i "s^${pkgdir}^^g" @@ -200,4 +200,4 @@ find $pkgdir/usr/lib -name *.pod -delete find $pkgdir -name .packlist -delete } -md5sums=('f7f2d7f5aaac15a75028381b159a560f' '15f653f99b270ba91438cae91718c69f') +md5sums=('7b018fe9c2f434eff0c629b4c515a8fc' 'f86eb0dba1638ca6d1c8fff1b06c2a71') Modified: perl.install =================================================================== --- perl.install 2010-11-07 23:57:51 UTC (rev 98350) +++ perl.install 2010-11-08 04:15:22 UTC (rev 98351) @@ -11,8 +11,8 @@ post_upgrade() { echo '- The directories /usr/lib/perl5/current, /usr/lib/perl5/site_perl/current,' echo ' /usr/lib/perl5/site_perl/5.10.1, and /usr/share/perl5/site_perl/5.10.1' - echo ' will be removed from @INC in a future release.' + echo ' have been removed from @INC.' - echo '- The directory /usr/bin/perlbin/site will not be added to $PATH in a' - echo ' future release.' + echo '- The script/binary directories are now /usr/bin/*_perl instead of' + echo ' /usr/lib/perl5/*_perl/bin which will be eventually removed.' } Modified: perlbin.sh =================================================================== --- perlbin.sh 2010-11-07 23:57:51 UTC (rev 98350) +++ perlbin.sh 2010-11-08 04:15:22 UTC (rev 98351) @@ -1,17 +1,21 @@ -# Set path to perl scripts. -# Remove the perlbin dirs in the next release. +# Set path to perl scriptdirs if they exist +# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts +# Added /usr/bin/*_perl dirs for scripts +# Remove /usr/lib/perl5/*_perl/bin in next release -# Add dirs to path if they exist. +[ -d /usr/bin/site_perl ] && + PATH=$PATH:/usr/bin/site_perl [ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin -[ -d /usr/bin/perlbin/site ] && - PATH=$PATH:/usr/bin/perlbin/site + +[ -d /usr/bin/vendor_perl ] && + PATH=$PATH:/usr/bin/vendor_perl [ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin -[ -d /usr/bin/perlbin/vendor ] && - PATH=$PATH:/usr/bin/perlbin/vendor -[ -d /usr/lib/perl5/core_perl/bin ] && - PATH=$PATH:/usr/lib/perl5/core_perl/bin + +[ -d /usr/bin/core_perl ] && + PATH=$PATH:/usr/bin/core_perl + export PATH # If you have modules in non-standard directories you can add them here.