diff options
Diffstat (limited to 'lang/perl5.12/files')
-rw-r--r-- | lang/perl5.12/files/patch-Install.pm | 13 | ||||
-rw-r--r-- | lang/perl5.12/files/patch-ac | 27 | ||||
-rw-r--r-- | lang/perl5.12/files/patch-ad | 20 | ||||
-rw-r--r-- | lang/perl5.12/files/patch-ae | 12 | ||||
-rw-r--r-- | lang/perl5.12/files/patch-af | 25 | ||||
-rw-r--r-- | lang/perl5.12/files/patch-lib_pm | 45 | ||||
-rw-r--r-- | lang/perl5.12/files/patch-perl.c | 58 | ||||
-rw-r--r-- | lang/perl5.12/files/use.perl | 132 |
8 files changed, 0 insertions, 332 deletions
diff --git a/lang/perl5.12/files/patch-Install.pm b/lang/perl5.12/files/patch-Install.pm deleted file mode 100644 index 228b24a1088a..000000000000 --- a/lang/perl5.12/files/patch-Install.pm +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- lib/ExtUtils/Install.pm.orig Fri Feb 23 03:57:55 2001 -+++ lib/ExtUtils/Install.pm Wed Jul 10 17:57:13 2002 -@@ -132,7 +132,7 @@ - $diff++; - } - -- if ($diff){ -+ if ($diff||1){ - if (-f $targetfile){ - forceunlink($targetfile) unless $nonono; - } else { diff --git a/lang/perl5.12/files/patch-ac b/lang/perl5.12/files/patch-ac deleted file mode 100644 index 313b7d4b48f2..000000000000 --- a/lang/perl5.12/files/patch-ac +++ /dev/null @@ -1,27 +0,0 @@ -$FreeBSD$ - ---- hints/freebsd.sh.orig Sat Jun 1 19:03:12 2002 -+++ hints/freebsd.sh Sat Jul 20 22:51:05 2002 -@@ -98,6 +98,13 @@ - ;; - esac - libswanted=`echo $libswanted | sed 's/ malloc / /'` -+ libswanted=`echo $libswanted | sed 's/ bind / /'` -+ libswanted=`echo $libswanted | sed 's/ iconv / /'` -+ d_setregid='define' -+ d_setreuid='define' -+ d_setegid='define' -+ d_seteuid='define' -+ d_dosuid='define' - ;; - esac - -@@ -124,7 +131,7 @@ - fi - lddlflags='-Bshareable' - fi -- cccdlflags='-DPIC -fpic' -+ cccdlflags='-DPIC -fPIC' - ;; - esac - diff --git a/lang/perl5.12/files/patch-ad b/lang/perl5.12/files/patch-ad deleted file mode 100644 index fa9bf3ebfc2e..000000000000 --- a/lang/perl5.12/files/patch-ad +++ /dev/null @@ -1,20 +0,0 @@ -$FreeBSD$ - ---- perl.h.ORIG Thu Mar 22 07:05:02 2001 -+++ perl.h Tue Apr 10 20:29:46 2001 -@@ -151,6 +151,15 @@ - - */ - -+/* needed for IAMSUID case for 4.4BSD systems -+ * XXX there should probably be a Configure variable -+ */ -+ -+#ifdef I_SYS_PARAM -+#if (defined (BSD) && (BSD >= 199306)) -+# include <sys/mount.h> -+#endif /* !BSD */ -+#endif /* !I_SYS_PARAM */ - - class CPerlObj; - diff --git a/lang/perl5.12/files/patch-ae b/lang/perl5.12/files/patch-ae deleted file mode 100644 index 27c3d9b7bd94..000000000000 --- a/lang/perl5.12/files/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$FreeBSD$ - ---- makedepend.SH.ORIG Fri Jul 24 06:00:58 1998 -+++ makedepend.SH Thu Jul 30 17:08:37 1998 -@@ -68,6 +68,7 @@ - case "$osname" in - os2) ;; - netbsd) ;; -+ freebsd) ;; - *) $touch $firstmakefile ;; - esac - fi diff --git a/lang/perl5.12/files/patch-af b/lang/perl5.12/files/patch-af deleted file mode 100644 index 24232388a5f8..000000000000 --- a/lang/perl5.12/files/patch-af +++ /dev/null @@ -1,25 +0,0 @@ -$FreeBSD$ - ---- Configure.orig Fri Jul 19 00:55:15 2002 -+++ Configure Tue Dec 10 12:12:35 2002 -@@ -308,7 +308,7 @@ cppflags='' - ldflags='' - lkflags='' - locincpth='' --optimize='' -+optimize=${CFLAGS:-''} - cf_email='' - cf_by='' - cf_time='' -@@ -9933,8 +9933,9 @@ eval $setvar - - : see if crypt exists - echo " " --set crypt d_crypt --eval $inlibc -+: no, crypt is NOT in libc on FreeBSD -+: set crypt d_crypt -+: eval $inlibc - case "$d_crypt" in - $define) cryptlib='' ;; - *) if set crypt val -f d_crypt; eval $csym; $val; then diff --git a/lang/perl5.12/files/patch-lib_pm b/lang/perl5.12/files/patch-lib_pm deleted file mode 100644 index b3299535adfd..000000000000 --- a/lang/perl5.12/files/patch-lib_pm +++ /dev/null @@ -1,45 +0,0 @@ -$FreeBSD$ - ---- lib/lib_pm.PL.orig Wed Jun 5 03:05:46 2002 -+++ lib/lib_pm.PL Tue Aug 20 21:32:55 2002 -@@ -71,30 +71,31 @@ sub import { - - my %names; - foreach (reverse @_) { -- if ($_ eq '') { -+ my $path = $_; -+ if ($path eq '') { - require Carp; - Carp::carp("Empty compile time value given to use lib"); - } - -- local $_ = _nativize($_); -+ $path = _nativize($path); - -- if (-e && ! -d _) { -+ if (-e $path && ! -d _) { - require Carp; - Carp::carp("Parameter to use lib must be directory, not file"); - } -- unshift(@INC, $_); -+ unshift(@INC, $path); - # Add any previous version directories we found at configure time - foreach my $incver (@inc_version_list) - { - my $dir = $Is_MacOS -- ? File::Spec->catdir( $_, $incver ) -- : "$_/$incver"; -+ ? File::Spec->catdir( $path, $incver ) -+ : "$path/$incver"; - unshift(@INC, $dir) if -d $dir; - } -- # Put a corresponding archlib directory in front of $_ if it -- # looks like $_ has an archlib directory below it. -+ # Put a corresponding archlib directory in front of $path if it -+ # looks like $path has an archlib directory below it. - my($arch_auto_dir, $arch_dir, $version_dir, $version_arch_dir) -- = _get_dirs($_); -+ = _get_dirs($path); - unshift(@INC, $arch_dir) if -d $arch_auto_dir; - unshift(@INC, $version_dir) if -d $version_dir; - unshift(@INC, $version_arch_dir) if -d $version_arch_dir; diff --git a/lang/perl5.12/files/patch-perl.c b/lang/perl5.12/files/patch-perl.c deleted file mode 100644 index b9b348bef069..000000000000 --- a/lang/perl5.12/files/patch-perl.c +++ /dev/null @@ -1,58 +0,0 @@ -$FreeBSD$ - ---- perl.c.orig Sun Jun 2 12:29:01 2002 -+++ perl.c Sun Jun 2 12:30:14 2002 -@@ -3407,6 +3407,26 @@ - #endif /* VMS */ - } - -+#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); -+# endif -+#endif -+ -+#ifdef SITELIB_EXP -+# if defined(WIN32) -+ incpush(SITELIB_EXP, TRUE, FALSE); /* this picks up sitearch as well */ -+# else -+ incpush(SITELIB_EXP, FALSE, FALSE); -+# endif -+#endif -+ -+#ifdef SITELIB_STEM /* Search for version-specific dirs below here */ -+ incpush(SITELIB_STEM, FALSE, TRUE); -+#endif -+ - /* Use the ~-expanded versions of APPLLIB (undocumented), - ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB - */ -@@ -3445,26 +3465,6 @@ - incpush(PRIVLIB_EXP, TRUE, FALSE); - #else - incpush(PRIVLIB_EXP, FALSE, FALSE); --#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); --# endif --#endif -- --#ifdef SITELIB_EXP --# if defined(WIN32) -- incpush(SITELIB_EXP, TRUE, FALSE); /* this picks up sitearch as well */ --# else -- incpush(SITELIB_EXP, FALSE, FALSE); --# endif --#endif -- --#ifdef SITELIB_STEM /* Search for version-specific dirs below here */ -- incpush(SITELIB_STEM, FALSE, TRUE); - #endif - - #ifdef PERL_VENDORARCH_EXP diff --git a/lang/perl5.12/files/use.perl b/lang/perl5.12/files/use.perl deleted file mode 100644 index bed88bd46d44..000000000000 --- a/lang/perl5.12/files/use.perl +++ /dev/null @@ -1,132 +0,0 @@ -#! %%PREFIX%%/bin/perl -w -# $FreeBSD$ -use strict; - -# XXX what to do with perldoc, pelbug, perlcc ?? - -sub usage -{ - print STDERR <<EOF; -Usage: - $0 port -> /usr/bin/perl is the perl5 port - $0 system -> /usr/bin/perl is the system perl -EOF - exit 2; -} - -my $port_perl = '%%PREFIX%%/bin/perl'; -$port_perl =~ tr|/|/|s; - -my $ident = `/usr/bin/ident -q /usr/bin/perl5`; - -@ARGV == 1 or usage(); -if ($ARGV[0] eq 'port') { - switch_to_port(); -} elsif ($ARGV[0] eq 'system') { - switch_to_system(); -} else { - usage(); -} -exit 0; - -# Both functions depend on the idea that switch_to_port leaves -# perl5 alone. If the wrapper is installed on a -current system, -# /usr/bin/perl5 will also be the wrapper. - -sub switch_to_system -{ - # protect against cases where people use PREFIX=/usr - if ($port_perl ne '/usr/bin/perl') { - unlink '/usr/bin/perl', '/usr/bin/suidperl', - '/usr/bin/perl%%PERL_VERSION%%'; - - link '/usr/bin/perl5', '/usr/bin/perl'; - link '/usr/bin/perl5', '/usr/bin/perl%%PERL_VERSION%%'; - - if ($ident =~ m#src/usr.bin/perl/perl.c#) { - link '/usr/bin/perl5', '/usr/bin/suidperl'; - } else { - link '/usr/bin/sperl5', '/usr/bin/suidperl'; - } - } - - open MK, ">> /etc/make.conf" or die "/etc/make.conf: $!"; - print MK <<EOF; -# -- use.perl generated deltas -- # -# Created: @{[scalar localtime]} -# Setting to use base system perl: -.undef PERL_VER -.undef PERL_VERSION -.undef PERL_ARCH -.undef NOPERL -.undef NO_PERL - -EOF - close MK; - - open MPOLD, "< /etc/manpath.config" or die "/etc/manpath.config: $!"; - open MPNEW, "> /etc/manpath.config.new" or die "/etc/manpath.config.new: $!"; - while (<MPOLD>) { - next if m|use.perl generated line|; - next if m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/%%PERL_VERSION%%/man\s*$|; - print MPNEW; - } - close MPNEW; - close MPOLD; - rename '/etc/manpath.config', '/etc/manpath.config.bak'; - rename '/etc/manpath.config.new', '/etc/manpath.config'; -} - -sub switch_to_port -{ - # protect against cases where people use PREFIX=/usr - if ($port_perl ne '/usr/bin/perl') { - if ($ident =~ m#src/usr.bin/perl/perl.c#) { - rename '/usr/bin/perl', '/usr/bin/perl-wrapper'; - } else { - unlink '/usr/bin/perl'; - } - - unlink '/usr/bin/suidperl', '/usr/bin/perl%%PERL_VERSION%%'; - - symlink '%%PREFIX%%/bin/perl', '/usr/bin/perl'; - symlink '%%PREFIX%%/bin/suidperl', '/usr/bin/suidperl'; - symlink '%%PREFIX%%/bin/perl', '/usr/bin/perl%%PERL_VERSION%%'; - } - - open MK, ">> /etc/make.conf" or die "/etc/make.conf: $!"; - print MK <<EOF; -# -- use.perl generated deltas -- # -# Created: @{[scalar localtime]} -# Setting to use base perl from ports: -PERL_VER=%%PERL_VER%% -PERL_VERSION=%%PERL_VERSION%% -PERL_ARCH=%%PERL_ARCH%% -NOPERL=yo -NO_PERL=yo -NO_PERL_WRAPPER=yo - -EOF - close MK; - - my $perl_port_manpath = <<EOF; -# -- use.perl generated line -- # -OPTIONAL_MANPATH %%PREFIX%%/lib/perl5/%%PERL_VERSION%%/man -EOF - - open MPOLD, "< /etc/manpath.config" or die "/etc/manpath.config: $!"; - open MPNEW, "> /etc/manpath.config.new" or die "/etc/manpath.config.new: $!"; - my $modified = 0; - while (<MPOLD>) { - if (!$modified && m|^\s*OPTIONAL_MANPATH\s+\S+/lib/perl5/\S+/man\s*$|) { - print MPNEW $perl_port_manpath; - $modified = 1; - } - print MPNEW; - } - print MPNEW $perl_port_manpath unless $modified; - close MPNEW; - close MPOLD; - rename '/etc/manpath.config', '/etc/manpath.config.bak'; - rename '/etc/manpath.config.new', '/etc/manpath.config'; -} |