aboutsummaryrefslogtreecommitdiffstats
path: root/lang/perl5.14
diff options
context:
space:
mode:
authortobez <tobez@FreeBSD.org>2007-02-20 04:12:22 +0800
committertobez <tobez@FreeBSD.org>2007-02-20 04:12:22 +0800
commitc73da68de531bd1e435169a19cf7e1500a1bb334 (patch)
treec2e8a2915c43d725231ac6df311b07f70bb0fb7c /lang/perl5.14
parent1aec4fe80b28d35fc562c44646727c9bc0a25e26 (diff)
downloadfreebsd-ports-gnome-c73da68de531bd1e435169a19cf7e1500a1bb334.tar.gz
freebsd-ports-gnome-c73da68de531bd1e435169a19cf7e1500a1bb334.tar.zst
freebsd-ports-gnome-c73da68de531bd1e435169a19cf7e1500a1bb334.zip
1. Fix breakage due to incorrect objformat-related change.
2. While at it, add a WITHOUT_USE_PERL knob that avoids spamming /usr/bin; it is meant for those who do cross-installs and such. No version bump. Pointy hat to: kris [1] Reported by: many [1] PR: 104524 [2] Submitted by: Nick Hibma <nick@anywi.com> [2]
Diffstat (limited to 'lang/perl5.14')
-rw-r--r--lang/perl5.14/Makefile3
-rw-r--r--lang/perl5.14/files/patch-freebsd.sh18
2 files changed, 12 insertions, 9 deletions
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index 4a7cf88df437..46c7d47d3b4e 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -146,6 +146,7 @@ pre-fetch:
@${ECHO} " (affects only 32-bit platforms)."
@${ECHO} " WITH_THREADS=yes Build threaded perl."
@${ECHO} " ENABLE_SUIDPERL=yes Also build set-user-id suidperl binary."
+ @${ECHO} " WITHOUT_USE_PERL=yes Do not rewrite links in /usr/bin"
@${ECHO} ""
post-patch:
@@ -187,11 +188,13 @@ post-install:
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
${BSDPAN_WRKSRC}/${files} ${BSDPAN_DEST}/${files}
.endfor
+.ifndef WITHOUT_USE_PERL
PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.if ${OSVERSION} < 500036
${INSTALL_SCRIPT} ${WRKDIR}/use.perl ${PREFIX}/bin/use.perl
@fmt ${PKGMESSAGE}
.endif
+.endif
rebuild-xs:
${LOCALBASE}/sbin/portupgrade -f `(${FIND} ${PKG_DBDIR}/p5*/+CONTENTS | \
diff --git a/lang/perl5.14/files/patch-freebsd.sh b/lang/perl5.14/files/patch-freebsd.sh
index 9fa2966a2e8e..ca8fa5a82cfb 100644
--- a/lang/perl5.14/files/patch-freebsd.sh
+++ b/lang/perl5.14/files/patch-freebsd.sh
@@ -1,6 +1,6 @@
---- 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 @@
+--- hints/freebsd.sh.orig Wed Mar 24 22:47:33 2004
++++ hints/freebsd.sh Mon Feb 19 20:53:50 2007
+@@ -88,6 +88,8 @@ case "$osvers" in
esac
libswanted=`echo $libswanted | sed 's/ malloc / /'`
libswanted=`echo $libswanted | sed 's/ bind / /'`
@@ -9,7 +9,7 @@
# 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 @@
+@@ -102,6 +104,10 @@ case "$osvers" in
;;
esac
libswanted=`echo $libswanted | sed 's/ malloc / /'`
@@ -20,7 +20,7 @@
;;
esac
-@@ -116,17 +122,17 @@
+@@ -116,17 +122,17 @@ case "$osvers" in
*)
objformat=`/usr/bin/objformat`
@@ -35,16 +35,16 @@
libpth="/usr/lib/aout /usr/local/lib /usr/lib"
glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
fi
-+ else
lddlflags='-Bshareable'
++ 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'
;;
-@@ -136,7 +142,7 @@
+@@ -136,7 +142,7 @@ case "$osvers" in
0*|1*|2*|3*) ;;
*)
@@ -53,7 +53,7 @@
if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
usenm=false
fi
-@@ -183,7 +189,9 @@
+@@ -183,7 +189,9 @@ esac
# This script UU/usethreads.cbu will get 'called-back' by Configure
# after it has prompted the user for whether to use threads.