sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[1] Unbreak build with THREADS option

Browse source 
[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]
This commit is contained in:
Sergey Skvortsov 2010-07-23 17:41:04 +00:00
parent 86fd2edceb
commit cc9986cdcf
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=258104
9 changed files with 36 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lang/perl5.12/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= perl PORTNAME= perl
PORTVERSION= ${PERL_VERSION} PORTVERSION= ${PERL_VERSION}
PORTREVISION= 1
CATEGORIES= lang devel perl5 CATEGORIES= lang devel perl5
MASTER_SITES= CPAN \ MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \ ${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 \ PERL_64BITINT "Use 64 bit integers (on i386)" on \
THREADS "Build threaded perl" off \ THREADS "Build threaded perl" off \
MULTIPLICITY "Use multiplicity" off \ MULTIPLICITY "Use multiplicity" off \
SUIDPERL "Build set-user-id suidperl binary" off \
SITECUSTOMIZE "Run-time customization of @INC" off \ SITECUSTOMIZE "Run-time customization of @INC" off \
USE_PERL "Rewrite links in /usr/bin" on USE_PERL "Rewrite links in /usr/bin" on
@ -88,14 +88,6 @@ STRIP_CMD= ${TRUE}
CONFIGURE_ARGS+= -Doptimize="${CFLAGS}" CONFIGURE_ARGS+= -Doptimize="${CFLAGS}"
.endif .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) .if defined(WITH_GDBM)
CONFIGURE_ARGS+= -Di_gdbm CONFIGURE_ARGS+= -Di_gdbm
LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm

13
lang/perl5.12/files/patch-freebsd.sh
View file

@ -29,7 +29,16 @@
lddlflags="-shared " lddlflags="-shared "
fi fi
cccdlflags='-DPIC -fPIC' 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*) ;; 0*|1*|2*|3*) ;;
*) *)
@ -38,7 +47,7 @@
if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
usenm=false usenm=false
fi fi
@@ -183,7 +189,9 @@ @@ -190,7 +196,9 @@
# This script UU/usethreads.cbu will get 'called-back' by Configure # This script UU/usethreads.cbu will get 'called-back' by Configure
# after it has prompted the user for whether to use threads. # after it has prompted the user for whether to use threads.

3
lang/perl5.12/pkg-plist
View file

@ -38,9 +38,7 @@ bin/ptar
bin/ptardiff bin/ptardiff
bin/s2p bin/s2p
bin/shasum bin/shasum
%%SUIDPERL%%bin/sperl%%PERL_VER%%
bin/splain bin/splain
%%SUIDPERL%%bin/suidperl
bin/xsubpp bin/xsubpp
lib/perl5/%%PERL_VER%%/AnyDBM_File.pm lib/perl5/%%PERL_VER%%/AnyDBM_File.pm
lib/perl5/%%PERL_VER%%/App/Cpan.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/regexp.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/regnodes.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/regnodes.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/scope.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/bitcount.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/sv.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/sv.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/thread.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/thread.h

10
lang/perl5.14/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= perl PORTNAME= perl
PORTVERSION= ${PERL_VERSION} PORTVERSION= ${PERL_VERSION}
PORTREVISION= 1
CATEGORIES= lang devel perl5 CATEGORIES= lang devel perl5
MASTER_SITES= CPAN \ MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \ ${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 \ PERL_64BITINT "Use 64 bit integers (on i386)" on \
THREADS "Build threaded perl" off \ THREADS "Build threaded perl" off \
MULTIPLICITY "Use multiplicity" off \ MULTIPLICITY "Use multiplicity" off \
SUIDPERL "Build set-user-id suidperl binary" off \
SITECUSTOMIZE "Run-time customization of @INC" off \ SITECUSTOMIZE "Run-time customization of @INC" off \
USE_PERL "Rewrite links in /usr/bin" on USE_PERL "Rewrite links in /usr/bin" on
@ -88,14 +88,6 @@ STRIP_CMD= ${TRUE}
CONFIGURE_ARGS+= -Doptimize="${CFLAGS}" CONFIGURE_ARGS+= -Doptimize="${CFLAGS}"
.endif .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) .if defined(WITH_GDBM)
CONFIGURE_ARGS+= -Di_gdbm CONFIGURE_ARGS+= -Di_gdbm
LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm

13
lang/perl5.14/files/patch-freebsd.sh
View file

@ -29,7 +29,16 @@
lddlflags="-shared " lddlflags="-shared "
fi fi
cccdlflags='-DPIC -fPIC' 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*) ;; 0*|1*|2*|3*) ;;
*) *)
@ -38,7 +47,7 @@
if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
usenm=false usenm=false
fi fi
@@ -183,7 +189,9 @@ @@ -190,7 +196,9 @@
# This script UU/usethreads.cbu will get 'called-back' by Configure # This script UU/usethreads.cbu will get 'called-back' by Configure
# after it has prompted the user for whether to use threads. # after it has prompted the user for whether to use threads.

3
lang/perl5.14/pkg-plist
View file

@ -38,9 +38,7 @@ bin/ptar
bin/ptardiff bin/ptardiff
bin/s2p bin/s2p
bin/shasum bin/shasum
%%SUIDPERL%%bin/sperl%%PERL_VER%%
bin/splain bin/splain
%%SUIDPERL%%bin/suidperl
bin/xsubpp bin/xsubpp
lib/perl5/%%PERL_VER%%/AnyDBM_File.pm lib/perl5/%%PERL_VER%%/AnyDBM_File.pm
lib/perl5/%%PERL_VER%%/App/Cpan.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/regexp.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/regnodes.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/regnodes.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/scope.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/bitcount.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/sv.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/sv.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/thread.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/thread.h

10
lang/perl5.16/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= perl PORTNAME= perl
PORTVERSION= ${PERL_VERSION} PORTVERSION= ${PERL_VERSION}
PORTREVISION= 1
CATEGORIES= lang devel perl5 CATEGORIES= lang devel perl5
MASTER_SITES= CPAN \ MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \ ${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 \ PERL_64BITINT "Use 64 bit integers (on i386)" on \
THREADS "Build threaded perl" off \ THREADS "Build threaded perl" off \
MULTIPLICITY "Use multiplicity" off \ MULTIPLICITY "Use multiplicity" off \
SUIDPERL "Build set-user-id suidperl binary" off \
SITECUSTOMIZE "Run-time customization of @INC" off \ SITECUSTOMIZE "Run-time customization of @INC" off \
USE_PERL "Rewrite links in /usr/bin" on USE_PERL "Rewrite links in /usr/bin" on
@ -88,14 +88,6 @@ STRIP_CMD= ${TRUE}
CONFIGURE_ARGS+= -Doptimize="${CFLAGS}" CONFIGURE_ARGS+= -Doptimize="${CFLAGS}"
.endif .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) .if defined(WITH_GDBM)
CONFIGURE_ARGS+= -Di_gdbm CONFIGURE_ARGS+= -Di_gdbm
LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm

13
lang/perl5.16/files/patch-freebsd.sh
View file

@ -29,7 +29,16 @@
lddlflags="-shared " lddlflags="-shared "
fi fi
cccdlflags='-DPIC -fPIC' 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*) ;; 0*|1*|2*|3*) ;;
*) *)
@ -38,7 +47,7 @@
if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
usenm=false usenm=false
fi fi
@@ -183,7 +189,9 @@ @@ -190,7 +196,9 @@
# This script UU/usethreads.cbu will get 'called-back' by Configure # This script UU/usethreads.cbu will get 'called-back' by Configure
# after it has prompted the user for whether to use threads. # after it has prompted the user for whether to use threads.

3
lang/perl5.16/pkg-plist
View file

@ -38,9 +38,7 @@ bin/ptar
bin/ptardiff bin/ptardiff
bin/s2p bin/s2p
bin/shasum bin/shasum
%%SUIDPERL%%bin/sperl%%PERL_VER%%
bin/splain bin/splain
%%SUIDPERL%%bin/suidperl
bin/xsubpp bin/xsubpp
lib/perl5/%%PERL_VER%%/AnyDBM_File.pm lib/perl5/%%PERL_VER%%/AnyDBM_File.pm
lib/perl5/%%PERL_VER%%/App/Cpan.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/regexp.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/regnodes.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/regnodes.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/scope.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/bitcount.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/sv.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/sv.h
lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/thread.h lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE/thread.h