[arch-commits] CVS update of core/base/perl (3 files)
Kevin Piche
kevin at archlinux.org
Sun Mar 9 18:13:43 UTC 2008
Date: Sunday, March 9, 2008 @ 14:13:43
Author: kevin
Path: /home/cvs-core/core/base/perl
Modified: PKGBUILD (1.56 -> 1.57) perl.install (1.21 -> 1.22)
Removed: perl-5.10.0-archlinux-cpan-installdir.patch (1.1)
upgpkg: perl 5.10.0-3
Separate binary directories for perl executables
Change default CPAN and CPANPLUS settings
---------------------------------------------+
PKGBUILD | 57 +++++++++++++++++---------
perl-5.10.0-archlinux-cpan-installdir.patch | 11 -----
perl.install | 27 +++++++++---
3 files changed, 58 insertions(+), 37 deletions(-)
Index: core/base/perl/PKGBUILD
diff -u core/base/perl/PKGBUILD:1.56 core/base/perl/PKGBUILD:1.57
--- core/base/perl/PKGBUILD:1.56 Tue Jan 22 23:18:33 2008
+++ core/base/perl/PKGBUILD Sun Mar 9 14:13:43 2008
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD,v 1.56 2008/01/23 04:18:33 kevin Exp $
+# $Id: PKGBUILD,v 1.57 2008/03/09 18:13:43 kevin Exp $
# Maintainer: judd <jvinet at zeroflux.org>
pkgname=perl
pkgver=5.10.0
-pkgrel=2
+pkgrel=3
pkgdesc="Practical Extraction and Report Language"
-arch=(i686 x86_64)
+arch=(i686 x86_64)
license=('GPL' 'PerlArtistic')
url="http://www.perl.org"
groups=('base')
depends=('gdbm' 'db>=4.6' 'coreutils' 'glibc' 'sh')
# for site_perl this is needed!
#test without options=('emptydirs')
-source=(http://www.perl.com/CPAN/src/perl-$pkgver.tar.gz
+source=(http://www.perl.com/CPAN/src/perl-${pkgver}.tar.gz
# http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/DB_File-1.814.tar.gz
- perl-5.8.6-picdl.patch0
- perl-5.10.0-archlinux-cpan-installdir.patch
+ perlbin.sh perl-5.8.6-picdl.patch0
perl-5.10.0-archlinux-inc-order.patch)
install=perl.install
provides=(
@@ -32,12 +31,13 @@
perl-object-accessor perl-params-check perl-term-ui perl-time-piece
)
md5sums=('d2c39b002ebfd2c3c5dba589365c5a71'
+ '9c4e3e56d71f123e92a68986df5ea924'
'319b56a7ce715fb7a494fe4d5cb9474c'
'7183a5a0b9332d135e1e52f582c5d4e4'
'0e4853bd75ee36b8f4c70b78c707b2fa')
build() {
- cd $startdir/src/$pkgname-$pkgver
+ cd ${startdir}/src/${pkgname}-${pkgver}
# Update some modules provided with perl:
# replace the old DB_File with the newest one from CPAN,
@@ -46,11 +46,10 @@
# rm -rf DB_File
# mv $startdir/src/DB_File-1.814 ./DB_File
- cd $startdir/src/$pkgname-$pkgver
+ cd ${startdir}/src/${pkgname}-${pkgver}
patch -Np0 -i ../perl-5.10.0-archlinux-inc-order.patch
- patch -Np0 -i ../perl-5.10.0-archlinux-cpan-installdir.patch
- if [ "$CARCH" = "x86_64" ]; then
+ if [ "${CARCH}" = "x86_64" ]; then
# for x86_64
arch_opts="-Dcccdlflags='-fPIC'"
patch -Np0 -i ../perl-5.8.6-picdl.patch0 || return 1
@@ -58,27 +57,47 @@
# for i686
arch_opts=""
fi
- ./Configure -des -Dusethreads -Doptimize="$CFLAGS" -Dprefix=/usr \
- -Dinstallprefix=$startdir/pkg/usr -Dvendorprefix=/usr \
+ ./Configure -des -Dusethreads -Doptimize="${CFLAGS}" -Dprefix=/usr \
+ -Dinstallprefix=${startdir}/pkg/usr -Dvendorprefix=/usr \
-Dprivlib=/usr/share/perl5/core_perl \
-Darchlib=/usr/lib/perl5/core_perl \
- -Dsitelib=/usr/share/perl5/site_perl/$pkgver \
- -Dsitearch=/usr/lib/perl5/site_perl/$pkgver \
+ -Dsitelib=/usr/share/perl5/site_perl/${pkgver} \
+ -Dsitearch=/usr/lib/perl5/site_perl/${pkgver} \
-Dvendorlib=/usr/share/perl5/vendor_perl \
-Dvendorarch=/usr/lib/perl5/vendor_perl \
-Dotherlibdirs=/usr/lib/perl5/current:/usr/lib/perl5/site_perl/current \
- -Dman1ext=1perl -Dman3ext=3perl $arch_opts
- #-Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/man/man3 \
+ -Dscriptdir='/usr/bin/perlbin/core' \
+ -Dsitescript='/usr/bin/perlbin/site' \
+ -Dvendorscript='/usr/bin/perlbin/vendor' \
+ -Dman1ext=1perl -Dman3ext=3perl ${arch_opts}
make || return 1
make install
+ ### Perl Settings ###
# Change man page extensions for site and vendor module builds.
sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \
-i ${startdir}/pkg/usr/lib/perl5/core_perl/Config_heavy.pl
- (cd $startdir/pkg/usr/bin; mv perl$pkgver perl; \
+ ### CPAN Settings ###
+ # Set CPAN default config to use the site directories.
+ sed -e '/(makepl_arg =>/ s/""/"INSTALLDIRS=site"/' \
+ -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \
+ -i ${startdir}/pkg/usr/share/perl5/core_perl/CPAN/FirstTime.pm
+
+ ### CPANPLUS Settings ###
+ # Set CPANPLUS default config to use the site directories.
+ sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \
+ -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \
+ -i ${startdir}/pkg/usr/share/perl5/core_perl/CPANPLUS/Config.pm
+
+ # Profile script so set paths to perl scripts.
+ install -D -m755 ${startdir}/src/perlbin.sh \
+ ${startdir}/pkg/etc/profile.d/perlbin.sh
+
+ (cd ${startdir}/pkg/usr/bin; mv perl${pkgver} perl)
+ (cd ${startdir}/pkg/usr/bin/perlbin/core; \
ln -sf c2ph pstruct; ln -sf s2p psed)
- grep -Rl "$startdir/pkg" $startdir/pkg/usr | \
- xargs sed -i "s^$startdir/pkg^^g"
+ grep -Rl "${startdir}/pkg" ${startdir}/pkg/usr | \
+ xargs sed -i "s^${startdir}/pkg^^g"
}
Index: core/base/perl/perl-5.10.0-archlinux-cpan-installdir.patch
diff -u core/base/perl/perl-5.10.0-archlinux-cpan-installdir.patch:1.1 core/base/perl/perl-5.10.0-archlinux-cpan-installdir.patch:removed
--- core/base/perl/perl-5.10.0-archlinux-cpan-installdir.patch:1.1 Tue Jan 1 00:26:08 2008
+++ core/base/perl/perl-5.10.0-archlinux-cpan-installdir.patch Sun Mar 9 14:13:43 2008
@@ -1,11 +0,0 @@
---- lib/CPAN/FirstTime.pm.orig 2007-12-24 23:21:42.000000000 -0500
-+++ lib/CPAN/FirstTime.pm 2007-12-24 23:26:04.000000000 -0500
-@@ -940,7 +940,7 @@
- }
-
- if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) {
-- my_dflt_prompt(makepl_arg => "", $matcher);
-+ my_dflt_prompt(makepl_arg => "INSTALLDIRS=site", $matcher);
- my_dflt_prompt(make_arg => "", $matcher);
- }
-
Index: core/base/perl/perl.install
diff -u core/base/perl/perl.install:1.21 core/base/perl/perl.install:1.22
--- core/base/perl/perl.install:1.21 Tue Jan 22 23:18:33 2008
+++ core/base/perl/perl.install Sun Mar 9 14:13:43 2008
@@ -12,21 +12,34 @@
echo
echo " - The perl package and its modules install in the core_perl directories"
echo " - Perl modules provided by Arch Linux install in vendor_perl directories"
- echo " - CPAN installed modules install in site_perl directories"
- echo " - Older modules in the current directory should still work"
+ echo " - CPAN/CPANPLUS installs should be placed in site_perl directories"
+ echo " - Older modules in the 'current' directory should still work"
echo " - Programs with embedded perl interpreters need to be rebuilt"
echo
- echo " If you use the CPAN shell to install modules it is recommended to"
- echo " rebuild the configuration file .../CPAN/Config.pm by using the CPAN"
- echo " command: o conf init"
+ echo " Users of the CPAN or CPANPLUS shells should modify the configuration"
+ echo " to use the site_perl directories. Under the CPAN shell use:"
+ echo " o conf makepl_arg INSTALLDIRS=site"
+ echo " o conf mbuildpl_arg installdirs=site"
+ echo " Under the CPANPLUS shell:"
+ echo " s conf buildflags installdirs=site"
+ echo " s conf makemakerflags INSTALLDIRS=site"
+ echo " Then save the configuration."
echo
- echo " The following packages can be removed since the modules are now"
- echo " included in the standard perl library:"
+ echo " The following official packages can be removed since the modules are"
+ echo " now included in the standard perl library:"
echo " perl-archive-tar perl-compress-raw-zlib perl-compress-zlib"
echo " perl-extutils-cbuilder perl-io-compress-base perl-io-compress-zlib"
echo " perl-io-zlib perl-module-pluggable perl-pod-escapes perl-pod-simple"
echo " perl-module-build perl-version"
echo
+ echo " These community packages are also included in the standard perl library:"
+ echo " perl-archive-extract perl-cpanplus perl-digest-sha perl-file-fetch"
+ echo " perl-extutils-parsexs perl-ipc-cmd perl-locale-maketext-simple"
+ echo " perl-log-message perl-log-message-simple perl-module-corelist"
+ echo " perl-module-load perl-module-load-conditional perl-module-loaded"
+ echo " perl-module-pluggable perl-object-accessor perl-params-check"
+ echo " perl-term-ui perl-time-piece"
+ echo
}
# arg 1: the new package version
More information about the arch-commits
mailing list