summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/libperl/Makefile36
-rw-r--r--lang/libperl/distinfo6
-rw-r--r--lang/libperl/pkg/DESCR17
-rw-r--r--lang/perl5-base/Makefile96
-rw-r--r--lang/perl5-base/distinfo21
-rw-r--r--lang/perl5-base/patches/patch-aa251
-rw-r--r--lang/perl5-base/patches/patch-ab95
-rw-r--r--lang/perl5-base/patches/patch-ac31
-rw-r--r--lang/perl5-base/patches/patch-ad98
-rw-r--r--lang/perl5-base/patches/patch-ae20
-rw-r--r--lang/perl5-base/patches/patch-af26
-rw-r--r--lang/perl5-base/patches/patch-ag44
-rw-r--r--lang/perl5-base/patches/patch-ah12
-rw-r--r--lang/perl5-base/patches/patch-ai36
-rw-r--r--lang/perl5-base/patches/patch-aj12
-rw-r--r--lang/perl5-base/pkg/DESCR18
-rw-r--r--lang/perl5/Makefile18
-rw-r--r--lang/perl5/Makefile.common17
-rw-r--r--lang/perl5/pkg/DESCR17
19 files changed, 293 insertions, 578 deletions
diff --git a/lang/libperl/Makefile b/lang/libperl/Makefile
index c172435c033..1cc6410d335 100644
--- a/lang/libperl/Makefile
+++ b/lang/libperl/Makefile
@@ -1,43 +1,41 @@
-# $NetBSD: Makefile,v 1.19 2001/05/29 15:45:28 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2001/06/07 04:25:33 jlam Exp $
-DISTNAME= perl-${PERL_VERSION}
-PKGNAME= libperl-${PERL_VERSION}nb3
-PERL_VERSION= 5.6.0
-CATEGORIES= lang devel perl5
-MASTER_SITES= ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/maint/ \
- ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/maint/
+.include "../../lang/perl5/Makefile.common"
-MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://language.perl.com/index.html
-COMMENT= Perl DynaLoader as a shared object
+PKGNAME= libperl-${PERL5_VERS}
+PERL5_PKG_VERS= # empty
+CATEGORIES+= lang devel
-USE_PERL5= # defined
-PERL_REQD= ${PERL_VERSION}nb6
+MAINTAINER= jlam@netbsd.org
+HOMEPAGE= http://language.perl.com/index.html
+COMMENT= Perl DynaLoader as a shared object
-#DISTINFO_FILE= ${.CURDIR}/../../lang/perl5-base/distinfo
+USE_PERL5= # defined
+PERL_REQD= ${PERL5_DIST_VERS}
EXTRACT_ELEMENTS= ${DISTNAME}/ext/DynaLoader
WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS}
.include "../../mk/bsd.prefs.mk"
+MKPIC?= yes
+
.if ${OPSYS} == "NetBSD"
-.if exists(/usr/libexec/ld.elf_so) || exists(/usr/libexec/ld.so)
-MKPIC?= yes
-.else
-MKPIC?= no
+.if !exists(/usr/libexec/ld.elf_so) && !exists(/usr/libexec/ld.so)
+MKPIC= no
.endif
.endif
.if ${MKPIC} == "no"
-IGNORE= ${PKGNAME} needs shared objects
+IGNORE= ${PKGNAME} needs shared objects
.endif
do-configure:
@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
do-build:
- @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} DynaLoader.o
+ @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
+ ${MAKE_PROGRAM} -f ${MAKEFILE} DynaLoader.o
do-install:
${INSTALL_DATA} ${WRKSRC}/DynaLoader.o ${PERL5_ARCHLIB}/DynaLoader_pic.o
diff --git a/lang/libperl/distinfo b/lang/libperl/distinfo
index 5d1f4e60f11..07be3d215ff 100644
--- a/lang/libperl/distinfo
+++ b/lang/libperl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/06/06 23:01:09 wiz Exp $
+$NetBSD: distinfo,v 1.6 2001/06/07 04:25:33 jlam Exp $
-SHA1 (perl-5.6.0.tar.gz) = a2e9da9c82116a9094cc0f92c248c4339fda89fa
-Size (perl-5.6.0.tar.gz) = 5443601 bytes
+SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744
+Size (perl-5.6.1.tar.gz) = 5983695 bytes
diff --git a/lang/libperl/pkg/DESCR b/lang/libperl/pkg/DESCR
index 96de57afbad..bd04f5c2d39 100644
--- a/lang/libperl/pkg/DESCR
+++ b/lang/libperl/pkg/DESCR
@@ -1,9 +1,14 @@
-From the distribution README:
-
-Perl is a language that combines some of the features of C, sed, awk
-and shell. See the manual page for more hype. There are also two Nutshell
-Handbooks published by O'Reilly & Assoc. See pod/perlbook.pod
-for more information.
+Perl is a high-level programming language with an eclectic heritage
+written by Larry Wall and a cast of thousands. It derives from the
+ubiquitous C programming language and to a lesser extent from sed, awk,
+the Unix shell, and at least a dozen other tools and languages. Perl's
+process, file, and text manipulation facilities make it particularly
+well-suited for tasks involving quick prototyping, system utilities,
+software tools, system management tasks, database access, graphical
+programming, networking, and world wide web programming. These strengths
+make it especially popular with system administrators and CGI script
+authors, but mathematicians, geneticists, journalists, and even managers
+also use Perl. Maybe you should, too.
This package is contains the Perl DynaLoader built as relocatable shared
object.
diff --git a/lang/perl5-base/Makefile b/lang/perl5-base/Makefile
index 92ca3f60e83..c1ea22da84d 100644
--- a/lang/perl5-base/Makefile
+++ b/lang/perl5-base/Makefile
@@ -1,69 +1,86 @@
-# $NetBSD: Makefile,v 1.6 2001/05/20 05:21:23 jlam Exp $
-# FreeBSD Id: Makefile,v 1.20 1997/07/18 06:16:44 markm Exp
-#
+# $NetBSD: Makefile,v 1.7 2001/06/07 04:25:34 jlam Exp $
+
+.include "../../lang/perl5/Makefile.common"
-DISTNAME= perl-${PERL_VERSION}
-PKGNAME= perl-base-${PERL_VERSION}nb2
-PERL_VERSION= 5.6.0
-CATEGORIES= lang devel perl5
-MASTER_SITES= ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/maint/ \
- ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/maint/
+PKGNAME= perl-base-${PERL5_VERS}
+PERL5_PKG_VERS= # empty
+CATEGORIES+= lang devel
-MAINTAINER= packages@netbsd.org
+MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://language.perl.com/index.html
COMMENT= base installation of Perl
-CONFLICTS= perl-5.00*
+CONFLICTS= perl-5.00* p5-CGI-2.6* p5-CGI-2.7[0-5]
HAS_CONFIGURE= # defined
-CONFIGURE_ENV+= PREFIX=${PREFIX}
CONFIGURE_SCRIPT= ./Configure
-CONFIGURE_ARGS+= -sde -Dprefix=${PREFIX} -Doptimize="${CFLAGS}" \
- -Darchname=${MACHINE_ARCH}-${LOWER_OPSYS} \
- -Dcc=gcc -Dusemymalloc=false
-MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}
+CONFIGURE_ARGS+= -sde
+CONFIGURE_ARGS+= -Dprefix="${PREFIX}"
+CONFIGURE_ARGS+= -Darchname="${MACHINE_ARCH}-${LOWER_OPSYS}"
+CONFIGURE_ARGS+= -Doptimize="${CFLAGS}"
+CONFIGURE_ARGS+= -Dcc="${CC}"
+CONFIGURE_ARGS+= -Uusemymalloc
+CONFIGURE_ARGS+= -Uinstallusrbinperl
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-.if exists(/usr/libexec/ld.so) || exists(/usr/libexec/ld.elf_so)
MKPIC?= yes
-.else
-MKPIC?= no
-.endif
+
+# Nail down the needed libraries for each platform here to avoid hidden
+# dependencies.
+#
+LIBSWANTED.NetBSD= m crypt
+
+.if defined(LIBSWANTED.${OPSYS})
+CONFIGURE_ARGS+= -Dlibswanted="${LIBSWANTED.${OPSYS}}"
.endif
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+= CFLAGS=
+.if ${OPSYS} == "NetBSD"
+.if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so)
+MKPIC= no
+.endif
+.if ${MACHINE_ARCH} == "sparc64"
+# The toolchain on sparc64 is not really production-quality right now, but
+# gcc-2.96 is supposed to fix most problems. Passing -g to the configure
+# process triggers -DDEBUGGING, which plays the real trick and circumvents
+# code-generation bugs, so we add -g to CFLAGS to at least have a really
+# debuggable build.
+#
+CFLAGS+= -g -msoft-quad-float -O2
+.endif
+.elif ${OPSYS} == "SunOS"
+CFLAGS=
.endif
.if ${MKPIC} == "yes"
-CONFIGURE_ARGS+= -Duseshrplib=true
+CONFIGURE_ARGS+= -Duseshrplib
.endif
-PERL5_ARCHLIB= ${PREFIX}/lib/perl5/${PERL_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}
-PERL5_SITEARCH= ${PREFIX}/lib/perl5/site_perl/${PERL_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}
+PERL5_ARCHLIB= ${PREFIX}/lib/perl5/${PERL5_DIST_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
+PERL5_SITEARCH= ${PREFIX}/lib/perl5/site_perl/${PERL5_DIST_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
PERL5_PACKLIST= ${PERL5_ARCHLIB}/.packlist
-post-patch:
- cd ${WRKSRC}/ext/DynaLoader/hints && ${CP} -f openbsd.pl netbsd.pl
-
-# Remove several modules which are externally available in pkgsrc and don't
-# need to be part of the base perl distribution.
+# Remove modules that are externally available in pkgsrc and that also install
+# manpages.
#
pre-configure:
- cd ${WRKSRC}/ext; ${RM} -rf Data Devel GDBM_File
- cd ${WRKSRC}/lib; ${RM} -rf CGI CGI.pm
- cd ${WRKSRC}/utils; ${RM} -f dprofpp.PL
+ cd ${WRKSRC}; ${RM} -rf eg/cgi lib/CGI lib/CGI.pm
-.if defined(MKPIC) && (${MKPIC} == "yes")
+.if ${MKPIC} == "yes"
+#
+# Build a static libperl.a and relink perl against it as a runtime
+# optimization.
+#
post-configure:
${CAT} Makefile.static >> ${WRKSRC}/${MAKEFILE}
post-build:
- @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} libperl.a
- ${RM} -f ${WRKSRC}/perl
- @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} perl LLIBPERL=libperl.a
+ @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+ ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} libperl.a
+ @${RM} -f ${WRKSRC}/perl
+ @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+ ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} perl \
+ LLIBPERL=libperl.a
.endif
post-install:
@@ -72,6 +89,7 @@ post-install:
${RMDIR} -p ${PERL5_SITEARCH} 2>/dev/null || ${TRUE}
test:
- @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} test
+ @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
+ ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/perl5-base/distinfo b/lang/perl5-base/distinfo
index 82c7cbe7d33..e2a2176be41 100644
--- a/lang/perl5-base/distinfo
+++ b/lang/perl5-base/distinfo
@@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:00:55 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/06/07 04:25:34 jlam Exp $
-SHA1 (perl-5.6.0.tar.gz) = a2e9da9c82116a9094cc0f92c248c4339fda89fa
-Size (perl-5.6.0.tar.gz) = 5443601 bytes
-SHA1 (patch-aa) = 574152b70a041dcd13f0f7c57a33d8068bbf776e
-SHA1 (patch-ab) = 97dc3d00c3621b923d4d37d48c5f482658094d5b
-SHA1 (patch-ac) = 0e6b9cd8f0adb0d7791c15f9216535fca6f9d813
-SHA1 (patch-ad) = 3dbd2399666ffa270b6463494752ead99aa755fd
-SHA1 (patch-ae) = 78f12e1e9f68d1ad93bbf5845ade7a8651d21208
-SHA1 (patch-af) = ecc2a7ff8d8ce6f40ddfbf1873ed04d5b3ab7e55
-SHA1 (patch-ag) = fd4cd3f029329a3dbb8fd786f19a8d97881fa2af
-SHA1 (patch-ah) = c293738f1822d474f26558b15a4071f806d5ea94
-SHA1 (patch-ai) = cb48b1316abceec5f7f337cf44b20eb6ab4056bf
-SHA1 (patch-aj) = bea0d2037649dda059872de663bb0b2c2ff32af0
+SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744
+Size (perl-5.6.1.tar.gz) = 5983695 bytes
+SHA1 (patch-aa) = e581ef24bfe84916339ab230a02e267e3100ec63
+SHA1 (patch-ab) = e34baeaf071957fa39efaa856f7e3676b9e3fd7f
+SHA1 (patch-ac) = 574af66da47465a2b06065651ae21fc87a992553
+SHA1 (patch-ad) = cb95cbf393ea484028bb9dd7f7d835f3f6f0e156
+SHA1 (patch-ae) = 763e087a277988851dde569b59408b030867d672
diff --git a/lang/perl5-base/patches/patch-aa b/lang/perl5-base/patches/patch-aa
index aac63250e99..db13addbd49 100644
--- a/lang/perl5-base/patches/patch-aa
+++ b/lang/perl5-base/patches/patch-aa
@@ -1,205 +1,48 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/09/05 09:18:21 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2001/06/07 04:25:34 jlam Exp $
---- Configure.orig Wed Mar 22 15:36:37 2000
-+++ Configure
-@@ -70,7 +70,7 @@
- fi
-
- : Proper PATH setting
--paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
-+paths='/bin /usr/bin ${PREFIX}/bin /usr/ucb ${PREFIX} /usr/lbin'
- 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"
-@@ -955,7 +955,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
-@@ -965,13 +965,13 @@
- : change the next line if compiling for Xenix/286 on Xenix/386
- xlibpth='/usr/lib/386 /lib/386'
- : Possible local library directories to search.
--loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
-+loclibpth="${PREFIX}/lib /opt/local/lib /usr/gnu/lib"
- loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
-
- : general looking path for locating libraries
- glibpth="/usr/lib/large /lib /usr/lib $xlibpth"
- glibpth="$glibpth /lib/large /usr/lib/small /lib/small"
--glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
-+glibpth="$glibpth /usr/ccs/lib /usr/ucblib ${PREFIX}/lib"
- test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
- test -f /shlib/libc.so && glibpth="/shlib $glibpth"
-
-@@ -992,10 +992,17 @@
-
- : List of libraries we want.
- : If anyone needs -lnet, put it in a hint file.
-+case `uname -s` in
-+NetBSD)
-+ libswanted='m crypt'
-+ ;;
-+*)
- libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl'
- libswanted="$libswanted dld ld sun m c cposix posix"
- libswanted="$libswanted ndir dir crypt sec"
- libswanted="$libswanted ucb bsd BSD PW x iconv"
-+ ;;
-+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 ! !'`
-@@ -1337,10 +1344,10 @@
- case "$fastread$alldone" in
- yescont|yesexit) ;;
- *)
-- if test ! -t 0; then
-- echo "Say 'sh Configure', not 'sh <Configure'"
-- exit 1
-- fi
-+# if test ! -t 0; then
-+# echo "Say 'sh Configure', not 'sh <Configure'"
-+# exit 1
-+# fi
- ;;
- esac
-
-@@ -2763,8 +2770,8 @@
- syspath='/usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1'
- syspath="$syspath /usr/man/u_man/man1 /usr/share/man/man1"
- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
-- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
-- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
-+ syspath="$syspath ${PREFIX}/man/u_man/man1 ${PREFIX}/man/l_man/man1"
-+ syspath="$syspath /usr/man/man.L /local/man/man1 ${PREFIX}/man/man1"
- sysman=`./loc . /usr/man/man1 $syspath`
- ;;
- esac
-@@ -3577,7 +3584,7 @@
- : Set private lib path
- case "$plibpth" in
- '') if ./mips; then
-- plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib"
-+ plibpth="$incpath/usr/lib ${PREFIX}/lib /usr/ccs/lib"
- fi;;
- esac
- case "$libpth" in
-@@ -4664,7 +4671,7 @@
- : determine root of directory hierarchy where package will be installed.
- case "$prefix" in
- '')
-- dflt=`./loc . /usr/local /usr/local /local /opt /usr`
-+ dflt=`./loc . ${PREFIX} ${PREFIX} /local /opt /usr`
- ;;
- *)
- dflt="$prefix"
-@@ -4674,9 +4681,9 @@
-
- By default, $package will be installed in $dflt/bin, manual pages
- under $dflt/man, etc..., i.e. with $dflt as prefix for all
--installation directories. Typically this is something like /usr/local.
-+installation directories. Typically this is something like ${PREFIX}.
- If you wish to have binaries under /usr/bin but other parts of the
--installation under /usr/local, that's ok: you will be prompted
-+installation under ${PREFIX}, that's ok: you will be prompted
- separately for each of the installation directories, the prefix being
- only used to set the defaults.
-
-@@ -4835,7 +4842,7 @@
- installstyle=$dflt
-
- : determine where private library files go
--: Usual default is /usr/local/lib/perl5/$version.
-+: Usual default is ${PREFIX}/lib/perl5. Also allow things like
- : Also allow things like /opt/perl/lib/$version, since
- : /opt/perl/lib/perl5... would be redundant.
- : The default "style" setting is made in installstyle.U
-@@ -4871,8 +4878,8 @@
- : determine where public architecture dependent libraries go
- set archlib archlib
- eval $prefixit
--: privlib default is /usr/local/lib/$package/$version
--: archlib default is /usr/local/lib/$package/$version/$archname
-+: privlib default is ${PREFIX}/lib/$package/$version
-+: archlib default is ${PREFIX}/lib/$package/$version/$archname
- : privlib may have an optional trailing /share.
- tdflt=`echo $privlib | $sed 's,/share$,,'`
- tdflt=$tdflt/$archname
-@@ -5304,7 +5311,7 @@
- ;;
- *) d_vendorlib="$define"
- : determine where vendor-supplied modules go.
-- : Usual default is /usr/local/lib/perl5/vendor_perl/$version
-+ : Usual default is ${PREFIX}/lib/perl5/vendor_perl/$version
- case "$vendorlib" in
- '')
- prog=`echo $package | $sed 's/-*[0-9.]*$//'`
-@@ -5338,8 +5345,8 @@
- ;;
- *) d_vendorarch="$define"
- : determine where vendor-supplied architecture-dependent libraries go.
-- : vendorlib default is /usr/local/lib/perl5/vendor_perl/$version
-- : vendorarch default is /usr/local/lib/perl5/vendor_perl/$version/$archname
-+ : vendorlib default is ${PREFIX}/lib/perl5/vendor_perl/$version
-+ : vendorarch default is ${PREFIX}/lib/perl5/vendor_perl/$version/$archname
- : vendorlib may have an optional trailing /share.
- case "$vendorarch" in
- '') dflt=`echo $vendorlib | $sed 's,/share$,,'`
-@@ -5481,7 +5488,7 @@
- siteprefixexp="$ansexp"
-
- : determine where site specific libraries go.
--: Usual default is /usr/local/lib/perl5/site_perl/$version
-+: Usual default is ${PREFIX}/lib/perl5/site_perl/$version
- : The default "style" setting is made in installstyle.U
- : XXX No longer works with Prefixit stuff.
- prog=`echo $package | $sed 's/-*[0-9.]*$//'`
-@@ -6476,10 +6483,10 @@
- aix)
- # We'll set it in Makefile.SH...
- ;;
-- solaris|netbsd)
-+ solaris)
- xxx="-R $shrpdir"
- ;;
-- freebsd)
-+ freebsd|netbsd)
- xxx="-Wl,-R$shrpdir"
- ;;
- linux|irix*|dec_osf)
-@@ -7113,8 +7120,8 @@
- : guess some guesses
- $test -d /usr/share/scripts && dflt=/usr/share/scripts
- $test -d /usr/share/bin && dflt=/usr/share/bin
-- $test -d /usr/local/script && dflt=/usr/local/script
-- $test -d /usr/local/scripts && dflt=/usr/local/scripts
-+ $test -d ${PREFIX}/script && dflt=${PREFIX}/script
-+ $test -d ${PREFIX}/scripts && dflt=${PREFIX}/scripts
- $test -d $prefixexp/script && dflt=$prefixexp/script
- set dflt
- eval $prefixup
-@@ -7146,8 +7153,8 @@
- fi
-
- : determine where site specific architecture-dependent libraries go.
--: sitelib default is /usr/local/lib/perl5/site_perl/$version
--: sitearch default is /usr/local/lib/perl5/site_perl/$version/$archname
-+: sitelib default is ${PREFIX}/lib/perl5/site_perl/$version
-+: sitearch default is ${PREFIX}/lib/perl5/site_perl/$version/$archname
- : sitelib may have an optional trailing /share.
- case "$sitearch" in
- '') dflt=`echo $sitelib | $sed 's,/share$,,'`
-@@ -13366,7 +13373,7 @@
- case "$ranlib" in
- :) ranlib='';;
- '')
-- ranlib=`./loc ranlib X /usr/bin /bin /usr/local/bin`
-+ ranlib=`./loc ranlib X /usr/bin /bin ${PREFIX}/bin`
- $test -f $ranlib || ranlib=''
- ;;
- esac
+--- MANIFEST.orig Sun Apr 8 11:38:40 2001
++++ MANIFEST Wed Jun 6 20:07:20 2001
+@@ -88,27 +88,6 @@
+ dump.c Debugging output
+ eg/ADB An adb wrapper to put in your crash dir
+ eg/README Intro to example perl scripts
+-eg/cgi/RunMeFirst Setup script for CGI examples
+-eg/cgi/caution.xbm CGI example
+-eg/cgi/clickable_image.cgi CGI example
+-eg/cgi/cookie.cgi CGI example
+-eg/cgi/crash.cgi CGI example
+-eg/cgi/customize.cgi CGI example
+-eg/cgi/diff_upload.cgi CGI example
+-eg/cgi/dna_small_gif.uu Small image for CGI examples
+-eg/cgi/file_upload.cgi CGI example
+-eg/cgi/frameset.cgi CGI example
+-eg/cgi/index.html Index page for CGI examples
+-eg/cgi/internal_links.cgi CGI example
+-eg/cgi/javascript.cgi CGI example
+-eg/cgi/monty.cgi CGI example
+-eg/cgi/multiple_forms.cgi CGI example
+-eg/cgi/nph-clock.cgi CGI example
+-eg/cgi/nph-multipart.cgi CGI example
+-eg/cgi/popup.cgi CGI example
+-eg/cgi/save_state.cgi CGI example
+-eg/cgi/tryit.cgi CGI example
+-eg/cgi/wilogo_gif.uu Small image for CGI examples
+ eg/changes A program to list recently changed files
+ eg/client A sample client
+ eg/down A program to do things to subdirectories
+@@ -571,15 +550,6 @@
+ lib/AutoLoader.pm Autoloader base class
+ lib/AutoSplit.pm Split up autoload functions
+ lib/Benchmark.pm Measure execution time
+-lib/CGI.pm Web server interface ("Common Gateway Interface")
+-lib/CGI/Apache.pm Support for Apache's Perl module
+-lib/CGI/Carp.pm Log server errors with helpful context
+-lib/CGI/Cookie.pm Interface to Netscape Cookies
+-lib/CGI/Fast.pm Support for FastCGI (persistent server process)
+-lib/CGI/Pretty.pm Output nicely formatted HTML
+-lib/CGI/Push.pm Support for server push
+-lib/CGI/Switch.pm Simple interface for multiple server types
+-lib/CGI/Util.pm Utility functions
+ lib/CPAN.pm Interface to Comprehensive Perl Archive Network
+ lib/CPAN/FirstTime.pm Utility for creating CPAN config files
+ lib/CPAN/Nox.pm Runs CPAN while avoiding compiled extensions
diff --git a/lang/perl5-base/patches/patch-ab b/lang/perl5-base/patches/patch-ab
index 29daa169ac3..56bfa1320d1 100644
--- a/lang/perl5-base/patches/patch-ab
+++ b/lang/perl5-base/patches/patch-ab
@@ -1,60 +1,37 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/09/05 09:18:21 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2001/06/07 04:25:34 jlam Exp $
---- MANIFEST.orig Wed Mar 22 14:33:23 2000
-+++ MANIFEST Mon Aug 28 18:35:18 2000
-@@ -214,20 +214,6 @@
- ext/DB_File/hints/sco.pl Hint for DB_File for named architecture
- ext/DB_File/typemap Berkeley DB extension interface types
- ext/DB_File/version.c Berkeley DB extension interface version check
--ext/Data/Dumper/Changes Data pretty printer, changelog
--ext/Data/Dumper/Dumper.pm Data pretty printer, module
--ext/Data/Dumper/Dumper.xs Data pretty printer, externals
--ext/Data/Dumper/Makefile.PL Data pretty printer, makefile writer
--ext/Data/Dumper/Todo Data pretty printer, futures
--ext/Devel/DProf/Changes Perl code profiler changelog
--ext/Devel/DProf/DProf.pm Perl code profiler
--ext/Devel/DProf/DProf.xs Perl code profiler
--ext/Devel/DProf/Makefile.PL Perl code profiler makefile writer
--ext/Devel/DProf/Todo Perl code profiler todo list
--ext/Devel/Peek/Changes Data debugging tool, changelog
--ext/Devel/Peek/Makefile.PL Data debugging tool, makefile writer
--ext/Devel/Peek/Peek.pm Data debugging tool, module and pod
--ext/Devel/Peek/Peek.xs Data debugging tool, externals
- ext/DynaLoader/DynaLoader_pm.PL Dynamic Loader perl module
- ext/DynaLoader/Makefile.PL Dynamic Loader makefile writer
- ext/DynaLoader/README Dynamic Loader notes and intro
-@@ -260,11 +246,6 @@
- ext/File/Glob/TODO File::Glob extension todo list
- ext/File/Glob/bsd_glob.c File::Glob extension run time code
- ext/File/Glob/bsd_glob.h File::Glob extension header file
--ext/GDBM_File/GDBM_File.pm GDBM extension Perl module
--ext/GDBM_File/GDBM_File.xs GDBM extension external subroutines
--ext/GDBM_File/Makefile.PL GDBM extension makefile writer
--ext/GDBM_File/hints/sco.pl Hint for GDBM_File for named architecture
--ext/GDBM_File/typemap GDBM extension interface types
- ext/IO/ChangeLog IO perl module change log
- ext/IO/IO.pm Top-level interface to IO::* classes
- ext/IO/IO.xs IO extension external subroutines
-@@ -559,14 +540,6 @@
- lib/AutoLoader.pm Autoloader base class
- lib/AutoSplit.pm Split up autoload functions
- lib/Benchmark.pm Measure execution time
--lib/CGI.pm Web server interface ("Common Gateway Interface")
--lib/CGI/Apache.pm Support for Apache's Perl module
--lib/CGI/Carp.pm Log server errors with helpful context
--lib/CGI/Cookie.pm Interface to Netscape Cookies
--lib/CGI/Fast.pm Support for FastCGI (persistent server process)
--lib/CGI/Pretty.pm Output nicely formatted HTML
--lib/CGI/Push.pm Support for server push
--lib/CGI/Switch.pm Simple interface for multiple server types
- lib/CPAN.pm Interface to Comprehensive Perl Archive Network
- lib/CPAN/FirstTime.pm Utility for creating CPAN config files
- lib/CPAN/Nox.pm Runs CPAN while avoiding compiled extensions
-@@ -1493,7 +1466,6 @@
- util.h Dummy header
- utils/Makefile Extract the utility scripts
- utils/c2ph.PL program to translate dbx stabs to perl
--utils/dprofpp.PL Perl code profile post-processor
- utils/h2ph.PL A thing to turn C .h files into perl .ph files
- utils/h2xs.PL Program to make .xs files from C header files
- utils/perlbc.PL Front-end for byte compiler
+--- hints/netbsd.sh.orig Thu Feb 22 21:57:55 2001
++++ hints/netbsd.sh Sun May 20 15:03:24 2001
+@@ -21,7 +21,11 @@
+ if [ -f /usr/libexec/ld.elf_so ]; then
+ d_dlopen=$define
+ d_dlerror=$define
+- ccdlflags="-Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags"
++ # Include the whole libgcc.a, required for Xerces-P, which
++ # needs __eh_alloc, __pure_virtual, and others.
++ # XXX This should be obsoleted by gcc-3.0.
++ ccdlflags="-Wl,-whole-archive -lgcc -Wl,-no-whole-archive \
++ -Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags"
+ cccdlflags="-DPIC -fPIC $cccdlflags"
+ lddlflags="--whole-archive -shared $lddlflags"
+ elif [ "`uname -m`" = "pmax" ]; then
+@@ -59,14 +63,14 @@
+ d_setruid="$undef"
+
+ # there's no problem with vfork.
+-case "$usevfork" in
+-'') usevfork=true ;;
+-esac
++usevfork=true
++
++# Using perl's malloc leads to trouble on some toolchain versions.
++usemymalloc="$undef"
+
+ # Pre-empt the /usr/bin/perl question of installperl.
+-installusrbinperl='n'
++installusrbinperl="$undef"
+
+ # Recognize the NetBSD packages collection.
+-# GDBM might be here.
+ test -d /usr/pkg/lib && loclibpth="$loclibpth /usr/pkg/lib"
+ test -d /usr/pkg/include && locincpth="$locincpth /usr/pkg/include"
diff --git a/lang/perl5-base/patches/patch-ac b/lang/perl5-base/patches/patch-ac
index 15d045419a7..97449e1189c 100644
--- a/lang/perl5-base/patches/patch-ac
+++ b/lang/perl5-base/patches/patch-ac
@@ -1,13 +1,20 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/09/05 09:18:21 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2001/06/07 04:25:34 jlam Exp $
---- ext/POSIX/Makefile.PL.orig Wed Mar 22 11:23:03 2000
-+++ ext/POSIX/Makefile.PL
-@@ -6,7 +6,7 @@
- @libs = ('LIBS' => ["-lm -lc -lposix -lcposix"]);
- }
- else {
-- @libs = ('LIBS' => ["-lm -lposix -lcposix"]);
-+ @libs = ('LIBS' => ["-lm"]);
- }
- }
- WriteMakefile(
+--- lib/ExtUtils/Install.pm.orig Thu Feb 22 21:57:55 2001
++++ lib/ExtUtils/Install.pm Mon May 21 12:06:01 2001
+@@ -156,7 +156,14 @@
+ } else {
+ inc_uninstall($_,$File::Find::dir,$verbose,0); # nonono set to 0
+ }
+- $packlist->{$origfile}++;
++ #
++ # jlam 2001-05-21 - Fix a bug in the packlists where only the
++ # filename and not the full pathname is recorded. The broken
++ # line is:
++ #
++ # $packlist->{$origfile}++;
++ #
++ $packlist->{$targetfile}++;
+
+ }, ".");
+ chdir($cwd) or Carp::croak("Couldn't chdir to $cwd: $!");
diff --git a/lang/perl5-base/patches/patch-ad b/lang/perl5-base/patches/patch-ad
index 868b22a8303..4d03f81ca18 100644
--- a/lang/perl5-base/patches/patch-ad
+++ b/lang/perl5-base/patches/patch-ad
@@ -1,55 +1,51 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/09/05 09:18:21 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2001/06/07 04:25:34 jlam Exp $
---- installperl.orig Wed Mar 8 07:22:41 2000
-+++ installperl Wed Aug 30 15:09:30 2000
-@@ -56,7 +56,7 @@
- }
-
- my @scripts = qw(utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc
-- utils/pl2pm utils/splain utils/perlcc utils/dprofpp
-+ utils/pl2pm utils/splain utils/perlcc
- x2p/s2p x2p/find2perl
- pod/pod2man pod/pod2html pod/pod2latex pod/pod2text
- pod/pod2usage pod/podchecker pod/podselect);
-@@ -224,7 +224,7 @@
- safe_unlink("$installbin/s$perl_verbase$ver$exe_ext");
- if ($d_dosuid) {
- copy("suidperl$exe_ext", "$installbin/s$perl_verbase$ver$exe_ext");
-- chmod(04711, "$installbin/s$perl_verbase$ver$exe_ext");
-+ chmod(04111, "$installbin/s$perl_verbase$ver$exe_ext");
- }
-
- # Install library files.
-@@ -326,19 +326,19 @@
- (-l $usrbinperl) &&
- ((readlink $usrbinperl) eq $expinstperl));
+--- pp.c.orig Sun Apr 8 02:09:16 2001
++++ pp.c Sun May 27 17:02:09 2001
+@@ -1900,6 +1900,28 @@
}
-- if ((! $mainperl_is_instperl) &&
-- (yn("Many scripts expect perl to be installed as $usrbinperl.\n" .
-- "Do you wish to have $usrbinperl be the same as\n" .
-- "$expinstperl? [y] ")))
-- {
-- unlink($usrbinperl);
-- ( $Config{'d_link'} eq 'define' &&
-- eval { CORE::link $instperl, $usrbinperl } ) ||
-- eval { symlink $expinstperl, $usrbinperl } ||
-- copy($instperl, $usrbinperl);
--
-- $mainperl_is_instperl = 1;
-- }
-+# if ((! $mainperl_is_instperl) &&
-+# (yn("Many scripts expect perl to be installed as $usrbinperl.\n" .
-+# "Do you wish to have $usrbinperl be the same as\n" .
-+# "$expinstperl? [y] ")))
-+# {
-+# unlink($usrbinperl);
-+# ( $Config{'d_link'} eq 'define' &&
-+# eval { CORE::link $instperl, $usrbinperl } ) ||
-+# eval { symlink $expinstperl, $usrbinperl } ||
-+# copy($instperl, $usrbinperl);
-+#
-+# $mainperl_is_instperl = 1;
-+# }
}
- # Make links to ordinary names if installbin directory isn't current directory.
++/*
++ * There are strange code-generation bugs caused on sparc64 by gcc-2.95.2.
++ * These need to be revisited when a newer toolchain becomes available.
++ */
++#if defined(__sparc64__) && defined(__GNUC__)
++#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
++#undef SPARC64_WORKAROUND
++#define SPARC64_WORKAROUND 1
++#endif
++#endif
++
++#if defined(SPARC64_WORKAROUND)
++double
++sparc64_workaround_modf(double theVal, double *theIntRes)
++{
++ double res, ret;
++ ret = modf(theVal, &res);
++ *theIntRes = res;
++ return ret;
++}
++#endif
++
+ PP(pp_int)
+ {
+ dSP; dTARGET;
+@@ -1913,6 +1935,9 @@
+ }
+ else {
+ if (value >= 0.0) {
++#if defined(SPARC64_WORKAROUND)
++ (void)sparc64_workaround_modf(value, &value);
++#else
+ #if defined(HAS_MODFL) || defined(LONG_DOUBLE_EQUALS_DOUBLE)
+ (void)Perl_modf(value, &value);
+ #else
+@@ -1920,6 +1945,7 @@
+ (void)Perl_modf(tmp, &tmp);
+ value = (NV)tmp;
+ #endif
++#endif /* SPARC64_WORKAROUND */
+ }
+ else {
+ #if defined(HAS_MODFL) || defined(LONG_DOUBLE_EQUALS_DOUBLE)
diff --git a/lang/perl5-base/patches/patch-ae b/lang/perl5-base/patches/patch-ae
deleted file mode 100644
index 99b14189d4b..00000000000
--- a/lang/perl5-base/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/09/05 09:18:21 jlam Exp $
-
---- perl.h.orig Sun Mar 19 00:45:33 2000
-+++ perl.h
-@@ -486,6 +486,15 @@
- # include <sys/param.h>
- #endif
-
-+/* needed for IAMSUID case for 4.4BSD systems
-+ * XXX there should probably be a Configure variable
-+ */
-+
-+#ifdef I_SYS_PARAM
-+#if (defined (BSD) && (BSD >= 199306))
-+# include <sys/mount.h>
-+#endif /* !BSD */
-+#endif /* !I_SYS_PARAM */
-
- /* Use all the "standard" definitions? */
- #if defined(STANDARD_C) && defined(I_STDLIB)
diff --git a/lang/perl5-base/patches/patch-af b/lang/perl5-base/patches/patch-af
deleted file mode 100644
index dba71526a4f..00000000000
--- a/lang/perl5-base/patches/patch-af
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/09/05 09:18:21 jlam Exp $
-
---- utils/Makefile.orig Mon Sep 6 15:46:15 1999
-+++ utils/Makefile
-@@ -5,9 +5,9 @@
- # Files to be built with variable substitution after miniperl is
- # available. Dependencies handled manually below (for now).
-
--pl = c2ph.PL h2ph.PL h2xs.PL perlbug.PL perldoc.PL pl2pm.PL splain.PL perlcc.PL dprofpp.PL
--plextract = c2ph h2ph h2xs perlbug perldoc pl2pm splain perlcc dprofpp
--plextractexe = c2ph.exe h2ph.exe h2xs.exe perlbug.exe perldoc.exe pl2pm.exe splain.exe perlcc.exe dprofpp.exe
-+pl = c2ph.PL h2ph.PL h2xs.PL perlbug.PL perldoc.PL pl2pm.PL splain.PL perlcc.PL
-+plextract = c2ph h2ph h2xs perlbug perldoc pl2pm splain perlcc
-+plextractexe = c2ph.exe h2ph.exe h2xs.exe perlbug.exe perldoc.exe pl2pm.exe splain.exe perlcc.exe
-
- all: $(plextract)
-
-@@ -32,8 +32,6 @@
- splain: splain.PL ../config.sh ../lib/diagnostics.pm
-
- perlcc: perlcc.PL ../config.sh
--
--dprofpp: dprofpp.PL ../config.sh
-
- clean:
-
diff --git a/lang/perl5-base/patches/patch-ag b/lang/perl5-base/patches/patch-ag
deleted file mode 100644
index 536d156cf2a..00000000000
--- a/lang/perl5-base/patches/patch-ag
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2001/04/15 18:10:47 manu Exp $
---- hints/netbsd.sh.orig Sun Feb 6 15:57:09 2000
-+++ hints/netbsd.sh Sat Apr 7 22:23:39 2001
-@@ -20,9 +20,13 @@
- *)
- if [ -f /usr/libexec/ld.elf_so ]; then
- d_dlopen=$define
- d_dlerror=$define
-- ccdlflags="-Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags"
-+ # Include the whole libgcc.a, requiered for Xerces-P, which
-+ # needs __eh_alloc, __pure_virtual, and others. This should
-+ # be obsoleted by gcc-3.0
-+ ccdlflags="-Wl,-whole-archive -lgcc -Wl,-no-whole-archive \
-+ -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.
-@@ -61,8 +65,25 @@
- # there's no problem with vfork.
- case "$usevfork" in
- '') usevfork=true ;;
- esac
-+
-+# Using perl's malloc leads to trouble on some toolchain versions...
-+test "$usemymalloc" || usemymalloc='n'
-+
-+# The toolchain on sparc64 is not realy production quality right now,
-+# but gcc 2.96 is supposed to fix most problems.
-+# The -g triggers -DDEBUGGING, which plays the real trick and circumvents
-+# code generation bugs. So we add -g everywhere, to at least have a
-+# realy debuggable build.
-+if [ "`uname -m`" = "sparc64" ]; then
-+ if $cc -v 2>&1 | grep "gcc version" | grep "2.95.2" > /dev/null; then
-+ ccdlflags="-g $ccdlflags"
-+ cccdlflags="-g $cccdlflags"
-+ lddlflags="-g $lddlflags"
-+ optimize='-g -msoft-quad-float -O2 -DGCC2952_SPARC64_WORKAROUND'
-+ fi
-+fi
-
- # Pre-empt the /usr/bin/perl question of installperl.
- installusrbinperl='n'
-
diff --git a/lang/perl5-base/patches/patch-ah b/lang/perl5-base/patches/patch-ah
deleted file mode 100644
index 373b892b9db..00000000000
--- a/lang/perl5-base/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2000/11/08 08:28:01 martin Exp $
-
---- regcomp.c.orig Tue Mar 14 23:19:44 2000
-+++ regcomp.c Wed Nov 8 01:23:19 2000
-@@ -669,6 +669,7 @@
- regnode *oscan = scan;
- struct regnode_charclass_class this_class;
- struct regnode_charclass_class *oclass = NULL;
-+ pos_before = 1;
-
- switch (PL_regkind[(U8)OP(scan)]) {
- case WHILEM: /* End of (?:...)* . */
diff --git a/lang/perl5-base/patches/patch-ai b/lang/perl5-base/patches/patch-ai
deleted file mode 100644
index dfd1859610f..00000000000
--- a/lang/perl5-base/patches/patch-ai
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2000/11/08 08:28:01 martin Exp $
-
---- pp.c.orig Mon Mar 20 16:35:44 2000
-+++ pp.c Mon Nov 6 23:07:51 2000
-@@ -1834,6 +1834,16 @@
- }
- }
-
-+#ifdef GCC2952_SPARC64_WORKAROUND
-+double myLocalModf(double theVal, double * theIntRes)
-+{
-+ double res, ret;
-+ ret = modf(theVal, &res);
-+ *theIntRes = res;
-+ return ret;
-+}
-+#endif
-+
- PP(pp_int)
- {
- djSP; dTARGET;
-@@ -1846,8 +1856,13 @@
- SETi(iv);
- }
- else {
-- if (value >= 0.0)
-+ if (value >= 0.0) {
-+#ifdef GCC2952_SPARC64_WORKAROUND
-+ (void)myLocalModf(value, &value);
-+#else
- (void)Perl_modf(value, &value);
-+#endif
-+ }
- else {
- (void)Perl_modf(-value, &value);
- value = -value;
diff --git a/lang/perl5-base/patches/patch-aj b/lang/perl5-base/patches/patch-aj
deleted file mode 100644
index dbdfdaab011..00000000000
--- a/lang/perl5-base/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2001/01/11 17:51:29 jlam Exp $
-
---- installman.orig Sun Jan 9 16:45:04 2000
-+++ installman Thu Jan 11 11:47:26 2001
-@@ -69,7 +69,6 @@
- runpod2man('utils', $man1dir, $man1ext, 'perlbug');
- runpod2man('utils', $man1dir, $man1ext, 'pl2pm');
- runpod2man('utils', $man1dir, $man1ext, 'splain');
--runpod2man('utils', $man1dir, $man1ext, 'dprofpp');
- runpod2man('x2p', $man1dir, $man1ext, 's2p');
- runpod2man('x2p', $man1dir, $man1ext, 'a2p.pod');
- runpod2man('x2p', $man1dir, $man1ext, 'find2perl');
diff --git a/lang/perl5-base/pkg/DESCR b/lang/perl5-base/pkg/DESCR
index 422f2238122..2b488353c49 100644
--- a/lang/perl5-base/pkg/DESCR
+++ b/lang/perl5-base/pkg/DESCR
@@ -1,7 +1,13 @@
-Perl is a language that combines some of the features of C, sed, awk
-and shell. See the manual page for more hype. There are also two Nutshell
-Handbooks published by O'Reilly & Assoc. See pod/perlbook.pod
-for more information.
+Perl is a high-level programming language with an eclectic heritage
+written by Larry Wall and a cast of thousands. It derives from the
+ubiquitous C programming language and to a lesser extent from sed, awk,
+the Unix shell, and at least a dozen other tools and languages. Perl's
+process, file, and text manipulation facilities make it particularly
+well-suited for tasks involving quick prototyping, system utilities,
+software tools, system management tasks, database access, graphical
+programming, networking, and world wide web programming. These strengths
+make it especially popular with system administrators and CGI script
+authors, but mathematicians, geneticists, journalists, and even managers
+also use Perl. Maybe you should, too.
-This contains the base installation of Perl with some modules removed that
-are externally available in pkgsrc.
+This package contains the base installation of Perl and the Perl Library.
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 58102d761a5..f7b47011cf6 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.36 2001/05/20 05:16:07 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2001/06/07 04:25:33 jlam Exp $
-DISTNAME= perl-5.6.0nb6
-CATEGORIES= lang devel perl5
-MASTER_SITES= # empty
+.include "../../lang/perl5/Makefile.common"
+
+PKGNAME= perl-${PERL5_VERS}
+PERL5_PKG_VERS= # empty
+CATEGORIES+= lang devel
DISTFILES= # empty
-MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://language.perl.com/index.html
COMMENT= Practical Extraction and Report Language
-DEPENDS+= perl-base>=5.6.0nb2:../../lang/perl5-base
-DEPENDS+= p5-Data-Dumper>=2.101:../../devel/p5-Data-Dumper
-DEPENDS+= p5-Devel-DProf>=19990108:../../devel/p5-Devel-DProf
-DEPENDS+= p5-Devel-Peek>=1.0001:../../devel/p5-Devel-Peek
-DEPENDS+= p5-CGI>=2.56:../../www/p5-CGI
+DEPENDS+= perl-base>=${PERL5_DIST_VERS}:../../lang/perl5-base
+DEPENDS+= p5-CGI>=2.75.2:../../www/p5-CGI
DEPENDS+= perl-mk-1.1:../../pkgtools/perl-mk
EXTRACT_ONLY= # empty
diff --git a/lang/perl5/Makefile.common b/lang/perl5/Makefile.common
new file mode 100644
index 00000000000..349cd609cb3
--- /dev/null
+++ b/lang/perl5/Makefile.common
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile.common,v 1.1 2001/06/07 04:25:34 jlam Exp $
+
+DISTNAME= perl-${PERL5_DIST_VERS}
+CATEGORIES+= perl5
+MASTER_SITES+= ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/maint/ \
+ ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/maint/
+
+# Version numbering scheme:
+#
+# PERL5_DIST_VERS version number on the distfile
+# PERL5_BASE_VERS pkgsrc-mangled version number (convert pl -> .)
+# PERL5_PKG_VERS pkgsrc revisions (nbX, etc.)
+# PERL5_VERS pkgsrc version number of package
+#
+PERL5_DIST_VERS= 5.6.1
+PERL5_PKG_VERS?= # empty
+PERL5_VERS= ${PERL5_DIST_VERS}${PERL5_PKG_VERS}
diff --git a/lang/perl5/pkg/DESCR b/lang/perl5/pkg/DESCR
index 84a1b8889ce..ace5f12f3c1 100644
--- a/lang/perl5/pkg/DESCR
+++ b/lang/perl5/pkg/DESCR
@@ -1,6 +1,11 @@
-From the distribution README:
-
-Perl is a language that combines some of the features of C, sed, awk
-and shell. See the manual page for more hype. There are also two Nutshell
-Handbooks published by O'Reilly & Assoc. See pod/perlbook.pod
-for more information.
+Perl is a high-level programming language with an eclectic heritage
+written by Larry Wall and a cast of thousands. It derives from the
+ubiquitous C programming language and to a lesser extent from sed, awk,
+the Unix shell, and at least a dozen other tools and languages. Perl's
+process, file, and text manipulation facilities make it particularly
+well-suited for tasks involving quick prototyping, system utilities,
+software tools, system management tasks, database access, graphical
+programming, networking, and world wide web programming. These strengths
+make it especially popular with system administrators and CGI script
+authors, but mathematicians, geneticists, journalists, and even managers
+also use Perl. Maybe you should, too.
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-19 10:24:10 +0000