From 2d340eb1f360ef7cc0d161121d8fdc4d9ae479a7 Mon Sep 17 00:00:00 2001 From: pius Date: Sun, 2 Jul 2000 19:56:34 +0000 Subject: [PATCH] - new and updated for perl-5.6.0 Changed files: perl-DESTDIR.patch -> 1.3 perl-installman.patch -> 1.1 perl-nodb.patch -> 1.1 perl-noroot_install.patch -> 1.4 perl-prereq.patch -> 1.1 --- perl-DESTDIR.patch | 48 +++++++++-------- perl-installman.patch | 15 ++++++ perl-nodb.patch | 110 ++++++++++++++++++++++++++++++++++++++ perl-noroot_install.patch | 16 +++--- perl-prereq.patch | 25 +++++++++ 5 files changed, 184 insertions(+), 30 deletions(-) create mode 100644 perl-installman.patch create mode 100644 perl-nodb.patch create mode 100644 perl-prereq.patch diff --git a/perl-DESTDIR.patch b/perl-DESTDIR.patch index 618e25b..dacd703 100644 --- a/perl-DESTDIR.patch +++ b/perl-DESTDIR.patch @@ -1,6 +1,6 @@ ---- perl5.005_03/lib/ExtUtils/MM_Unix.pm.wiget Fri Mar 5 01:34:20 1999 -+++ perl5.005_03/lib/ExtUtils/MM_Unix.pm Tue Sep 14 16:32:31 1999 -@@ -515,8 +515,7 @@ +--- perl-5.6.0/lib/ExtUtils/MM_Unix.pm.pius Thu Mar 2 18:52:52 2000 ++++ perl-5.6.0/lib/ExtUtils/MM_Unix.pm Sun Jul 2 11:13:32 2000 +@@ -552,8 +552,7 @@ AR_STATIC_ARGS NAME DISTNAME NAME_SYM VERSION VERSION_SYM XS_VERSION INST_BIN INST_EXE INST_LIB INST_ARCHLIB INST_SCRIPT PREFIX INSTALLDIRS @@ -9,39 +9,43 @@ + PERL_LIB PERL_ARCHLIB SITELIBEXP SITEARCHEXP LIBPERL_A MYEXTLIB FIRST_MAKEFILE MAKE_APERL_FILE PERLMAINCC PERL_SRC - PERL_INC PERL FULLPERL -@@ -526,6 +525,15 @@ + PERL_INC PERL FULLPERL FULL_AR +@@ -563,6 +562,16 @@ push @m, "$tmp = $self->{$tmp}\n"; } + for $tmp (qw/ + -+ INSTALLPRIVLIB INSTALLARCHLIB INSTALLSITELIB -+ INSTALLSITEARCH INSTALLBIN INSTALLSCRIPT ++ INSTALLPRIVLIB INSTALLARCHLIB INSTALLSITELIB ++ INSTALLSITEARCH INSTALLBIN INSTALLSCRIPT + -+ / ) { -+ next unless defined $self->{$tmp}; -+ push @m, "$tmp = \$\(DESTDIR\)$self->{$tmp}\n"; ++ / ) { ++ next unless defined $self->{$tmp}; ++ push @m, "$tmp = \$\(DESTDIR\)$self->{$tmp}\n"; + } ++ push @m, qq{ VERSION_MACRO = VERSION DEFINE_VERSION = -D\$(VERSION_MACRO)=\\\"\$(VERSION)\\\" -@@ -565,10 +573,17 @@ - "; - - for $tmp (qw/ -- INST_MAN1DIR INSTALLMAN1DIR MAN1EXT INST_MAN3DIR INSTALLMAN3DIR MAN3EXT -+ INST_MAN1DIR MAN1EXT INST_MAN3DIR MAN3EXT +@@ -609,12 +618,19 @@ + INST_HTMLSITELIBDIR INSTALLHTMLSITELIBDIR + INST_HTMLSCRIPTDIR INSTALLHTMLSCRIPTDIR + INST_HTMLLIBDIR HTMLEXT +- INST_MAN1DIR INSTALLMAN1DIR MAN1EXT +- INST_MAN3DIR INSTALLMAN3DIR MAN3EXT ++ INST_MAN1DIR MAN1EXT ++ INST_MAN3DIR MAN3EXT /) { next unless defined $self->{$tmp}; push @m, "$tmp = $self->{$tmp}\n"; -+ } + } + + for $tmp (qw/ -+ INSTALLMAN1DIR INSTALLMAN3DIR -+ /) { -+ next unless defined $self->{$tmp}; -+ push @m, "$tmp = \$\(DESTDIR\)$self->{$tmp}\n"; - } ++ INSTALLMAN1DIR INSTALLMAN3DIR ++ /) { ++ next unless defined $self->{$tmp}; ++ push @m, "$tmp = \$\(DESTDIR\)$self->{$tmp}\n"; ++ } for $tmp (qw( + PERM_RW PERM_RWX diff --git a/perl-installman.patch b/perl-installman.patch new file mode 100644 index 0000000..1114e12 --- /dev/null +++ b/perl-installman.patch @@ -0,0 +1,15 @@ +--- perl-5.6.0/lib/ExtUtils/MM_Unix.pm.instman Thu Mar 2 18:52:52 2000 ++++ perl-5.6.0/lib/ExtUtils/MM_Unix.pm Thu Mar 23 17:32:54 2000 +@@ -1757,6 +1757,12 @@ + # you to build directly into, say $Config::Config{privlibexp}. + unless ($self->{INST_LIB}){ + ++ for $install_variable (qw/ ++ INSTALLMAN1DIR ++ INSTALLMAN3DIR ++ /) { ++ $self->prefixify($install_variable,$configure_prefix,qq[\$\(PREFIX\)]); ++ } + + ##### XXXXX We have to change this nonsense + diff --git a/perl-nodb.patch b/perl-nodb.patch new file mode 100644 index 0000000..08c0bba --- /dev/null +++ b/perl-nodb.patch @@ -0,0 +1,110 @@ +--- perl-5.6.0/ext/NDBM_File/Makefile.PL.nodb Tue Jul 20 19:17:56 1999 ++++ perl-5.6.0/ext/NDBM_File/Makefile.PL Thu Mar 23 17:54:21 2000 +@@ -2,6 +2,7 @@ + WriteMakefile( + NAME => 'NDBM_File', + LIBS => ["-L/usr/local/lib -lndbm", "-ldbm -lucb"], ++ CCFLAGS => '-I/usr/include/db1 -Dbool=char -DHAS_BOOL', + MAN3PODS => {}, # Pods will be built by installman. + XSPROTOARG => '-noprototypes', # XXX remove later? + VERSION_FROM => 'NDBM_File.pm', +--- perl-5.6.0/hints/linux.sh.nodb Sun Mar 19 08:37:24 2000 ++++ perl-5.6.0/hints/linux.sh Thu Mar 23 17:54:21 2000 +@@ -70,7 +70,12 @@ + + # BSD compatability library no longer needed + # 'kaffe' has a /usr/lib/libnet.so which is not at all relevent for perl. +-set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ net / /'` ++set `echo X "$libswanted "| \ ++ sed -e 's/ bsd / /' \ ++ -e 's/ net / /' \ ++ -e 's/ db / /' \ ++ -e 's/ gdbm / /' \ ++ -e 's/ ndbm / /'` + shift + libswanted="$*" + +--- perl-5.6.0/t/lib/ndbm.t.nodb Tue Jul 20 19:18:13 1999 ++++ perl-5.6.0/t/lib/ndbm.t Thu Mar 23 17:54:21 2000 +@@ -103,7 +103,9 @@ + if ($#keys == 31) {print "ok 7\n";} else {print "not ok 7\n";} + + $h{'foo'} = ''; +-$h{''} = 'bar'; ++# stupid DB library does not support empty string as keys, so there ++# is nothing for perl to test here... ++$h{' '} = 'bar'; + + # check cache overflow and numeric keys and contents + $ok = 1; +@@ -120,7 +122,8 @@ + print join(':',200..400) eq join(':',@foo) ? "ok 10\n" : "not ok 10\n"; + + print ($h{'foo'} eq '' ? "ok 11\n" : "not ok 11\n"); +-print ($h{''} eq 'bar' ? "ok 12\n" : "not ok 12\n"); ++# same thing ... we used to test for $h{''}, but DB does not allow it ++print ($h{' '} eq 'bar' ? "ok 12\n" : "not ok 12\n"); + + untie %h; + unlink 'Op.dbmx.dir', $Dfile; +--- perl-5.6.0/t/lib/anydbm.t.nodb Fri Mar 3 03:34:21 2000 ++++ perl-5.6.0/t/lib/anydbm.t Thu Mar 23 17:58:01 2000 +@@ -101,7 +101,9 @@ + if ($#keys == 31) {print "ok 7\n";} else {print "not ok 7\n";} + + $h{'foo'} = ''; +-$h{''} = 'bar'; ++# stupid DB does not allow zero-length keys. Not perl's fault, really ++# so we test for $h{' '} instead of $h{''} ++$h{' '} = 'bar'; + + # check cache overflow and numeric keys and contents + $ok = 1; +@@ -118,7 +120,9 @@ + print join(':',200..400) eq join(':',@foo) ? "ok 10\n" : "not ok 10\n"; + + print ($h{'foo'} eq '' ? "ok 11\n" : "not ok 11\n"); +-if ($h{''} eq 'bar') { ++# stupid DB does not allow zero-length keys. Not perl's fault, really ++# so we test for $h{' '} instead of $h{''} ++if ($h{' '} eq 'bar') { + print "ok 12\n" ; + } + else { +--- perl-5.6.0/Configure.nodb Thu Mar 23 17:54:21 2000 ++++ perl-5.6.0/Configure Thu Mar 23 17:56:07 2000 +@@ -12053,10 +12053,16 @@ + } + EOCP + set try ++ # this is really stupid, but we have to link in the -ldb to have ++ # the above program succeed ++ _old_libs=$libs ++ libs="$libs -ldb" + if eval $compile_ok && ./try; then + echo 'Looks OK.' >&4 ++ libs=$_old_libs + else + echo "I can't use Berkeley DB with your . I'll disable Berkeley DB." >&4 ++ libs=$_old_libs + i_db=$undef + case " $libs " in + *"-ldb "*) +@@ -12099,7 +12105,7 @@ + } + #endif + EOCP +- if $cc $ccflags -c try.c >try.out 2>&1 ; then ++ if $cc $ccflags -c try.c -ldb >try.out 2>&1 ; then + if $contains warning try.out >>/dev/null 2>&1 ; then + db_hashtype='int' + else +@@ -12144,7 +12150,7 @@ + } + #endif + EOCP +- if $cc $ccflags -c try.c >try.out 2>&1 ; then ++ if $cc $ccflags -c try.c -ldb >try.out 2>&1 ; then + if $contains warning try.out >>/dev/null 2>&1 ; then + db_prefixtype='int' + else diff --git a/perl-noroot_install.patch b/perl-noroot_install.patch index b620584..231da6a 100644 --- a/perl-noroot_install.patch +++ b/perl-noroot_install.patch @@ -1,6 +1,6 @@ ---- perl5.005_56/installperl~ Mon Feb 15 15:23:47 1999 -+++ perl5.005_56/installperl Tue Apr 20 19:16:44 1999 -@@ -117,8 +117,6 @@ +--- perl-5.6.0/installperl.pius Wed Mar 8 13:22:41 2000 ++++ perl-5.6.0/installperl Sun Jul 2 13:36:20 2000 +@@ -143,8 +143,6 @@ # Do some quick sanity checks. @@ -9,12 +9,12 @@ $installbin || die "No installbin directory in config.sh\n"; -d $installbin || mkpath($installbin, 1, 0777); -d $installbin || $nonono || die "$installbin is not a directory\n"; -@@ -182,7 +180,7 @@ - safe_unlink("$installbin/s$perl$ver$exe_ext"); +@@ -224,7 +222,7 @@ + safe_unlink("$installbin/s$perl_verbase$ver$exe_ext"); if ($d_dosuid) { - copy("suidperl$exe_ext", "$installbin/s$perl$ver$exe_ext"); -- chmod(04711, "$installbin/s$perl$ver$exe_ext"); -+ chmod(0755, "$installbin/s$perl$ver$exe_ext"); + copy("suidperl$exe_ext", "$installbin/s$perl_verbase$ver$exe_ext"); +- chmod(04711, "$installbin/s$perl_verbase$ver$exe_ext"); ++ chmod(0755, "$installbin/s$perl_verbase$ver$exe_ext"); } # Install library files. diff --git a/perl-prereq.patch b/perl-prereq.patch new file mode 100644 index 0000000..3dd173a --- /dev/null +++ b/perl-prereq.patch @@ -0,0 +1,25 @@ +--- perl-5.6.0/lib/ExtUtils/MakeMaker.pm.prereq Mon Feb 28 07:58:49 2000 ++++ perl-5.6.0/lib/ExtUtils/MakeMaker.pm Thu Mar 23 17:59:56 2000 +@@ -201,6 +201,7 @@ + NAME NEEDS_LINKING NOECHO NORECURS NO_VC OBJECT OPTIMIZE PERL PERLMAINCC + PERL_ARCHLIB PERL_LIB PERL_SRC PERM_RW PERM_RWX + PL_FILES PM PMLIBDIRS POLLUTE PPM_INSTALL_EXEC PPM_INSTALL_SCRIPT PREFIX ++ PRINT_PREREQ + PREREQ_PM SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG + XS_VERSION clean depend dist dynamic_lib linkext macro realclean + tool_autosplit +@@ -316,6 +317,14 @@ + sub ExtUtils::MakeMaker::new { + my($class,$self) = @_; + my($key); ++ ++ if ("@ARGV" =~ "PRINT_PREREQ") { ++ foreach $prereq (sort keys %{$self->{PREREQ_PM}}) { ++ print "perl($prereq)>=$self->{PREREQ_PM}->{$prereq} "; ++ } ++ print "\n"; ++ exit 0; ++ } + + print STDOUT "MakeMaker (v$VERSION)\n" if $Verbose; + if (-f "MANIFEST" && ! -f "Makefile"){ -- 2.44.0