Revert to building libperl statically, and clean up.

5 files changed, 72 insertions, 80 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index bdb46ed4598..1136172d70c 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/12/01 02:47:18 tv Exp $
+# $NetBSD: Makefile,v 1.15 1998/12/02 02:28:30 tv Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/07/18 06:16:44 markm Exp
 #
 
@@ -11,32 +11,18 @@ MASTER_SITES=		ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://language.perl.com/index.html
 
-OPSYS!=			uname -s
-LOPSYS!= 		echo ${OPSYS}|tr [A-Z] [a-z]
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		PREFIX=${PREFIX}
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS+=	-sde -Dprefix=${PREFIX} \
-			-Darchname=${MACHINE_ARCH}-${LOPSYS}
+			-Darchname=${MACHINE_ARCH}-netbsd
 MAKE_ENV+=		LD_LIBRARY_PATH=${WRKSRC}
 
 test:
 	@(cd ${WRKSRC}; make test)
 
-# ELF and a.out systems have slightly different libperl extensions.
-pre-install:
-.if exists(/usr/libexec/ld.elf_so)
-	@echo 'lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/CORE/libperl.so' >>${WRKDIR}/.PLIST-add
-.elif exists(/usr/libexec/ld.so)
-	@echo 'lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/CORE/libperl.so.4.4' >>${WRKDIR}/.PLIST-add
-.else
-	@echo 'lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/CORE/libperl.a' >>${WRKDIR}/.PLIST-add
-.endif
-
 post-install:
 	@strip ${PREFIX}/bin/a2p
 	@strip ${PREFIX}/bin/perl
 
 .include "../../mk/bsd.pkg.mk"
-
-PLIST_SRC:=	${WRKDIR}/.PLIST-add ${PLIST_SRC}
diff --git a/lang/perl5/patches/patch-aa b/lang/perl5/patches/patch-aa
index bd247960bea..7a75964aa73 100644
--- a/lang/perl5/patches/patch-aa
+++ b/lang/perl5/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.9 1998/12/01 02:47:19 tv Exp $
+$NetBSD: patch-aa,v 1.10 1998/12/02 02:28:30 tv Exp $
 
 --- Configure.orig	Fri Oct  3 13:57:39 1997
-+++ Configure	Mon Nov 30 20:48:38 1998
++++ Configure	Tue Dec  1 20:42:23 1998
 @@ -65,7 +65,7 @@
  fi
  
@@ -52,17 +52,19 @@ $NetBSD: patch-aa,v 1.9 1998/12/01 02:47:19 tv Exp $
  
  : Private path used by Configure to find libraries.  Its value
  : is prepended to libpth. This variable takes care of special
-@@ -753,7 +753,8 @@
+@@ -753,9 +753,8 @@
  defvoidused=15
  
  : List of libraries we want.
 -libswanted='sfio net 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"
 +# libswanted='sfio net socket inet nsl nm ndbm gdbm dbm db malloc dl'
-+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"
++libswanted='m posix crypt'
  : We probably want to search /usr/shlib before most other libraries.
-@@ -2365,7 +2366,7 @@
+ : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
+ glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
+@@ -2365,7 +2364,7 @@
  : determine root of directory hierarchy where package will be installed.
  case "$prefix" in
  '')
@@ -71,7 +73,7 @@ $NetBSD: patch-aa,v 1.9 1998/12/01 02:47:19 tv Exp $
  	;;
  *)
  	dflt="$prefix"
-@@ -2375,10 +2376,10 @@
+@@ -2375,10 +2374,10 @@
  
  By default, $package will be installed in $dflt/bin, manual
  pages under $dflt/man, etc..., i.e. with $dflt as prefix for
@@ -84,7 +86,7 @@ $NetBSD: patch-aa,v 1.9 1998/12/01 02:47:19 tv Exp $
  for each of the installation directories, the prefix being only used
  to set the defaults.
  
-@@ -2426,7 +2427,7 @@
+@@ -2426,7 +2425,7 @@
  esac'
  
  : determine where private library files go
@@ -93,7 +95,7 @@ $NetBSD: patch-aa,v 1.9 1998/12/01 02:47:19 tv Exp $
  : /opt/perl/lib, since /opt/perl/lib/perl5 would be redundant.
  case "$prefix" in
  *perl*) set dflt privlib lib ;;
-@@ -2501,7 +2502,7 @@
+@@ -2501,7 +2500,7 @@
  case "$archlib" in
  '')
      case "$privlib" in
@@ -102,7 +104,7 @@ $NetBSD: patch-aa,v 1.9 1998/12/01 02:47:19 tv Exp $
  	set dflt
  	eval $prefixup
  	;;
-@@ -2986,8 +2987,8 @@
+@@ -2986,8 +2985,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"
@@ -113,7 +115,7 @@ $NetBSD: patch-aa,v 1.9 1998/12/01 02:47:19 tv Exp $
  	sysman=`./loc . /usr/man/man1 $syspath`
  	;;
  esac
-@@ -3268,7 +3269,7 @@
+@@ -3268,7 +3267,7 @@
  : Set private lib path
  case "$plibpth" in
  '') if ./mips; then
@@ -122,7 +124,7 @@ $NetBSD: patch-aa,v 1.9 1998/12/01 02:47:19 tv Exp $
  	fi;;
  esac
  case "$libpth" in
-@@ -4747,10 +4748,10 @@
+@@ -4747,10 +4746,10 @@
  	aix)
  		# We'll set it in Makefile.SH...
  		;;
@@ -135,7 +137,7 @@ $NetBSD: patch-aa,v 1.9 1998/12/01 02:47:19 tv Exp $
  		xxx="-Wl,-R$shrpdir"
  		;;
  	linux|irix*|dec_osf)
-@@ -4965,8 +4966,8 @@
+@@ -4965,8 +4964,8 @@
  esac
  
  echo "If you don't want the manual sources installed, answer 'none'."
@@ -146,7 +148,7 @@ $NetBSD: patch-aa,v 1.9 1998/12/01 02:47:19 tv Exp $
  : thus man less will show the perl module less.pm, but not the system
  : less command.  We might also conflict with TCL man pages.
  : However, something like /opt/perl/man/man3 is fine.
-@@ -5413,7 +5414,7 @@
+@@ -5413,7 +5412,7 @@
  	: guess some guesses
  	$test -d /usr/share/scripts && dflt=/usr/share/scripts
  	$test -d /usr/share/bin && dflt=/usr/share/bin
@@ -155,7 +157,7 @@ $NetBSD: patch-aa,v 1.9 1998/12/01 02:47:19 tv Exp $
  	$test -d $prefixexp/script && dflt=$prefixexp/script
  	set dflt
  	eval $prefixup
-@@ -8726,7 +8727,7 @@
+@@ -8726,7 +8725,7 @@
  	case "$ranlib" in
  	:) ranlib='';;
  	'')
diff --git a/lang/perl5/patches/patch-af b/lang/perl5/patches/patch-af
index c89497909f5..e5019986ab9 100644
--- a/lang/perl5/patches/patch-af
+++ b/lang/perl5/patches/patch-af
@@ -1,14 +1,37 @@
-$NetBSD: patch-af,v 1.3 1998/12/01 02:47:19 tv Exp $
+$NetBSD: patch-af,v 1.4 1998/12/02 02:28:30 tv Exp $
 
 --- hints/netbsd.sh.orig	Thu May  8 11:52:59 1997
-+++ hints/netbsd.sh	Mon Nov 30 21:06:57 1998
-@@ -19,26 +19,25 @@
++++ hints/netbsd.sh	Tue Dec  1 20:41:28 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)
--		d_dlopen=$undef
++	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)
@@ -18,17 +41,9 @@ $NetBSD: patch-af,v 1.3 1998/12/01 02:47:19 tv Exp $
 -#		lddlflags="-shared $lddlflags"
 -#		;;
 -	*)
-+	if [ -f /usr/libexec/ld.elf_so ]; then
-+		d_dlopen=$define
-+		d_dlerror=$define
-+		useshrplib=$define
-+		ccdlflags="-Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags"
-+		cccdlflags="-DPIC -fPIC $cccdlflags"
-+		lddlflags="--whole-archive -shared $lddlflags"
 +	elif [ -f /usr/libexec/ld.so ]; then
  		d_dlopen=$define
  		d_dlerror=$define
-+		useshrplib=$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)
@@ -42,7 +57,7 @@ $NetBSD: patch-af,v 1.3 1998/12/01 02:47:19 tv Exp $
  	;;
  esac
  
-@@ -47,15 +46,18 @@
+@@ -47,13 +46,26 @@
  # 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.
@@ -50,16 +65,24 @@ $NetBSD: patch-af,v 1.3 1998/12/01 02:47:19 tv Exp $
 +# 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.0*|1.1*|1.2*|1.3|1.3.1)
++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=true
++
++# in case the user installs a shared libperl, with or without the static lib,
++# give us a "rpath" for third party binary builds:
++case "$osvers" in
++0*|1.[01]*)
++	;;
++*)
++	ccdlflags="-Wl,-R$archlibexp/CORE $ccdlflags"
  	;;
  esac
-+
-+# there's no problem with vfork:
-+d_vfork=$define # HFHFHF
  
- # Avoid telldir prototype conflict in pp_sys.c  (NetBSD uses const DIR *)
- # Configure should test for this.  Volunteers?
diff --git a/lang/perl5/pkg/PLIST-md.shared b/lang/perl5/pkg/PLIST-md.shared
index 0a72d9671d7..9f28190ebc3 100644
--- a/lang/perl5/pkg/PLIST-md.shared
+++ b/lang/perl5/pkg/PLIST-md.shared
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST-md.shared,v 1.2 1998/01/28 15:33:54 hubertf Exp $
-@comment rest (m68k, arm32, i386, pc532, pica, sparc, vax):
+@comment $NetBSD: PLIST-md.shared,v 1.3 1998/12/02 02:28:31 tv Exp $
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/DB_File/DB_File.so
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/DB_File/DB_File.bs
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/Fcntl/Fcntl.so
diff --git a/lang/perl5/pkg/PLIST-mi b/lang/perl5/pkg/PLIST-mi
index 4b55114ab9b..4c4e1c3cb5b 100644
--- a/lang/perl5/pkg/PLIST-mi
+++ b/lang/perl5/pkg/PLIST-mi
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST-mi,v 1.4 1998/12/01 02:47:19 tv Exp $
-@comment this list changes by some files if gdbm is installed - hubertf
+@comment $NetBSD: PLIST-mi,v 1.5 1998/12/02 02:28:31 tv Exp $
 bin/a2p
 bin/c2ph
 bin/find2perl
@@ -17,13 +16,6 @@ bin/pod2text
 bin/pstruct
 bin/s2p
 bin/splain
-@comment some empty dirs perl creates
-@exec	mkdir -p %D/lib/perl5/IO
-@unexec	rm -fr   %D/lib/perl5/IO
-@exec	mkdir -p %D/lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/Text/ParseWords
-@unexec	rm -fr   %D/lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/Text/ParseWords
-@exec	mkdir -p %D/lib/perl5/site_perl/${MACHINE_ARCH}-netbsd
-@unexec rmdir -p %D/lib/perl5/site_perl/${MACHINE_ARCH}-netbsd 2>/dev/null || true
 lib/perl5/AnyDBM_File.pm
 lib/perl5/AutoLoader.pm
 lib/perl5/AutoSplit.pm
@@ -178,6 +170,7 @@ lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/CORE/scope.h
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/CORE/sv.h
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/CORE/unixish.h
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/CORE/util.h
+lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/CORE/libperl.a
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/Config.pm
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/DB_File.pm
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/DynaLoader.pm
@@ -197,8 +190,6 @@ lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/POSIX.pod
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/SDBM_File.pm
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/Safe.pm
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/Socket.pm
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/DB_File/DB_File.bs
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/DB_File/DB_File.so
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/DB_File/autosplit.ix
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/DynaLoader/DynaLoader.a
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/DynaLoader/autosplit.ix
@@ -206,16 +197,6 @@ lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/DynaLoader/dl_expandspec.al
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/DynaLoader/dl_find_symbol_anywhere.al
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/DynaLoader/dl_findfile.al
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/DynaLoader/extralibs.ld
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/Fcntl/Fcntl.bs
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/Fcntl/Fcntl.so
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/IO/IO.bs
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/IO/IO.so
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/NDBM_File/NDBM_File.bs
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/NDBM_File/NDBM_File.so
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/Opcode/Opcode.bs
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/Opcode/Opcode.so
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/POSIX/POSIX.bs
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/POSIX/POSIX.so
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/POSIX/abs.al
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/POSIX/alarm.al
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/POSIX/assert.al
@@ -363,10 +344,6 @@ lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/POSIX/vprintf.al
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/POSIX/vsprintf.al
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/POSIX/wait.al
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/POSIX/waitpid.al
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/SDBM_File/SDBM_File.bs
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/SDBM_File/SDBM_File.so
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/Socket/Socket.bs
-@comment MD lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/Socket/Socket.so
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/sdbm/extralibs.ld
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/ops.pm
 lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/overload.pm
@@ -620,6 +597,11 @@ man/man1/pstruct.1
 man/man1/s2p.1
 man/man1/splain.1
 man/man1/xsubpp.1
+@exec	mkdir -p %D/lib/perl5/IO
+@exec	mkdir -p %D/lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/Text/ParseWords
+@exec	mkdir -p %D/lib/perl5/site_perl/${MACHINE_ARCH}-netbsd
+@unexec rmdir -p %D/lib/perl5/site_perl/${MACHINE_ARCH}-netbsd 2>/dev/null || true
+@unexec rmdir -p %D/lib/perl5/man/man3 2>/dev/null || true
 @dirrm lib/perl5/Bundle
 @dirrm lib/perl5/CGI
 @dirrm lib/perl5/CPAN
@@ -629,6 +611,7 @@ man/man1/xsubpp.1
 @dirrm lib/perl5/File
 @dirrm lib/perl5/Getopt
 @dirrm lib/perl5/I18N
+@dirrm lib/perl5/IO
 @dirrm lib/perl5/IPC
 @dirrm lib/perl5/Math
 @dirrm lib/perl5/Net
@@ -647,8 +630,7 @@ man/man1/xsubpp.1
 @dirrm lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/CORE
 @dirrm lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/IO
 @dirrm lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/DynaLoader
+@dirrm lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/Text/ParseWords
 @dirrm lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/Text
 @dirrm lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/auto/sdbm
-@dirrm lib/perl5/man/man3
-@dirrm lib/perl5/man
 @dirrm lib/perl5/pod