From 2869c7e36693da6a695d1e8f0948d29dd3461bb0 Mon Sep 17 00:00:00 2001 From: christos Date: Mon, 17 Jan 2000 03:07:09 +0000 Subject: Upgrade perl to 5.005_03 --- lang/perl5/Makefile | 6 +- lang/perl5/files/md5 | 4 +- lang/perl5/files/patch-sum | 17 ++--- lang/perl5/patches/patch-aa | 166 ++++++++++++++++++++++++-------------------- lang/perl5/patches/patch-ab | 36 +++++----- lang/perl5/patches/patch-ac | 8 +-- lang/perl5/patches/patch-ad | 18 ++--- lang/perl5/patches/patch-ae | 12 ---- lang/perl5/patches/patch-af | 80 --------------------- lang/perl5/patches/patch-ag | 31 --------- lang/perl5/patches/patch-ah | 13 ---- lang/perl5/patches/patch-ai | 13 ---- lang/perl5/patches/patch-aj | 12 ++-- 13 files changed, 140 insertions(+), 276 deletions(-) delete mode 100644 lang/perl5/patches/patch-ae delete mode 100644 lang/perl5/patches/patch-af delete mode 100644 lang/perl5/patches/patch-ag delete mode 100644 lang/perl5/patches/patch-ah delete mode 100644 lang/perl5/patches/patch-ai (limited to 'lang/perl5') diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index 6737e3c9baa..2f0bc80a5e3 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.24 1999/12/08 16:06:25 veego Exp $ +# $NetBSD: Makefile,v 1.25 2000/01/17 03:07:09 christos Exp $ # FreeBSD Id: Makefile,v 1.20 1997/07/18 06:16:44 markm Exp # -DISTNAME= perl5.004_04 -PKGNAME= perl-5.00404 +DISTNAME= perl5.005_03 +PKGNAME= perl-5.00503 CATEGORIES= lang devel perl5 MASTER_SITES= ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \ ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/ diff --git a/lang/perl5/files/md5 b/lang/perl5/files/md5 index 0ff4c6f8867..0bade561fbd 100644 --- a/lang/perl5/files/md5 +++ b/lang/perl5/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.3 1998/08/07 13:24:58 agc Exp $ +$NetBSD: md5,v 1.4 2000/01/17 03:07:10 christos Exp $ -MD5 (perl5.004_04.tar.gz) = 2618029201ad19cfb9a7d02a498eb1f4 +MD5 (perl5.005_03.tar.gz) = 427890d97e32430341c1fa80f55277a7 diff --git a/lang/perl5/files/patch-sum b/lang/perl5/files/patch-sum index d39575813a4..5d78de76567 100644 --- a/lang/perl5/files/patch-sum +++ b/lang/perl5/files/patch-sum @@ -1,12 +1,7 @@ -$NetBSD: patch-sum,v 1.3 1999/09/06 19:28:01 hubertf Exp $ +$NetBSD: patch-sum,v 1.4 2000/01/17 03:07:10 christos Exp $ -MD5 (patch-aa) = 42c154c839adb39220b3d7e972bff260 -MD5 (patch-ab) = 418c37ad9e29a9200169d867b2236fd9 -MD5 (patch-ac) = a99477228107e3defaf67fb49cec58ea -MD5 (patch-ad) = 861e47c36e7ee1bfa5e37694721eb6cf -MD5 (patch-ae) = 85f49061d90969e6911daeb1d705b7c4 -MD5 (patch-af) = 508b7c2f7ccd9e68db9e270cfe5eac0a -MD5 (patch-ag) = 606e6d1da35d708d89b5245802a0e75c -MD5 (patch-ah) = 7766cc142d9dec367fdc34734aa3bde8 -MD5 (patch-ai) = 947672a95abf57054246fc3c79f43952 -MD5 (patch-aj) = b7b0a20e8b8e4cc000f926d90d7079b1 +MD5 (patch-aa) = b0c1d2593300efac4712a9492a05805d +MD5 (patch-ab) = 1c92c2233dce44d058532f4a806739ca +MD5 (patch-ac) = 4c285b27cc0ab931910cc61ac42be171 +MD5 (patch-ad) = a31ef86c02391d355631be1b43bffacb +MD5 (patch-aj) = 48ae85e4c0934301a3c0fe425f8cc517 diff --git a/lang/perl5/patches/patch-aa b/lang/perl5/patches/patch-aa index 068887a1e94..44146b91c2e 100644 --- a/lang/perl5/patches/patch-aa +++ b/lang/perl5/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.13 1999/08/31 18:51:36 agc Exp $ +$NetBSD: patch-aa,v 1.14 2000/01/17 03:07:11 christos Exp $ ---- Configure.orig Fri Oct 3 13:57:39 1997 -+++ Configure Wed Dec 2 14:30:27 1998 -@@ -65,7 +65,7 @@ +--- Configure.orig Sun Jan 16 21:17:27 2000 ++++ Configure Sun Jan 16 21:25:08 2000 +@@ -70,7 +70,7 @@ fi : Proper PATH setting @@ -11,31 +11,7 @@ $NetBSD: patch-aa,v 1.13 1999/08/31 18:51:36 agc Exp $ paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" -@@ -92,10 +92,10 @@ - esac - - : Sanity checks --if test ! -t 0; then -- echo "Say 'sh $me', not 'sh <$me'" -- exit 1 --fi -+# if test ! -t 0; then -+# echo "Say 'sh $me', not 'sh <$me'" -+# exit 1 -+# fi - - : Test and see if we are running under ksh, either blatantly or in disguise. - if (PATH=.; alias -x) >/dev/null 2>&1; then -@@ -725,7 +725,7 @@ - archobjs='' - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. --locincpth="/usr/local/include /opt/local/include /usr/gnu/include" -+locincpth="${PREFIX}/include /opt/local/include /usr/gnu/include" - locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" - : - : no include file wanted by default -@@ -735,14 +735,14 @@ +@@ -814,14 +814,14 @@ xlibpth='/usr/lib/386 /lib/386' : Possible local library directories to search. @@ -44,7 +20,7 @@ $NetBSD: patch-aa,v 1.13 1999/08/31 18:51:36 agc Exp $ loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" : general looking path for locating libraries - glibpth="/shlib /usr/shlib /usr/lib/pa1.1 /usr/lib/large" + glibpth="/shlib /usr/shlib /lib/pa1.1 /usr/lib/large" glibpth="$glibpth /lib /usr/lib $xlibpth" glibpth="$glibpth /lib/large /usr/lib/small /lib/small" -glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" @@ -52,27 +28,51 @@ $NetBSD: patch-aa,v 1.13 1999/08/31 18:51:36 agc Exp $ : Private path used by Configure to find libraries. Its value : is prepended to libpth. This variable takes care of special -@@ -753,9 +753,16 @@ - defvoidused=15 - +@@ -834,7 +834,7 @@ + ignore_versioned_solibs='' + : Possible local include directories to search. + : Set locincpth to "" in a hint file to defeat local include searches. +-locincpth="/usr/local/include /opt/local/include /usr/gnu/include" ++locincpth="${PREFIX}/include /opt/local/include /usr/gnu/include" + locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" + : + : no include file wanted by default +@@ -855,9 +855,16 @@ + : set usethreads on the Configure command line to enable threads. : List of libraries we want. --libswanted='sfio net socket inet nsl nm ndbm gdbm dbm db malloc dl' + : If anyone needs -lnet, put it in a hint file. +-libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl' -libswanted="$libswanted dld ld sun m c cposix posix ndir dir crypt" -libswanted="$libswanted ucb bsd BSD PW x" +case `uname -s` in -+SunOS) ++NetBSD) ++ libswanted='m crypt' ++ ;; ++*) + libswanted='sfio net socket inet nsl nm ndbm dbm db malloc dl' + libswanted="$libswanted dld ld sun m c cposix posix ndir dir crypt" + libswanted="$libswanted ucb bsd BSD PW x" + ;; -+NetBSD) -+ libswanted='m crypt' -+ ;; +esac : We probably want to search /usr/shlib before most other libraries. : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` -@@ -2365,7 +2372,7 @@ +@@ -1138,10 +1145,10 @@ + case "$fastread$alldone" in + yescont|yesexit) ;; + *) +- if test ! -t 0; then +- echo "Say 'sh Configure', not 'sh #endif diff --git a/lang/perl5/patches/patch-ad b/lang/perl5/patches/patch-ad index 1c59499625f..c29b6e4cf81 100644 --- a/lang/perl5/patches/patch-ad +++ b/lang/perl5/patches/patch-ad @@ -1,17 +1,17 @@ -$NetBSD: patch-ad,v 1.3 1998/08/07 11:09:23 agc Exp $ +$NetBSD: patch-ad,v 1.4 2000/01/17 03:07:11 christos Exp $ ---- perl.c.BAK Wed Nov 19 23:09:31 1997 -+++ perl.c Wed Nov 19 23:10:58 1997 -@@ -2036,6 +2036,20 @@ +--- perl.c.orig Sat Mar 27 12:49:17 1999 ++++ perl.c Sun Jan 16 21:31:04 2000 +@@ -2213,6 +2213,20 @@ croak("Can't swap uid and euid"); /* really paranoid */ - if (Stat(SvPVX(GvSV(curcop->cop_filegv)),&tmpstatbuf) < 0) + if (PerlLIO_stat(SvPVX(GvSV(PL_curcop->cop_filegv)),&tmpstatbuf) < 0) croak("Permission denied"); /* testing full pathname here */ +#if (defined(BSD) && (BSD >= 199306)) +#ifdef IAMSUID + { + struct statfs stfs; + -+ if (fstatfs(fileno(rsfp),&stfs) < 0) ++ if (fstatfs(PerlIO_fileno(PL_rsfp),&stfs) < 0) + croak("Can't statfs filesystem of script \"%s\"",origfilename); + + if (stfs.f_flags & MNT_NOSUID) @@ -20,6 +20,6 @@ $NetBSD: patch-ad,v 1.3 1998/08/07 11:09:23 agc Exp $ +#endif /* IAMSUID */ +#endif /* BSD */ + - if (tmpstatbuf.st_dev != statbuf.st_dev || - tmpstatbuf.st_ino != statbuf.st_ino) { - (void)PerlIO_close(rsfp); + #if defined(IAMSUID) && !defined(NO_NOSUID_CHECK) + if (fd_on_nosuid_fs(PerlIO_fileno(PL_rsfp))) + croak("Permission denied"); diff --git a/lang/perl5/patches/patch-ae b/lang/perl5/patches/patch-ae deleted file mode 100644 index 51906996458..00000000000 --- a/lang/perl5/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.3 1998/08/07 11:09:23 agc Exp $ - ---- makedepend.SH.BAK Wed Nov 19 23:11:49 1997 -+++ makedepend.SH Wed Nov 19 23:12:34 1997 -@@ -66,6 +66,7 @@ - # to be out of date. I don't know if OS/2 has touch, so do this: - case "$osname" in - os2) ;; -+ netbsd) ;; - *) $touch $firstmakefile ;; - esac - fi diff --git a/lang/perl5/patches/patch-af b/lang/perl5/patches/patch-af deleted file mode 100644 index 1c9acf60fd4..00000000000 --- a/lang/perl5/patches/patch-af +++ /dev/null @@ -1,80 +0,0 @@ -$NetBSD: patch-af,v 1.6 1998/12/02 21:14:41 tv Exp $ - ---- hints/netbsd.sh.orig Thu May 8 11:52:59 1997 -+++ hints/netbsd.sh Wed Dec 2 14:21:34 1998 -@@ -1,12 +1,11 @@ - # hints/netbsd.sh - # --# talk to mrg@eterna.com.au if you want to change this file. -+# talk to packages@netbsd.org if you want to change this file. - # - # netbsd keeps dynamic loading dl*() functions in /usr/lib/crt0.o, - # so Configure doesn't find them (unless you abandon the nm scan). - # this should be *just* 0.9 below as netbsd 0.9a was the first to --# introduce shared libraries. however, they don't work/build on --# pmax, powerpc and alpha ports correctly, yet. -+# introduce shared libraries. - - case "$archname" in - '') -@@ -19,26 +18,26 @@ - usedl="$undef" - ;; - *) -- case `uname -m` in -- alpha|powerpc|pmax) -+ if [ -f /usr/libexec/ld.elf_so ]; then -+ d_dlopen=$define -+ d_dlerror=$define -+ ccdlflags="-Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags" -+ cccdlflags="-DPIC -fPIC $cccdlflags" -+ lddlflags="--whole-archive -shared $lddlflags" -+ elif [ "`uname -m`" = "pmax" ]; then -+# NetBSD 1.3 and 1.3.1 on pmax shipped an `old' ld.so, which will not work. - d_dlopen=$undef -- ;; --# this doesn't work (yet). --# alpha) --# d_dlopen=$define --# d_dlerror=$define --# cccdlflags="-DPIC -fPIC $cccdlflags" --# lddlflags="-shared $lddlflags" --# ;; -- *) -+ elif [ -f /usr/libexec/ld.so ]; then - d_dlopen=$define - d_dlerror=$define -+ ccdlflags="-Wl,-R${PREFIX}/lib $ccdlflags" - # we use -fPIC here because -fpic is *NOT* enough for some of the - # extensions like Tk on some netbsd platforms (the sparc is one) - cccdlflags="-DPIC -fPIC $cccdlflags" - lddlflags="-Bforcearchive -Bshareable $lddlflags" -- ;; -- esac -+ else -+ d_dlopen=$undef -+ fi - ;; - esac - -@@ -47,15 +46,18 @@ - # way to make perl call setuid() or setgid(). if they aren't, then - # ($<, $>) = ($u, $u); will work (same for $(/$)). this is because - # you can not change the real userid of a process under 4.4BSD. --# netbsd fixed this in 1.2A. -+# netbsd fixed this in 1.3.2. - case "$osvers" in --0.9*|1.0*|1.1*|1.2_*|1.2|1.2.*) -+0.9*|1.[012]*|1.3|1.3.1) - d_setregid="$undef" - d_setreuid="$undef" - d_setrgid="$undef" - d_setruid="$undef" - ;; - esac -+ -+# there's no problem with vfork. -+d_vfork="$define" - - # Avoid telldir prototype conflict in pp_sys.c (NetBSD uses const DIR *) - # Configure should test for this. Volunteers? diff --git a/lang/perl5/patches/patch-ag b/lang/perl5/patches/patch-ag deleted file mode 100644 index 592f0019cd4..00000000000 --- a/lang/perl5/patches/patch-ag +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ag,v 1.3 1999/09/06 03:54:34 kim Exp $ - ---- doio.c.orig Mon Jul 28 21:08:11 1997 -+++ doio.c Sun Sep 5 23:27:54 1999 -@@ -1333,7 +1333,7 @@ - char *a; - I32 id, n, cmd, infosize, getinfo; - I32 ret = -1; --#ifdef __linux__ /* XXX Need metaconfig test */ -+#if defined(__linux__) || (defined(__NetBSD__) && (__NetBSD_Version__ < 104110000)) /* XXX Need metaconfig test */ - union semun unsemds; - #endif - -@@ -1365,7 +1365,7 @@ - else if (cmd == GETALL || cmd == SETALL) - { - struct semid_ds semds; --#ifdef __linux__ /* XXX Need metaconfig test */ -+#if defined(__linux__) || (defined(__NetBSD__) && (__NetBSD_Version__ < 104110000)) /* XXX Need metaconfig test */ - /* linux (and Solaris2?) uses : - int semctl (int semid, int semnum, int cmd, union semun arg) - union semun { -@@ -1425,7 +1425,7 @@ - #endif - #ifdef HAS_SEM - case OP_SEMCTL: --#ifdef __linux__ /* XXX Need metaconfig test */ -+#if defined(__linux__) || (defined(__NetBSD__) && (__NetBSD_Version__ < 104110000)) /* XXX Need metaconfig test */ - unsemds.buf = (struct semid_ds *)a; - ret = semctl(id, n, cmd, unsemds); - #else diff --git a/lang/perl5/patches/patch-ah b/lang/perl5/patches/patch-ah deleted file mode 100644 index 2e84a6331f5..00000000000 --- a/lang/perl5/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1 1998/11/26 17:43:47 bad Exp $ - ---- unixish.h.orig Mon Sep 22 13:46:47 1997 -+++ unixish.h Thu Nov 26 17:18:58 1998 -@@ -81,7 +81,7 @@ - */ - /* #define ALTERNATE_SHEBANG "#!" / **/ - --#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) -+#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) || defined(__NetBSD__) - # include - #endif - diff --git a/lang/perl5/patches/patch-ai b/lang/perl5/patches/patch-ai deleted file mode 100644 index 0a80cd6e035..00000000000 --- a/lang/perl5/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.1 1998/12/01 02:47:19 tv Exp $ - ---- Makefile.SH.orig Wed Oct 15 05:33:16 1997 -+++ Makefile.SH Mon Nov 30 21:02:40 1998 -@@ -37,7 +37,7 @@ - -prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@" - ;; - sunos*|freebsd[23]*|netbsd*) -- linklibperl="-lperl" -+ linklibperl="-L. -lperl" - ;; - aix*) - shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp" diff --git a/lang/perl5/patches/patch-aj b/lang/perl5/patches/patch-aj index e4656390742..58bae93315c 100644 --- a/lang/perl5/patches/patch-aj +++ b/lang/perl5/patches/patch-aj @@ -1,13 +1,13 @@ -$NetBSD: patch-aj,v 1.1 1999/07/02 15:35:14 bad Exp $ +$NetBSD: patch-aj,v 1.2 2000/01/17 03:07:11 christos Exp $ ---- ext/POSIX/Makefile.PL.orig Mon Jun 24 16:25:03 1996 -+++ ext/POSIX/Makefile.PL Thu Jul 1 18:46:41 1999 +--- ext/POSIX/Makefile.PL.orig Thu Nov 26 21:13:25 1998 ++++ ext/POSIX/Makefile.PL Sun Jan 16 21:37:36 2000 @@ -1,7 +1,7 @@ use ExtUtils::MakeMaker; WriteMakefile( NAME => 'POSIX', -- LIBS => ["-lm -lposix -lcposix"], -+ LIBS => ["-lm"], - MAN3PODS => ' ', # Pods will be built by installman. +- ($^O eq 'MSWin32' ? () : (LIBS => ["-lm -lposix -lcposix"])), ++ ($^O eq 'MSWin32' ? () : (LIBS => ["-lm"])), + MAN3PODS => {}, # Pods will be built by installman. XSPROTOARG => '-noprototypes', # XXX remove later? VERSION_FROM => 'POSIX.pm', -- cgit v1.2.3