Userland build stuff for Perl5.006.

This is cleaned up quite a lot since 5.00502, and the library modules
are broken out into individual dirs. This should please a lot folk.

39 files changed, 984 insertions, 999 deletions

diff --git a/gnu/usr.bin/perl/Makefile b/gnu/usr.bin/perl/Makefile
index 967b0ce..67e63c6 100644
--- a/gnu/usr.bin/perl/Makefile
+++ b/gnu/usr.bin/perl/Makefile
@@ -4,7 +4,12 @@
 _suidperl=	suidperl
 .endif
 
-SUBDIR= libperl miniperl perl ${_suidperl} pod utils x2p
+SUBDIR= libperl miniperl perl ${_suidperl} library pod utils x2p
+
 MAINTAINER=markm@freebsd.org
 
+build-tools:
+	cd ${.CURDIR}/libperl && make build-tools
+	cd ${.CURDIR}/miniperl && make build-tools
+
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/perl/Makefile.inc b/gnu/usr.bin/perl/Makefile.inc
index 26594c7..17cd9ab 100644
--- a/gnu/usr.bin/perl/Makefile.inc
+++ b/gnu/usr.bin/perl/Makefile.inc
@@ -5,16 +5,19 @@ PERL5LIBSRC?= ${.CURDIR}/../libperl
 
 BINDIR?=	/usr/bin
 
-SHLIB_MAJOR?=	3
-SHLIB_MINOR?=	0
+SHLIB_MAJOR?=	4
 
-HEADERS=EXTERN.h INTERN.h XSUB.h XSlock.h av.h bytecode.h byterun.h \
-	cc_runtime.h cop.h cv.h dosish.h embed.h embedvar.h fakethr.h form.h \
-	gv.h handy.h hv.h intrpvar.h iperlsys.h keywords.h mg.h nostdio.h \
-	objXSUB.h objpp.h op.h opcode.h patchlevel.h perl.h perlio.h \
-	perlsdio.h perlsfio.h perlvars.h perly.h pp.h pp_proto.h proto.h \
-	regcomp.h regexp.h regnodes.h scope.h sv.h thrdvar.h thread.h \
-	unixish.h util.h
+VERSION=	5.006
+
+DYNALOADER= lib/auto/DynaLoader/DynaLoader.a
+
+HEADERS=EXTERN.h INTERN.h XSUB.h av.h cc_runtime.h cop.h cv.h dosish.h \
+	embed.h embedvar.h fakethr.h form.h gv.h handy.h hv.h intrpvar.h \
+	iperlsys.h keywords.h mg.h nostdio.h objXSUB.h op.h opcode.h \
+	opnames.h patchlevel.h perl.h perlapi.h perlio.h perlsdio.h \
+	perlsfio.h perlvars.h perly.h pp.h pp_proto.h proto.h regcomp.h \
+	regexp.h regnodes.h scope.h sv.h thrdvar.h thread.h unixish.h \
+	utf8.h util.h warnings.h
 
 DEPEND_H=
 
@@ -38,25 +41,47 @@ links: ${DEPEND_H}
 			ln -s ${PERL5SRC}/$${i} $${i} ;\
 		done ;\
 	done
+	@ln -sf ${PERL5SRC}/ext/File/Glob/Glob.pm lib/File/Glob.pm
 	@mkdir lib/auto
 	@mkdir build
 	@ln -sf ${PERL5SRC}/config_h.SH config_h.sh
 	@ln -sf ${PERL5SRC}/cflags.SH cflags.sh
 	@ln -sf ${PERL5SRC}/ext/re/re.pm lib/re.pm
-	@ln -sf ${PERL5SRC}/myconfig myconfig
+	@ln -sf ${PERL5SRC}/myconfig.SH myconfig.SH
 	@ln -sf ${PERL5SRC}/miniperlmain.c miniperlmain.c
 	@ln -sf ${PERL5SRC}/writemain.SH writemain.sh
 	@ln -sf ${PERL5SRC}/regcomp.c regcomp.c
 	@ln -sf ${PERL5SRC}/regexec.c regexec.c
+	@ln -sf ${PERL5LIBSRC}/config.SH-${THREAD}${OBJFORMAT}.${MACHINE_ARCH} \
+		config.sh
+	@touch ${.TARGET}
+
+scripts: links
+	@sh config_h.sh
+	@sh cflags.sh
+	@sh writemain.sh
+	@sh myconfig.SH
+	@miniperl ${PERL5SRC}/configpm \
+		Config.pm Porting/Glossary myconfig
+	@ln -sf ../Config.pm lib/Config.pm
 	@touch ${.TARGET}
 
-CLEANFILES+=	links
-CLEANFILES+=	config.h config.sh config_h.sh
+config.h:	scripts
+
+CLEANFILES+=	links scripts
+CLEANFILES+=	config.h config.sh config_h.sh Config.pm
+CLEANFILES+=	myconfig myconfig.SH
 CLEANFILES+=	regcomp.c regexec.c miniperlmain.c
-CLEANFILES+=	writemain writemain.sh cflags cflags.sh myconfig
+CLEANFILES+=	writemain writemain.sh cflags cflags.sh
 CLEANDIRS+=	lib ext Porting hints build
+
 FARMDIRS=	lib ext Porting hints
 
+MAKEMAKER_ARGS=	INSTALLDIRS=perl PERL_SRC=${.OBJDIR} \
+		INSTALLMAN3DIR=${DESTDIR}/usr/share/perl/man3 \
+		PERL=miniperl FULLPERL=perl DEFINE=-I${DESTDIR}/usr/include \
+		DEFINE=-DPERL_CORE
+
 PERL_THREADED?= no
 .if ${PERL_THREADED} == "yes"
 CFLAGS+=        -pthread
@@ -68,16 +93,28 @@ PERL_DEBUGGING?=        no
 CFLAGS+=        -DDEBUGGING
 .endif
 
-config.sh: ${PERL5LIBSRC}/config.SH-${THREAD}${OBJFORMAT}.${MACHINE_ARCH}
-	ln -sf ${.OODATE} ${.TARGET}
-
-config.h: links config_h.sh config.sh
-	sh config_h.sh
-
-cflags.sh config_h.sh writemain.sh: links
-
-cflags: cflags.sh
-	sh cflags.sh
+autosplit: scripts lib/*.pm lib/*/*.pm
+	miniperl -I${.OBJDIR}/lib \
+		-e 'use AutoSplit; autosplit_lib_modules(@ARGV)' \
+		lib/*.pm lib/*/*.pm
+	@touch ${.TARGET}
 
-writemain: writemain.sh
-	sh writemain.sh
+${DYNALOADER}:	scripts \
+		ext/DynaLoader/DynaLoader.pm ext/DynaLoader/XSLoader.pm \
+		ext/DynaLoader/Makefile
+	@cd ext/DynaLoader; \
+	make -B all PERL_SRC=${.OBJDIR}
+
+ext/DynaLoader/DynaLoader.pm: scripts ext/DynaLoader/DynaLoader_pm.PL
+	@cd ext/DynaLoader; \
+	miniperl -I${.OBJDIR} -I${.OBJDIR}/lib DynaLoader_pm.PL DynaLoader.pm
+
+ext/DynaLoader/XSLoader.pm: scripts ext/DynaLoader/XSLoader_pm.PL
+	@cd ext/DynaLoader; \
+	miniperl -I${.OBJDIR} -I${.OBJDIR}/lib XSLoader_pm.PL XSLoader.pm
+
+ext/DynaLoader/Makefile: scripts ext/DynaLoader/Makefile.PL
+	@cd ext/DynaLoader; \
+	miniperl -I${.OBJDIR} -I${.OBJDIR}/lib Makefile.PL ${MAKEMAKER_ARGS} \
+		LINKTYPE=static LIBS="-lperl -lm"; \
+	make -B config PERL_SRC=${.OBJDIR}
diff --git a/gnu/usr.bin/perl/libperl/Makefile b/gnu/usr.bin/perl/libperl/Makefile
index 0c46f35..96e9d98 100644
--- a/gnu/usr.bin/perl/libperl/Makefile
+++ b/gnu/usr.bin/perl/libperl/Makefile
@@ -2,11 +2,12 @@
 
 LIB=	perl
 
-CFLAGS+=-I${.OBJDIR} -I${PERL5SRC}
+CFLAGS+=-I${.OBJDIR} -I${PERL5SRC} -DPERL_CORE
 
-SRCS=	perl.c gv.c toke.c perly.c op.c regcomp.c dump.c util.c mg.c byterun.c \
+SRCS=	perl.c gv.c toke.c perly.c op.c regcomp.c dump.c util.c mg.c \
 	hv.c av.c run.c pp_hot.c sv.c pp.c scope.c pp_ctl.c pp_sys.c \
-	doop.c doio.c regexec.c taint.c deb.c universal.c globals.c perlio.c \
+	doop.c doio.c regexec.c utf8.c taint.c deb.c universal.c \
+	xsutils.c globals.c perlio.c perlapi.c \
 	config.h
 
 DPADD=	${LIBM}
@@ -16,6 +17,8 @@ LDADD=	-lm
 
 .include <bsd.lib.mk>
 
+build-tools:	lib${LIB}.a
+
 .SUFFIXES:
 
 .SUFFIXES: .o .po .So .s .S .c
diff --git a/gnu/usr.bin/perl/libperl/config.SH-aout.i386 b/gnu/usr.bin/perl/libperl/config.SH-aout.i386
deleted file mode 100644
index 1f80af1..0000000
--- a/gnu/usr.bin/perl/libperl/config.SH-aout.i386
+++ /dev/null
@@ -1,601 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# Package name      : perl5
-# Source directory  : .
-# Configuration time: $Date: 1999/05/05 19:09:48 $
-# Configured by     : markm
-# Target system     : freebsd 3.0-current #0:
-
-Author=''
-Date='$Date: 1999/05/05 19:09:48 $'
-Header=''
-Id='$FreeBSD$'
-Locker=''
-Mcc='Mcc'
-RCSfile='$RCSfile: config.SH-aout.i386,v $'
-Revision='$Revision: 1.12 $'
-Source=''
-State=''
-_a='.a'
-_exe=''
-_o='.o'
-afs='false'
-alignbytes='4'
-ansi2knr=''
-aphostname=''
-apiversion='5.005'
-ar='ar'
-archlib='/usr/libdata/perl/5.00503/mach'
-archlibexp='/usr/libdata/perl/5.00503/mach'
-archname='i386-freebsd'
-archobjs=''
-awk='awk'
-baserev='5.0'
-bash=''
-bin='/usr/bin'
-binexp='/usr/bin'
-bison=''
-byacc='byacc'
-byteorder='1234'
-c=''
-castflags='0'
-cat='cat'
-cc='cc'
-cccdlflags='-DPIC -fpic'
-ccdlflags=' '
-ccflags=''
-ccsymbols='__ELF__=0 __FreeBSD__=4 __FreeBSD_cc_version=400002 __GNUC_MINOR__=9
-1 __GNUC__=2 cpu=i386 machine=i386 system=FreeBSD system=unix'
-cf_by='markm'
-cf_email='markm@freebsd.org'
-cf_time='$Date: 1999/05/05 19:09:48 $'
-chgrp=''
-chmod=''
-chown=''
-clocktype='clock_t'
-comm='comm'
-compress=''
-contains='grep'
-cp='cp'
-cpio=''
-cpp='cpp'
-cpp_stuff='42'
-cppflags=''
-cpplast='-'
-cppminus='-'
-cpprun='cc -E'
-cppstdin='cc -E'
-cppsymbols='__STDC__=1'
-cppccsymbols='__i386=1 __i386__=1 __unix=1 __unix__=1 i386=1 unix=1'
-cryptlib=''
-csh='csh'
-d_Gconvert='sprintf((b),"%.*g",(n),(x))'
-d_access='define'
-d_alarm='define'
-d_archlib='define'
-d_attribut='define'
-d_bcmp='define'
-d_bcopy='define'
-d_bsd='define'
-d_bsdgetpgrp='undef'
-d_bsdsetpgrp='define'
-d_bzero='define'
-d_casti32='undef'
-d_castneg='define'
-d_charvspr='undef'
-d_chown='define'
-d_chroot='define'
-d_chsize='undef'
-d_closedir='define'
-d_const='define'
-d_crypt='define'
-d_csh='define'
-d_cuserid='undef'
-d_dbl_dig='define'
-d_difftime='define'
-d_dirnamlen='define'
-d_dlerror='define'
-d_dlopen='define'
-d_dlsymun='undef'
-d_dosuid='define'
-d_dup2='define'
-d_endgrent='define'
-d_endhent='define'
-d_endnent='define'
-d_endpent='define'
-d_endpwent='define'
-d_endsent='define'
-d_eofnblk='define'
-d_eunice='undef'
-d_fchmod='define'
-d_fchown='define'
-d_fcntl='define'
-d_fd_macros='define'
-d_fd_set='define'
-d_fds_bits='define'
-d_fgetpos='define'
-d_flexfnam='define'
-d_flock='define'
-d_fork='define'
-d_fpathconf='define'
-d_fsetpos='define'
-d_fstatfs='define'
-d_statfsflags='define'
-d_fstatvfs='undef'
-d_getmntent='undef'
-d_hasmntopt='undef'
-d_ftime='undef'
-d_getgrent='define'
-d_getgrps='define'
-d_gethbyaddr='define'
-d_gethbyname='define'
-d_gethent='define'
-d_gethname='undef'
-d_gethostprotos='define'
-d_getlogin='define'
-d_getnbyaddr='define'
-d_getnbyname='define'
-d_getnent='define'
-d_getnetprotos='define'
-d_getpbyname='define'
-d_getpbynumber='define'
-d_getpent='define'
-d_getpgid='define'
-d_getpgrp2='undef'
-d_getpgrp='define'
-d_getppid='define'
-d_getprior='define'
-d_getprotoprotos='define'
-d_getpwent='define'
-d_getsbyname='define'
-d_getsbyport='define'
-d_getsent='define'
-d_getservprotos='define'
-d_gettimeod='define'
-d_gnulibc='undef'
-d_grpasswd='define'
-d_htonl='define'
-d_index='undef'
-d_inetaton='define'
-d_isascii='define'
-d_killpg='define'
-d_lchown='define'
-d_link='define'
-d_locconv='define'
-d_lockf='define'
-d_longdbl='define'
-d_longlong='define'
-d_lstat='define'
-d_mblen='define'
-d_mbstowcs='define'
-d_mbtowc='define'
-d_memcmp='define'
-d_memcpy='define'
-d_memmove='define'
-d_memset='define'
-d_mkdir='define'
-d_mkfifo='define'
-d_mktime='define'
-d_msg='define'
-d_msgctl='define'
-d_msgget='define'
-d_msgrcv='define'
-d_msgsnd='define'
-d_mymalloc='undef'
-d_nice='define'
-d_oldpthreads='undef'
-d_oldsock='undef'
-d_open3='define'
-d_pathconf='define'
-d_pause='define'
-d_phostname='undef'
-d_pipe='define'
-d_poll='define'
-d_portable='define'
-d_pthread_yield='undef'
-d_pthreads_created_joinable='undef'
-d_pwage='undef'
-d_pwchange='define'
-d_pwclass='define'
-d_pwcomment='undef'
-d_pwexpire='define'
-d_pwgecos='define'
-d_pwquota='undef'
-d_pwpasswd='define'
-d_readdir='define'
-d_readlink='define'
-d_rename='define'
-d_rewinddir='define'
-d_rmdir='define'
-d_safebcpy='define'
-d_safemcpy='define'
-d_sanemcmp='define'
-d_sched_yield='define'
-d_seekdir='define'
-d_select='define'
-d_sem='define'
-d_semctl='define'
-d_semctl_semid_ds='define'
-d_semctl_semun='define'
-d_semget='define'
-d_semop='define'
-d_setegid='define'
-d_seteuid='define'
-d_setgrent='define'
-d_setgrps='define'
-d_sethent='define'
-d_setlinebuf='define'
-d_setlocale='define'
-d_setnent='define'
-d_setpent='define'
-d_setpgid='define'
-d_setpgrp2='undef'
-d_setpgrp='define'
-d_setprior='define'
-d_setpwent='define'
-d_setregid='define'
-d_setresgid='undef'
-d_setresuid='undef'
-d_setreuid='define'
-d_setrgid='define'
-d_setruid='define'
-d_setsent='define'
-d_setsid='define'
-d_setvbuf='define'
-d_sfio='undef'
-d_shm='define'
-d_shmat='define'
-d_shmatprototype='define'
-d_shmctl='define'
-d_shmdt='define'
-d_shmget='define'
-d_sigaction='define'
-d_sigsetjmp='define'
-d_socket='define'
-d_sockpair='define'
-d_statblks='define'
-d_stdio_cnt_lval='undef'
-d_stdio_ptr_lval='undef'
-d_stdiobase='undef'
-d_stdstdio='undef'
-d_strchr='define'
-d_strcoll='define'
-d_strctcpy='define'
-d_strerrm='strerror(e)'
-d_strerror='define'
-d_strtod='define'
-d_strtol='define'
-d_strtoul='define'
-d_strxfrm='define'
-d_suidsafe='undef'
-d_symlink='define'
-d_syscall='define'
-d_sysconf='define'
-d_sysernlst=''
-d_syserrlst='define'
-d_system='define'
-d_tcgetpgrp='define'
-d_tcsetpgrp='define'
-d_telldir='define'
-d_time='define'
-d_times='define'
-d_truncate='define'
-d_tzname='define'
-d_umask='define'
-d_uname='define'
-d_union_semun='define'
-d_vfork='define'
-d_void_closedir='undef'
-d_voidsig='define'
-d_voidtty=''
-d_volatile='define'
-d_vprintf='define'
-d_wait4='define'
-d_waitpid='define'
-d_wcstombs='define'
-d_wctomb='define'
-d_xenix='undef'
-date='date'
-db_hashtype='u_int32_t'
-db_prefixtype='size_t'
-defvoidused='15'
-direntrytype='struct dirent'
-dlext='so'
-dlsrc='dl_dlopen.xs'
-doublesize='8'
-dynamic_ext='B DB_File Data/Dumper Fcntl IO IPC/SysV NDBM_File Opcode POSIX SDBM_File Socket attrs re'
-eagain='EAGAIN'
-ebcdic='undef'
-echo='echo'
-egrep='egrep'
-emacs=''
-eunicefix=':'
-exe_ext=''
-expr='expr'
-extensions='B DB_File Data/Dumper Fcntl IO IPC/SysV NDBM_File Opcode POSIX SDBM_File Socket attrs re Errno'
-find='find'
-firstmakefile='makefile'
-flex=''
-fpostype='fpos_t'
-freetype='void'
-full_ar='/usr/bin/ar'
-full_csh='/bin/csh'
-full_sed='/usr/bin/sed'
-gccversion='egcs-2.91.66 19990314 (egcs-1.1.2 release)'
-gidtype='gid_t'
-glibpth='/usr/lib/aout'
-grep='grep'
-groupcat='cat /etc/group'
-groupstype='gid_t'
-gzip='gzip'
-h_fcntl='false'
-h_sysfile='true'
-hint='recommended'
-hostcat='cat /etc/hosts'
-huge=''
-i_arpainet='define'
-i_bsdioctl=''
-i_db='define'
-i_dbm='undef'
-i_dirent='define'
-i_dld='undef'
-i_dlfcn='define'
-i_fcntl='undef'
-i_float='define'
-i_gdbm='undef'
-i_grp='define'
-i_limits='define'
-i_locale='define'
-i_malloc='define'
-i_machcthreads='undef'
-i_math='define'
-i_memory='undef'
-i_mntent='undef'
-i_ndbm='define'
-i_netdb='define'
-i_neterrno='undef'
-i_niin='define'
-i_pwd='define'
-i_pthread='define'
-i_rpcsvcdbm='undef'
-i_sfio='undef'
-i_sgtty='undef'
-i_stdarg='define'
-i_stddef='define'
-i_stdlib='define'
-i_string='define'
-i_sysdir='define'
-i_sysfile='define'
-i_sysfilio='define'
-i_sysin='undef'
-i_sysioctl='define'
-i_sysmount='define'
-i_sysndir='undef'
-i_sysparam='define'
-i_sysresrc='define'
-i_sysselct='define'
-i_syssockio=''
-i_sysstat='define'
-i_sysstatvfs='undef'
-i_systime='define'
-i_systimek='undef'
-i_systimes='define'
-i_systypes='define'
-i_sysun='define'
-i_syswait='define'
-i_termio='undef'
-i_termios='define'
-i_time='undef'
-i_unistd='define'
-i_utime='define'
-i_values='define'
-i_varargs='undef'
-i_varhdr='stdarg.h'
-i_vfork='undef'
-ignore_versioned_solibs=''
-incpath=''
-inews=''
-installarchlib='/usr/libdata/perl/5.00503/mach'
-installbin='/usr/local/bin'
-installman1dir='/usr/local/man/man1'
-installman3dir='/usr/local/lib/perl5/5.00503/man/man3'
-installprivlib='/usr/libdata/perl/5.00503'
-installscript='/usr/local/bin'
-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=''
-large=''
-ld='ld'
-lddlflags='-Bshareable'
-ldflags=''
-less='less'
-lib_ext='.a'
-libc='undef'
-libperl='libperl.so.3.0'
-libpth='/usr/lib/aout'
-libs='-lm -lc -lcrypt'
-libswanted='sfio socket inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x'
-line='line'
-lint=''
-lkflags=''
-ln='ln'
-lns='/bin/ln -s'
-locincpth=''
-loclibpth=''
-longdblsize='12'
-longlongsize='8'
-longsize='4'
-lp=''
-lpr=''
-ls='ls'
-lseektype='off_t'
-mail=''
-mailx=''
-make='make'
-make_set_make='#'
-mallocobj=''
-mallocsrc=''
-malloctype='void *'
-man1dir='/usr/local/man/man1'
-man1direxp='/usr/local/man/man1'
-man1ext='1'
-man3dir='/usr/share/perl/man/man3'
-man3direxp='/usr/share/perl/man/man3'
-man3ext='3'
-medium=''
-mips=''
-mips_type=''
-mkdir='mkdir'
-models='none'
-modetype='mode_t'
-more='more'
-mv=''
-myarchname='i386-freebsd'
-mydomain='.freebsd.org'
-myhostname='freefall'
-myuname='freebsd freefall.freebsd.org 4.0-current freebsd 4.0-current #0: $Date: 1999/05/05 19:09:48 $'
-n='-n'
-netdb_hlen_type='int'
-netdb_host_type='const char *'
-netdb_name_type='const char *'
-netdb_net_type='unsigned long'
-nm='nm'
-nm_opt=''
-nm_so_opt=''
-nonxs_ext='Errno'
-nroff='nroff'
-o_nonblock='O_NONBLOCK'
-obj_ext='.o'
-optimize=${CFLAGS:-''}
-orderlib='false'
-osname='freebsd'
-osvers='4.0-current'
-package='perl5'
-pager='/usr/bin/more'
-passcat='cat /etc/passwd'
-patchlevel='5'
-path_sep=':'
-perl='perl'
-perladmin='current@freebsd.org'
-perlpath='/usr/bin/perl'
-pg='pg'
-phostname='hostname'
-pidtype='pid_t'
-plibpth=''
-pmake=''
-pr=''
-prefix='/usr'
-prefixexp='/usr'
-privlib='/usr/libdata/perl/5.00503'
-privlibexp='/usr/libdata/perl/5.00503'
-prototype='define'
-ptrsize='4'
-randbits='31'
-ranlib='ranlib'
-rd_nodata='-1'
-rm='rm'
-rmail=''
-runnm='true'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
-sed='sed'
-selectminbits='32'
-selecttype='fd_set *'
-sendmail='sendmail'
-sh='/bin/sh'
-shar=''
-sharpbang='#!'
-shmattype='char *'
-shortsize='2'
-shrpenv=''
-shsharp='true'
-sig_name='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 '
-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 '
-sig_num_init='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/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=''
-small=''
-so='so'
-sockethdr=''
-socketlib=''
-sort='sort'
-spackage='Perl5'
-spitshell='cat'
-split=''
-src='.'
-ssizetype='ssize_t'
-startperl='#!/usr/bin/perl'
-startsh='#!/bin/sh'
-static_ext=' '
-stdchar='char'
-stdio_base='((fp)->_base)'
-stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
-stdio_cnt='((fp)->_cnt)'
-stdio_filbuf=''
-stdio_ptr='((fp)->_ptr)'
-strings='/usr/include/string.h'
-submit=''
-subversion='3'
-sysman='/usr/local/man/man1'
-tail=''
-tar=''
-tbl=''
-tee='tee'
-test='test'
-timeincl='/usr/include/sys/time.h '
-timetype='time_t'
-touch='touch'
-tr='tr'
-trnl='\n'
-troff=''
-uidtype='uid_t'
-uname='uname'
-uniq='uniq'
-usedl='define'
-usemymalloc='n'
-usenm='true'
-useopcode='true'
-useperlio='undef'
-useposix='true'
-usesfio='false'
-useshrplib='true'
-usethreads='undef'
-usevfork='true'
-usrinc='/usr/include'
-uuname=''
-version='5.00503'
-vi=''
-voidflags='15'
-xlibpth=''
-zcat=''
-zip='zip'
-# Configure command line arguments.
-config_arg0='Configure'
-config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00503/mach -Dprivlib=/usr/libdata/perl/5.00503 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/local/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.00503/mach'
-config_arg3='-Dprivlib=/usr/libdata/perl/5.00503'
-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/local/man/man1'
-config_arg7='-Dman3dir=/usr/share/perl/man/man3'
-config_arg8='-des'
-config_arg9='-Ulocincpth='
-config_arg10='-Uloclibpth='
-config_arg11='-Dpager=more'
-PATCHLEVEL=5
-SUBVERSION=3
-CONFIG=true
diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
index 7dccb03..1526fd7 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
+++ b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
@@ -5,18 +5,19 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: $Date$
+# Configuration time: Mon Apr 24 11:11:27 SAST 2000
 # Configured by     : markm
-# Target system     : freebsd 4.0-current #0:
+# Target system     : freebsd 5.0-current #0:
 
 Author=''
-Date='$Date$'
+Date='$Date'
 Header=''
-Id='$FreeBSD$'
+Id='$Id'
 Locker=''
+Log='$Log'
 Mcc='Mcc'
-RCSfile='$RCSfile$'
-Revision='$Revision$'
+RCSfile='$RCSfile'
+Revision='$Revision'
 Source=''
 State=''
 _a='.a'
@@ -25,17 +26,22 @@ _o='.o'
 afs='false'
 alignbytes='8'
 ansi2knr=''
-aphostname=''
-apiversion='5.005'
+aphostname='/bin/hostname'
+api_revision='5'
+api_subversion='0'
+api_version='5'
+api_versionstring='5.005'
 ar='ar'
-archlib='/usr/libdata/perl/5.00503/mach'
-archlibexp='/usr/libdata/perl/5.00503/mach'
+archlib='/usr/libdata/perl/5.006/mach'
+archlibexp='/usr/libdata/perl/5.006/mach'
+archname64=''
 archname='alpha-freebsd'
 archobjs=''
 awk='awk'
 baserev='5.0'
 bash=''
 bin='/usr/bin'
+bincompat5005='define'
 binexp='/usr/bin'
 bison=''
 byacc='byacc'
@@ -46,11 +52,12 @@ cat='cat'
 cc='cc'
 cccdlflags='-DPIC -fpic'
 ccdlflags=' -Wl,-R/usr/lib'
-ccflags=''
-ccsymbols='__ELF__=1 __FreeBSD__=4 __FreeBSD_cc_version=400004 __GNUC_MINOR__=95 __GNUC__=2 cpu=alpha machine=alpha system=FreeBSD system=unix'
+ccflags='-fno-strict-aliasing'
+ccsymbols='__FreeBSD__=5 __FreeBSD_cc_version=500001 __GNUC_MINOR__=95 __alpha=1 __alpha__=1 __unix=1 __unix__=1 cpu=alpha machine=alpha system=FreeBSD system=unix'
 cf_by='markm'
 cf_email='markm@FreeBSD.org'
-cf_time='Sun Mar  5 13:39:27 SAST 2000'
+cf_time='Mon Apr 24 11:11:27 SAST 2000'
+charsize='1'
 chgrp=''
 chmod=''
 chown=''
@@ -62,22 +69,39 @@ cp='cp'
 cpio=''
 cpp='cpp'
 cpp_stuff='42'
-cppflags=''
+cppccsymbols='__ELF__=1 __GNUC__=2 alpha=1 unix=1'
+cppflags='-fno-strict-aliasing'
 cpplast='-'
 cppminus='-'
 cpprun='cc -E'
 cppstdin='cc -E'
-cppsymbols='__STDC__=1'
-cppccsymbols='__alpha=1 __alpha=1 __unix=1 __unix__=1 alpha=1 unix=1'
+cppsymbols='__GNUC_MINOR__=95 __STDC__=1 __alpha=1 __alpha__=1 __unix=1 __unix__=1'
+crosscompile='undef'
 cryptlib=''
 csh='csh'
 d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+d_PRIEldbl='define'
+d_PRIFldbl='define'
+d_PRIGldbl='define'
+d_PRIX64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
 d_access='define'
+d_accessx='undef'
 d_alarm='define'
 d_archlib='define'
+d_atolf='undef'
+d_atoll='undef'
 d_attribut='define'
 d_bcmp='define'
 d_bcopy='define'
+d_bincompat5005='define'
 d_bsd='define'
 d_bsdgetpgrp='undef'
 d_bsdsetpgrp='define'
@@ -100,13 +124,16 @@ d_dlerror='define'
 d_dlopen='define'
 d_dlsymun='undef'
 d_dosuid='define'
+d_drand48proto='define'
 d_dup2='define'
+d_eaccess='undef'
 d_endgrent='define'
 d_endhent='define'
 d_endnent='define'
 d_endpent='define'
 d_endpwent='define'
 d_endsent='define'
+d_endspent='undef'
 d_eofnblk='define'
 d_eunice='undef'
 d_fchmod='define'
@@ -120,21 +147,26 @@ d_flexfnam='define'
 d_flock='define'
 d_fork='define'
 d_fpathconf='define'
+d_fpos64_t='undef'
+d_fs_data_s='undef'
+d_fseeko='define'
 d_fsetpos='define'
 d_fstatfs='define'
-d_statfsflags='define'
 d_fstatvfs='undef'
-d_getmntent='undef'
-d_hasmntopt='undef'
+d_ftello='define'
 d_ftime='undef'
+d_getcwd='define'
+d_getfsstat='define'
 d_getgrent='define'
 d_getgrps='define'
 d_gethbyaddr='define'
 d_gethbyname='define'
 d_gethent='define'
-d_gethname='undef'
+d_gethname='define'
 d_gethostprotos='define'
 d_getlogin='define'
+d_getmnt='undef'
+d_getmntent='undef'
 d_getnbyaddr='define'
 d_getnbyname='define'
 d_getnent='define'
@@ -153,38 +185,62 @@ d_getsbyname='define'
 d_getsbyport='define'
 d_getsent='define'
 d_getservprotos='define'
+d_getspent='undef'
+d_getspnam='undef'
 d_gettimeod='define'
 d_gnulibc='undef'
 d_grpasswd='define'
+d_hasmntopt='undef'
 d_htonl='define'
+d_iconv='undef'
 d_index='undef'
 d_inetaton='define'
+d_int64_t='define'
 d_isascii='define'
 d_killpg='define'
 d_lchown='define'
+d_ldbl_dig='define'
 d_link='define'
 d_locconv='define'
 d_lockf='define'
 d_longdbl='define'
 d_longlong='define'
+d_lseekproto='define'
 d_lstat='define'
+d_madvise='define'
 d_mblen='define'
 d_mbstowcs='define'
 d_mbtowc='define'
+d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
 d_memmove='define'
 d_memset='define'
 d_mkdir='define'
+d_mkdtemp='define'
 d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='define'
 d_mktime='define'
+d_mmap='define'
+d_mprotect='define'
 d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='undef'
 d_msgctl='define'
 d_msgget='define'
 d_msgrcv='define'
 d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
 d_mymalloc='undef'
 d_nice='define'
+d_nv_preserves_uv='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
 d_oldpthreads='undef'
 d_oldsock='undef'
 d_open3='define'
@@ -195,15 +251,16 @@ d_pipe='define'
 d_poll='define'
 d_portable='define'
 d_pthread_yield='undef'
-d_pthreads_created_joinable='undef'
 d_pwage='undef'
 d_pwchange='define'
 d_pwclass='define'
 d_pwcomment='undef'
 d_pwexpire='define'
 d_pwgecos='define'
-d_pwquota='undef'
 d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='undef'
+d_quad='define'
 d_readdir='define'
 d_readlink='define'
 d_rename='define'
@@ -213,6 +270,7 @@ d_safebcpy='define'
 d_safemcpy='define'
 d_sanemcmp='define'
 d_sched_yield='define'
+d_scm_rights='define'
 d_seekdir='define'
 d_select='define'
 d_sem='define'
@@ -243,6 +301,7 @@ d_setrgid='define'
 d_setruid='define'
 d_setsent='define'
 d_setsid='define'
+d_setspent='undef'
 d_setvbuf='define'
 d_sfio='undef'
 d_shm='define'
@@ -254,10 +313,16 @@ d_shmget='define'
 d_sigaction='define'
 d_sigsetjmp='define'
 d_socket='define'
+d_socklen_t='define'
 d_sockpair='define'
+d_sqrtl='undef'
 d_statblks='define'
+d_statfs_f_flags='define'
+d_statfs_s='define'
+d_statvfs='undef'
 d_stdio_cnt_lval='undef'
 d_stdio_ptr_lval='undef'
+d_stdio_stream_array='define'
 d_stdiobase='undef'
 d_stdstdio='undef'
 d_strchr='define'
@@ -267,7 +332,11 @@ d_strerrm='strerror(e)'
 d_strerror='define'
 d_strtod='define'
 d_strtol='define'
+d_strtold='undef'
+d_strtoll='undef'
 d_strtoul='define'
+d_strtoull='undef'
+d_strtouq='define'
 d_strxfrm='define'
 d_suidsafe='undef'
 d_symlink='define'
@@ -279,6 +348,7 @@ d_system='define'
 d_tcgetpgrp='define'
 d_tcsetpgrp='define'
 d_telldir='define'
+d_telldirproto='define'
 d_time='define'
 d_times='define'
 d_truncate='define'
@@ -286,6 +356,10 @@ d_tzname='define'
 d_umask='define'
 d_uname='define'
 d_union_semun='define'
+d_ustat='undef'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
 d_vfork='define'
 d_void_closedir='undef'
 d_voidsig='define'
@@ -305,7 +379,8 @@ direntrytype='struct dirent'
 dlext='so'
 dlsrc='dl_dlopen.xs'
 doublesize='8'
-dynamic_ext='B DB_File Data/Dumper Fcntl IO IPC/SysV NDBM_File Opcode POSIX SDBM_File Socket attrs re'
+drand01='drand48()'
+dynamic_ext='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File Opcode POSIX SDBM_File Socket Sys/Hostname Sys/Syslog attrs re'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
@@ -314,16 +389,22 @@ emacs=''
 eunicefix=':'
 exe_ext=''
 expr='expr'
-extensions='B DB_File Data/Dumper Fcntl IO IPC/SysV NDBM_File Opcode POSIX SDBM_File Socket attrs re Errno'
-find='find'
+extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File Opcode POSIX SDBM_File Socket Sys/Hostname Sys/Syslog attrs re Errno'
+fflushNULL='define'
+fflushall='undef'
+find=''
 firstmakefile='makefile'
 flex=''
+fpossize='8'
 fpostype='fpos_t'
 freetype='void'
 full_ar='/usr/bin/ar'
 full_csh='/bin/csh'
 full_sed='/usr/bin/sed'
 gccversion='2.95.2 19991024 (release)'
+gidformat='"lu"'
+gidsign='1'
+gidsize='4'
 gidtype='gid_t'
 glibpth='/usr/lib'
 grep='grep'
@@ -335,6 +416,14 @@ h_sysfile='true'
 hint='recommended'
 hostcat='cat /etc/hosts'
 huge=''
+i16size='2'
+i16type='short'
+i32size='4'
+i32type='long'
+i64size='8'
+i64type='long long'
+i8size='1'
+i8type='char'
 i_arpainet='define'
 i_bsdioctl=''
 i_db='define'
@@ -346,81 +435,116 @@ i_fcntl='undef'
 i_float='define'
 i_gdbm='undef'
 i_grp='define'
+i_iconv='undef'
+i_ieeefp='define'
+i_inttypes='define'
 i_limits='define'
 i_locale='define'
+i_machcthr='undef'
 i_malloc='define'
-i_machcthreads='undef'
 i_math='define'
 i_memory='undef'
 i_mntent='undef'
 i_ndbm='define'
 i_netdb='define'
 i_neterrno='undef'
+i_netinettcp='define'
 i_niin='define'
-i_pwd='define'
+i_poll='define'
 i_pthread='define'
+i_pwd='define'
 i_rpcsvcdbm='undef'
 i_sfio='undef'
 i_sgtty='undef'
+i_shadow='undef'
+i_socks='undef'
 i_stdarg='define'
 i_stddef='define'
 i_stdlib='define'
 i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
 i_sysdir='define'
 i_sysfile='define'
 i_sysfilio='define'
 i_sysin='undef'
 i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
 i_sysmount='define'
 i_sysndir='undef'
 i_sysparam='define'
 i_sysresrc='define'
+i_syssecrt='undef'
 i_sysselct='define'
 i_syssockio=''
 i_sysstat='define'
+i_sysstatfs='undef'
 i_sysstatvfs='undef'
 i_systime='define'
 i_systimek='undef'
 i_systimes='define'
 i_systypes='define'
+i_sysuio='define'
 i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='undef'
 i_syswait='define'
 i_termio='undef'
 i_termios='define'
 i_time='undef'
 i_unistd='define'
+i_ustat='undef'
 i_utime='define'
 i_values='define'
 i_varargs='undef'
 i_varhdr='stdarg.h'
 i_vfork='undef'
 ignore_versioned_solibs=''
+inc_version_list=' '
+inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='/usr/libdata/perl/5.00503/mach'
+installarchlib='/usr/libdata/perl/5.006/mach'
 installbin='/usr/local/bin'
 installman1dir='/usr/local/man/man1'
-installman3dir='/usr/local/lib/perl5/5.00503/man/man3'
-installprivlib='/usr/libdata/perl/5.00503'
+installman3dir='/usr/local/lib/perl5/5.006/man/man3'
+installprefix='/usr/local'
+installprefixexp='/usr/local'
+installprivlib='/usr/libdata/perl/5.006'
 installscript='/usr/local/bin'
-installsitearch='/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd'
-installsitelib='/usr/local/lib/perl5/site_perl/5.005'
-installusrbinperl='undef'
+installsitearch='/usr/local/lib/perl5/site_perl/5.006/mach'
+installsitebin='/usr/local/bin'
+installsitelib='/usr/local/lib/perl5/site_perl/5.006'
+installstyle='lib/perl5'
+installusrbinperl='define'
+installvendorarch=''
+installvendorbin=''
+installvendorlib=''
 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'
+ivdformat='"ld"'
+ivsize='4'
+ivtype='long'
+known_extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Sys/Hostname Sys/Syslog Thread attrs re'
 ksh=''
 large=''
 ld='cc'
 lddlflags='-Wl,-E -shared -lperl -lm '
 ldflags='-Wl,-E -lperl -lm '
+ldlibpthname='LD_LIBRARY_PATH'
 less='less'
 lib_ext='.a'
 libc=''
-libperl='libperl.so.3'
+libperl='libperl.so.4'
 libpth='/usr/lib'
 libs='-lm -lc -lcrypt'
-libswanted='sfio socket inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x'
-line='line'
+libsdirs=' /usr/lib'
+libsfiles=' libm.so.2 libc.so.4 libcrypt.so.2'
+libsfound=' /usr/lib/libm.so.2 /usr/lib/libc.so.4 /usr/lib/libcrypt.so.2'
+libspath=' /usr/lib'
+libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x iconv'
+line=''
 lint=''
 lkflags=''
 ln='ln'
@@ -433,6 +557,7 @@ longsize='8'
 lp=''
 lpr=''
 ls='ls'
+lseeksize='8'
 lseektype='off_t'
 mail=''
 mailx=''
@@ -444,21 +569,22 @@ malloctype='void *'
 man1dir='/usr/local/man/man1'
 man1direxp='/usr/local/man/man1'
 man1ext='1'
-man3dir='/usr/share/perl/man/man3'
-man3direxp='/usr/share/perl/man/man3'
+man3dir='/usr/share/perl5/man3'
+man3direxp='/usr/share/perl5/man3'
 man3ext='3'
 medium=''
-mips=''
 mips_type=''
 mkdir='mkdir'
+mmaptype='caddr_t'
 models='none'
 modetype='mode_t'
 more='more'
+multiarch='undef'
 mv=''
 myarchname='alpha-freebsd'
 mydomain='.FreeBSD.org'
 myhostname='freefall'
-myuname='FreeBSD freefall.FreeBSD.org 4.0-current FreeBSD 4.0-current #0: $Date$'
+myuname='freebsd freefall.FreeBSD.org 5.0-current freebsd 5.0-current #0: $Date$ '
 n='-n'
 netdb_hlen_type='int'
 netdb_host_type='const char *'
@@ -469,44 +595,68 @@ nm_opt=''
 nm_so_opt=''
 nonxs_ext='Errno'
 nroff='nroff'
+nvsize='8'
+nvtype='double'
 o_nonblock='O_NONBLOCK'
 obj_ext='.o'
+old_pthread_create_joinable=''
 optimize=${CFLAGS:-''}
 orderlib='false'
 osname='freebsd'
-osvers='4.0-current'
+osvers='5.0-current'
 package='perl5'
 pager='/usr/bin/more'
 passcat='cat /etc/passwd'
-patchlevel='5'
+patchlevel='6'
 path_sep=':'
-perl='perl'
+perl5='/usr/bin/perl'
+perl=''
 perladmin='hackers@FreeBSD.org'
 perlpath='/usr/bin/perl'
 pg='pg'
 phostname='hostname'
 pidtype='pid_t'
 plibpth=''
+pm_apiversion='5.005'
 pmake=''
 pr=''
-prefix='/usr'
-prefixexp='/usr'
-privlib='/usr/libdata/perl/5.00503'
-privlibexp='/usr/libdata/perl/5.00503'
+prefix='/usr/local'
+prefixexp='/usr/local'
+privlib='/usr/libdata/perl/5.006'
+privlibexp='/usr/libdata/perl/5.006'
 prototype='define'
 ptrsize='8'
-randbits='31'
+quadkind='3'
+quadtype='long long'
+randbits='48'
+randfunc='drand48'
+randseedtype='long'
 ranlib=':'
 rd_nodata='-1'
+revision='5'
 rm='rm'
 rmail=''
 runnm='false'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
+sPRIEldbl='"LE"'
+sPRIFldbl='"LF"'
+sPRIGldbl='"LG"'
+sPRIX64='"llX"'
+sPRId64='"lld"'
+sPRIeldbl='"Le"'
+sPRIfldbl='"Lf"'
+sPRIgldbl='"Lg"'
+sPRIi64='"lli"'
+sPRIo64='"llo"'
+sPRIu64='"llu"'
+sPRIx64='"llx"'
+sched_yield='sched_yield()'
+scriptdir='/usr/local/bin'
+scriptdirexp='/usr/local/bin'
 sed='sed'
+seedfunc='srand48'
 selectminbits='32'
 selecttype='fd_set *'
-sendmail='sendmail'
+sendmail=''
 sh='/bin/sh'
 shar=''
 sharpbang='#!'
@@ -514,15 +664,22 @@ shmattype='char *'
 shortsize='2'
 shrpenv=''
 shsharp='true'
+sig_count='32'
 sig_name='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 '
 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 '
 sig_num_init='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/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'
+sitearch='/usr/local/lib/perl5/site_perl/5.006/mach'
+sitearchexp='/usr/local/lib/perl5/site_perl/5.006/mach'
+sitebin='/usr/local/bin'
+sitebinexp='/usr/local/bin'
+sitelib='/usr/local/lib/perl5/site_perl/5.006'
+sitelib_stem='/usr/local/lib/perl5/site_perl/5.006'
+sitelibexp='/usr/local/lib/perl5/site_perl/5.006'
+siteprefix='/usr/local'
+siteprefixexp='/usr/local'
+sizesize='4'
 sizetype='size_t'
 sleep=''
 smail=''
@@ -530,6 +687,7 @@ small=''
 so='so'
 sockethdr=''
 socketlib=''
+socksizetype='socklen_t'
 sort='sort'
 spackage='Perl5'
 spitshell='cat'
@@ -545,14 +703,15 @@ stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
 stdio_cnt='((fp)->_cnt)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_ptr)'
+stdio_stream_array='__sF'
 strings='/usr/include/string.h'
 submit=''
-subversion='3'
-sysman='/usr/local/man/man1'
+subversion='0'
+sysman='/usr/share/man/man1'
 tail=''
 tar=''
 tbl=''
-tee='tee'
+tee=''
 test='test'
 timeincl='/usr/include/sys/time.h '
 timetype='time_t'
@@ -560,10 +719,30 @@ touch='touch'
 tr='tr'
 trnl='\n'
 troff=''
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned long'
+u64size='8'
+u64type='unsigned long long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"lu"'
+uidsign='1'
+uidsize='4'
 uidtype='uid_t'
 uname='uname'
 uniq='uniq'
+uquadtype='unsigned long long'
+use5005threads='undef'
+use64bitall='undef'
+use64bitint='undef'
 usedl='define'
+useithreads='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemorebits='undef'
+usemultiplicity='undef'
 usemymalloc='n'
 usenm='false'
 useopcode='true'
@@ -571,30 +750,58 @@ useperlio='undef'
 useposix='true'
 usesfio='false'
 useshrplib='true'
+usesocks='undef'
 usethreads='undef'
+usevendorprefix='undef'
 usevfork='true'
 usrinc='/usr/include'
 uuname=''
-version='5.00503'
+uvoformat='"lo"'
+uvsize='4'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorprefix=''
+vendorprefixexp=''
+version='5.6.0'
 vi=''
 voidflags='15'
-xlibpth=''
+xlibpth='/usr/lib/386 /lib/386'
+xs_apiversion='5.005'
 zcat=''
 zip='zip'
 # Configure command line arguments.
 config_arg0='Configure'
-config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00503/mach -Dprivlib=/usr/libdata/perl/5.00503 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/alpha-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/share/perl/man/man3 -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more'
-config_argc=10
-config_arg1='-Dprefix=/usr'
-config_arg2='-Darchlib=/usr/libdata/perl/5.00503/mach'
-config_arg3='-Dprivlib=/usr/libdata/perl/5.00503'
-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/local/man/man1'
-config_arg7='-Dman3dir=/usr/share/perl/man/man3'
-config_arg8='-Ulocincpth='
-config_arg9='-Uloclibpth='
-config_arg10='-Dpager=/usr/bin/more'
-PATCHLEVEL=5
-SUBVERSION=3
-CONFIG=true
+config_args='-Dprefix=/usr/local -Darchlib=/usr/libdata/perl/5.006/mach -Dprivlib=/usr/libdata/perl/5.006 -Dsitearch=/usr/local/lib/perl5/site_perl/5.006/mach -Dsitelib=/usr/local/lib/perl5/site_perl/5.006 -Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.006/mach -Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.006 -Dinstallbin=/usr/local/bin -Dinstallsitebin=/usr/local/bin -Dinstallscript=/usr/local/bin -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/local/lib/perl5/5.006/man/man3 -Duseshrplib=true -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more -des'
+config_argc=17
+config_arg1='-Dprefix=/usr/local'
+config_arg2='-Darchlib=/usr/libdata/perl/5.006/mach'
+config_arg3='-Dprivlib=/usr/libdata/perl/5.006'
+config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.006/mach'
+config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.006'
+config_arg6='-Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.006/mach'
+config_arg7='-Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.006'
+config_arg8='-Dinstallbin=/usr/local/bin'
+config_arg9='-Dinstallsitebin=/usr/local/bin'
+config_arg10='-Dinstallscript=/usr/local/bin'
+config_arg11='-Dman1dir=/usr/local/man/man1'
+config_arg12='-Dman3dir=/usr/local/lib/perl5/5.006/man/man3'
+config_arg13='-Duseshrplib=true'
+config_arg14='-Ulocincpth='
+config_arg15='-Uloclibpth='
+config_arg16='-Dpager=/usr/bin/more'
+config_arg17='-des'
+PERL_REVISION=5
+PERL_VERSION=6
+PERL_SUBVERSION=0
+PERL_API_REVISION=5
+PERL_API_VERSION=5
+PERL_API_SUBVERSION=0
+CONFIGDOTSH=true
diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.i386 b/gnu/usr.bin/perl/libperl/config.SH-elf.i386
index 3bb4bb3..f3b0f00 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-elf.i386
+++ b/gnu/usr.bin/perl/libperl/config.SH-elf.i386
@@ -5,18 +5,19 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: $Date$
+# Configuration time: Mon Apr 24 11:11:27 SAST 2000
 # Configured by     : markm
-# Target system     : freebsd 4.0-current #0:
+# Target system     : freebsd 5.0-current #0:
 
 Author=''
-Date='$Date$'
+Date='$Date'
 Header=''
-Id='$FreeBSD$'
+Id='$Id'
 Locker=''
+Log='$Log'
 Mcc='Mcc'
-RCSfile='$RCSfile$'
-Revision='$Revision$'
+RCSfile='$RCSfile'
+Revision='$Revision'
 Source=''
 State=''
 _a='.a'
@@ -25,17 +26,22 @@ _o='.o'
 afs='false'
 alignbytes='4'
 ansi2knr=''
-aphostname=''
-apiversion='5.005'
+aphostname='/bin/hostname'
+api_revision='5'
+api_subversion='0'
+api_version='5'
+api_versionstring='5.005'
 ar='ar'
-archlib='/usr/libdata/perl/5.00503/mach'
-archlibexp='/usr/libdata/perl/5.00503/mach'
+archlib='/usr/libdata/perl/5.006/mach'
+archlibexp='/usr/libdata/perl/5.006/mach'
+archname64=''
 archname='i386-freebsd'
 archobjs=''
 awk='awk'
 baserev='5.0'
 bash=''
 bin='/usr/bin'
+bincompat5005='define'
 binexp='/usr/bin'
 bison=''
 byacc='byacc'
@@ -46,11 +52,12 @@ cat='cat'
 cc='cc'
 cccdlflags='-DPIC -fpic'
 ccdlflags=' -Wl,-R/usr/lib'
-ccflags=''
-ccsymbols='__ELF__=1 __FreeBSD__=4 __FreeBSD_cc_version=400004 __GNUC_MINOR__=95 __GNUC__=2 cpu=i386 machine=i386 system=FreeBSD system=unix'
+ccflags='-fno-strict-aliasing'
+ccsymbols='__FreeBSD__=5 __FreeBSD_cc_version=500001 __GNUC_MINOR__=95 __i386=1 __i386__=1 __unix=1 __unix__=1 cpu=i386 machine=i386 system=FreeBSD system=unix'
 cf_by='markm'
 cf_email='markm@FreeBSD.org'
-cf_time='Sun Mar  5 13:39:27 SAST 2000'
+cf_time='Mon Apr 24 11:11:27 SAST 2000'
+charsize='1'
 chgrp=''
 chmod=''
 chown=''
@@ -62,22 +69,39 @@ cp='cp'
 cpio=''
 cpp='cpp'
 cpp_stuff='42'
-cppflags=''
+cppccsymbols='__ELF__=1 __GNUC__=2 i386=1 unix=1'
+cppflags='-fno-strict-aliasing'
 cpplast='-'
 cppminus='-'
 cpprun='cc -E'
 cppstdin='cc -E'
-cppsymbols='__STDC__=1'
-cppccsymbols='__i386=1 __i386__=1 __unix=1 __unix__=1 i386=1 unix=1'
+cppsymbols='__GNUC_MINOR__=95 __STDC__=1 __i386=1 __i386__=1 __unix=1 __unix__=1'
+crosscompile='undef'
 cryptlib=''
 csh='csh'
 d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+d_PRIEldbl='define'
+d_PRIFldbl='define'
+d_PRIGldbl='define'
+d_PRIX64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
 d_access='define'
+d_accessx='undef'
 d_alarm='define'
 d_archlib='define'
+d_atolf='undef'
+d_atoll='undef'
 d_attribut='define'
 d_bcmp='define'
 d_bcopy='define'
+d_bincompat5005='define'
 d_bsd='define'
 d_bsdgetpgrp='undef'
 d_bsdsetpgrp='define'
@@ -100,13 +124,16 @@ d_dlerror='define'
 d_dlopen='define'
 d_dlsymun='undef'
 d_dosuid='define'
+d_drand48proto='define'
 d_dup2='define'
+d_eaccess='undef'
 d_endgrent='define'
 d_endhent='define'
 d_endnent='define'
 d_endpent='define'
 d_endpwent='define'
 d_endsent='define'
+d_endspent='undef'
 d_eofnblk='define'
 d_eunice='undef'
 d_fchmod='define'
@@ -120,21 +147,26 @@ d_flexfnam='define'
 d_flock='define'
 d_fork='define'
 d_fpathconf='define'
+d_fpos64_t='undef'
+d_fs_data_s='undef'
+d_fseeko='define'
 d_fsetpos='define'
 d_fstatfs='define'
-d_statfsflags='define'
 d_fstatvfs='undef'
-d_getmntent='undef'
-d_hasmntopt='undef'
+d_ftello='define'
 d_ftime='undef'
+d_getcwd='define'
+d_getfsstat='define'
 d_getgrent='define'
 d_getgrps='define'
 d_gethbyaddr='define'
 d_gethbyname='define'
 d_gethent='define'
-d_gethname='undef'
+d_gethname='define'
 d_gethostprotos='define'
 d_getlogin='define'
+d_getmnt='undef'
+d_getmntent='undef'
 d_getnbyaddr='define'
 d_getnbyname='define'
 d_getnent='define'
@@ -153,38 +185,62 @@ d_getsbyname='define'
 d_getsbyport='define'
 d_getsent='define'
 d_getservprotos='define'
+d_getspent='undef'
+d_getspnam='undef'
 d_gettimeod='define'
 d_gnulibc='undef'
 d_grpasswd='define'
+d_hasmntopt='undef'
 d_htonl='define'
+d_iconv='undef'
 d_index='undef'
 d_inetaton='define'
+d_int64_t='define'
 d_isascii='define'
 d_killpg='define'
 d_lchown='define'
+d_ldbl_dig='define'
 d_link='define'
 d_locconv='define'
 d_lockf='define'
 d_longdbl='define'
 d_longlong='define'
+d_lseekproto='define'
 d_lstat='define'
+d_madvise='define'
 d_mblen='define'
 d_mbstowcs='define'
 d_mbtowc='define'
+d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
 d_memmove='define'
 d_memset='define'
 d_mkdir='define'
+d_mkdtemp='define'
 d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='define'
 d_mktime='define'
+d_mmap='define'
+d_mprotect='define'
 d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='undef'
 d_msgctl='define'
 d_msgget='define'
 d_msgrcv='define'
 d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
 d_mymalloc='undef'
 d_nice='define'
+d_nv_preserves_uv='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
 d_oldpthreads='undef'
 d_oldsock='undef'
 d_open3='define'
@@ -195,15 +251,16 @@ d_pipe='define'
 d_poll='define'
 d_portable='define'
 d_pthread_yield='undef'
-d_pthreads_created_joinable='undef'
 d_pwage='undef'
 d_pwchange='define'
 d_pwclass='define'
 d_pwcomment='undef'
 d_pwexpire='define'
 d_pwgecos='define'
-d_pwquota='undef'
 d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='undef'
+d_quad='define'
 d_readdir='define'
 d_readlink='define'
 d_rename='define'
@@ -213,6 +270,7 @@ d_safebcpy='define'
 d_safemcpy='define'
 d_sanemcmp='define'
 d_sched_yield='define'
+d_scm_rights='define'
 d_seekdir='define'
 d_select='define'
 d_sem='define'
@@ -243,6 +301,7 @@ d_setrgid='define'
 d_setruid='define'
 d_setsent='define'
 d_setsid='define'
+d_setspent='undef'
 d_setvbuf='define'
 d_sfio='undef'
 d_shm='define'
@@ -254,10 +313,16 @@ d_shmget='define'
 d_sigaction='define'
 d_sigsetjmp='define'
 d_socket='define'
+d_socklen_t='define'
 d_sockpair='define'
+d_sqrtl='undef'
 d_statblks='define'
+d_statfs_f_flags='define'
+d_statfs_s='define'
+d_statvfs='undef'
 d_stdio_cnt_lval='undef'
 d_stdio_ptr_lval='undef'
+d_stdio_stream_array='define'
 d_stdiobase='undef'
 d_stdstdio='undef'
 d_strchr='define'
@@ -267,7 +332,11 @@ d_strerrm='strerror(e)'
 d_strerror='define'
 d_strtod='define'
 d_strtol='define'
+d_strtold='undef'
+d_strtoll='undef'
 d_strtoul='define'
+d_strtoull='undef'
+d_strtouq='define'
 d_strxfrm='define'
 d_suidsafe='undef'
 d_symlink='define'
@@ -279,6 +348,7 @@ d_system='define'
 d_tcgetpgrp='define'
 d_tcsetpgrp='define'
 d_telldir='define'
+d_telldirproto='define'
 d_time='define'
 d_times='define'
 d_truncate='define'
@@ -286,6 +356,10 @@ d_tzname='define'
 d_umask='define'
 d_uname='define'
 d_union_semun='define'
+d_ustat='undef'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
 d_vfork='define'
 d_void_closedir='undef'
 d_voidsig='define'
@@ -305,7 +379,8 @@ direntrytype='struct dirent'
 dlext='so'
 dlsrc='dl_dlopen.xs'
 doublesize='8'
-dynamic_ext='B DB_File Data/Dumper Fcntl IO IPC/SysV NDBM_File Opcode POSIX SDBM_File Socket attrs re'
+drand01='drand48()'
+dynamic_ext='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File Opcode POSIX SDBM_File Socket Sys/Hostname Sys/Syslog attrs re'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
@@ -314,16 +389,22 @@ emacs=''
 eunicefix=':'
 exe_ext=''
 expr='expr'
-extensions='B DB_File Data/Dumper Fcntl IO IPC/SysV NDBM_File Opcode POSIX SDBM_File Socket attrs re Errno'
-find='find'
+extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob IO IPC/SysV NDBM_File Opcode POSIX SDBM_File Socket Sys/Hostname Sys/Syslog attrs re Errno'
+fflushNULL='define'
+fflushall='undef'
+find=''
 firstmakefile='makefile'
 flex=''
+fpossize='8'
 fpostype='fpos_t'
 freetype='void'
 full_ar='/usr/bin/ar'
 full_csh='/bin/csh'
 full_sed='/usr/bin/sed'
 gccversion='2.95.2 19991024 (release)'
+gidformat='"lu"'
+gidsign='1'
+gidsize='4'
 gidtype='gid_t'
 glibpth='/usr/lib'
 grep='grep'
@@ -335,6 +416,14 @@ h_sysfile='true'
 hint='recommended'
 hostcat='cat /etc/hosts'
 huge=''
+i16size='2'
+i16type='short'
+i32size='4'
+i32type='long'
+i64size='8'
+i64type='long long'
+i8size='1'
+i8type='char'
 i_arpainet='define'
 i_bsdioctl=''
 i_db='define'
@@ -346,81 +435,116 @@ i_fcntl='undef'
 i_float='define'
 i_gdbm='undef'
 i_grp='define'
+i_iconv='undef'
+i_ieeefp='define'
+i_inttypes='define'
 i_limits='define'
 i_locale='define'
+i_machcthr='undef'
 i_malloc='define'
-i_machcthreads='undef'
 i_math='define'
 i_memory='undef'
 i_mntent='undef'
 i_ndbm='define'
 i_netdb='define'
 i_neterrno='undef'
+i_netinettcp='define'
 i_niin='define'
-i_pwd='define'
+i_poll='define'
 i_pthread='define'
+i_pwd='define'
 i_rpcsvcdbm='undef'
 i_sfio='undef'
 i_sgtty='undef'
+i_shadow='undef'
+i_socks='undef'
 i_stdarg='define'
 i_stddef='define'
 i_stdlib='define'
 i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
 i_sysdir='define'
 i_sysfile='define'
 i_sysfilio='define'
 i_sysin='undef'
 i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
 i_sysmount='define'
 i_sysndir='undef'
 i_sysparam='define'
 i_sysresrc='define'
+i_syssecrt='undef'
 i_sysselct='define'
 i_syssockio=''
 i_sysstat='define'
+i_sysstatfs='undef'
 i_sysstatvfs='undef'
 i_systime='define'
 i_systimek='undef'
 i_systimes='define'
 i_systypes='define'
+i_sysuio='define'
 i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='undef'
 i_syswait='define'
 i_termio='undef'
 i_termios='define'
 i_time='undef'
 i_unistd='define'
+i_ustat='undef'
 i_utime='define'
 i_values='define'
 i_varargs='undef'
 i_varhdr='stdarg.h'
 i_vfork='undef'
 ignore_versioned_solibs=''
+inc_version_list=' '
+inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='/usr/libdata/perl/5.00503/mach'
+installarchlib='/usr/libdata/perl/5.006/mach'
 installbin='/usr/local/bin'
 installman1dir='/usr/local/man/man1'
-installman3dir='/usr/local/lib/perl5/5.00503/man/man3'
-installprivlib='/usr/libdata/perl/5.00503'
+installman3dir='/usr/local/lib/perl5/5.006/man/man3'
+installprefix='/usr/local'
+installprefixexp='/usr/local'
+installprivlib='/usr/libdata/perl/5.006'
 installscript='/usr/local/bin'
-installsitearch='/usr/local/lib/perl5/site_perl/5.005/i386-freebsd'
-installsitelib='/usr/local/lib/perl5/site_perl/5.005'
-installusrbinperl='undef'
+installsitearch='/usr/local/lib/perl5/site_perl/5.006/mach'
+installsitebin='/usr/local/bin'
+installsitelib='/usr/local/lib/perl5/site_perl/5.006'
+installstyle='lib/perl5'
+installusrbinperl='define'
+installvendorarch=''
+installvendorbin=''
+installvendorlib=''
 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'
+ivdformat='"ld"'
+ivsize='4'
+ivtype='long'
+known_extensions='B ByteLoader DB_File Data/Dumper Devel/DProf Devel/Peek Fcntl File/Glob GDBM_File IO IPC/SysV NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Sys/Hostname Sys/Syslog Thread attrs re'
 ksh=''
 large=''
 ld='cc'
 lddlflags='-Wl,-E -shared -lperl -lm '
 ldflags='-Wl,-E -lperl -lm '
+ldlibpthname='LD_LIBRARY_PATH'
 less='less'
 lib_ext='.a'
 libc=''
-libperl='libperl.so.3'
+libperl='libperl.so.4'
 libpth='/usr/lib'
 libs='-lm -lc -lcrypt'
-libswanted='sfio socket inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x'
-line='line'
+libsdirs=' /usr/lib'
+libsfiles=' libm.so.2 libc.so.4 libcrypt.so.2'
+libsfound=' /usr/lib/libm.so.2 /usr/lib/libc.so.4 /usr/lib/libcrypt.so.2'
+libspath=' /usr/lib'
+libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db dl dld ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x iconv'
+line=''
 lint=''
 lkflags=''
 ln='ln'
@@ -433,6 +557,7 @@ longsize='4'
 lp=''
 lpr=''
 ls='ls'
+lseeksize='8'
 lseektype='off_t'
 mail=''
 mailx=''
@@ -444,21 +569,22 @@ malloctype='void *'
 man1dir='/usr/local/man/man1'
 man1direxp='/usr/local/man/man1'
 man1ext='1'
-man3dir='/usr/share/perl/man/man3'
-man3direxp='/usr/share/perl/man/man3'
+man3dir='/usr/share/perl5/man3'
+man3direxp='/usr/share/perl5/man3'
 man3ext='3'
 medium=''
-mips=''
 mips_type=''
 mkdir='mkdir'
+mmaptype='caddr_t'
 models='none'
 modetype='mode_t'
 more='more'
+multiarch='undef'
 mv=''
 myarchname='i386-freebsd'
 mydomain='.FreeBSD.org'
 myhostname='freefall'
-myuname='FreeBSD freefall.FreeBSD.org 4.0-current FreeBSD 4.0-current #0: $Date$'
+myuname='freebsd freefall.FreeBSD.org 5.0-current freebsd 5.0-current #0: $Date$ '
 n='-n'
 netdb_hlen_type='int'
 netdb_host_type='const char *'
@@ -469,44 +595,68 @@ nm_opt=''
 nm_so_opt=''
 nonxs_ext='Errno'
 nroff='nroff'
+nvsize='8'
+nvtype='double'
 o_nonblock='O_NONBLOCK'
 obj_ext='.o'
+old_pthread_create_joinable=''
 optimize=${CFLAGS:-''}
 orderlib='false'
 osname='freebsd'
-osvers='4.0-current'
+osvers='5.0-current'
 package='perl5'
 pager='/usr/bin/more'
 passcat='cat /etc/passwd'
-patchlevel='5'
+patchlevel='6'
 path_sep=':'
-perl='perl'
+perl5='/usr/bin/perl'
+perl=''
 perladmin='hackers@FreeBSD.org'
 perlpath='/usr/bin/perl'
 pg='pg'
 phostname='hostname'
 pidtype='pid_t'
 plibpth=''
+pm_apiversion='5.005'
 pmake=''
 pr=''
-prefix='/usr'
-prefixexp='/usr'
-privlib='/usr/libdata/perl/5.00503'
-privlibexp='/usr/libdata/perl/5.00503'
+prefix='/usr/local'
+prefixexp='/usr/local'
+privlib='/usr/libdata/perl/5.006'
+privlibexp='/usr/libdata/perl/5.006'
 prototype='define'
 ptrsize='4'
-randbits='31'
+quadkind='3'
+quadtype='long long'
+randbits='48'
+randfunc='drand48'
+randseedtype='long'
 ranlib=':'
 rd_nodata='-1'
+revision='5'
 rm='rm'
 rmail=''
 runnm='false'
-scriptdir='/usr/bin'
-scriptdirexp='/usr/bin'
+sPRIEldbl='"LE"'
+sPRIFldbl='"LF"'
+sPRIGldbl='"LG"'
+sPRIX64='"llX"'
+sPRId64='"lld"'
+sPRIeldbl='"Le"'
+sPRIfldbl='"Lf"'
+sPRIgldbl='"Lg"'
+sPRIi64='"lli"'
+sPRIo64='"llo"'
+sPRIu64='"llu"'
+sPRIx64='"llx"'
+sched_yield='sched_yield()'
+scriptdir='/usr/local/bin'
+scriptdirexp='/usr/local/bin'
 sed='sed'
+seedfunc='srand48'
 selectminbits='32'
 selecttype='fd_set *'
-sendmail='sendmail'
+sendmail=''
 sh='/bin/sh'
 shar=''
 sharpbang='#!'
@@ -514,15 +664,22 @@ shmattype='char *'
 shortsize='2'
 shrpenv=''
 shsharp='true'
+sig_count='32'
 sig_name='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 '
 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 '
 sig_num_init='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/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'
+sitearch='/usr/local/lib/perl5/site_perl/5.006/mach'
+sitearchexp='/usr/local/lib/perl5/site_perl/5.006/mach'
+sitebin='/usr/local/bin'
+sitebinexp='/usr/local/bin'
+sitelib='/usr/local/lib/perl5/site_perl/5.006'
+sitelib_stem='/usr/local/lib/perl5/site_perl/5.006'
+sitelibexp='/usr/local/lib/perl5/site_perl/5.006'
+siteprefix='/usr/local'
+siteprefixexp='/usr/local'
+sizesize='4'
 sizetype='size_t'
 sleep=''
 smail=''
@@ -530,6 +687,7 @@ small=''
 so='so'
 sockethdr=''
 socketlib=''
+socksizetype='socklen_t'
 sort='sort'
 spackage='Perl5'
 spitshell='cat'
@@ -545,14 +703,15 @@ stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
 stdio_cnt='((fp)->_cnt)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_ptr)'
+stdio_stream_array='__sF'
 strings='/usr/include/string.h'
 submit=''
-subversion='3'
-sysman='/usr/local/man/man1'
+subversion='0'
+sysman='/usr/share/man/man1'
 tail=''
 tar=''
 tbl=''
-tee='tee'
+tee=''
 test='test'
 timeincl='/usr/include/sys/time.h '
 timetype='time_t'
@@ -560,10 +719,30 @@ touch='touch'
 tr='tr'
 trnl='\n'
 troff=''
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned long'
+u64size='8'
+u64type='unsigned long long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"lu"'
+uidsign='1'
+uidsize='4'
 uidtype='uid_t'
 uname='uname'
 uniq='uniq'
+uquadtype='unsigned long long'
+use5005threads='undef'
+use64bitall='undef'
+use64bitint='undef'
 usedl='define'
+useithreads='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemorebits='undef'
+usemultiplicity='undef'
 usemymalloc='n'
 usenm='false'
 useopcode='true'
@@ -571,30 +750,58 @@ useperlio='undef'
 useposix='true'
 usesfio='false'
 useshrplib='true'
+usesocks='undef'
 usethreads='undef'
+usevendorprefix='undef'
 usevfork='true'
 usrinc='/usr/include'
 uuname=''
-version='5.00503'
+uvoformat='"lo"'
+uvsize='4'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorprefix=''
+vendorprefixexp=''
+version='5.6.0'
 vi=''
 voidflags='15'
-xlibpth=''
+xlibpth='/usr/lib/386 /lib/386'
+xs_apiversion='5.005'
 zcat=''
 zip='zip'
 # Configure command line arguments.
 config_arg0='Configure'
-config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.00503/mach -Dprivlib=/usr/libdata/perl/5.00503 -Dsitearch=/usr/local/lib/perl5/site_perl/5.005/i386-freebsd -Dsitelib=/usr/local/lib/perl5/site_perl/5.005 -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/share/perl/man/man3 -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more'
-config_argc=10
-config_arg1='-Dprefix=/usr'
-config_arg2='-Darchlib=/usr/libdata/perl/5.00503/mach'
-config_arg3='-Dprivlib=/usr/libdata/perl/5.00503'
-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/local/man/man1'
-config_arg7='-Dman3dir=/usr/share/perl/man/man3'
-config_arg8='-Ulocincpth='
-config_arg9='-Uloclibpth='
-config_arg10='-Dpager=/usr/bin/more'
-PATCHLEVEL=5
-SUBVERSION=3
-CONFIG=true
+config_args='-Dprefix=/usr/local -Darchlib=/usr/libdata/perl/5.006/mach -Dprivlib=/usr/libdata/perl/5.006 -Dsitearch=/usr/local/lib/perl5/site_perl/5.006/mach -Dsitelib=/usr/local/lib/perl5/site_perl/5.006 -Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.006/mach -Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.006 -Dinstallbin=/usr/local/bin -Dinstallsitebin=/usr/local/bin -Dinstallscript=/usr/local/bin -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/local/lib/perl5/5.006/man/man3 -Duseshrplib=true -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more -des'
+config_argc=17
+config_arg1='-Dprefix=/usr/local'
+config_arg2='-Darchlib=/usr/libdata/perl/5.006/mach'
+config_arg3='-Dprivlib=/usr/libdata/perl/5.006'
+config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.006/mach'
+config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.006'
+config_arg6='-Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.006/mach'
+config_arg7='-Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.006'
+config_arg8='-Dinstallbin=/usr/local/bin'
+config_arg9='-Dinstallsitebin=/usr/local/bin'
+config_arg10='-Dinstallscript=/usr/local/bin'
+config_arg11='-Dman1dir=/usr/local/man/man1'
+config_arg12='-Dman3dir=/usr/local/lib/perl5/5.006/man/man3'
+config_arg13='-Duseshrplib=true'
+config_arg14='-Ulocincpth='
+config_arg15='-Uloclibpth='
+config_arg16='-Dpager=/usr/bin/more'
+config_arg17='-des'
+PERL_REVISION=5
+PERL_VERSION=6
+PERL_SUBVERSION=0
+PERL_API_REVISION=5
+PERL_API_VERSION=5
+PERL_API_SUBVERSION=0
+CONFIGDOTSH=true
diff --git a/gnu/usr.bin/perl/library/B/Makefile b/gnu/usr.bin/perl/library/B/Makefile
new file mode 100644
index 0000000..fae4d74
--- /dev/null
+++ b/gnu/usr.bin/perl/library/B/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+MODULE=	B
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/ByteLoader/Makefile b/gnu/usr.bin/perl/library/ByteLoader/Makefile
new file mode 100644
index 0000000..13e4936
--- /dev/null
+++ b/gnu/usr.bin/perl/library/ByteLoader/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+MODULE=	ByteLoader
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/DB_File/Makefile b/gnu/usr.bin/perl/library/DB_File/Makefile
new file mode 100644
index 0000000..b35ab10
--- /dev/null
+++ b/gnu/usr.bin/perl/library/DB_File/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+MODULE=	DB_File
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/DProf/Makefile b/gnu/usr.bin/perl/library/DProf/Makefile
new file mode 100644
index 0000000..f0a93e5
--- /dev/null
+++ b/gnu/usr.bin/perl/library/DProf/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MODULE=		DProf
+MODULEDIR=	Devel/DProf
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/Dumper/Makefile b/gnu/usr.bin/perl/library/Dumper/Makefile
new file mode 100644
index 0000000..f102067
--- /dev/null
+++ b/gnu/usr.bin/perl/library/Dumper/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MODULE=		Dumper
+MODULEDIR=	Data/Dumper
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/Errno/Makefile b/gnu/usr.bin/perl/library/Errno/Makefile
new file mode 100644
index 0000000..2210e03
--- /dev/null
+++ b/gnu/usr.bin/perl/library/Errno/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+MODULE=	Errno
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/Fcntl/Makefile b/gnu/usr.bin/perl/library/Fcntl/Makefile
new file mode 100644
index 0000000..d2a0a68
--- /dev/null
+++ b/gnu/usr.bin/perl/library/Fcntl/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+MODULE=	Fcntl
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/Glob/Makefile b/gnu/usr.bin/perl/library/Glob/Makefile
new file mode 100644
index 0000000..8a96e12
--- /dev/null
+++ b/gnu/usr.bin/perl/library/Glob/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MODULE=		Glob
+MODULEDIR=	File/Glob
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/Hostname/Makefile b/gnu/usr.bin/perl/library/Hostname/Makefile
new file mode 100644
index 0000000..a13c094
--- /dev/null
+++ b/gnu/usr.bin/perl/library/Hostname/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MODULE=		Hostname
+MODULEDIR=	Sys/Hostname
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/IO/Makefile b/gnu/usr.bin/perl/library/IO/Makefile
new file mode 100644
index 0000000..69a7753
--- /dev/null
+++ b/gnu/usr.bin/perl/library/IO/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+MODULE=	IO
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/Makefile b/gnu/usr.bin/perl/library/Makefile
new file mode 100644
index 0000000..4a33e56
--- /dev/null
+++ b/gnu/usr.bin/perl/library/Makefile
@@ -0,0 +1,52 @@
+# $FreeBSD$
+
+SUBDIR= B ByteLoader DB_File Dumper DProf Peek Fcntl Glob IO SysV \
+	NDBM_File Opcode POSIX SDBM_File Socket Hostname Syslog attrs re
+
+all:	man3pages
+	
+beforeinstall:
+	@cd ${.OBJDIR}/lib ;\
+	for i in `find . \! -type d \! -name \*.3.gz` ; do \
+		j=`echo $$i|sed -e 's|auto/DynaLoader|mach/auto/DynaLoader|'` ;\
+		${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+			$$i ${DESTDIR}/usr/libdata/perl/${VERSION}/$$j ;\
+	done
+	@cd ${.OBJDIR}/lib ;\
+	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
+		*.3.gz ${DESTDIR}/usr/share/perl/man/man3
+	@cd ${.OBJDIR} ;\
+	${INSTALL} ${COPY} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
+		*.h ${DESTDIR}/usr/libdata/perl/${VERSION}/mach/CORE
+	@cd ${.OBJDIR} ;\
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+		Config.pm ${DESTDIR}/usr/libdata/perl/${VERSION}/mach
+
+.include <bsd.prog.mk>
+
+man3pages: ${DYNALOADER} pod2man
+	@cd ${.OBJDIR}/lib ;\
+	for i in `find . -name \*.pm | grep -v Functions.pm` ; do \
+		j=`echo $$i | sed -e 's|./||' -e 's|/|::|g' -e 's|.pm|.3|'` ;\
+		echo Manifying $$j ;\
+		miniperl -I${.OBJDIR}/lib ${.OBJDIR}/pod2man $$i > $$j ;\
+		gzip -fn $$j ;\
+	done
+	@cd ${.OBJDIR}/ext ;\
+	for i in `find . -name \*.pm -o -name \*.pod | grep -v POSIX.pm` ; do \
+		j=`echo $$i | sed -e 's|./||' -e 's|/SysV/|/IPC/|' \
+			-e 's|/Dumper/|/Data/|' -e 's|/lib/|/|' \
+			-e 's|^[^/]*/||' \
+			-e 's|/|::|g' -e 's|.pm|.3|' -e 's|.pod|.3|'`;\
+		i=`echo $$i | sed -e 's|./||'` ;\
+		echo Manifying $$j ;\
+		miniperl -I${.OBJDIR}/lib ${.OBJDIR}/pod2man $$i > ../lib/$$j ;\
+		gzip -fn ../lib/$$j ;\
+	done
+	@touch ${.TARGET}
+
+pod2man: scripts autosplit ${PERL5SRC}/pod/pod2man.PL
+	ln -sf ${PERL5SRC}/pod/pod2man.PL 
+	miniperl -I${.OBJDIR}/lib pod2man.PL
+
+.PATH:	${PERL5SRC}
diff --git a/gnu/usr.bin/perl/library/Makefile.inc b/gnu/usr.bin/perl/library/Makefile.inc
new file mode 100644
index 0000000..013253a
--- /dev/null
+++ b/gnu/usr.bin/perl/library/Makefile.inc
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+PERL5SRC?= ${.CURDIR}/../../../../../contrib/perl5
+PERL5LIBSRC?= ${.CURDIR}/../../libperl
+
+MODULEDIR?=	${MODULE}
+
+MAKEMAKER_ARGS=	INSTALLDIRS=perl PERL_SRC=${.OBJDIR} \
+		INSTALLMAN3DIR=${DESTDIR}/usr/share/perl/man3 \
+		PERL=miniperl FULLPERL=perl DEFINE=-I${DESTDIR}/usr/include \
+		DEFINE=-DPERL_CORE
+
+all:	lib/auto/${MODULE}.so
+
+.include "../Makefile.inc"
+
+lib/auto/${MODULE}.so: ext/${MODULEDIR}/Makefile ${DYNALOADER}
+	cd ext/${MODULEDIR}; \
+	make -B all PERL_SRC=${.OBJDIR}
+
+ext/${MODULEDIR}/Makefile: scripts
+	cd ext/${MODULEDIR}; \
+	miniperl -I${.OBJDIR}/lib Makefile.PL ${MAKEMAKER_ARGS} \
+		LINKTYPE=dynamic LIBS="-lperl -lm" \
+		INST_LIB=${.OBJDIR}/build/${MODULEDIR} \
+		INST_ARCHLIB=${.OBJDIR}/build/${MODULEDIR}; \
+	make -B config PERL_SRC=${.OBJDIR}
+
+install:
+	cd ${.OBJDIR}/ext/${MODULEDIR} ;\
+	make -B install \
+		INSTALLPRIVLIB=${DESTDIR}/usr/libdata/perl/${VERSION} \
+		INSTALLARCHLIB=${DESTDIR}/usr/libdata/perl/${VERSION}/mach
+
+.PATH:	${PERL5SRC}
diff --git a/gnu/usr.bin/perl/library/NDBM_File/Makefile b/gnu/usr.bin/perl/library/NDBM_File/Makefile
new file mode 100644
index 0000000..1395f67
--- /dev/null
+++ b/gnu/usr.bin/perl/library/NDBM_File/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+MODULE=	NDBM_File
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/Opcode/Makefile b/gnu/usr.bin/perl/library/Opcode/Makefile
new file mode 100644
index 0000000..5497061
--- /dev/null
+++ b/gnu/usr.bin/perl/library/Opcode/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+MODULE=	Opcode
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/POSIX/Makefile b/gnu/usr.bin/perl/library/POSIX/Makefile
new file mode 100644
index 0000000..7345909
--- /dev/null
+++ b/gnu/usr.bin/perl/library/POSIX/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+MODULE=	POSIX
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/Peek/Makefile b/gnu/usr.bin/perl/library/Peek/Makefile
new file mode 100644
index 0000000..24df80b
--- /dev/null
+++ b/gnu/usr.bin/perl/library/Peek/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MODULE=		Peek
+MODULEDIR=	Devel/Peek
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/SDBM_File/Makefile b/gnu/usr.bin/perl/library/SDBM_File/Makefile
new file mode 100644
index 0000000..3695e76
--- /dev/null
+++ b/gnu/usr.bin/perl/library/SDBM_File/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+MODULE=	SDBM_File
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/Socket/Makefile b/gnu/usr.bin/perl/library/Socket/Makefile
new file mode 100644
index 0000000..4102086
--- /dev/null
+++ b/gnu/usr.bin/perl/library/Socket/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+MODULE=	Socket
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/SysV/Makefile b/gnu/usr.bin/perl/library/SysV/Makefile
new file mode 100644
index 0000000..2386888
--- /dev/null
+++ b/gnu/usr.bin/perl/library/SysV/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MODULE=		SysV
+MODULEDIR=	IPC/SysV
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/Syslog/Makefile b/gnu/usr.bin/perl/library/Syslog/Makefile
new file mode 100644
index 0000000..350e7d2
--- /dev/null
+++ b/gnu/usr.bin/perl/library/Syslog/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MODULE=		Syslog
+MODULEDIR=	Sys/Syslog
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/attrs/Makefile b/gnu/usr.bin/perl/library/attrs/Makefile
new file mode 100644
index 0000000..462815b
--- /dev/null
+++ b/gnu/usr.bin/perl/library/attrs/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+MODULE=	attrs
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/library/re/Makefile b/gnu/usr.bin/perl/library/re/Makefile
new file mode 100644
index 0000000..1752651
--- /dev/null
+++ b/gnu/usr.bin/perl/library/re/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+MODULE=	re
+
+.include "../Makefile.inc"
+.include <bsd.obj.mk>
diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile
index 351539d..f90c23d 100644
--- a/gnu/usr.bin/perl/miniperl/Makefile
+++ b/gnu/usr.bin/perl/miniperl/Makefile
@@ -2,8 +2,8 @@
 
 PROG=	miniperl
 NOMAN=	true
-CFLAGS+=-I${PERL5SRC} -I${.OBJDIR}
-SRCS=	miniperlmain.c config.h
+CFLAGS+=-I${PERL5SRC} -I${.OBJDIR} -DPERL_EXTERNAL_GLOB
+SRCS=	miniperlmain.c opmini.c config.h
 # Miniperl _must_ be static!!
 NOSHARED= yes
 .if exists(${.OBJDIR}/../libperl/)
@@ -14,10 +14,13 @@ MYLIBPERL= ${.CURDIR}/../libperl/libperl.a
 DPADD=	${MYLIBPERL} ${LIBM} ${LIBCRYPT}
 LDADD=	${MYLIBPERL} -lm -lcrypt
 
-# Trick the bootstrap tools into thinking that miniperl is perl.
-# This gets overwritten.
-LINKS=	${BINDIR}/${PROG} ${BINDIR}/perl
+build-tools:	${PROG}
 
 .include <bsd.prog.mk>
 
 .PATH:	${PERL5SRC}
+
+opmini.c:	op.c
+	ln -sf ${.OODATE} ${.TARGET}
+
+CLEANFILES+=	opmini.c
diff --git a/gnu/usr.bin/perl/perl/Makefile b/gnu/usr.bin/perl/perl/Makefile
index 12d51de..cefa99f 100644
--- a/gnu/usr.bin/perl/perl/Makefile
+++ b/gnu/usr.bin/perl/perl/Makefile
@@ -2,151 +2,25 @@
 
 PROG=	perl
 NOMAN=	true
-CFLAGS+=-I${PERL5SRC} -I${.OBJDIR}
+CFLAGS+=-I${PERL5SRC} -I${.OBJDIR} -DPERL_CORE
 SRCS=	perlmain.c config.h
 NOSHARED= no
 LDFLAGS=-Wl,-E
-DYNALOADER= lib/auto/DynaLoader/DynaLoader.a
 DPADD=	${DYNALOADER} ${LIBPERL} ${LIBM} ${LIBCRYPT} ${LIBMD}
 LDADD=	${DYNALOADER} -lperl -lm -lcrypt -lmd
 LINKS=	${BINDIR}/${PROG} ${BINDIR}/perl5 \
-	${BINDIR}/${PROG} ${BINDIR}/perl5.00503
+	${BINDIR}/${PROG} ${BINDIR}/perl${VERSION}
 
 CLEANFILES=	Config.pm perlmain.c \
-		autosplit pod2man.PL pod2man ext.libs \
-		man3pages
+		autosplit ext.libs
 
 .include <bsd.prog.mk>
 
-STATIC_EXT=	DynaLoader/DynaLoader
+beforedepend all:	scripts
 
-DYNAMIC_EXT=	B/B DB_File/DB_File Data/Dumper/Dumper Fcntl/Fcntl IO/IO \
-		IPC/SysV/SysV NDBM_File/NDBM_File Opcode/Opcode POSIX/POSIX \
-		SDBM_File/SDBM_File Socket/Socket attrs/attrs re/re
-.if ${PERL_THREADED} == "yes"
-DYNAMIC_EXT+=	Thread/Thread
-.endif
+${PROG}: scripts autosplit ${DYNALOADER}
 
-NONXS_EXT=	Errno/pm_to_blib
-
-MAKEMAKER_ARGS=	INSTALLDIRS=perl PERL_SRC=${.OBJDIR} \
-		INSTALLMAN3DIR=${DESTDIR}/usr/share/perl/man3 \
-		PERL=perl FULLPERL=perl DEFINE=-I${DESTDIR}/usr/include
-
-${PROG}: Config.pm autosplit lib/auto/DynaLoader/DynaLoader.a
-
-Config.pm: links ${PERL5SRC}/configpm myconfig config.sh
-	miniperl ${PERL5SRC}/configpm \
-		Config.pm Porting/Glossary myconfig config.sh
-	@cd lib ; ln -sf ../${.TARGET}
-
-perlmain.c: config.sh writemain config.h
-	sh writemain lib/auto/DynaLoader/DynaLoader.a > ${.TARGET}
-
-autosplit: links Config.pm lib/*.pm lib/*/*.pm
-	miniperl -I${.OBJDIR}/lib \
-		-e 'use AutoSplit; autosplit_lib_modules(@ARGV)' \
-		lib/*.pm lib/*/*.pm
-	touch ${.TARGET}
-
-.for I in ${STATIC_EXT}
-ext/${I:H}/Makefile: links ext/${I:H}/Makefile.PL cflags Config.pm config.h
-	@cd ext/${I:H}; \
-	miniperl -I${.OBJDIR}/lib Makefile.PL ${MAKEMAKER_ARGS} \
-		LINKTYPE=static LIBS="-lperl -lm"; \
-	make -B config PERL_SRC=${.OBJDIR}
-
-lib/auto/${I}.a: links ext/${I:H}/Makefile
-	@cd ext/${I:H}; \
-	make -B all PERL_SRC=${.OBJDIR}
-
-all:	lib/auto/${I}.a
-
-STATICS+=	lib/auto/${I}.a
-.endfor
-
-.for I in ${DYNAMIC_EXT}
-ext/${I:H}/Makefile: links ext/${I:H}/Makefile.PL cflags Config.pm pod2man config.h
-	@cd ext/${I:H}; \
-	miniperl -I${.OBJDIR}/lib Makefile.PL ${MAKEMAKER_ARGS} \
-		LINKTYPE=dynamic LIBS="-lperl -lm" \
-		INST_LIB=${.OBJDIR}/build/${I:H} \
-		INST_ARCHLIB=${.OBJDIR}/build/${I:H}; \
-	make -B config PERL_SRC=${.OBJDIR}
-
-lib/auto/${I}.so: links ${PROG} ext/${I:H}/Makefile
-	@cd ext/${I:H}; \
-	make -B all PERL_SRC=${.OBJDIR}
-
-all:	lib/auto/${I}.so
-
-DYNAMICS+=	lib/auto/${I}.so
-.endfor
-
-.for I in ${NONXS_EXT}
-ext/${I:H}/Makefile: links ext/${I:H}/Makefile.PL cflags lib/Config.pm
-	mkdir -p ${.OBJDIR}/lib/auto/${I:H} ;\
-	@cd ext/${I:H} ;\
-	miniperl -I${.OBJDIR}/lib Makefile.PL ${MAKEMAKER_ARGS} \
-		INST_LIB=${.OBJDIR}/lib/auto/${I:H} \
-		INST_ARCHLIB=${.OBJDIR}/lib/auto/${I:H}; \
-	make -B config PERL_SRC=${.OBJDIR}
-
-lib/auto/${I}: links ${PROG} ext/${I:H}/Makefile
-	@cd ext/${I:H}; \
-	make -B all LINKTYPE=nonxs PERL_SRC=${.OBJDIR}
-
-NONXSS+=	lib/auto/${I}
-.endfor
-
-pod2man: Config.pm autosplit ${PERL5SRC}/pod/pod2man.PL
-	ln -sf ${PERL5SRC}/pod/pod2man.PL 
-	miniperl -I${.OBJDIR}/lib pod2man.PL
-
-man3pages: pod2man
-	@cd ${.OBJDIR}/lib ;\
-	for i in `find . -name \*.pm | grep -v Functions.pm` ; do \
-		j=`echo $$i | sed -e 's|./||' -e 's|/|::|g' -e 's|.pm|.3|'` ;\
-		echo Manifying $$j ;\
-		miniperl -I${.OBJDIR}/lib ${.OBJDIR}/pod2man $$i > $$j ;\
-		gzip -fn $$j ;\
-	done
-	@cd ${.OBJDIR}/ext ;\
-	for i in `find . -name \*.pm -o -name \*.pod | grep -v POSIX.pm` ; do \
-		j=`echo $$i | sed -e 's|./||' -e 's|/SysV/|/IPC/|' \
-			-e 's|/Dumper/|/Data/|' -e 's|/lib/|/|' \
-			-e 's|^[^/]*/||' \
-			-e 's|/|::|g' -e 's|.pm|.3|' -e 's|.pod|.3|'`;\
-		i=`echo $$i | sed -e 's|./||'` ;\
-		echo Manifying $$j ;\
-		miniperl -I${.OBJDIR}/lib ${.OBJDIR}/pod2man $$i > ../lib/$$j ;\
-		gzip -fn ../lib/$$j ;\
-	done
-	touch ${.TARGET}
-
-all: man3pages
-
-install:
-.for I in ${DYNAMIC_EXT}
-	@cd ${.OBJDIR}/ext/${I:H} ;\
-	make -B install \
-		INSTALLPRIVLIB=${DESTDIR}/usr/libdata/perl/5.00503 \
-		INSTALLARCHLIB=${DESTDIR}/usr/libdata/perl/5.00503/mach
-.endfor
-	@cd ${.OBJDIR}/lib ;\
-	for i in `find . \! -type d \! -name \*.3.gz` ; do \
-		j=`echo $$i|sed -e 's|auto/DynaLoader|mach/auto/DynaLoader|'` ;\
-		${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-			$$i ${DESTDIR}/usr/libdata/perl/5.00503/$$j ;\
-	done
-	@cd ${.OBJDIR}/lib ;\
-	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
-		*.3.gz ${DESTDIR}/usr/share/perl/man/man3
-	@cd ${.OBJDIR} ;\
-	${INSTALL} ${COPY} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
-		*.h ${DESTDIR}/usr/libdata/perl/5.00503/mach/CORE
-	@cd ${.OBJDIR} ;\
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		Config.pm ${DESTDIR}/usr/libdata/perl/5.00503/mach
+perlmain.c: scripts autosplit
+	sh writemain ${DYNALOADER} > ${.TARGET}
 
 .PATH:	${PERL5SRC}
diff --git a/gnu/usr.bin/perl/pod/pod/Makefile b/gnu/usr.bin/perl/pod/pod/Makefile
index dd61498..745080d 100644
--- a/gnu/usr.bin/perl/pod/pod/Makefile
+++ b/gnu/usr.bin/perl/pod/pod/Makefile
@@ -2,17 +2,72 @@
 # $FreeBSD$
 #
 
-PODS=	perl.pod perl5004delta.pod perlapio.pod perlbook.pod perlbot.pod \
-	perlcall.pod perldata.pod perldebug.pod perldelta.pod perldiag.pod \
-	perldsc.pod perlembed.pod perlfaq.pod perlfaq1.pod perlfaq2.pod \
-	perlfaq3.pod perlfaq4.pod perlfaq5.pod perlfaq6.pod perlfaq7.pod \
-	perlfaq8.pod perlfaq9.pod perlform.pod perlfunc.pod perlguts.pod \
-	perlhist.pod perlipc.pod perllocale.pod perllol.pod perlmod.pod \
-	perlmodinstall.pod perlmodlib.pod perlobj.pod perlop.pod \
-	perlopentut.pod perlpod.pod perlport.pod perlre.pod perlref.pod \
-	perlreftut.pod perlrun.pod perlsec.pod perlstyle.pod perlsub.pod \
-	perlsyn.pod perlthrtut.pod perltie.pod perltoc.pod \
-	perltoot.pod perltrap.pod perlvar.pod perlxs.pod perlxstut.pod
+PODS= \
+	perl.pod \
+	perldelta.pod \
+	perl5004delta.pod \
+	perl5005delta.pod \
+	perldata.pod \
+	perlsyn.pod \
+	perlop.pod \
+	perlre.pod \
+	perlrun.pod \
+	perlfunc.pod \
+	perlopentut.pod \
+	perlvar.pod \
+	perlsub.pod \
+	perlmod.pod \
+	perlmodlib.pod \
+	perlmodinstall.pod \
+	perlfork.pod \
+	perlform.pod \
+	perllocale.pod \
+	perlref.pod \
+	perlreftut.pod \
+	perldsc.pod \
+	perllol.pod \
+	perlboot.pod \
+	perltoot.pod \
+	perltootc.pod \
+	perlobj.pod \
+	perltie.pod \
+	perlbot.pod \
+	perlipc.pod \
+	perlthrtut.pod \
+	perldbmfilter.pod \
+	perldebguts.pod \
+	perldebug.pod \
+	perlnumber.pod \
+	perldiag.pod \
+	perlsec.pod \
+	perltrap.pod \
+	perlport.pod \
+	perlstyle.pod \
+	perlpod.pod \
+	perlbook.pod \
+	perlembed.pod \
+	perlapio.pod \
+	perlxs.pod \
+	perlxstut.pod \
+	perlguts.pod \
+	perlcall.pod \
+	perlcompile.pod \
+	perltodo.pod \
+	perlapi.pod \
+	perlintern.pod \
+	perlhack.pod \
+	perlhist.pod \
+	perlfaq.pod \
+	perlfaq1.pod \
+	perlfaq2.pod \
+	perlfaq3.pod \
+	perlfaq4.pod \
+	perlfaq5.pod \
+	perlfaq6.pod \
+	perlfaq7.pod \
+	perlfaq8.pod \
+	perlfaq9.pod \
+	perltoc.pod
 
 .for I in ${PODS:R}
 ${.OBJDIR}/${I}.pod: ${I}.pod
@@ -32,6 +87,6 @@ CLEANFILES+= ${.OBJDIR}/${I}.pod ${I}.1
 install:
 	cd ${PERL5SRC}/pod ;\
 	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
-		${PODS} ${DESTDIR}/usr/libdata/perl/5.00503/pod
+		${PODS} ${DESTDIR}/usr/libdata/perl/${VERSION}/pod
 
 .PATH: ${PERL5SRC}/pod
diff --git a/gnu/usr.bin/perl/suidperl/Makefile b/gnu/usr.bin/perl/suidperl/Makefile
index 416ac8f4f3..6b5f8ac 100644
--- a/gnu/usr.bin/perl/suidperl/Makefile
+++ b/gnu/usr.bin/perl/suidperl/Makefile
@@ -2,62 +2,33 @@
 
 PROG=	suidperl
 NOMAN=	true
-CFLAGS+=-I${PERL5SRC} -I${.OBJDIR} -DIAMSUID
-SRCS=	perlmain.c sperl.c config.h
+CFLAGS+=-I${PERL5SRC} -I${.OBJDIR} -DPERL_CORE
+CFLAGS+=-DIAMSUID
+SRCS=	perlmain.c config.h
+SRCS+=	sperl.c
 NOSHARED= no
 LDFLAGS=-Wl,-E
-DYNALOADER= lib/auto/DynaLoader/DynaLoader.a
 DPADD=	${DYNALOADER} ${LIBPERL} ${LIBM} ${LIBCRYPT} ${LIBMD}
 LDADD=	${DYNALOADER} -lperl -lm -lcrypt -lmd
+LINKS=	${BINDIR}/${PROG} ${BINDIR}/sperl5 \
+	${BINDIR}/${PROG} ${BINDIR}/sperl${VERSION}
 BINOWN=	root
 BINMODE=4511
-LINKS=	${BINDIR}/${PROG} ${BINDIR}/sperl5.00503
 
-CLEANFILES=	Config.pm perlmain.c sperl.c \
-		autosplit pod2man.PL pod2man ext.libs \
-		man3pages
-
-STATIC_EXT=	DynaLoader/DynaLoader
+CLEANFILES=	Config.pm perlmain.c \
+		autosplit ext.libs
+CLEANFILES+=	sperl.c
 
 .include <bsd.prog.mk>
 
-MAKEMAKER_ARGS=	INSTALLDIRS=perl PERL_SRC=${.OBJDIR} \
-		INSTALLMAN3DIR=${DESTDIR}/usr/share/perl/man3 \
-		PERL=perl FULLPERL=perl DEFINE=-I${DESTDIR}/usr/include
-
-${PROG}: Config.pm autosplit lib/auto/DynaLoader/DynaLoader.a
-
-sperl.c: perl.c
-	@ln -sf ${.OODATE} ${.TARGET}
-
-Config.pm: links ${PERL5SRC}/configpm myconfig config.sh
-	miniperl ${PERL5SRC}/configpm \
-		Config.pm Porting/Glossary myconfig config.sh
-	@cd lib ; ln -sf ../${.TARGET}
-
-perlmain.c: config.sh writemain config.h
-	sh writemain lib/auto/DynaLoader/DynaLoader.a > ${.TARGET}
+beforedepend all:	scripts
 
-autosplit: links Config.pm lib/*.pm lib/*/*.pm
-	miniperl -I${.OBJDIR}/lib \
-		-e 'use AutoSplit; autosplit_lib_modules(@ARGV)' \
-		lib/*.pm lib/*/*.pm
-	touch ${.TARGET}
+${PROG}: scripts autosplit ${DYNALOADER}
 
-.for I in ${STATIC_EXT}
-ext/${I:H}/Makefile: links ext/${I:H}/Makefile.PL cflags Config.pm config.h
-	@cd ext/${I:H}; \
-	miniperl -I${.OBJDIR}/lib Makefile.PL ${MAKEMAKER_ARGS} \
-		LINKTYPE=static LIBS="-lperl -lm"; \
-	make -B config PERL_SRC=${.OBJDIR}
-
-lib/auto/${I}.a: links ext/${I:H}/Makefile
-	@cd ext/${I:H}; \
-	make -B all PERL_SRC=${.OBJDIR}
-
-all:	lib/auto/${I}.a
-
-STATICS+=	lib/auto/${I}.a
-.endfor
+perlmain.c: scripts autosplit
+	sh writemain ${DYNALOADER} > ${.TARGET}
 
 .PATH:	${PERL5SRC}
+
+sperl.c: ${PERL5SRC}/perl.c
+	ln -sf ${.OODATE} ${.TARGET}
diff --git a/gnu/usr.bin/perl/utils/Makefile b/gnu/usr.bin/perl/utils/Makefile
index 58a2ce7..fe1eb05 100644
--- a/gnu/usr.bin/perl/utils/Makefile
+++ b/gnu/usr.bin/perl/utils/Makefile
@@ -2,6 +2,10 @@
 # $FreeBSD$
 #
 
-SUBDIR= c2ph h2ph h2xs perlbug perlcc perldoc pl2pm splain
+beforedepend all:	links
 
-.include <bsd.subdir.mk>
+SUBDIR= c2ph dprofpp h2ph h2xs perlbc perlbug perlcc perldoc pl2pm splain
+
+.include <bsd.prog.mk>
+
+.PATH:	${PERL5SRC}
diff --git a/gnu/usr.bin/perl/utils/Makefile.inc b/gnu/usr.bin/perl/utils/Makefile.inc
index 6f8850d..7e8a877 100644
--- a/gnu/usr.bin/perl/utils/Makefile.inc
+++ b/gnu/usr.bin/perl/utils/Makefile.inc
@@ -3,7 +3,11 @@
 #
 
 PERL5SRC=	${.CURDIR}/../../../../../contrib/perl5
-MINIPERLOPT?=	-I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
+PERL5LIBSRC=	${.CURDIR}/../../libperl
+
+.include "../Makefile.inc"
+
+MINIPERLOPT?=	-I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl -I${PERL5SRC}
 
 ${PROG}: ${PROG}.PL
 	miniperl ${MINIPERLOPT} ${.OODATE}
@@ -12,10 +16,8 @@ ${PROG}.1: ${PROG}.PL
 	miniperl ${MINIPERLOPT} ${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET}
 
 ${PROG}.PL: ${PERL5SRC}/utils/${PROG}.PL
-	@ln -sf ${.OODATE} ${.TARGET}
+	ln -sf ${.OODATE} ${.TARGET}
 
 CLEANFILES+=	${PROG}.1 ${PROG}.PL pstruct
 
 STRIP=
-
-.include "../Makefile.inc"
diff --git a/gnu/usr.bin/perl/utils/dprofpp/Makefile b/gnu/usr.bin/perl/utils/dprofpp/Makefile
new file mode 100644
index 0000000..5ffdfcc
--- /dev/null
+++ b/gnu/usr.bin/perl/utils/dprofpp/Makefile
@@ -0,0 +1,7 @@
+#
+# $FreeBSD$
+#
+
+PROG=	dprofpp
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/utils/h2ph/Makefile b/gnu/usr.bin/perl/utils/h2ph/Makefile
index ab7075d..8b0c2c5 100644
--- a/gnu/usr.bin/perl/utils/h2ph/Makefile
+++ b/gnu/usr.bin/perl/utils/h2ph/Makefile
@@ -4,9 +4,13 @@
 
 PROG=	h2ph
 
+beforedepend all:	scripts
+
 .include <bsd.prog.mk>
 
 afterinstall:
 	cd ${DESTDIR}/usr/include; \
-	miniperl ${.OBJDIR}/${PROG} -d \
-		${DESTDIR}/usr/libdata/perl/5.00503/mach * */*
+	miniperl -I${.OBJDIR}/lib ${.OBJDIR}/${PROG} -d \
+		${DESTDIR}/usr/libdata/perl/${VERSION}/mach * */*
+
+.PATH:	${PERL5SRC}
diff --git a/gnu/usr.bin/perl/utils/perlbc/Makefile b/gnu/usr.bin/perl/utils/perlbc/Makefile
new file mode 100644
index 0000000..47a247d
--- /dev/null
+++ b/gnu/usr.bin/perl/utils/perlbc/Makefile
@@ -0,0 +1,7 @@
+#
+# $FreeBSD$
+#
+
+PROG=	perlbc
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/utils/perlbug/Makefile b/gnu/usr.bin/perl/utils/perlbug/Makefile
index 2d4399a..baea837 100644
--- a/gnu/usr.bin/perl/utils/perlbug/Makefile
+++ b/gnu/usr.bin/perl/utils/perlbug/Makefile
@@ -5,10 +5,3 @@
 PROG=	perlbug
 
 .include <bsd.prog.mk>
-
-${PROG}: patchlevel.h
-
-CLEANFILES+=	patchlevel.h
-
-patchlevel.h: ${PERL5SRC}/patchlevel.h
-	@ln -sf ${.OODATE} ${.TARGET}
diff --git a/gnu/usr.bin/perl/utils/splain/Makefile b/gnu/usr.bin/perl/utils/splain/Makefile
index c971ceb..b05337e 100644
--- a/gnu/usr.bin/perl/utils/splain/Makefile
+++ b/gnu/usr.bin/perl/utils/splain/Makefile
@@ -6,10 +6,3 @@ PROG=	splain
 NOMAN=	true
 
 .include <bsd.prog.mk>
-
-${PROG}: ${.OBJDIR}/diagnostics.pm
-
-CLEANFILES+=	${.OBJDIR}/diagnostics.pm
-
-${.OBJDIR}/diagnostics.pm: ${.OBJDIR}/../../perl/lib/diagnostics.pm
-	@ln -sf ${.OODATE} ${.TARGET}