svn commit: r339452 - in head/lang: perl5.14/files perl5.16/files perl5.18/files
Mathieu Arnold
mat at FreeBSD.org
Sat Jan 11 20:36:20 UTC 2014
Author: mat
Date: Sat Jan 11 20:36:18 2014
New Revision: 339452
URL: http://svnweb.freebsd.org/changeset/ports/339452
Log:
Rename patches in the makepatch fashion.
Added:
- copied unchanged from r339204, head/lang/perl5.14/files/patch-MM_Any.pm
- copied unchanged from r339204, head/lang/perl5.14/files/patch-INST_PREFIX.t
- copied unchanged from r339204, head/lang/perl5.14/files/patch-freebsd.sh
- copied unchanged from r339204, head/lang/perl5.16/files/patch-MM_Any.pm
- copied unchanged from r339204, head/lang/perl5.16/files/patch-INST_PREFIX.t
- copied unchanged from r339204, head/lang/perl5.16/files/patch-freebsd.sh
- copied unchanged from r339204, head/lang/perl5.18/files/patch-MM_Any.pm
- copied unchanged from r339204, head/lang/perl5.18/files/patch-INST_PREFIX.t
- copied unchanged from r339204, head/lang/perl5.18/files/patch-freebsd.sh
Directory Properties:
head/lang/perl5.14/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm (props changed)
head/lang/perl5.14/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t (props changed)
head/lang/perl5.14/files/patch-hints__freebsd.sh (props changed)
head/lang/perl5.16/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm (props changed)
head/lang/perl5.16/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t (props changed)
head/lang/perl5.16/files/patch-hints__freebsd.sh (props changed)
head/lang/perl5.18/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm (props changed)
head/lang/perl5.18/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t (props changed)
head/lang/perl5.18/files/patch-hints__freebsd.sh (props changed)
Deleted:
head/lang/perl5.14/files/patch-INST_PREFIX.t
head/lang/perl5.14/files/patch-MM_Any.pm
head/lang/perl5.14/files/patch-freebsd.sh
head/lang/perl5.16/files/patch-INST_PREFIX.t
head/lang/perl5.16/files/patch-MM_Any.pm
head/lang/perl5.16/files/patch-freebsd.sh
head/lang/perl5.18/files/patch-INST_PREFIX.t
head/lang/perl5.18/files/patch-MM_Any.pm
head/lang/perl5.18/files/patch-freebsd.sh
Copied: head/lang/perl5.14/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm (from r339204, head/lang/perl5.14/files/patch-MM_Any.pm)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.14/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm Sat Jan 11 20:36:18 2014 (r339452, copy of r339204, head/lang/perl5.14/files/patch-MM_Any.pm)
@@ -0,0 +1,18 @@
+--- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm.orig Wed Feb 15 12:20:43 2006
++++ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm Wed Feb 15 12:22:29 2006
+@@ -1069,13 +1069,14 @@ sub init_INSTALL_from_PREFIX {
+ ('$(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};
Copied: head/lang/perl5.14/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t (from r339204, head/lang/perl5.14/files/patch-INST_PREFIX.t)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.14/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t Sat Jan 11 20:36:18 2014 (r339452, copy of r339204, head/lang/perl5.14/files/patch-INST_PREFIX.t)
@@ -0,0 +1,20 @@
+--- cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t.orig Wed Feb 15 12:46:31 2006
++++ cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t Wed Feb 15 12:46:52 2006
+@@ -16,7 +16,7 @@ BEGIN {
+ }
+
+ 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 @@ like( $stdout->read, qr{
+ Writing\ $Makefile\ for\ Big::Dummy\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' );
+
Copied: head/lang/perl5.14/files/patch-hints__freebsd.sh (from r339204, head/lang/perl5.14/files/patch-freebsd.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.14/files/patch-hints__freebsd.sh Sat Jan 11 20:36:18 2014 (r339452, copy of r339204, head/lang/perl5.14/files/patch-freebsd.sh)
@@ -0,0 +1,60 @@
+--- hints/freebsd.sh
++++ hints/freebsd.sh
+@@ -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
+
+@@ -125,7 +131,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'
+@@ -133,7 +139,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'
+ ;;
+@@ -143,7 +149,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
+@@ -190,7 +196,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'`
Copied: head/lang/perl5.16/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm (from r339204, head/lang/perl5.16/files/patch-MM_Any.pm)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.16/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm Sat Jan 11 20:36:18 2014 (r339452, copy of r339204, head/lang/perl5.16/files/patch-MM_Any.pm)
@@ -0,0 +1,18 @@
+--- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm.orig Wed Feb 15 12:20:43 2006
++++ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm Wed Feb 15 12:22:29 2006
+@@ -1069,13 +1069,14 @@ sub init_INSTALL_from_PREFIX {
+ ('$(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};
Copied: head/lang/perl5.16/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t (from r339204, head/lang/perl5.16/files/patch-INST_PREFIX.t)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.16/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t Sat Jan 11 20:36:18 2014 (r339452, copy of r339204, head/lang/perl5.16/files/patch-INST_PREFIX.t)
@@ -0,0 +1,20 @@
+--- cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t.orig Wed Feb 15 12:46:31 2006
++++ cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t Wed Feb 15 12:46:52 2006
+@@ -16,7 +16,7 @@ BEGIN {
+ }
+
+ 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 @@ like( $stdout->read, qr{
+ Writing\ $Makefile\ for\ Big::Dummy\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' );
+
Copied: head/lang/perl5.16/files/patch-hints__freebsd.sh (from r339204, head/lang/perl5.16/files/patch-freebsd.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.16/files/patch-hints__freebsd.sh Sat Jan 11 20:36:18 2014 (r339452, copy of r339204, head/lang/perl5.16/files/patch-freebsd.sh)
@@ -0,0 +1,60 @@
+--- hints/freebsd.sh
++++ hints/freebsd.sh
+@@ -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
+
+@@ -125,7 +131,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'
+@@ -133,7 +139,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'
+ ;;
+@@ -143,7 +149,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
+@@ -190,7 +196,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'`
Copied: head/lang/perl5.18/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm (from r339204, head/lang/perl5.18/files/patch-MM_Any.pm)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.18/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm Sat Jan 11 20:36:18 2014 (r339452, copy of r339204, head/lang/perl5.18/files/patch-MM_Any.pm)
@@ -0,0 +1,18 @@
+--- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm.orig Wed Feb 15 12:20:43 2006
++++ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm Wed Feb 15 12:22:29 2006
+@@ -1069,13 +1069,14 @@ sub init_INSTALL_from_PREFIX {
+ ('$(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};
Copied: head/lang/perl5.18/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t (from r339204, head/lang/perl5.18/files/patch-INST_PREFIX.t)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.18/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t Sat Jan 11 20:36:18 2014 (r339452, copy of r339204, head/lang/perl5.18/files/patch-INST_PREFIX.t)
@@ -0,0 +1,20 @@
+--- cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t.orig Wed Feb 15 12:46:31 2006
++++ cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t Wed Feb 15 12:46:52 2006
+@@ -16,7 +16,7 @@ BEGIN {
+ }
+
+ 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 @@ like( $stdout->read, qr{
+ Writing\ $Makefile\ for\ Big::Dummy\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' );
+
Copied: head/lang/perl5.18/files/patch-hints__freebsd.sh (from r339204, head/lang/perl5.18/files/patch-freebsd.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/perl5.18/files/patch-hints__freebsd.sh Sat Jan 11 20:36:18 2014 (r339452, copy of r339204, head/lang/perl5.18/files/patch-freebsd.sh)
@@ -0,0 +1,60 @@
+--- hints/freebsd.sh
++++ hints/freebsd.sh
+@@ -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
+
+@@ -125,7 +131,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'
+@@ -133,7 +139,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'
+ ;;
+@@ -143,7 +149,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
+@@ -190,7 +196,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'`
More information about the svn-ports-all
mailing list