OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 03-Sep-2003 14:48:22
Branch: HEAD Handle: 2003090313482002
Modified files:
openpkg-src/perl56 perl56.patch perl56.spec
openpkg-web news.txt
Log:
apply similar module search order patches to Perl 5.6.1 as we now have
for Perl 5.8.0
Summary:
Revision Changes Path
1.2 +102 -0 openpkg-src/perl56/perl56.patch
1.7 +2 -1 openpkg-src/perl56/perl56.spec
1.6375 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl56/perl56.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 perl56.patch
--- openpkg-src/perl56/perl56.patch 22 Jul 2003 13:41:40 -0000 1.1
+++ openpkg-src/perl56/perl56.patch 3 Sep 2003 12:48:22 -0000 1.2
@@ -65,3 +65,105 @@
lddlflags="-shared "
else
if [ -e /usr/lib/aout ]; then
+--- perl.c.orig 2001-03-22 06:05:02.000000000 +0100
++++ perl.c 2003-09-03 14:40:14.000000000 +0200
+@@ -3414,39 +3414,6 @@
+ incpush(APPLLIB_EXP, TRUE, TRUE);
+ #endif
+
+-#ifdef ARCHLIB_EXP
+- incpush(ARCHLIB_EXP, FALSE, FALSE);
+-#endif
+-#ifdef MACOS_TRADITIONAL
+- {
+- struct stat tmpstatbuf;
+- SV * privdir = NEWSV(55, 0);
+- char * macperl = PerlEnv_getenv("MACPERL");
+-
+- if (!macperl)
+- macperl = "";
+-
+- Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
+- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 &&
S_ISDIR(tmpstatbuf.st_mode))
+- incpush(SvPVX(privdir), TRUE, FALSE);
+- Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
+- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 &&
S_ISDIR(tmpstatbuf.st_mode))
+- incpush(SvPVX(privdir), TRUE, FALSE);
+-
+- SvREFCNT_dec(privdir);
+- }
+- if (!PL_tainting)
+- incpush(":", FALSE, FALSE);
+-#else
+-#ifndef PRIVLIB_EXP
+-# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
+-#endif
+-#if defined(WIN32)
+- incpush(PRIVLIB_EXP, TRUE, FALSE);
+-#else
+- incpush(PRIVLIB_EXP, FALSE, FALSE);
+-#endif
+-
+ #ifdef SITEARCH_EXP
+ /* sitearch is always relative to sitelib on Windows for
+ * DLL-based path intuition to work correctly */
+@@ -3487,6 +3454,39 @@
+ incpush(PERL_VENDORLIB_STEM, FALSE, TRUE);
+ #endif
+
++#ifdef ARCHLIB_EXP
++ incpush(ARCHLIB_EXP, FALSE, FALSE);
++#endif
++#ifdef MACOS_TRADITIONAL
++ {
++ struct stat tmpstatbuf;
++ SV * privdir = NEWSV(55, 0);
++ char * macperl = PerlEnv_getenv("MACPERL");
++
++ if (!macperl)
++ macperl = "";
++
++ Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
++ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 &&
S_ISDIR(tmpstatbuf.st_mode))
++ incpush(SvPVX(privdir), TRUE, FALSE);
++ Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
++ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 &&
S_ISDIR(tmpstatbuf.st_mode))
++ incpush(SvPVX(privdir), TRUE, FALSE);
++
++ SvREFCNT_dec(privdir);
++ }
++ if (!PL_tainting)
++ incpush(":", FALSE, FALSE);
++#else
++#ifndef PRIVLIB_EXP
++# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
++#endif
++#if defined(WIN32)
++ incpush(PRIVLIB_EXP, TRUE, FALSE);
++#else
++ incpush(PRIVLIB_EXP, FALSE, FALSE);
++#endif
++
+ #ifdef PERL_OTHERLIBDIRS
+ incpush(PERL_OTHERLIBDIRS, TRUE, TRUE);
+ #endif
+--- installperl.orig 2001-03-20 18:40:22.000000000 +0100
++++ installperl 2003-09-03 14:41:38.000000000 +0200
+@@ -129,6 +129,8 @@
+ my $installarchlib = $Config{installarchlib};
+ my $installsitelib = $Config{installsitelib};
+ my $installsitearch = $Config{installsitearch};
++my $installvendorlib = $Config{installvendorlib};
++my $installvendorarch = $Config{installvendorarch};
+ my $installman1dir = $Config{installman1dir};
+ my $man1ext = $Config{man1ext};
+ my $libperl = $Config{libperl};
+@@ -251,6 +253,8 @@
+ mkpath($installarchlib, $verbose, 0777);
+ mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
+ mkpath($installsitearch, $verbose, 0777) if ($installsitearch);
++mkpath($installvendorlib, $verbose, 0777) if ($installvendorlib);
++mkpath($installvendorarch, $verbose, 0777) if ($installvendorarch);
+
+ if (chdir "lib") {
+ $do_installarchlib = ! samepath($installarchlib, '.');
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl56/perl56.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 perl56.spec
--- openpkg-src/perl56/perl56.spec 23 Jul 2003 13:32:16 -0000 1.6
+++ openpkg-src/perl56/perl56.spec 3 Sep 2003 12:48:22 -0000 1.7
@@ -33,7 +33,7 @@
Group: Language
License: GPL/Artistic
Version: 5.6.1
-Release: 20030723
+Release: 20030903
# list of sources
Source0: ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz
@@ -74,6 +74,7 @@
./Configure \
-d -e -s \
-Dprefix=%{l_prefix} \
+ -Dvendorprefix=%{l_prefix} \
-Dinstallprefix=$RPM_BUILD_ROOT%{l_prefix} \
-Dcc="%{l_cc}" -Doptimize="%{l_cflags -O}" \
-Dlocincpth="%{l_prefix}/include" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6374 -r1.6375 news.txt
--- openpkg-web/news.txt 3 Sep 2003 12:37:44 -0000 1.6374
+++ openpkg-web/news.txt 3 Sep 2003 12:48:20 -0000 1.6375
@@ -1,3 +1,4 @@
+03-Sep-2003: Upgraded package: P<perl56-5.6.1-20030903>
03-Sep-2003: Upgraded package: P<perl-5.8.0-20030903>
02-Sep-2003: Upgraded package: P<pks-0.9.6-20030902>
02-Sep-2003: Upgraded package: P<pb4sd-1.2-20030902>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
