[arch-commits] Commit in perl/trunk (ChangeLog PKGBUILD perl.install perlbin.sh)

[Kevin Piché]

    Date: Saturday, May 15, 2010 @ 22:03:46
  Author: kevin
Revision: 80366

upgpkg: in_bin -
Fix FS#19411 and FS#19427

Modified:
  perl/trunk/ChangeLog
  perl/trunk/PKGBUILD
  perl/trunk/perl.install
  perl/trunk/perlbin.sh

--------------+
 ChangeLog    |   16 ++++++++++++++++
 PKGBUILD     |   18 +++++++++---------
 perl.install |    8 ++++++++
 perlbin.sh   |   22 ++++++++++++++--------
 4 files changed, 47 insertions(+), 17 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-05-15 18:38:42 UTC (rev 80365)
+++ ChangeLog	2010-05-16 02:03:46 UTC (rev 80366)
@@ -1,4 +1,17 @@
+2010-05-15  kevin  <kevin at archlinux.org>
 
+    * perl 5.12.0-2
+
+
+2010-05-12  kevin  <kevin at archlinux.org>
+
+    - FS#19411.  Removed the for loop in perlbin.sh which didn't work on zsh.
+      This makes the loop variables unnecessary so the script no longer
+      pollutes the user's environment.
+    - FS#19427.  Added /usr/*/perl5/site_perl/5.10.1 to otherlibdirs to support
+      user built modules.
+
+
 2010-05-09  kevin  <kevin at archlinux.org>
 
     * perl 5.12.0-1
@@ -13,4 +26,7 @@
       This removes the duplicates and versioned directory entries.
     - Change scriptdirs to /usr/lib/perl5/{core,vendor,site}_perl/bin to fix
       Fix FS#13808, binaries don't follow FHS.
+    - Stopped using versioned directories in sitelib and sitearch.
 
+
+# vim: set ft=changelog ts=4 sw=4 et:

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-15 18:38:42 UTC (rev 80365)
+++ PKGBUILD	2010-05-16 02:03:46 UTC (rev 80366)
@@ -4,14 +4,14 @@
 # Contributor: francois <francois.archlinux.org> 
 pkgname=perl
 pkgver=5.12.0
-pkgrel=1
+pkgrel=2
 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')
-source=(http://www.cpan.org/src/perl-${pkgver}.tar.bz2 perlbin.sh)
+source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perlbin.sh)
 install=perl.install
 provides=(
 perl-ansicolor=2.00 
@@ -140,18 +140,18 @@
     # for i686
     arch_opts=""
   fi
-  ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" -Dprefix=/usr \
-    -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \
+  ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \
+    -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \
     -Dprivlib=/usr/share/perl5/core_perl \
     -Darchlib=/usr/lib/perl5/core_perl \
     -Dsitelib=/usr/share/perl5/site_perl \
     -Dsitearch=/usr/lib/perl5/site_perl \
     -Dvendorlib=/usr/share/perl5/vendor_perl \
     -Dvendorarch=/usr/lib/perl5/vendor_perl \
-    -Dotherlibdirs=/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' \
+    -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 \
     -Dinc_version_list=none \
     -Dman1ext=1perl -Dman3ext=3perl ${arch_opts}
 
@@ -199,4 +199,4 @@
   find $pkgdir/usr/lib -name *.pod -delete
   find $pkgdir -name .packlist -delete
 }
-md5sums=('3e15696f4160775a90f6b2fb3ccc98c2' '1aa14b4f24fddc7795f4d679f8c265ec')
+md5sums=('3e15696f4160775a90f6b2fb3ccc98c2' '15f653f99b270ba91438cae91718c69f')

Modified: perl.install
===================================================================
--- perl.install	2010-05-15 18:38:42 UTC (rev 80365)
+++ perl.install	2010-05-16 02:03:46 UTC (rev 80366)
@@ -8,3 +8,11 @@
   return 0
 }
 
+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 '  The directory /usr/bin/perlbin/site will not be added to $PATH in a'
+  echo '  future release.'
+}

Modified: perlbin.sh
===================================================================
--- perlbin.sh	2010-05-15 18:38:42 UTC (rev 80365)
+++ perlbin.sh	2010-05-16 02:03:46 UTC (rev 80366)
@@ -1,13 +1,19 @@
 # Set path to perl scripts.
-
 # Remove the perlbin dirs in the next release.
-scriptdirs="/usr/lib/perl5/site_perl/bin /usr/bin/perlbin/site
-/usr/lib/perl5/vendor_perl/bin /usr/bin/perlbin/vendor
-/usr/lib/perl5/core_perl/bin /usr/bin/perlbin/core"
 
 # Add dirs to path if they exist.
-for currdir in ${scriptdirs}; do
-	[ -d ${currdir} ] && perlpaths=${perlpaths}:${currdir}
-done
-export PATH=${PATH}:$perlpaths
+[ -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/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
+export PATH
 
+# If you have modules in non-standard directories you can add them here.
+#export PERLLIB=dir1:dir2
+