Index: head/lang/perl5.10/files/patch-freebsd.sh =================================================================== --- head/lang/perl5.10/files/patch-freebsd.sh (revision 183583) +++ head/lang/perl5.10/files/patch-freebsd.sh (revision 183584) @@ -1,51 +1,66 @@ ---- 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 +--- hints/freebsd.sh.orig Wed Mar 24 21:47:33 2004 ++++ hints/freebsd.sh Mon Jan 29 00:30:11 2007 +@@ -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 +103,10 @@ case "$osvers" in +@@ -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 -@@ -119,7 +123,7 @@ case "$osvers" in - if [ x$objformat = xelf ]; then - libpth="/usr/lib /usr/local/lib" - glibpth="/usr/lib /usr/local/lib" +@@ -116,17 +122,17 @@ + + *) + objformat=`/usr/bin/objformat` +- 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 +- lddlflags="-shared " +- else ++ if [ x$objformat = xaout ]; then if [ -e /usr/lib/aout ]; then -@@ -136,7 +140,7 @@ case "$osvers" in + libpth="/usr/lib/aout /usr/local/lib /usr/lib" + glibpth="/usr/lib/aout /usr/local/lib /usr/lib" + fi ++ else + lddlflags='-Bshareable' ++ libpth="/usr/lib /usr/local/lib" ++ glibpth="/usr/lib /usr/local/lib" ++ ldflags=" -Wl,-E" ++ lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' + ;; +@@ -136,7 +142,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 -@@ -183,7 +187,9 @@ esac +@@ -183,7 +189,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'` Property changes on: head/lang/perl5.10/files/patch-freebsd.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/lang/perl5.12/files/patch-freebsd.sh =================================================================== --- head/lang/perl5.12/files/patch-freebsd.sh (revision 183583) +++ head/lang/perl5.12/files/patch-freebsd.sh (revision 183584) @@ -1,51 +1,66 @@ ---- 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 +--- hints/freebsd.sh.orig Wed Mar 24 21:47:33 2004 ++++ hints/freebsd.sh Mon Jan 29 00:30:11 2007 +@@ -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 +103,10 @@ case "$osvers" in +@@ -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 -@@ -119,7 +123,7 @@ case "$osvers" in - if [ x$objformat = xelf ]; then - libpth="/usr/lib /usr/local/lib" - glibpth="/usr/lib /usr/local/lib" +@@ -116,17 +122,17 @@ + + *) + objformat=`/usr/bin/objformat` +- 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 +- lddlflags="-shared " +- else ++ if [ x$objformat = xaout ]; then if [ -e /usr/lib/aout ]; then -@@ -136,7 +140,7 @@ case "$osvers" in + libpth="/usr/lib/aout /usr/local/lib /usr/lib" + glibpth="/usr/lib/aout /usr/local/lib /usr/lib" + fi ++ else + lddlflags='-Bshareable' ++ libpth="/usr/lib /usr/local/lib" ++ glibpth="/usr/lib /usr/local/lib" ++ ldflags=" -Wl,-E" ++ lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' + ;; +@@ -136,7 +142,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 -@@ -183,7 +187,9 @@ esac +@@ -183,7 +189,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'` Property changes on: head/lang/perl5.12/files/patch-freebsd.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/lang/perl5.14/files/patch-freebsd.sh =================================================================== --- head/lang/perl5.14/files/patch-freebsd.sh (revision 183583) +++ head/lang/perl5.14/files/patch-freebsd.sh (revision 183584) @@ -1,51 +1,66 @@ ---- 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 +--- hints/freebsd.sh.orig Wed Mar 24 21:47:33 2004 ++++ hints/freebsd.sh Mon Jan 29 00:30:11 2007 +@@ -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 +103,10 @@ case "$osvers" in +@@ -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 -@@ -119,7 +123,7 @@ case "$osvers" in - if [ x$objformat = xelf ]; then - libpth="/usr/lib /usr/local/lib" - glibpth="/usr/lib /usr/local/lib" +@@ -116,17 +122,17 @@ + + *) + objformat=`/usr/bin/objformat` +- 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 +- lddlflags="-shared " +- else ++ if [ x$objformat = xaout ]; then if [ -e /usr/lib/aout ]; then -@@ -136,7 +140,7 @@ case "$osvers" in + libpth="/usr/lib/aout /usr/local/lib /usr/lib" + glibpth="/usr/lib/aout /usr/local/lib /usr/lib" + fi ++ else + lddlflags='-Bshareable' ++ libpth="/usr/lib /usr/local/lib" ++ glibpth="/usr/lib /usr/local/lib" ++ ldflags=" -Wl,-E" ++ lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' + ;; +@@ -136,7 +142,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 -@@ -183,7 +187,9 @@ esac +@@ -183,7 +189,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'` Property changes on: head/lang/perl5.14/files/patch-freebsd.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/lang/perl5.16/files/patch-freebsd.sh =================================================================== --- head/lang/perl5.16/files/patch-freebsd.sh (revision 183583) +++ head/lang/perl5.16/files/patch-freebsd.sh (revision 183584) @@ -1,51 +1,66 @@ ---- 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 +--- hints/freebsd.sh.orig Wed Mar 24 21:47:33 2004 ++++ hints/freebsd.sh Mon Jan 29 00:30:11 2007 +@@ -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 +103,10 @@ case "$osvers" in +@@ -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 -@@ -119,7 +123,7 @@ case "$osvers" in - if [ x$objformat = xelf ]; then - libpth="/usr/lib /usr/local/lib" - glibpth="/usr/lib /usr/local/lib" +@@ -116,17 +122,17 @@ + + *) + objformat=`/usr/bin/objformat` +- 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 +- lddlflags="-shared " +- else ++ if [ x$objformat = xaout ]; then if [ -e /usr/lib/aout ]; then -@@ -136,7 +140,7 @@ case "$osvers" in + libpth="/usr/lib/aout /usr/local/lib /usr/lib" + glibpth="/usr/lib/aout /usr/local/lib /usr/lib" + fi ++ else + lddlflags='-Bshareable' ++ libpth="/usr/lib /usr/local/lib" ++ glibpth="/usr/lib /usr/local/lib" ++ ldflags=" -Wl,-E" ++ lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' + ;; +@@ -136,7 +142,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 -@@ -183,7 +187,9 @@ esac +@@ -183,7 +189,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'` Property changes on: head/lang/perl5.16/files/patch-freebsd.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/lang/perl5.8/files/patch-freebsd.sh =================================================================== --- head/lang/perl5.8/files/patch-freebsd.sh (revision 183583) +++ head/lang/perl5.8/files/patch-freebsd.sh (revision 183584) @@ -1,51 +1,66 @@ ---- 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 +--- hints/freebsd.sh.orig Wed Mar 24 21:47:33 2004 ++++ hints/freebsd.sh Mon Jan 29 00:30:11 2007 +@@ -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 +103,10 @@ case "$osvers" in +@@ -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 -@@ -119,7 +123,7 @@ case "$osvers" in - if [ x$objformat = xelf ]; then - libpth="/usr/lib /usr/local/lib" - glibpth="/usr/lib /usr/local/lib" +@@ -116,17 +122,17 @@ + + *) + objformat=`/usr/bin/objformat` +- 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 +- lddlflags="-shared " +- else ++ if [ x$objformat = xaout ]; then if [ -e /usr/lib/aout ]; then -@@ -136,7 +140,7 @@ case "$osvers" in + libpth="/usr/lib/aout /usr/local/lib /usr/lib" + glibpth="/usr/lib/aout /usr/local/lib /usr/lib" + fi ++ else + lddlflags='-Bshareable' ++ libpth="/usr/lib /usr/local/lib" ++ glibpth="/usr/lib /usr/local/lib" ++ ldflags=" -Wl,-E" ++ lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' + ;; +@@ -136,7 +142,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 -@@ -183,7 +187,9 @@ esac +@@ -183,7 +189,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'` Property changes on: head/lang/perl5.8/files/patch-freebsd.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property