aboutsummaryrefslogtreecommitdiffstats
path: root/lang/perl5.14
diff options
context:
space:
mode:
authorskv <skv@FreeBSD.org>2010-07-24 01:41:04 +0800
committerskv <skv@FreeBSD.org>2010-07-24 01:41:04 +0800
commit2702b8ad3017d1970ce3d84660d3c3473b0f88b5 (patch)
tree4bb51a03f359b9b31f232decacdbb9bed2669d73 /lang/perl5.14
parent283874ae59c35180e6d2ae926b53ca86b32aa259 (diff)
downloadfreebsd-ports-gnome-2702b8ad3017d1970ce3d84660d3c3473b0f88b5.tar.gz
freebsd-ports-gnome-2702b8ad3017d1970ce3d84660d3c3473b0f88b5.tar.zst
freebsd-ports-gnome-2702b8ad3017d1970ce3d84660d3c3473b0f88b5.zip
[1] Unbreak build with THREADS option
[2] Remove SUIDPERL option: SUID emulation has been removed for 5.12 PR: ports/148648 [1] Submitted by: Andrei Lavreniyuk <andy.lavr@gmail.com> [1] WWW: http://search.cpan.org/~jesse/perl-5.12.1/pod/perl5120delta.pod#Deprecations [2]
Diffstat (limited to 'lang/perl5.14')
-rw-r--r--lang/perl5.14/Makefile10
-rw-r--r--lang/perl5.14/files/patch-freebsd.sh13
-rw-r--r--lang/perl5.14/pkg-plist3
3 files changed, 12 insertions, 14 deletions
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index 1e870e5bdf90..bfb91b64c1a6 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -7,6 +7,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VERSION}
+PORTREVISION= 1
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -29,7 +30,6 @@ OPTIONS= DEBUGGING "Build with debugging support" off \
PERL_64BITINT "Use 64 bit integers (on i386)" on \
THREADS "Build threaded perl" off \
MULTIPLICITY "Use multiplicity" off \
- SUIDPERL "Build set-user-id suidperl binary" off \
SITECUSTOMIZE "Run-time customization of @INC" off \
USE_PERL "Rewrite links in /usr/bin" on
@@ -88,14 +88,6 @@ STRIP_CMD= ${TRUE}
CONFIGURE_ARGS+= -Doptimize="${CFLAGS}"
.endif
-.if defined(ENABLE_SUIDPERL) || defined(WITH_SUIDPERL)
-CONFIGURE_ARGS+= -Dd_dosuid=define
-PLIST_SUB+= SUIDPERL=""
-.else
-CONFIGURE_ARGS+= -Ud_dosuid
-PLIST_SUB+= SUIDPERL="@comment "
-.endif
-
.if defined(WITH_GDBM)
CONFIGURE_ARGS+= -Di_gdbm
LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
diff --git a/lang/perl5.14/files/patch-freebsd.sh b/lang/perl5.14/files/patch-freebsd.sh
index 4587e5338e7f..42dd19c79b8c 100644
--- a/lang/perl5.14/files/patch-freebsd.sh
+++ b/lang/perl5.14/files/patch-freebsd.sh
@@ -29,7 +29,16 @@
lddlflags="-shared "
fi
cccdlflags='-DPIC -fPIC'
-@@ -136,7 +142,7 @@
+@@ -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*) ;;
*)
@@ -38,7 +47,7 @@
if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
usenm=false
fi
-@@ -183,7 +189,9 @@
+@@ -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.
diff --git a/lang/perl5.14/pkg-plist b/lang/perl5.14/pkg-plist
index a4e947b0bd06..8d941a797eff 100644
--- a/lang/perl5.14/pkg-plist
+++ b/lang/perl5.14/pkg-plist
@@ -38,9 +38,7 @@ bin/ptar
bin/ptardiff
bin/s2p
bin/shasum
-%%SUIDPERL%%bin/sperl%%PERL_VER%%
bin/splain
-%%SUIDPERL%%bin/suidperl
bin/xsubpp
lib/perl5/%%PERL_VER%%/AnyDBM_File.pm
lib/perl5/%%PERL_VER%%/App/Cpan.pm
@@ -656,7 +654,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/regcomp.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/regexp.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/regnodes.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/scope.h
-%%SUIDPERL%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/sperl.o
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/bitcount.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/sv.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/thread.h