diff options
Diffstat (limited to 'lang/perl5.20/files')
-rw-r--r-- | lang/perl5.20/files/patch-Configure | 21 | ||||
-rw-r--r-- | lang/perl5.20/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm | 18 | ||||
-rw-r--r-- | lang/perl5.20/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t | 20 | ||||
-rw-r--r-- | lang/perl5.20/files/patch-hints__freebsd.sh | 60 | ||||
-rw-r--r-- | lang/perl5.20/files/perl-man.conf.in | 2 | ||||
-rw-r--r-- | lang/perl5.20/files/perl5_version.in | 2 | ||||
-rw-r--r-- | lang/perl5.20/files/use.perl.in | 46 |
7 files changed, 169 insertions, 0 deletions
diff --git a/lang/perl5.20/files/patch-Configure b/lang/perl5.20/files/patch-Configure new file mode 100644 index 000000000000..2a7dcb6de120 --- /dev/null +++ b/lang/perl5.20/files/patch-Configure @@ -0,0 +1,21 @@ +--- ./Configure.orig 2014-04-23 03:36:51.000000000 +0200 ++++ ./Configure 2014-05-23 01:02:51.000000000 +0200 +@@ -4948,7 +4948,7 @@ + : Now check and see which directories actually exist, avoiding duplicates + for xxx in $dlist + do +- if $test -d $xxx; then ++ if $test -d $xxx || [ $xxx = $prefix/lib ]; then + case " $libpth " in + *" $xxx "*) ;; + *) libpth="$libpth $xxx";; +@@ -9345,8 +9345,7 @@ + + : determine where add-on public executable scripts go + case "$sitescript" in +-'') dflt=$siteprefix/script +- $test -d $dflt || dflt=$sitebin ;; ++'') dflt=$sitebin ;; + *) dflt="$sitescript" ;; + esac + fn=d~+ diff --git a/lang/perl5.20/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm b/lang/perl5.20/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm new file mode 100644 index 000000000000..5a8a3bf86213 --- /dev/null +++ b/lang/perl5.20/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm @@ -0,0 +1,18 @@ +--- ./cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm.orig 2014-05-12 16:56:54.000000000 +0200 ++++ ./cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 2014-05-23 01:02:51.000000000 +0200 +@@ -1744,13 +1744,14 @@ + ('$(PREFIX)') x 3; + } + else { ++ $self->{PREFIX} ||= $iprefix; + $self->{PERLPREFIX} ||= $iprefix; + $self->{SITEPREFIX} ||= $sprefix; + $self->{VENDORPREFIX} ||= $vprefix; + + # Lots of MM extension authors like to use $(PREFIX) so we + # put something sensible in there no matter what. +- $self->{PREFIX} = '$('.uc $self->{INSTALLDIRS}.'PREFIX)'; ++ #$self->{PREFIX} = '$('.uc $self->{INSTALLDIRS}.'PREFIX)'; + } + + my $arch = $Config{archname}; diff --git a/lang/perl5.20/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t b/lang/perl5.20/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t new file mode 100644 index 000000000000..2a1512d7a6c4 --- /dev/null +++ b/lang/perl5.20/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t @@ -0,0 +1,20 @@ +--- ./cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t.orig 2014-03-10 15:42:51.000000000 +0100 ++++ ./cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t 2014-05-23 01:02:51.000000000 +0200 +@@ -10,7 +10,7 @@ + } + + use strict; +-use Test::More tests => 52; ++use Test::More tests => 51; + use MakeMaker::Test::Utils; + use MakeMaker::Test::Setup::BFD; + use ExtUtils::MakeMaker; +@@ -62,7 +62,7 @@ + (?:Writing\ MYMETA.yml\ and\ MYMETA.json\n)? + }x ); + +-is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' ); ++## is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' ); + + isa_ok( $mm, 'ExtUtils::MakeMaker' ); + diff --git a/lang/perl5.20/files/patch-hints__freebsd.sh b/lang/perl5.20/files/patch-hints__freebsd.sh new file mode 100644 index 000000000000..0d757ee3a2f5 --- /dev/null +++ b/lang/perl5.20/files/patch-hints__freebsd.sh @@ -0,0 +1,60 @@ +--- ./hints/freebsd.sh.orig 2014-01-31 22:55:51.000000000 +0100 ++++ ./hints/freebsd.sh 2014-05-23 01:02:51.000000000 +0200 +@@ -88,6 +88,8 @@ + 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 +104,10 @@ + ;; + 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 + +@@ -126,7 +132,7 @@ + else + libpth="/usr/lib /usr/local/lib" + glibpth="/usr/lib /usr/local/lib" +- ldflags="-Wl,-E " ++ ldflags="%%PTHREAD_LIBS%% -Wl,-E " + lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' +@@ -134,7 +140,7 @@ + *) + libpth="/usr/lib /usr/local/lib" + glibpth="/usr/lib /usr/local/lib" +- ldflags="-Wl,-E " ++ ldflags="%%PTHREAD_LIBS%% -Wl,-E " + lddlflags="-shared " + cccdlflags='-DPIC -fPIC' + ;; +@@ -144,7 +150,7 @@ + 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 +@@ -191,7 +197,9 @@ + + # 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.20/files/perl-man.conf.in b/lang/perl5.20/files/perl-man.conf.in new file mode 100644 index 000000000000..7f265b64652b --- /dev/null +++ b/lang/perl5.20/files/perl-man.conf.in @@ -0,0 +1,2 @@ +MANPATH %%PREFIX%%/lib/perl5/%%PERL_VER%%/man +MANPATH %%PREFIX%%/lib/perl5/%%PERL_VER%%/perl/man diff --git a/lang/perl5.20/files/perl5_version.in b/lang/perl5.20/files/perl5_version.in new file mode 100644 index 000000000000..97e1f75dfb9f --- /dev/null +++ b/lang/perl5.20/files/perl5_version.in @@ -0,0 +1,2 @@ +# Do not modify PERL_VERSION here, instead use DEFAULT_VERSIONS= perl5=%%PERL_VER%% +PERL_VERSION=%%PERL_VERSION%% diff --git a/lang/perl5.20/files/use.perl.in b/lang/perl5.20/files/use.perl.in new file mode 100644 index 000000000000..7b6c5f4c56df --- /dev/null +++ b/lang/perl5.20/files/use.perl.in @@ -0,0 +1,46 @@ +#!/bin/sh + +# $FreeBSD$ + +: ${OSVERSION:=`/sbin/sysctl -n kern.osreldate`}; +PERL_VERSION="%%PERL_VERSION%%" +PERL_VER="%%PERL_VER%%" +banner="# added by use.perl $(/bin/date +'%F %T')" +special_link_list="perl perl5" + +do_cleanup_manpath() +{ + if [ -f /etc/manpath.config ] ; then + /bin/cp -p /etc/manpath.config /etc/manpath.config.new + /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 + /bin/rm /etc/manpath.config.bak + fi +} + +do_spam_manpath() +{ + if [ -f /etc/manpath.config ] ; then + echo "${banner}" >>/etc/manpath.config + echo "OPTIONAL_MANPATH ${PKG_PREFIX}/lib/perl5/${PERL_VER}/man" >>/etc/manpath.config + echo "OPTIONAL_MANPATH ${PKG_PREFIX}/lib/perl5/${PERL_VER}/perl/man" >>/etc/manpath.config + fi +} + + +if [ "$2" = "POST-INSTALL" ] ; then + if [ "${OSVERSION}" -lt 900022 ] ; then + do_cleanup_manpath + do_spam_manpath + fi +elif [ "$2" = "POST-DEINSTALL" ] ; then + [ "${OSVERSION}" -lt 900022 ] && do_cleanup_manpath +fi + +exit 0 |