7 files changed, 627 insertions, 35 deletions

diff --git a/gnu/usr.bin/perl/libperl/Makefile b/gnu/usr.bin/perl/libperl/Makefile
index aae679bbdfa2..f4b07f5fec7a 100644
--- a/gnu/usr.bin/perl/libperl/Makefile
+++ b/gnu/usr.bin/perl/libperl/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.1 1998/09/09 07:20:25 markm Exp $
 #
 
 LIB=	perl
@@ -28,11 +28,8 @@ CLEANFILES+=	config.h config.sh config_h.sh
 config.h: config_h.sh config.sh
 	sh config_h.sh
 
-config.sh: ${.CURDIR}/config.SH
+config.sh: config.SH-${OBJFORMAT}
 	ln -sf ${.OODATE} ${.TARGET}
 
 config_h.sh: config_h.SH
 	ln -sf ${.OODATE} ${.TARGET}
-
-test:
-	@echo ${PERL5SRC}
diff --git a/gnu/usr.bin/perl/libperl/config.SH b/gnu/usr.bin/perl/libperl/config.SH-aout
index 954c1c8c1337..954c1c8c1337 100644
--- a/gnu/usr.bin/perl/libperl/config.SH
+++ b/gnu/usr.bin/perl/libperl/config.SH-aout
diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf b/gnu/usr.bin/perl/libperl/config.SH-elf
new file mode 100644
index 000000000000..35f21f74a1fa
--- /dev/null
+++ b/gnu/usr.bin/perl/libperl/config.SH-elf
@@ -0,0 +1,587 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# 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".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Wed Sep  2 12:54:30 SAST 1998
+# Configured by     : root
+# Target system     : freebsd greenpeace.grondar.za 3.0-current freebsd 3.0-current #0: sat aug 22 14:55:55 sast 1998 root@greenpeace.grondar.za:usrsrcsyscompilega586dx i386 
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+Mcc='Mcc'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+alignbytes='4'
+ansi2knr=''
+aphostname=''
+apiversion='5.005'
+ar='ar'
+archlib='/usr/libdata/perl/5.00502/mach'
+archlibexp='/usr/libdata/perl/5.00502/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=''
+cf_by='root'
+cf_email='root@greenpeace.grondar.za'
+cf_time='Wed Sep  2 12:54:30 SAST 1998'
+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'
+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='undef'
+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_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_csh='/bin/csh'
+full_sed='/usr/bin/sed'
+gccversion='2.7.2.1'
+gidtype='gid_t'
+glibpth="/usr/lib /usr/local/lib"
+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_math='define'
+i_memory='undef'
+i_ndbm='define'
+i_netdb='define'
+i_neterrno='undef'
+i_niin='define'
+i_pwd='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_sysndir='undef'
+i_sysparam='define'
+i_sysresrc='define'
+i_sysselct='define'
+i_syssockio=''
+i_sysstat='define'
+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'
+incpath=''
+inews=''
+installarchlib='/usr/libdata/perl/5.00502/mach'
+installbin='/usr/bin'
+installman1dir='/usr/share/man/man1'
+installman3dir='/usr/share/perl/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'
+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="-shared "
+ldflags="-Wl,-E "
+less='less'
+lib_ext='.a'
+libc='undef'
+libperl='libperl.a'
+libpth="/usr/lib /usr/local/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'
+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/share/man/man1'
+man1direxp='/usr/share/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='.grondar.za'
+myhostname='greenpeace'
+myuname='freebsd greenpeace.grondar.za 3.0-current freebsd 3.0-current #0: sat aug 22 14:55:55 sast 1998 root@greenpeace.grondar.za:usrsrcsyscompilega586dx i386 '
+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='-O'
+orderlib='false'
+osname='freebsd'
+osvers='3.0-current'
+package='perl5'
+pager='/usr/bin/more'
+passcat='cat /etc/passwd'
+patchlevel='5'
+path_sep=':'
+perl='perl'
+perladmin='root@greenpeace.grondar.za'
+perlpath='/usr/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth=''
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+privlib='/usr/libdata/perl/5.00502'
+privlibexp='/usr/libdata/perl/5.00502'
+prototype='define'
+ptrsize='4'
+randbits='31'
+ranlib='/usr/bin/ranlib'
+rd_nodata='-1'
+rm='rm'
+rmail=''
+runnm='true'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+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, 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'
+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='2'
+sysman='/usr/share/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='false'
+usethreads='undef'
+usevfork='true'
+usrinc='/usr/include'
+uuname=''
+version='5.00502'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+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=/usr/bin/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_arg6='-Dman1dir=/usr/share/man/man1'
+config_arg7='-Dman3dir=/usr/share/perl/man/man3'
+config_arg8='-des'
+config_arg9='-Ulocincpth='
+config_arg10='-Uloclibpth='
+config_arg11='-Dpager=/usr/bin/more'
+PATCHLEVEL=5
+SUBVERSION=2
+CONFIG=true
diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile
index 1d5910f493bb..a6e68178e243 100644
--- a/gnu/usr.bin/perl/miniperl/Makefile
+++ b/gnu/usr.bin/perl/miniperl/Makefile
@@ -6,6 +6,7 @@ PROG=	miniperl
 NOMAN=	true
 CFLAGS+=-I${PERL5SRC} -I${.OBJDIR}
 SRCS=	miniperlmain.c config.h
+DPADD=	${LIBPERL} ${LIBM} ${LIBCRYPT}
 LDADD=	-lperl -lm -lcrypt
 
 # Trick the bootstrap tools into thinking that miniperl is perl.
@@ -21,7 +22,7 @@ miniperlmain.o: config.h
 config.h: config_h.sh config.sh
 	sh config_h.sh
 
-config.sh: ${.CURDIR}/../libperl/config.SH
+config.sh: ${.CURDIR}/../libperl/config.SH-${OBJFORMAT}
 	@ln -sf ${.OODATE} ${.TARGET}
 
 config_h.sh: config_h.SH
diff --git a/gnu/usr.bin/perl/perl/Makefile b/gnu/usr.bin/perl/perl/Makefile
index 423e5f81c3b5..f642de44d357 100644
--- a/gnu/usr.bin/perl/perl/Makefile
+++ b/gnu/usr.bin/perl/perl/Makefile
@@ -6,6 +6,8 @@ PROG=	perl
 NOMAN=	true
 CFLAGS+=-I${PERL5SRC} -I${.OBJDIR}
 SRCS=	perlmain.c config.h
+# NOSHARED= no
+DPADD=	lib/auto/DynaLoader/DynaLoader.a ${LIBPERL} ${LIBM} ${LIBCRYPT}
 LDADD=	lib/auto/DynaLoader/DynaLoader.a -lperl -lm -lcrypt
 LINKS=	${BINDIR}/${PROG} ${BINDIR}/perl5
 
@@ -30,17 +32,19 @@ DYNAMIC_EXT=	B/B DB_File/DB_File Data/Dumper/Dumper Fcntl/Fcntl IO/IO \
 
 ${PROG}: lib/auto/DynaLoader/DynaLoader.a
 
+.ORDER: lib/auto/DynaLoader/DynaLoader.a ${DYNAMIC_EXT}
+
 config.h: config_h.sh config.sh
 	sh config_h.sh
 
-config.sh: ${.CURDIR}/../libperl/config.SH
-	@ln -sf ${.OODATE} ${.TARGET}
+config.sh: ${.CURDIR}/../libperl/config.SH-${OBJFORMAT}
+	cp -p ${.OODATE} ${.TARGET}
 
 config_h.sh: config_h.SH
-	@ln -sf ${.OODATE} ${.TARGET}
+	cp -p ${.OODATE} ${.TARGET}
 
 cflags.sh: cflags.SH
-	@ln -sf ${.OODATE} ${.TARGET}
+	cp -p ${.OODATE} ${.TARGET}
 
 cflags: cflags.sh
 	sh ${.OODATE}
@@ -65,12 +69,12 @@ lib/re.pm: lib ext hints ext/re/re.pm
 	cat ${PERL5SRC}/ext/re/re.pm > ${.OBJDIR}/lib/re.pm
 
 lib/Config.pm: Config.pm
-	@cd lib; ln -s ../${.OODATE}
+	cp -p ${.OODATE} ${.TARGET}
 
 myconfig: ${PERL5SRC}/myconfig
-	@ln -sf ${.OODATE} ${.TARGET}
+	ln -sf ${.OODATE} ${.TARGET}
 
-Config.pm: myconfig lib ext hints Porting lib/re.pm
+Config.pm: myconfig config.sh lib ext hints Porting lib/re.pm
 	miniperl ${PERL5SRC}/configpm \
 		Config.pm Porting/Glossary myconfig config.sh
 
@@ -91,13 +95,13 @@ lib/auto/DynaLoader/DynaLoader.a: cflags lib/Config.pm ${DEPEND_H}
 	cd ext/DynaLoader; \
 	miniperl -I${.OBJDIR}/lib Makefile.PL \
 		INSTALLDIRS=perl PERL_SRC=${.OBJDIR}; \
-	make config PERL_SRC=${.OBJDIR}; \
-	make all LINKTYPE=static PERL_SRC=${.OBJDIR}
+	make -B config PERL_SRC=${.OBJDIR}; \
+	make -B all LINKTYPE=static PERL_SRC=${.OBJDIR}
 
 ${.OBJDIR}/miniperlmain.c: miniperlmain.c
 	@ln -sf ${.OODATE} ${.TARGET}
 
-perlmain.c: ${.OBJDIR}/miniperlmain.c config.sh writemain
+perlmain.c: ${.OBJDIR}/miniperlmain.c config.sh writemain config.h
 	sh writemain lib/auto/DynaLoader/DynaLoader.a > ${.TARGET}
 
 writemain.sh: writemain.SH
@@ -116,9 +120,9 @@ ${.OBJDIR}/regexec.c: ${PERL5SRC}/regexec.c
 lib/auto/${I}.so:	${PROG} ${.OBJDIR}/regcomp.c ${.OBJDIR}/regexec.c
 	cd ext/${I:H}; \
 	miniperl -I${.OBJDIR}/lib Makefile.PL \
-		INSTALLDIRS=perl PERL_SRC=${.OBJDIR}; \
-	make config PERL_SRC=${.OBJDIR}; \
-	make all LINKTYPE=dynamic PERL_SRC=${.OBJDIR}
+		INSTALLDIRS=perl PERL_SRC=${.OBJDIR} LIBS="-lperl"; \
+	make -B config PERL_SRC=${.OBJDIR}; \
+	make -B all LINKTYPE=dynamic PERL_SRC=${.OBJDIR}
 
 DYNAMICS+=	lib/auto/${I}.so
 .endfor
diff --git a/gnu/usr.bin/perl/suidperl/Makefile b/gnu/usr.bin/perl/suidperl/Makefile
index 0b28e6d36562..20ff24e7dab7 100644
--- a/gnu/usr.bin/perl/suidperl/Makefile
+++ b/gnu/usr.bin/perl/suidperl/Makefile
@@ -6,6 +6,8 @@ PROG=	suidperl
 NOMAN=	true
 CFLAGS+=-I${PERL5SRC} -I${.OBJDIR} -DIAMSUID
 SRCS=	perlmain.c sperl.c config.h
+NOSHARED= no
+DPADD=	lib/auto/DynaLoader/DynaLoader.a ${LIBPERL} ${LIBM} ${LIBCRYPT}
 LDADD=	lib/auto/DynaLoader/DynaLoader.a -lperl -lm -lcrypt
 BINOWN=	root
 BINMODE=4511
@@ -29,14 +31,14 @@ ${PROG}: lib/auto/DynaLoader/DynaLoader.a
 config.h: config_h.sh config.sh
 	sh config_h.sh
 
-config.sh: ${.CURDIR}/../libperl/config.SH
-	@ln -sf ${.OODATE} ${.TARGET}
+config.sh: ${.CURDIR}/../libperl/config.SH-${OBJFORMAT}
+	cp -p ${.OODATE} ${.TARGET}
 
 config_h.sh: config_h.SH
-	@ln -sf ${.OODATE} ${.TARGET}
+	cp -p ${.OODATE} ${.TARGET}
 
 cflags.sh: cflags.SH
-	@ln -sf ${.OODATE} ${.TARGET}
+	cp -p ${.OODATE} ${.TARGET}
 
 cflags: cflags.sh
 	sh ${.OODATE}
@@ -61,12 +63,12 @@ lib/re.pm: lib ext hints ext/re/re.pm
 	cat ${PERL5SRC}/ext/re/re.pm > ${.OBJDIR}/lib/re.pm
 
 lib/Config.pm: Config.pm
-	@cd lib; ln -s ../${.OODATE}
+	@cp -p ${.OODATE} ${.TARGET}
 
 myconfig: ${PERL5SRC}/myconfig
 	@ln -sf ${.OODATE} ${.TARGET}
 
-Config.pm: myconfig lib ext hints Porting lib/re.pm
+Config.pm: myconfig config.sh lib ext hints Porting lib/re.pm
 	miniperl ${PERL5SRC}/configpm \
 		Config.pm Porting/Glossary myconfig config.sh
 
@@ -84,8 +86,8 @@ lib/auto/DynaLoader/DynaLoader.a: cflags lib/Config.pm ${DEPEND_H}
 	cd ext/DynaLoader; \
 	miniperl -I../../lib Makefile.PL \
 		INSTALLDIRS=perl PERL_SRC=${.OBJDIR}; \
-	make config PERL_SRC=${.OBJDIR}; \
-	make all LINKTYPE=static PERL_SRC=${.OBJDIR}
+	make -B config PERL_SRC=${.OBJDIR}; \
+	make -B all LINKTYPE=static PERL_SRC=${.OBJDIR}
 
 ${.OBJDIR}/miniperlmain.c: miniperlmain.c
 	@ln -sf ${.OODATE} ${.TARGET}
@@ -93,7 +95,7 @@ ${.OBJDIR}/miniperlmain.c: miniperlmain.c
 sperl.c: perl.c
 	@ln -sf ${.OODATE} ${.TARGET}
 
-perlmain.c: ${.OBJDIR}/miniperlmain.c config.sh writemain
+perlmain.c: ${.OBJDIR}/miniperlmain.c config.sh writemain config.h
 	sh writemain lib/auto/DynaLoader/DynaLoader.a > ${.TARGET}
 
 writemain.sh: writemain.SH
diff --git a/gnu/usr.bin/perl/x2p/a2pl/Makefile b/gnu/usr.bin/perl/x2p/a2pl/Makefile
index 9bd0a8d3ff30..254dc2778a48 100644
--- a/gnu/usr.bin/perl/x2p/a2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/a2pl/Makefile
@@ -4,13 +4,15 @@
 
 PROG=	a2p
 CFLAGS+=-I${PERL5SRC}/x2p -I${.OBJDIR} -I${.OBJDIR}/temp
-SRCS=	a2p.c hash.c str.c util.c walk.c
+LDFLAGS+=-lperl
+SRCS=	a2p.c hash.c str.c util.c walk.c config.h
 
-beforedepend all: ${.OBJDIR}/config.h temp
+beforedepend all: config.h temp
 
 .include <bsd.prog.mk>
 
 .PATH: ${PERL5SRC}/x2p
+.PATH: ${PERL5SRC}
 
 .SUFFIXES:
 .SUFFIXES: .c .h .o
@@ -18,16 +20,15 @@ beforedepend all: ${.OBJDIR}/config.h temp
 temp:
 	@mkdir temp
 
-CLEANFILES+= ${.OBJDIR}/config.h ${.OBJDIR}/config_h.sh ${.OBJDIR}/config.sh \
-		${PROG}.1
+CLEANFILES+= config.h config_h.sh config.sh ${PROG}.1
 
-${.OBJDIR}/config.h: ${.OBJDIR}/config_h.sh ${.OBJDIR}/config.sh
+config.h: config_h.sh config.sh
 	sh config_h.sh
 
-${.OBJDIR}/config.sh: ${.CURDIR}/../../libperl/config.SH
+config.sh: ${.CURDIR}/../../libperl/config.SH-${OBJFORMAT}
 	@ln -sf ${.OODATE} ${.TARGET}
 
-${.OBJDIR}/config_h.sh: ${PERL5SRC}/config_h.SH
+config_h.sh: ${PERL5SRC}/config_h.SH
 	@ln -sf ${.OODATE} ${.TARGET}
 
 ${PROG}.1: ${PROG}.pod