This commit was manufactured by cvs2svn to create tag 'RELEASE_5_4_0'.release/5.4.0

7 files changed, 0 insertions, 450 deletions

diff --git a/lang/perl5.16/files/patch-MM_Unix.pm b/lang/perl5.16/files/patch-MM_Unix.pm
deleted file mode 100644
index 7937392ae080..000000000000
--- a/lang/perl5.16/files/patch-MM_Unix.pm
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/ExtUtils/MM_Unix.pm.orig	Tue Oct 28 22:12:01 2003
-+++ lib/ExtUtils/MM_Unix.pm	Tue Oct 28 22:14:18 2003
-@@ -2089,6 +2089,7 @@
-           ('$(PREFIX)') x 3;
-     }
-     else {
-+        $self->{PREFIX}   ||= $iprefix;  # for FreeBSD ports collection
-         $self->{PERLPREFIX}   ||= $iprefix;
-         $self->{SITEPREFIX}   ||= $sprefix;
-         $self->{VENDORPREFIX} ||= $vprefix;
diff --git a/lang/perl5.16/files/patch-Path.pm b/lang/perl5.16/files/patch-Path.pm
deleted file mode 100644
index 2735b0f6a648..000000000000
--- a/lang/perl5.16/files/patch-Path.pm
+++ /dev/null
@@ -1,30 +0,0 @@
-$FreeBSD$
---- lib/File/Path.pm.orig	Sat Jan 29 20:23:40 2005
-+++ lib/File/Path.pm	Sat Jan 29 20:24:56 2005
-@@ -196,7 +196,7 @@ sub rmtree {
- 	    # it's also intended to change it to writable in case we have
- 	    # to recurse in which case we are better than rm -rf for 
- 	    # subtrees with strange permissions
--	    chmod(0777, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
-+	    chmod(0700, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
- 	      or carp "Can't make directory $root read+writeable: $!"
- 		unless $safe;
- 
-@@ -230,7 +230,7 @@ sub rmtree {
- 		print "skipped $root\n" if $verbose;
- 		next;
- 	    }
--	    chmod 0777, $root
-+	    chmod 0700, $root
- 	      or carp "Can't make directory $root writeable: $!"
- 		if $force_writeable;
- 	    print "rmdir $root\n" if $verbose;
-@@ -252,7 +252,7 @@ sub rmtree {
- 		print "skipped $root\n" if $verbose;
- 		next;
- 	    }
--	    chmod 0666, $root
-+	    chmod 0600, $root
- 	      or carp "Can't make file $root writeable: $!"
- 		if $force_writeable;
- 	    print "unlink $root\n" if $verbose;
diff --git a/lang/perl5.16/files/patch-freebsd.sh b/lang/perl5.16/files/patch-freebsd.sh
deleted file mode 100644
index 6c5e9d7b0118..000000000000
--- a/lang/perl5.16/files/patch-freebsd.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- hints/freebsd.sh.orig	Wed Mar 24 22:47:33 2004
-+++ hints/freebsd.sh	Sun Jan 30 23:39:33 2005
-@@ -88,6 +88,8 @@ case "$osvers" in
- 	esac
- 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
- 	libswanted=`echo $libswanted | sed 's/ bind / /'`
-+	libswanted=`echo $libswanted | sed 's/ dl / /'`
-+	libswanted=`echo $libswanted | sed 's/ c / /'`
- 	# iconv gone in Perl 5.8.1, but if someone compiles 5.8.0 or earlier.
- 	libswanted=`echo $libswanted | sed 's/ iconv / /'`
- 	d_setregid='define'
-@@ -102,6 +103,10 @@ case "$osvers" in
- 	        ;;
- 	esac
- 	libswanted=`echo $libswanted | sed 's/ malloc / /'`
-+	libswanted=`echo $libswanted | sed 's/ bind / /'`
-+	libswanted=`echo $libswanted | sed 's/ dl / /'`
-+	libswanted=`echo $libswanted | sed 's/ iconv / /'`
-+	libswanted=`echo $libswanted | sed 's/ c / /'`
- 	;;
- esac
- 
-@@ -119,7 +123,7 @@ case "$osvers" in
-         if [ x$objformat = xelf ]; then
-             libpth="/usr/lib /usr/local/lib"
-             glibpth="/usr/lib /usr/local/lib"
--            ldflags="-Wl,-E "
-+            ldflags="%%PTHREAD_LIBS%% -Wl,-E"
-             lddlflags="-shared "
-         else
-             if [ -e /usr/lib/aout ]; then
-@@ -136,7 +140,7 @@ case "$osvers" in
- 0*|1*|2*|3*) ;;
- 
- *)
--	ccflags="${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
-+	ccflags="${ccflags} %%PTHREAD_CFLAGS%% -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
- 	if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
- 	    usenm=false
- 	fi
-@@ -183,7 +187,9 @@ esac
- 
- # This script UU/usethreads.cbu will get 'called-back' by Configure 
- # after it has prompted the user for whether to use threads.
--cat > UU/usethreads.cbu <<'EOCBU'
-+## not quite - modern FreeBSD perl port is supposed to take care of that
-+## we just add extra libraries and cflags nowadays
-+cat > /dev/null <<'EOCBU'
- case "$usethreads" in
- $define|true|[yY]*)
-         lc_r=`/sbin/ldconfig -r|grep ':-lc_r'|awk '{print $NF}'|sed -n '$p'`
diff --git a/lang/perl5.16/files/patch-patchlevel.h b/lang/perl5.16/files/patch-patchlevel.h
deleted file mode 100644
index c24961cf5dbc..000000000000
--- a/lang/perl5.16/files/patch-patchlevel.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- patchlevel.h.orig	Wed Feb  2 16:45:30 2005
-+++ patchlevel.h	Wed Feb  2 16:45:34 2005
-@@ -120,6 +120,8 @@ hunk.
- #if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT)
- static	char	*local_patches[] = {
- 	NULL
-+	,"SUIDPERLIO0 - fix PERLIO_DEBUG local root exploit (CAN-2005-0155)"
-+	,"SUIDPERLIO1 - fix PERLIO_DEBUG buffer overflow (CAN-2005-0156)"
- 	,NULL
- };
- 
diff --git a/lang/perl5.16/files/patch-perl.c b/lang/perl5.16/files/patch-perl.c
deleted file mode 100644
index 69c0e55bb12e..000000000000
--- a/lang/perl5.16/files/patch-perl.c
+++ /dev/null
@@ -1,60 +0,0 @@
-$FreeBSD$
-
---- perl.c.orig	Mon Oct 27 20:32:18 2003
-+++ perl.c	Mon Oct 27 20:33:57 2003
-@@ -3945,6 +3945,27 @@ S_init_perllib(pTHX)
- /* Use the ~-expanded versions of APPLLIB (undocumented),
-     ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
- */
-+#ifdef SITEARCH_EXP
-+    /* sitearch is always relative to sitelib on Windows for
-+     * DLL-based path intuition to work correctly */
-+#  if !defined(WIN32)
-+    incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
-+#  endif
-+#endif
-+
-+#ifdef SITELIB_EXP
-+#  if defined(WIN32)
-+    /* this picks up sitearch as well */
-+    incpush(SITELIB_EXP, TRUE, FALSE, TRUE);
-+#  else
-+    incpush(SITELIB_EXP, FALSE, FALSE, TRUE);
-+#  endif
-+#endif
-+
-+#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
-+    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
-+#endif
-+
- #ifdef APPLLIB_EXP
-     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
- #endif
-@@ -3980,27 +4001,6 @@ S_init_perllib(pTHX)
-     incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
- #else
-     incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
--#endif
--
--#ifdef SITEARCH_EXP
--    /* sitearch is always relative to sitelib on Windows for
--     * DLL-based path intuition to work correctly */
--#  if !defined(WIN32)
--    incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
--#  endif
--#endif
--
--#ifdef SITELIB_EXP
--#  if defined(WIN32)
--    /* this picks up sitearch as well */
--    incpush(SITELIB_EXP, TRUE, FALSE, TRUE);
--#  else
--    incpush(SITELIB_EXP, FALSE, FALSE, TRUE);
--#  endif
--#endif
--
--#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
--    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
- #endif
- 
- #ifdef PERL_VENDORARCH_EXP
diff --git a/lang/perl5.16/files/patch-perlio.c b/lang/perl5.16/files/patch-perlio.c
deleted file mode 100644
index c680381d2123..000000000000
--- a/lang/perl5.16/files/patch-perlio.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$FreeBSD$
-
---- perlio.c.orig	Wed Feb  2 16:45:24 2005
-+++ perlio.c	Wed Feb  2 16:45:34 2005
-@@ -454,7 +454,7 @@ PerlIO_debug(const char *fmt, ...)
-     va_list ap;
-     dSYS;
-     va_start(ap, fmt);
--    if (!dbg) {
-+    if (!dbg && !PL_tainting && PL_uid == PL_euid && PL_gid == PL_egid) {
- 	char *s = PerlEnv_getenv("PERLIO_DEBUG");
- 	if (s && *s)
- 	    dbg = PerlLIO_open3(s, O_WRONLY | O_CREAT | O_APPEND, 0666);
-@@ -471,7 +471,7 @@ PerlIO_debug(const char *fmt, ...)
- 	s = CopFILE(PL_curcop);
- 	if (!s)
- 	    s = "(none)";
--	sprintf(buffer, "%s:%" IVdf " ", s, (IV) CopLINE(PL_curcop));
-+	sprintf(buffer, "%.40s:%" IVdf " ", s, (IV) CopLINE(PL_curcop));
- 	len = strlen(buffer);
- 	vsprintf(buffer+len, fmt, ap);
- 	PerlLIO_write(dbg, buffer, strlen(buffer));
diff --git a/lang/perl5.16/files/use.perl b/lang/perl5.16/files/use.perl
deleted file mode 100644
index 57e1acde0bc8..000000000000
--- a/lang/perl5.16/files/use.perl
+++ /dev/null
@@ -1,264 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-this=`echo -n $0 | /usr/bin/sed -e 's!^.*/!!'`
-PERL_VERSION="%%PERL_VERSION%%"
-MAKE_CONF=%%MAKE_CONF%%
-banner=`date +"%F %T"`
-banner="# added by use.perl $banner"
-if [ -z "${OSVERSION}" ]; then
-	if [ -f /sbin/sysctl -a -x /sbin/sysctl ] ; then
-    		osreldate=`/sbin/sysctl -n kern.osreldate`
-	else
-    		osreldate=`/usr/sbin/sysctl -n kern.osreldate`
-	fi
-else
-    	osreldate=${OSVERSION}
-fi
-
-if [ "x$this" = "xuse.perl" ]; then
-	PKG_PREFIX="%%PREFIX%%"
-	if [ "$1" = "port" ] ; then
-		need_remove_links=yes
-		need_create_links=yes
-		need_cleanup_make_conf=yes
-		need_cleanup_manpath=yes
-		need_spam_make_conf=yes
-		need_spam_manpath=yes
-	elif [ "$1" = "system" ] ; then
-		need_remove_links=yes
-		if [ $osreldate -lt 500036 ] ; then
-			need_base_system_perl=yes
-		fi
-		need_cleanup_make_conf=yes
-		need_cleanup_manpath=yes
-	else
-		echo 'Usage:
-	$0 port       -> /usr/bin/perl is the perl5 port
-	$0 system     -> /usr/bin/perl is the system perl'
-		exit 2;
-	fi
-else
-	if [ "$2" = "POST-INSTALL" ] ; then
-		need_remove_links=yes
-		if [ $osreldate -ge 500036 ] ; then
-			need_create_links=yes
-			need_cleanup_make_conf=yes
-			need_cleanup_manpath=yes
-			need_spam_make_conf=yes
-			need_spam_manpath=yes
-		fi
-		need_post_install=yes
-	elif [ "$2" = "POST-DEINSTALL" ] ; then
-		need_remove_links=yes
-		if [ $osreldate -lt 500036 ] ; then
-			need_base_system_perl=yes
-		fi
-		need_cleanup_make_conf=yes
-		need_cleanup_manpath=yes
-	else
-		exit 0;
-	fi
-fi
-
-link_list="
-	a2p
-	c2ph
-	find2perl
-	h2ph
-	h2xs
-	perlbug
-	perlcc
-	perldoc
-	pl2pm
-	pod2html
-	pod2latex
-	pod2man
-	pod2text
-	s2p
-	splain"
-if [ $osreldate -ge 500036 ] ; then
-	link_list=""
-fi
-special_link_list="
-	perl
-	perl5
-	suidperl"
-
-do_remove_links()
-{
-	echo "Removing stale symlinks from /usr/bin..."
-	for binary in $link_list $special_link_list
-	do
-		if [ -L "/usr/bin/$binary" ] ; then
-			echo "    Removing /usr/bin/$binary"
-			/bin/rm -f "/usr/bin/$binary"
-		else
-			echo "    Skipping /usr/bin/$binary"
-		fi
-	done
-	bins=`/bin/ls /usr/bin/*perl*5.* ${PKG_PREFIX}/bin/*perl*5.* 2>/dev/null`
-	for binary in $bins
-	do
-		if [ -L "$binary" ] ; then
-			echo "    Removing $binary installed by an older perl port"
-			/bin/rm -f "$binary"
-		fi
-	done
-	echo "Done."
-}
-
-do_create_links()
-{
-	echo "Creating various symlinks in /usr/bin..."
-	for binary in $link_list
-	do
-		if [ -f "/usr/bin/$binary" ] ; then
-			echo "    Backing up /usr/bin/$binary as /usr/bin/$binary.freebsd"
-			/bin/mv -f "/usr/bin/$binary" "/usr/bin/$binary.freebsd"
-		fi
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is still there, which should not happen"
-		elif [ -e "$PKG_PREFIX/bin/$binary" ] ; then
-			echo "    Symlinking $PKG_PREFIX/bin/$binary to /usr/bin/$binary"
-			/bin/ln -sf "$PKG_PREFIX/bin/$binary" "/usr/bin/$binary"
-		else
-			echo "    *** $PKG_PREFIX/bin/$binary is not there, a symlink won't do any good"
-		fi
-	done
-	for binary in $special_link_list
-	do
-		if [ -f "/usr/bin/$binary" ] ; then
-			echo "    Removing /usr/bin/$binary"
-		fi
-		bin=`echo $binary | /usr/bin/sed -e 's!perl5!perl!'`
-		bin=`echo $bin | /usr/bin/sed -e 's!suidperl!sperl!'`
-		if [ -e "/usr/bin/$binary.XXX" ] ; then
-			echo "    *** /usr/bin/$binary is still there, which should not happen"
-		elif [ -e "$PKG_PREFIX/bin/${bin}%%PERL_VERSION%%" ] ; then
-			echo "    Symlinking $PKG_PREFIX/bin/${bin}%%PERL_VERSION%% to /usr/bin/$binary"
-			/bin/ln -sf "$PKG_PREFIX/bin/${bin}%%PERL_VERSION%%" "/usr/bin/$binary"
-		else
-			echo "    *** $PKG_PREFIX/bin/${bin}%%PERL_VERSION%% is not there, a symlink won't do any good"
-		fi
-	done
-	echo "Done."
-}
-
-do_base_system_perl()
-{
-	echo "Restoring base system perl binaries..."
-	for binary in $link_list
-	do
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is there, which should not happen"
-		else
-			if [ -f "/usr/bin/$binary.freebsd" ] ; then
-				echo "    Moving /usr/bin/$binary.freebsd to /usr/bin/$binary"
-				/bin/mv -f "/usr/bin/$binary.freebsd" "/usr/bin/$binary"
-			else
-				echo "    *** /usr/bin/$binary.freebsd is NOT there, nothing to restore"
-			fi
-		fi
-	done
-	for binary in $special_link_list
-	do
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is there, which should not happen"
-		else
-			bin=`echo $binary | /usr/bin/sed -e 's!perl5!perl!'`
-			bin=`echo $bin | /usr/bin/sed -e 's!suidperl!sperl!'`
-			bins=`/bin/ls /usr/bin/${bin}5.* 2>/dev/null | /usr/bin/sort`
-			bin=""
-			for b in $bins
-			do
-				if [ -f $b -a ! -L $b ] ; then
-					bin=$b
-				fi
-			done
-			if [ -z $bin ] ; then
-				echo "    *** cannot find what /usr/bin/$binary shall be restored FROM"
-			elif [ -f $bin ] ; then
-				echo "    Hardlinking $bin to /usr/bin/$binary"
-				ln -f "$bin" "/usr/bin/$binary"
-			else
-				echo "    *** $bin is NOT there, nothing to restore"
-			fi
-		fi
-	done
-	echo "Done."
-}
-
-do_post_install()
-{
-	INCLUDEDIR=/usr/include
-	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/auto
-	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VERSION%%/auto
-	install -d ${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/man/man3
-	cd ${INCLUDEDIR} && ${PKG_PREFIX}/bin/h2ph *.h machine/*.h sys/*.h >/dev/null
-}
-
-do_cleanup_make_conf()
-{
-	echo -n "Cleaning up ${MAKE_CONF}..."
-	if [ -f ${MAKE_CONF} ] ; then
-		/usr/bin/awk 's=0;
-			/^#.*use.perl/ { s=1; mode=1 }
-			/^#/ { s=1; if (mode != 1) { mode=0 } }
-			/.*PERL.*=/ { s=1; if (mode == 1) { mode=2 } }
-			/^$/ { s=1; if (mode != 2) { mode = 0 } }
-			{ if (s != 1) { mode = 0 } if (mode == 0) print }' ${MAKE_CONF} >${MAKE_CONF}.new
-		/bin/mv ${MAKE_CONF} ${MAKE_CONF}.bak
-		/bin/mv ${MAKE_CONF}.new ${MAKE_CONF}
-	fi
-	echo " Done."
-}
-
-do_cleanup_manpath()
-{
-	echo -n "Cleaning up /etc/manpath.config..."
-	if [ -f /etc/manpath.config ] ; then
-		/usr/bin/awk 's=0;
-			/^#.*use.perl/ { s=1; mode=1 }
-			/^#/ { s=1; if (mode != 1) { mode=0 } }
-			/^OPTIONAL_MANPATH.*perl5/ { s=1; if (mode == 1) { mode=2 } }
-			/^$/ { s=1; if (mode != 2) { mode = 0 } }
-			{ if (s != 1) { mode = 0 } if (mode == 0) print }' /etc/manpath.config >/etc/manpath.config.new
-		/bin/mv /etc/manpath.config /etc/manpath.config.bak
-		/bin/mv /etc/manpath.config.new /etc/manpath.config
-	fi
-	echo " Done."
-}
-
-do_spam_make_conf()
-{
-	echo -n "Spamming ${MAKE_CONF}..."
-	echo "$banner" >>${MAKE_CONF}
-	echo "PERL_VER=%%PERL_VER%%" >>${MAKE_CONF}
-	echo "PERL_VERSION=%%PERL_VERSION%%" >>${MAKE_CONF}
-	if [ $osreldate -lt 500036 ] ; then
-		echo "NOPERL=yes" >>${MAKE_CONF}
-	fi
-	echo " Done."
-}
-
-do_spam_manpath()
-{
-	echo -n "Spamming /etc/manpath.config..."
-	echo "$banner" >>/etc/manpath.config
-	echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/man" >>/etc/manpath.config
-	echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/perl/man" >>/etc/manpath.config
-	echo " Done."
-}
-
-[ $need_remove_links ] && do_remove_links
-[ $need_create_links ] && do_create_links
-[ $need_base_system_perl ] && do_base_system_perl
-[ $need_post_install ] && do_post_install
-[ $need_cleanup_make_conf ] && do_cleanup_make_conf
-[ $need_spam_make_conf ] && do_spam_make_conf
-[ $need_cleanup_manpath ] && do_cleanup_manpath
-[ $need_spam_manpath ] && do_spam_manpath
-
-exit 0