Repairs to make the ports system work again. Currently, the ports

are installed in the same place as on 2.2.*; this will almost
certainly change in the future.

While I'm here, finish off the shared library brouhaha with miniperl.

5 files changed, 42 insertions, 43 deletions

diff --git a/gnu/usr.bin/perl/libperl/config.SH-aout.i386 b/gnu/usr.bin/perl/libperl/config.SH-aout.i386
index e65c46802e7c..89eff472bd03 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-aout.i386
+++ b/gnu/usr.bin/perl/libperl/config.SH-aout.i386
@@ -5,12 +5,12 @@
 # do not forget to propagate your changes by running "Configure -der". You may
 # instead choose to run each of the .SH files by yourself, or "Configure -S".
 #
-# $Id: config.SH-aout.i386,v 1.3 1998/09/22 12:00:58 markm Exp $
+# $Id: config.SH-aout.i386,v 1.4 1998/09/24 17:25:26 markm Exp $
 #
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: $Date: 1998/09/22 12:00:58 $
+# Configuration time: $Date: 1998/09/24 17:25:26 $
 # Configured by     : markm
 # Target system     : freebsd 3.0-current #0:
 
@@ -55,7 +55,7 @@ ccdlflags=' '
 ccflags=''
 cf_by='markm'
 cf_email='markm@freebsd.org'
-cf_time='$Date: 1998/09/22 12:00:58 $'
+cf_time='$Date: 1998/09/24 17:25:26 $'
 chgrp=''
 chmod=''
 chown=''
@@ -391,11 +391,11 @@ inews=''
 installarchlib='/usr/libdata/perl/5.00502/mach'
 installbin='/usr/bin'
 installman1dir='/usr/share/man/man1'
-installman3dir='/usr/share/perl/man/man3'
+installman3dir='/usr/local/lib/perl5/5.00502/man/man3'
 installprivlib='/usr/libdata/perl/5.00502'
 installscript='/usr/bin'
-installsitearch='/usr/local/lib/perl/5.00502/i386-freebsd'
-installsitelib='/usr/local/lib/perl/5.00502'
+installsitearch='/usr/local/lib/perl5/site_perl/5.005/i386-freebsd'
+installsitelib='/usr/local/lib/perl5/site_perl/5.005'
 intsize='4'
 known_extensions='B DB_File Data/Dumper Fcntl GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re'
 ksh=''
@@ -507,10 +507,10 @@ sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TE
 sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "URG", "STOP", "TSTP", "CONT", "CHLD", "TTIN", "TTOU", "IO", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "INFO", "USR1", "USR2", "IOT", 0'
 sig_num='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 6, 0'
 signal_t='void'
-sitearch='/usr/local/lib/perl/5.00502/i386-freebsd'
-sitearchexp='/usr/local/lib/perl/5.00502/i386-freebsd'
-sitelib='/usr/local/lib/perl/5.00502'
-sitelibexp='/usr/local/lib/perl/5.00502'
+sitearch='/usr/local/lib/perl5/site_perl/5.005/i386-freebsd'
+sitearchexp='/usr/local/lib/perl5/site_perl/5.005/i386-freebsd'
+sitelib='/usr/local/lib/perl5/site_perl/5.005'
+sitelibexp='/usr/local/lib/perl5/site_perl/5.005'
 sizetype='size_t'
 sleep=''
 smail=''
@@ -571,13 +571,13 @@ zcat=''
 zip='zip'
 # Configure command line arguments.
 config_arg0='Configure'
-config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl/5.00502/i386-freebsd -Dsitelib=/usr/local/lib/perl/5.00502 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more'
+config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more'
 config_argc=11
 config_arg1='-Dprefix=/usr'
 config_arg2='-Darchlib=/usr/libdata/perl/5.00502/mach'
 config_arg3='-Dprivlib=/usr/libdata/perl/5.00502'
-config_arg4='-Dsitearch=/usr/local/lib/perl/5.00502/i386-freebsd'
-config_arg5='-Dsitelib=/usr/local/lib/perl/5.00502'
+config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd'
+config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.005'
 config_arg6='-Dman1dir=/usr/share/man/man1'
 config_arg7='-Dman3dir=/usr/share/perl/man/man3'
 config_arg8='-des'
diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
index df14b42b91b8..a3fcb795e94f 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
+++ b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
@@ -5,12 +5,12 @@
 # do not forget to propagate your changes by running "Configure -der". You may
 # instead choose to run each of the .SH files by yourself, or "Configure -S".
 #
-# $Id: config.SH-elf.alpha,v 1.4 1998/09/22 12:00:58 markm Exp $
+# $Id: config.SH-elf.alpha,v 1.5 1998/09/24 17:25:26 markm Exp $
 #
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: $Date: 1998/09/22 12:00:58 $
+# Configuration time: $Date: 1998/09/24 17:25:26 $
 # Configured by     : markm
 # Target system     : freebsd 3.0-current #0:
 
@@ -55,7 +55,7 @@ ccdlflags=' '
 ccflags=''
 cf_by='markm'
 cf_email='markm@freebsd.org'
-cf_time='$Date: 1998/09/22 12:00:58 $'
+cf_time='$Date: 1998/09/24 17:25:26 $'
 chgrp=''
 chmod=''
 chown=''
@@ -391,11 +391,11 @@ inews=''
 installarchlib='/usr/libdata/perl/5.00502/mach'
 installbin='/usr/bin'
 installman1dir='/usr/share/man/man1'
-installman3dir='/usr/share/perl/man/man3'
+installman3dir='/usr/local/lib/perl5/5.00502/man/man3'
 installprivlib='/usr/libdata/perl/5.00502'
 installscript='/usr/bin'
-installsitearch='/usr/local/lib/perl/5.00502/alpha-freebsd'
-installsitelib='/usr/local/lib/perl/5.00502'
+installsitearch='/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd'
+installsitelib='/usr/local/lib/perl5/site_perl/5.005'
 intsize='4'
 known_extensions='B DB_File Data/Dumper Fcntl GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re'
 ksh=''
@@ -507,10 +507,10 @@ sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TE
 sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "URG", "STOP", "TSTP", "CONT", "CHLD", "TTIN", "TTOU", "IO", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "INFO", "USR1", "USR2", "IOT", 0'
 sig_num='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 6, 0'
 signal_t='void'
-sitearch='/usr/local/lib/perl/5.00502/alpha-freebsd'
-sitearchexp='/usr/local/lib/perl/5.00502/alpha-freebsd'
-sitelib='/usr/local/lib/perl/5.00502'
-sitelibexp='/usr/local/lib/perl/5.00502'
+sitearch='/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd'
+sitearchexp='/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd'
+sitelib='/usr/local/lib/perl5/site_perl/5.005'
+sitelibexp='/usr/local/lib/perl5/site_perl/5.005'
 sizetype='size_t'
 sleep=''
 smail=''
@@ -571,13 +571,13 @@ zcat=''
 zip='zip'
 # Configure command line arguments.
 config_arg0='Configure'
-config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl/5.00502/alpha-freebsd -Dsitelib=/usr/local/lib/perl/5.00502 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more'
+config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more'
 config_argc=11
 config_arg1='-Dprefix=/usr'
 config_arg2='-Darchlib=/usr/libdata/perl/5.00502/mach'
 config_arg3='-Dprivlib=/usr/libdata/perl/5.00502'
-config_arg4='-Dsitearch=/usr/local/lib/perl/5.00502/alpha-freebsd'
-config_arg5='-Dsitelib=/usr/local/lib/perl/5.00502'
+config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd'
+config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.005'
 config_arg6='-Dman1dir=/usr/share/man/man1'
 config_arg7='-Dman3dir=/usr/share/perl/man/man3'
 config_arg8='-des'
diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.i386 b/gnu/usr.bin/perl/libperl/config.SH-elf.i386
index e5f3b906d0c7..66c2c9ba5d55 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-elf.i386
+++ b/gnu/usr.bin/perl/libperl/config.SH-elf.i386
@@ -5,12 +5,12 @@
 # do not forget to propagate your changes by running "Configure -der". You may
 # instead choose to run each of the .SH files by yourself, or "Configure -S".
 #
-# $Id: config.SH-elf.i386,v 1.3 1998/09/22 12:00:58 markm Exp $
+# $Id: config.SH-elf.i386,v 1.4 1998/09/24 17:25:26 markm Exp $
 #
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: $Date: 1998/09/22 12:00:58 $
+# Configuration time: $Date: 1998/09/24 17:25:26 $
 # Configured by     : markm
 # Target system     : freebsd 3.0-current #0:
 
@@ -55,7 +55,7 @@ ccdlflags=' '
 ccflags=''
 cf_by='markm'
 cf_email='markm@freebsd.org'
-cf_time='$Date: 1998/09/22 12:00:58 $'
+cf_time='$Date: 1998/09/24 17:25:26 $'
 chgrp=''
 chmod=''
 chown=''
@@ -391,11 +391,11 @@ inews=''
 installarchlib='/usr/libdata/perl/5.00502/mach'
 installbin='/usr/bin'
 installman1dir='/usr/share/man/man1'
-installman3dir='/usr/share/perl/man/man3'
+installman3dir='/usr/local/lib/perl5/5.00502/man/man3'
 installprivlib='/usr/libdata/perl/5.00502'
 installscript='/usr/bin'
-installsitearch='/usr/local/lib/perl/5.00502/i386-freebsd'
-installsitelib='/usr/local/lib/perl/5.00502'
+installsitearch='/usr/local/lib/perl5/site_perl/5.005/i386-freebsd'
+installsitelib='/usr/local/lib/perl5/site_perl/5.005'
 intsize='4'
 known_extensions='B DB_File Data/Dumper Fcntl GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs re'
 ksh=''
@@ -507,10 +507,10 @@ sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TE
 sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "URG", "STOP", "TSTP", "CONT", "CHLD", "TTIN", "TTOU", "IO", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "INFO", "USR1", "USR2", "IOT", 0'
 sig_num='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 6, 0'
 signal_t='void'
-sitearch='/usr/local/lib/perl/5.00502/i386-freebsd'
-sitearchexp='/usr/local/lib/perl/5.00502/i386-freebsd'
-sitelib='/usr/local/lib/perl/5.00502'
-sitelibexp='/usr/local/lib/perl/5.00502'
+sitearch='/usr/local/lib/perl5/site_perl/5.005/i386-freebsd'
+sitearchexp='/usr/local/lib/perl5/site_perl/5.005/i386-freebsd'
+sitelib='/usr/local/lib/perl5/site_perl/5.005'
+sitelibexp='/usr/local/lib/perl5/site_perl/5.005'
 sizetype='size_t'
 sleep=''
 smail=''
@@ -571,13 +571,13 @@ zcat=''
 zip='zip'
 # Configure command line arguments.
 config_arg0='Configure'
-config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl/5.00502/i386-freebsd -Dsitelib=/usr/local/lib/perl/5.00502 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more'
+config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00502/mach -Dprivlib=/usr/libdata/perl/5.00502 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/perl/man/man3 -des -Ulocincpth= -Uloclibpth= -Dpager=more'
 config_argc=11
 config_arg1='-Dprefix=/usr'
 config_arg2='-Darchlib=/usr/libdata/perl/5.00502/mach'
 config_arg3='-Dprivlib=/usr/libdata/perl/5.00502'
-config_arg4='-Dsitearch=/usr/local/lib/perl/5.00502/i386-freebsd'
-config_arg5='-Dsitelib=/usr/local/lib/perl/5.00502'
+config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd'
+config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.005'
 config_arg6='-Dman1dir=/usr/share/man/man1'
 config_arg7='-Dman3dir=/usr/share/perl/man/man3'
 config_arg8='-des'
diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile
index 2b8981ef561c..3b0d6a1a6a54 100644
--- a/gnu/usr.bin/perl/miniperl/Makefile
+++ b/gnu/usr.bin/perl/miniperl/Makefile
@@ -1,12 +1,11 @@
 #
-# $Id: Makefile,v 1.4 1998/09/16 17:25:52 markm Exp $
+# $Id: Makefile,v 1.5 1998/09/23 06:05:28 markm Exp $
 #
 
 PROG=	miniperl
 NOMAN=	true
 CFLAGS+=-I${PERL5SRC} -I${.OBJDIR}
 SRCS=	miniperlmain.c config.h
-NOSHARED= yes
 DPADD=	${LIBPERL} ${LIBM} ${LIBCRYPT}
 LDADD=	-lperl -lm -lcrypt
 
diff --git a/gnu/usr.bin/perl/perl/install_perl_libs b/gnu/usr.bin/perl/perl/install_perl_libs
index aa2c0f5fe631..6e03b52180c7 100755
--- a/gnu/usr.bin/perl/perl/install_perl_libs
+++ b/gnu/usr.bin/perl/perl/install_perl_libs
@@ -4,7 +4,7 @@
 # This was perl 5.00502's installperl, very thoroughly hacked to only
 # install the perl libraries.
 #
-# $Id: install_perl_libs,v 1.1 1998/09/09 07:20:26 markm Exp $
+# $Id: install_perl_libs,v 1.2 1998/09/23 06:05:28 markm Exp $
 #
 
 BEGIN {
@@ -57,7 +57,7 @@ my $installprivlib = $destdir . $Config{installprivlib};
 my $installarchlib = $destdir . $Config{installarchlib};
 my $man1dir = $destdir . $Config{man1dir};
 my $man1ext = $Config{man1ext};
-my $man3dir = $destdir . $Config{man3dir};
+my $man3dir = $destdir . '/usr/share/perl/man/man3';
 my $man3ext = $Config{man3ext};
 my $libperl = $Config{libperl};
 # Shared library and dynamic loading suffixes.