Thu Apr 7 04:03:58 2011 UTC ()
Add a patch to fix for http://secunia.com/advisories/43921/ from perl's
git repository (539689e74a).

Bump PKGREVISION.


(taca)
diff -r1.170 -r1.171 pkgsrc/lang/perl5/Makefile
diff -r1.73 -r1.74 pkgsrc/lang/perl5/distinfo
diff -r0 -r1.1 pkgsrc/lang/perl5/patches/patch-pp.c
cvs diff -r1.170 -r1.171 pkgsrc/lang/perl5/Makefile (switch to unified diff)

--- pkgsrc/lang/perl5/Makefile 2011/01/30 21:31:42 1.170
+++ pkgsrc/lang/perl5/Makefile 2011/04/07 04:03:57 1.171
@@ -1,357 +1,357 @@ @@ -1,357 +1,357 @@
1# $NetBSD: Makefile,v 1.170 2011/01/30 21:31:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.171 2011/04/07 04:03:57 taca Exp $
2 2
3.include "license.mk" 3.include "license.mk"
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6PKGREVISION= 1 6PKGREVISION= 2
7COMMENT= Practical Extraction and Report Language 7COMMENT= Practical Extraction and Report Language
8 8
9PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10 10
11CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \ 11CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \
12 p5-CGI-2.66{,nb*} p5-CGI-2.75{,nb*} p5-CGI-2.75.[0-2] \ 12 p5-CGI-2.66{,nb*} p5-CGI-2.75{,nb*} p5-CGI-2.75.[0-2] \
13 p5-Tie-File-0.96{,nb*} \ 13 p5-Tie-File-0.96{,nb*} \
14 p5-Memoize-1.01{,nb*} \ 14 p5-Memoize-1.01{,nb*} \
15 p5-I18N-LangTags<0.35 \ 15 p5-I18N-LangTags<0.35 \
16 p5-Locale-Maketext-1.[0-9]*{,nb*} \ 16 p5-Locale-Maketext-1.[0-9]*{,nb*} \
17 p5-Locale-Maketext-Simple<0.21 \ 17 p5-Locale-Maketext-Simple<0.21 \
18 p5-Digest<=1.16 \ 18 p5-Digest<=1.16 \
19 p5-Digest-MD5<=2.39 \ 19 p5-Digest-MD5<=2.39 \
20 p5-Digest-SHA<2.48 20 p5-Digest-SHA<2.48
21 21
22SUPERSEDES+= p5-Tie-File<0.97 22SUPERSEDES+= p5-Tie-File<0.97
23SUPERSEDES+= p5-Memoize<1.02 23SUPERSEDES+= p5-Memoize<1.02
24SUPERSEDES+= p5-I18N-LangTags<=0.35 24SUPERSEDES+= p5-I18N-LangTags<=0.35
25SUPERSEDES+= p5-Locale-Maketext<=1.15 25SUPERSEDES+= p5-Locale-Maketext<=1.15
26 26
27.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
28 28
29# Determine the Perl API version from the patchlevel.h file from the 29# Determine the Perl API version from the patchlevel.h file from the
30# source distribution. 30# source distribution.
31# 31#
32PERL5_API_VERS= ${PERL5_API_VERS_cmd:sh} 32PERL5_API_VERS= ${PERL5_API_VERS_cmd:sh}
33PERL5_API_VERS_cmd= \ 33PERL5_API_VERS_cmd= \
34 if ${TEST} -f ${WRKSRC}/patchlevel.h; then \ 34 if ${TEST} -f ${WRKSRC}/patchlevel.h; then \
35 ${AWK} '/\#define[ ]*PERL_API_REVISION/ { R = $$3 }\ 35 ${AWK} '/\#define[ ]*PERL_API_REVISION/ { R = $$3 }\
36 /\#define[ ]*PERL_API_VERSION/ { r = "."$$3 } \ 36 /\#define[ ]*PERL_API_VERSION/ { r = "."$$3 } \
37 /\#define[ ]*PERL_API_SUBVERSION/ { s = "."$$3 } \ 37 /\#define[ ]*PERL_API_SUBVERSION/ { s = "."$$3 } \
38 END { printf "%s%s%s\n", R, r, s }' \ 38 END { printf "%s%s%s\n", R, r, s }' \
39 ${WRKSRC}/patchlevel.h; \ 39 ${WRKSRC}/patchlevel.h; \
40 else \ 40 else \
41 ${ECHO} "unknown"; \ 41 ${ECHO} "unknown"; \
42 fi 42 fi
43 43
44.include "dirs.mk" 44.include "dirs.mk"
45 45
46.include "../../mk/compiler.mk" 46.include "../../mk/compiler.mk"
47 47
48HAS_CONFIGURE= yes 48HAS_CONFIGURE= yes
49CONFIGURE_SCRIPT= ./Configure 49CONFIGURE_SCRIPT= ./Configure
50CONFIGURE_ARGS+= -sde 50CONFIGURE_ARGS+= -sde
51CONFIGURE_ARGS+= -D ccflags=${CFLAGS:Q} 51CONFIGURE_ARGS+= -D ccflags=${CFLAGS:Q}
52CONFIGURE_ARGS+= -D ldflags=${LDFLAGS:Q} 52CONFIGURE_ARGS+= -D ldflags=${LDFLAGS:Q}
53MAKE_ENV+= LC_ALL="C" 53MAKE_ENV+= LC_ALL="C"
54 54
55TEST_TARGET= test 55TEST_TARGET= test
56 56
57# Policy.sh generation 57# Policy.sh generation
58# (see comments in files/Policy.sh) 58# (see comments in files/Policy.sh)
59SUBST_CLASSES+= policysh 59SUBST_CLASSES+= policysh
60SUBST_STAGE.policysh= pre-configure 60SUBST_STAGE.policysh= pre-configure
61SUBST_FILES.policysh= Policy.sh 61SUBST_FILES.policysh= Policy.sh
62SUBST_VARS.policysh+= MACHINE_ARCH 62SUBST_VARS.policysh+= MACHINE_ARCH
63SUBST_VARS.policysh+= LOWER_OPSYS 63SUBST_VARS.policysh+= LOWER_OPSYS
64SUBST_VARS.policysh+= CC 64SUBST_VARS.policysh+= CC
65SUBST_VARS.policysh+= CFLAGS 65SUBST_VARS.policysh+= CFLAGS
66SUBST_VARS.policysh+= PERL5_PREFIX 66SUBST_VARS.policysh+= PERL5_PREFIX
67SUBST_VARS.policysh+= PERL5_SITEPREFIX 67SUBST_VARS.policysh+= PERL5_SITEPREFIX
68SUBST_VARS.policysh+= PERL5_VENDORPREFIX 68SUBST_VARS.policysh+= PERL5_VENDORPREFIX
69PERL5_SCRIPTDIR= ${PERL5_PERLBASE}/bin 69PERL5_SCRIPTDIR= ${PERL5_PERLBASE}/bin
70SUBST_VARS.policysh+= PERL5_SCRIPTDIR 70SUBST_VARS.policysh+= PERL5_SCRIPTDIR
71SUBST_VARS.policysh+= PERL5_PERLBASE 71SUBST_VARS.policysh+= PERL5_PERLBASE
72SUBST_VARS.policysh+= PERL5_SITEBASE 72SUBST_VARS.policysh+= PERL5_SITEBASE
73SUBST_VARS.policysh+= PERL5_VENDORBASE 73SUBST_VARS.policysh+= PERL5_VENDORBASE
74SUBST_VARS.policysh+= PERL5_PRIVLIB 74SUBST_VARS.policysh+= PERL5_PRIVLIB
75SUBST_VARS.policysh+= PERL5_SITELIB 75SUBST_VARS.policysh+= PERL5_SITELIB
76SUBST_VARS.policysh+= PERL5_VENDORLIB 76SUBST_VARS.policysh+= PERL5_VENDORLIB
77PERL5_MAN1DIR= ${PERL5_PERLBASE}/${PKGMANDIR}/man1 77PERL5_MAN1DIR= ${PERL5_PERLBASE}/${PKGMANDIR}/man1
78SUBST_VARS.policysh+= PERL5_MAN1DIR 78SUBST_VARS.policysh+= PERL5_MAN1DIR
79SUBST_VARS.policysh+= PKGMANDIR 79SUBST_VARS.policysh+= PKGMANDIR
80SUBST_VARS.policysh+= LOCALBASE 80SUBST_VARS.policysh+= LOCALBASE
81SUBST_VARS.policysh+= PTHREAD_LDFLAGS 81SUBST_VARS.policysh+= PTHREAD_LDFLAGS
82 82
83.if ${OPSYS} == "Darwin" 83.if ${OPSYS} == "Darwin"
84# 84#
85# The Perl build attempts to work around case-insensitivity problems on 85# The Perl build attempts to work around case-insensitivity problems on
86# HFS filesystems by using GNUmakefiles, so we need to use GNU make. 86# HFS filesystems by using GNUmakefiles, so we need to use GNU make.
87# 87#
88USE_TOOLS+= gmake 88USE_TOOLS+= gmake
89.endif 89.endif
90 90
91# 91#
92# For the moment disable the building of a shared libperl.dylib on Darwin 92# For the moment disable the building of a shared libperl.dylib on Darwin
93# => 9.0 as it breaks the build. This should just be considered a temporary 93# => 9.0 as it breaks the build. This should just be considered a temporary
94# work around until the actual problem can be fixed as this worked for 94# work around until the actual problem can be fixed as this worked for
95# Darwin < 9.0. 95# Darwin < 9.0.
96# 96#
97.if empty(MACHINE_PLATFORM:MDarwin-9.*-*) 97.if empty(MACHINE_PLATFORM:MDarwin-9.*-*)
98CONFIGURE_ARGS+= -Duseshrplib 98CONFIGURE_ARGS+= -Duseshrplib
99.endif 99.endif
100 100
101# Perl embeds the full paths to the following tools in several installed 101# Perl embeds the full paths to the following tools in several installed
102# files, so make sure the paths to the ones in ${TOOLS_DIR} aren't used. 102# files, so make sure the paths to the ones in ${TOOLS_DIR} aren't used.
103# 103#
104USE_TOOLS+= hostname ln sed test 104USE_TOOLS+= hostname ln sed test
105SUBST_VARS.policysh+= TOOLS_HOSTNAME_CMD 105SUBST_VARS.policysh+= TOOLS_HOSTNAME_CMD
106SUBST_VARS.policysh+= TOOLS_LN 106SUBST_VARS.policysh+= TOOLS_LN
107TOOLS_ALIASES.sed+= ${TOOLS_SED:T} 107TOOLS_ALIASES.sed+= ${TOOLS_SED:T}
108SUBST_VARS.policysh+= TOOLS_SED 108SUBST_VARS.policysh+= TOOLS_SED
109SUBST_VARS.policysh+= TOOLS_SH 109SUBST_VARS.policysh+= TOOLS_SH
110SUBST_VARS.policysh+= TOOLS_TEST 110SUBST_VARS.policysh+= TOOLS_TEST
111SUBST_VARS.policysh+= FALSE 111SUBST_VARS.policysh+= FALSE
112 112
113# Nail down the needed libraries for each platform here to avoid hidden 113# Nail down the needed libraries for each platform here to avoid hidden
114# dependencies. If this isn't defined, then use the perl defaults for the 114# dependencies. If this isn't defined, then use the perl defaults for the
115# particular operating system. 115# particular operating system.
116# 116#
117LIBSWANTED.Darwin= m c 117LIBSWANTED.Darwin= m c
118LIBSWANTED.DragonFly= m crypt 118LIBSWANTED.DragonFly= m crypt
119LIBSWANTED.FreeBSD= m crypt 119LIBSWANTED.FreeBSD= m crypt
120LIBSWANTED.HPUX= cl pthread $$libswanted # see Perl's README.hpux 120LIBSWANTED.HPUX= cl pthread $$libswanted # see Perl's README.hpux
121LIBSWANTED.IRIX= m crypt 121LIBSWANTED.IRIX= m crypt
122LIBSWANTED.Interix= m dl 122LIBSWANTED.Interix= m dl
123LIBSWANTED.Linux= m crypt dl nsl 123LIBSWANTED.Linux= m crypt dl nsl
124LIBSWANTED.MirBSD= m crypt 124LIBSWANTED.MirBSD= m crypt
125LIBSWANTED.NetBSD= m crypt 125LIBSWANTED.NetBSD= m crypt
126LIBSWANTED.OpenBSD= m crypt 126LIBSWANTED.OpenBSD= m crypt
127LIBSWANTED.SunOS= m crypt dl socket nsl 127LIBSWANTED.SunOS= m crypt dl socket nsl
128LIBSWANTED.AIX= m crypt dl socket nsl bind c 128LIBSWANTED.AIX= m crypt dl socket nsl bind c
129LIBSWANTED= ${LIBSWANTED.${OPSYS}} 129LIBSWANTED= ${LIBSWANTED.${OPSYS}}
130SUBST_VARS.policysh+= LIBSWANTED 130SUBST_VARS.policysh+= LIBSWANTED
131 131
132# Nail down the directories in which the system libraries may be found. 132# Nail down the directories in which the system libraries may be found.
133# If this isn't defined, then use the perl defaults for the particular 133# If this isn't defined, then use the perl defaults for the particular
134# operating system. 134# operating system.
135# 135#
136SYSLIBPATH.Darwin= /usr/lib 136SYSLIBPATH.Darwin= /usr/lib
137SYSLIBPATH.DragonFly= /usr/lib 137SYSLIBPATH.DragonFly= /usr/lib
138SYSLIBPATH.FreeBSD= /usr/lib 138SYSLIBPATH.FreeBSD= /usr/lib
139SYSLIBPATH.Interix= /usr/lib 139SYSLIBPATH.Interix= /usr/lib
140SYSLIBPATH.MirBSD= /usr/lib 140SYSLIBPATH.MirBSD= /usr/lib
141SYSLIBPATH.NetBSD= /usr/lib 141SYSLIBPATH.NetBSD= /usr/lib
142SYSLIBPATH.OpenBSD= /usr/lib 142SYSLIBPATH.OpenBSD= /usr/lib
143SYSLIBPATH.SunOS= /usr/lib 143SYSLIBPATH.SunOS= /usr/lib
144SYSLIBPATH.AIX= /usr/lib 144SYSLIBPATH.AIX= /usr/lib
145SYSLIBPATH= ${SYSLIBPATH.${OPSYS}} 145SYSLIBPATH= ${SYSLIBPATH.${OPSYS}}
146SUBST_VARS.policysh+= SYSLIBPATH 146SUBST_VARS.policysh+= SYSLIBPATH
147 147
148# On a.out platforms, we link with "ld" and on ELF platforms, we link with 148# On a.out platforms, we link with "ld" and on ELF platforms, we link with
149# "cc", so we need to use different options to pass the run-time search path 149# "cc", so we need to use different options to pass the run-time search path
150# flags to the link command in the right way. 150# flags to the link command in the right way.
151# 151#
152.if ${OBJECT_FMT} == "a.out" 152.if ${OBJECT_FMT} == "a.out"
153LOCLIBRPATHFLAGS= ${LINKER_RPATH_FLAG} ${LOCALBASE}/lib 153LOCLIBRPATHFLAGS= ${LINKER_RPATH_FLAG} ${LOCALBASE}/lib
154.elif ${OBJECT_FMT} == "ELF" || ${OBJECT_FMT} == "XCOFF" 154.elif ${OBJECT_FMT} == "ELF" || ${OBJECT_FMT} == "XCOFF"
155LOCLIBRPATHFLAGS= ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib 155LOCLIBRPATHFLAGS= ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
156.else 156.else
157LOCLIBRPATHFLAGS= # empty 157LOCLIBRPATHFLAGS= # empty
158.endif 158.endif
159 159
160.include "../../mk/dlopen.buildlink3.mk" 160.include "../../mk/dlopen.buildlink3.mk"
161 161
162CHECK_BUILTIN.pthread:= yes 162CHECK_BUILTIN.pthread:= yes
163.include "../../mk/pthread.builtin.mk" 163.include "../../mk/pthread.builtin.mk"
164CHECK_BUILTIN.pthread:= no 164CHECK_BUILTIN.pthread:= no
165 165
166# By default, build with threads only if the threads are native. 166# By default, build with threads only if the threads are native.
167.if !empty(USE_BUILTIN.pthread:M[yY][eE][sS]) 167.if !empty(USE_BUILTIN.pthread:M[yY][eE][sS])
168PERL5_BUILD_THREADS_SUPPORT= yes 168PERL5_BUILD_THREADS_SUPPORT= yes
169.else 169.else
170PERL5_BUILD_THREADS_SUPPORT= ${DLOPEN_REQUIRE_PTHREADS} 170PERL5_BUILD_THREADS_SUPPORT= ${DLOPEN_REQUIRE_PTHREADS}
171.endif 171.endif
172 172
173### [Sat Dec 18 17:29:44 EST 2004 : jlam] 173### [Sat Dec 18 17:29:44 EST 2004 : jlam]
174### Native threading on VAX isn't ready for primetime in NetBSD>=2.0. 174### Native threading on VAX isn't ready for primetime in NetBSD>=2.0.
175### Build Perl without threads-support until VAX native threads are 175### Build Perl without threads-support until VAX native threads are
176### known to work. 176### known to work.
177### 177###
178.if !empty(MACHINE_PLATFORM:MNetBSD-*-vax) && \ 178.if !empty(MACHINE_PLATFORM:MNetBSD-*-vax) && \
179 !empty(USE_BUILTIN.pthread:M[yY][eE][sS]) 179 !empty(USE_BUILTIN.pthread:M[yY][eE][sS])
180PKG_HACKS+= broken-vax-pthreads 180PKG_HACKS+= broken-vax-pthreads
181PERL5_BUILD_THREADS_SUPPORT= no 181PERL5_BUILD_THREADS_SUPPORT= no
182.endif 182.endif
183 183
184.if !empty(MACHINE_PLATFORM:MMirBSD*) 184.if !empty(MACHINE_PLATFORM:MMirBSD*)
185SUBST_CLASSES+= mirbsd-paths 185SUBST_CLASSES+= mirbsd-paths
186SUBST_STAGE.mirbsd-paths= pre-configure 186SUBST_STAGE.mirbsd-paths= pre-configure
187SUBST_FILES.mirbsd-paths= hints/mirbsd.sh 187SUBST_FILES.mirbsd-paths= hints/mirbsd.sh
188SUBST_SED.mirbsd-paths= -e 's,/usr/mpkg,${PREFIX},g' 188SUBST_SED.mirbsd-paths= -e 's,/usr/mpkg,${PREFIX},g'
189SUBST_MESSAGE.mirbsd-paths= Do not use non-pkgsrc paths on MirBSD. 189SUBST_MESSAGE.mirbsd-paths= Do not use non-pkgsrc paths on MirBSD.
190.endif 190.endif
191 191
192.include "../../mk/compiler.mk" 192.include "../../mk/compiler.mk"
193 193
194PKG_OPTIONS_VAR= PKG_OPTIONS.perl 194PKG_OPTIONS_VAR= PKG_OPTIONS.perl
195PKG_OPTIONS_REQUIRED_GROUPS= perlbits 195PKG_OPTIONS_REQUIRED_GROUPS= perlbits
196PKG_OPTIONS_GROUP.perlbits= 64bitauto 64bitint 64bitmore 64bitall 64bitnone 196PKG_OPTIONS_GROUP.perlbits= 64bitauto 64bitint 64bitmore 64bitall 64bitnone
197PKG_SUPPORTED_OPTIONS= debug threads mstats 197PKG_SUPPORTED_OPTIONS= debug threads mstats
198.if !empty(PERL5_BUILD_THREADS_SUPPORT:M[yY][eE][sS]) 198.if !empty(PERL5_BUILD_THREADS_SUPPORT:M[yY][eE][sS])
199PKG_SUGGESTED_OPTIONS= threads 199PKG_SUGGESTED_OPTIONS= threads
200.endif 200.endif
201 201
202.if ${OPSYS} == "IRIX" 202.if ${OPSYS} == "IRIX"
203. if defined(ABI) && ${ABI} == "64" 203. if defined(ABI) && ${ABI} == "64"
204PKG_SUGGESTED_OPTIONS+= 64bitint 204PKG_SUGGESTED_OPTIONS+= 64bitint
205. endif 205. endif
206.elif ${OPSYS} == "AIX" 206.elif ${OPSYS} == "AIX"
207. if defined(ABI) && ${ABI} == "64" 207. if defined(ABI) && ${ABI} == "64"
208PKG_SUGGESTED_OPTIONS+= 64bitall 208PKG_SUGGESTED_OPTIONS+= 64bitall
209. else 209. else
210PKG_SUGGESTED_OPTIONS+= 64bitnone 210PKG_SUGGESTED_OPTIONS+= 64bitnone
211. endif 211. endif
212.else 212.else
213PKG_SUGGESTED_OPTIONS+= 64bitauto 213PKG_SUGGESTED_OPTIONS+= 64bitauto
214.endif 214.endif
215 215
216.include "../../mk/bsd.options.mk" 216.include "../../mk/bsd.options.mk"
217 217
218.if !empty(PKG_OPTIONS:Mthreads) 218.if !empty(PKG_OPTIONS:Mthreads)
219. include "../../mk/pthread.buildlink3.mk" 219. include "../../mk/pthread.buildlink3.mk"
220CONFIGURE_ARGS+= -Duseithreads 220CONFIGURE_ARGS+= -Duseithreads
221CFLAGS+= ${PTHREAD_CFLAGS} 221CFLAGS+= ${PTHREAD_CFLAGS}
222LIBSWANTED+= ${PTHREAD_LIBS:M-l*:S/^-l//} 222LIBSWANTED+= ${PTHREAD_LIBS:M-l*:S/^-l//}
223. if ${OBJECT_FMT} == "XCOFF" 223. if ${OBJECT_FMT} == "XCOFF"
224PERL5_RPATH_THREAD=-thread 224PERL5_RPATH_THREAD=-thread
225. endif 225. endif
226.else 226.else
227CONFIGURE_ARGS+= -Uuseithreads 227CONFIGURE_ARGS+= -Uuseithreads
228. if ${OBJECT_FMT} == "XCOFF" 228. if ${OBJECT_FMT} == "XCOFF"
229PERL5_RPATH_THREAD= 229PERL5_RPATH_THREAD=
230. endif 230. endif
231.endif 231.endif
232 232
233.if !empty(PKG_OPTIONS:Mdebug) 233.if !empty(PKG_OPTIONS:Mdebug)
234CFLAGS+= -DDEBUGGING 234CFLAGS+= -DDEBUGGING
235.endif 235.endif
236 236
237.if !empty(PKG_OPTIONS:Mmstats) 237.if !empty(PKG_OPTIONS:Mmstats)
238CFLAGS+= -DPERL_DEBUGGING_MSTATS 238CFLAGS+= -DPERL_DEBUGGING_MSTATS
239CONFIGURE_ARGS+= -Dusemymalloc 239CONFIGURE_ARGS+= -Dusemymalloc
240.else 240.else
241CONFIGURE_ARGS+= -Uusemymalloc 241CONFIGURE_ARGS+= -Uusemymalloc
242.endif 242.endif
243 243
244.if !empty(PKG_OPTIONS:M64bitint) 244.if !empty(PKG_OPTIONS:M64bitint)
245CONFIGURE_ARGS+= -Duse64bitint 245CONFIGURE_ARGS+= -Duse64bitint
246. if ${OBJECT_FMT} == "XCOFF" 246. if ${OBJECT_FMT} == "XCOFF"
247LOCLIBRPATHFLAGS+= ${COMPILER_RPATH_FLAG}${PERL5_PRIVLIB}/${MACHINE_ARCH}-${LOWER_OPSYS}${PERL5_RPATH_THREAD}-multi-64int/CORE 247LOCLIBRPATHFLAGS+= ${COMPILER_RPATH_FLAG}${PERL5_PRIVLIB}/${MACHINE_ARCH}-${LOWER_OPSYS}${PERL5_RPATH_THREAD}-multi-64int/CORE
248. endif 248. endif
249.elif !empty(PKG_OPTIONS:M64bitmore) 249.elif !empty(PKG_OPTIONS:M64bitmore)
250CONFIGURE_ARGS+= -Dusemorebits 250CONFIGURE_ARGS+= -Dusemorebits
251. if ${OBJECT_FMT} == "XCOFF" 251. if ${OBJECT_FMT} == "XCOFF"
252LOCLIBRPATHFLAGS+= ${COMPILER_RPATH_FLAG}${PERL5_PRIVLIB}/${MACHINE_ARCH}-${LOWER_OPSYS}${PERL5_RPATH_THREAD}-multi-64int-ld/CORE 252LOCLIBRPATHFLAGS+= ${COMPILER_RPATH_FLAG}${PERL5_PRIVLIB}/${MACHINE_ARCH}-${LOWER_OPSYS}${PERL5_RPATH_THREAD}-multi-64int-ld/CORE
253. endif 253. endif
254.elif !empty(PKG_OPTIONS:M64bitall) 254.elif !empty(PKG_OPTIONS:M64bitall)
255CONFIGURE_ARGS+= -Duse64bitall 255CONFIGURE_ARGS+= -Duse64bitall
256. if ${OBJECT_FMT} == "XCOFF" 256. if ${OBJECT_FMT} == "XCOFF"
257LOCLIBRPATHFLAGS+= ${COMPILER_RPATH_FLAG}${PERL5_PRIVLIB}/${MACHINE_ARCH}-${LOWER_OPSYS}${PERL5_RPATH_THREAD}-multi-64all/CORE 257LOCLIBRPATHFLAGS+= ${COMPILER_RPATH_FLAG}${PERL5_PRIVLIB}/${MACHINE_ARCH}-${LOWER_OPSYS}${PERL5_RPATH_THREAD}-multi-64all/CORE
258. endif 258. endif
259.elif !empty(PKG_OPTIONS:M64bitnone) 259.elif !empty(PKG_OPTIONS:M64bitnone)
260CONFIGURE_ARGS+= -Uuse64bitall -Uusemorebits -Uuse64bitint 260CONFIGURE_ARGS+= -Uuse64bitall -Uusemorebits -Uuse64bitint
261. if ${OBJECT_FMT} == "XCOFF" 261. if ${OBJECT_FMT} == "XCOFF"
262LOCLIBRPATHFLAGS+= ${COMPILER_RPATH_FLAG}${PERL5_PRIVLIB}/${MACHINE_ARCH}-${LOWER_OPSYS}${PERL5_RPATH_THREAD}-multi/CORE 262LOCLIBRPATHFLAGS+= ${COMPILER_RPATH_FLAG}${PERL5_PRIVLIB}/${MACHINE_ARCH}-${LOWER_OPSYS}${PERL5_RPATH_THREAD}-multi/CORE
263. endif 263. endif
264.else 264.else
265. if ${OBJECT_FMT} == "XCOFF" 265. if ${OBJECT_FMT} == "XCOFF"
266BROKEN= XCOFF targets need the path specified where libperl.a resides.\ 266BROKEN= XCOFF targets need the path specified where libperl.a resides.\
267Please choose on of 64bitint 64bitmore 64bitall or 64bitnone to allow this. 267Please choose on of 64bitint 64bitmore 64bitall or 64bitnone to allow this.
268. endif 268. endif
269.endif 269.endif
270SUBST_VARS.policysh+= LOCLIBRPATHFLAGS 270SUBST_VARS.policysh+= LOCLIBRPATHFLAGS
271 271
272# Remove a spurious workdir reference 272# Remove a spurious workdir reference
273SUBST_CLASSES+= rm 273SUBST_CLASSES+= rm
274SUBST_STAGE.rm= pre-install 274SUBST_STAGE.rm= pre-install
275SUBST_FILES.rm= lib/Config_heavy.pl 275SUBST_FILES.rm= lib/Config_heavy.pl
276SUBST_SED.rm= -e "s!^rm_try='/.*/\\.tools/bin/rm -f!rm_try='/bin/rm -f!" 276SUBST_SED.rm= -e "s!^rm_try='/.*/\\.tools/bin/rm -f!rm_try='/bin/rm -f!"
277 277
278# Replace our perl as the interpreter 278# Replace our perl as the interpreter
279REPLACE_PERL+= lib/File/DosGlob.pm 279REPLACE_PERL+= lib/File/DosGlob.pm
280REPLACE_PERL+= lib/version.pm 280REPLACE_PERL+= lib/version.pm
281REPLACE_PERL+= cpan/bignum/lib/Math/BigFloat/Trace.pm 281REPLACE_PERL+= cpan/bignum/lib/Math/BigFloat/Trace.pm
282REPLACE_PERL+= cpan/bignum/lib/Math/BigInt/Trace.pm 282REPLACE_PERL+= cpan/bignum/lib/Math/BigInt/Trace.pm
283REPLACE_PERL+= lib/unicore/mktables 283REPLACE_PERL+= lib/unicore/mktables
284 284
285# And replace a perl interpreter during the pre-install stage 285# And replace a perl interpreter during the pre-install stage
286# I think this may be a bootstrap script, so can't use REPLACE_PERL 286# I think this may be a bootstrap script, so can't use REPLACE_PERL
287# because that is acted upon already in the pre-configure stage 287# because that is acted upon already in the pre-configure stage
288SUBST_CLASSES+= miniperl 288SUBST_CLASSES+= miniperl
289SUBST_STAGE.miniperl= pre-install 289SUBST_STAGE.miniperl= pre-install
290SUBST_FILES.miniperl= lib/ExtUtils/xsubpp 290SUBST_FILES.miniperl= lib/ExtUtils/xsubpp
291SUBST_SED.miniperl= -e "1s:\#!./miniperl:\#!${PERL5}:" 291SUBST_SED.miniperl= -e "1s:\#!./miniperl:\#!${PERL5}:"
292 292
293.if ${PKGSRC_COMPILER} == "xlc" 293.if ${PKGSRC_COMPILER} == "xlc"
294SUBST_CLASSES+= cpprun 294SUBST_CLASSES+= cpprun
295SUBST_STAGE.cpprun= pre-install 295SUBST_STAGE.cpprun= pre-install
296SUBST_FILES.cpprun= lib/Config_heavy.pl 296SUBST_FILES.cpprun= lib/Config_heavy.pl
297. if !empty(PKG_OPTIONS:Mthreads) 297. if !empty(PKG_OPTIONS:Mthreads)
298SUBST_SED.cpprun= -e "s/cpprun=''/cpprun='cc_r -E'/" 298SUBST_SED.cpprun= -e "s/cpprun=''/cpprun='cc_r -E'/"
299. else 299. else
300SUBST_SED.cpprun= -e "s/cpprun=''/cpprun='cc -E'/" 300SUBST_SED.cpprun= -e "s/cpprun=''/cpprun='cc -E'/"
301. endif 301. endif
302.endif 302.endif
303 303
304# Some platforms may want the directory mode not to be 0755. This 304# Some platforms may want the directory mode not to be 0755. This
305# is, unfortunately, hardcoded in quite a few places in Perl, so 305# is, unfortunately, hardcoded in quite a few places in Perl, so
306# let's substitute what pkgsrc says instead. 306# let's substitute what pkgsrc says instead.
307# 307#
308SUBST_CLASSES+= dirmode 308SUBST_CLASSES+= dirmode
309SUBST_STAGE.dirmode= post-patch 309SUBST_STAGE.dirmode= post-patch
310SUBST_FILES.dirmode= installhtml install_lib.pl \ 310SUBST_FILES.dirmode= installhtml install_lib.pl \
311 dist/ExtUtils-Install/lib/ExtUtils/Install.pm 311 dist/ExtUtils-Install/lib/ExtUtils/Install.pm
312SUBST_SED.dirmode= -e "s/755/${PKGDIRMODE}/g;/umask(/d" 312SUBST_SED.dirmode= -e "s/755/${PKGDIRMODE}/g;/umask(/d"
313 313
314post-extract: 314post-extract:
315 cp ${FILESDIR}/Policy.sh ${WRKSRC}/Policy.sh 315 cp ${FILESDIR}/Policy.sh ${WRKSRC}/Policy.sh
316 316
317pre-configure: 317pre-configure:
318 cd ${WRKSRC} && find `pwd` -name "*.orig" -type f -exec ${RM} -f {} \; 318 cd ${WRKSRC} && find `pwd` -name "*.orig" -type f -exec ${RM} -f {} \;
319 319
320post-build: 320post-build:
321 ${SED} -e "s,@PERL5@,"${PERL5:Q}",g" \ 321 ${SED} -e "s,@PERL5@,"${PERL5:Q}",g" \
322 -e "s,@SH@,"${SH:Q}",g" \ 322 -e "s,@SH@,"${SH:Q}",g" \
323 -e "s,@PKGMANDIR@,"${PKGMANDIR:Q}",g" \ 323 -e "s,@PKGMANDIR@,"${PKGMANDIR:Q}",g" \
324 ${FILESDIR}/perllink.in > ${WRKDIR}/perllink.sh 324 ${FILESDIR}/perllink.in > ${WRKDIR}/perllink.sh
325 325
326INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 326INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
327PERL5_PACKLIST_DIR_cmd= . ${WRKSRC}/config.sh; echo $$installarchlib 327PERL5_PACKLIST_DIR_cmd= . ${WRKSRC}/config.sh; echo $$installarchlib
328PERL5_PACKLIST_DIR= ${PERL5_PACKLIST_DIR_cmd:sh} 328PERL5_PACKLIST_DIR= ${PERL5_PACKLIST_DIR_cmd:sh}
329PERL5_PACKLIST= .packlist 329PERL5_PACKLIST= .packlist
330PERL5_PACKLIST_DESTDIR= no 330PERL5_PACKLIST_DESTDIR= no
331FILES_SUBST+= PERL5_COMMENT=\# 331FILES_SUBST+= PERL5_COMMENT=\#
332FILES_SUBST+= PERL5_PACKLIST= 332FILES_SUBST+= PERL5_PACKLIST=
333PLIST_SRC= ${WRKDIR}/.PLIST_SRC 333PLIST_SRC= ${WRKDIR}/.PLIST_SRC
334 334
335post-install: perl5-post-install 335post-install: perl5-post-install
336 336
337perl5-post-install: 337perl5-post-install:
338 ${RUN}if ${TEST} -x ${DESTDIR}${PREFIX}/bin/a2p; then \ 338 ${RUN}if ${TEST} -x ${DESTDIR}${PREFIX}/bin/a2p; then \
339 strip ${DESTDIR}${PREFIX}/bin/a2p; \ 339 strip ${DESTDIR}${PREFIX}/bin/a2p; \
340 fi 340 fi
341 ${RUN}${INSTALL_SCRIPT} ${WRKDIR}/perllink.sh ${DESTDIR}${PERL5_SCRIPTDIR}/perllink; \ 341 ${RUN}${INSTALL_SCRIPT} ${WRKDIR}/perllink.sh ${DESTDIR}${PERL5_SCRIPTDIR}/perllink; \
342 ${INSTALL_MAN} ${FILESDIR}/perllink.1 ${DESTDIR}${PERL5_MAN1DIR}/perllink.1; \ 342 ${INSTALL_MAN} ${FILESDIR}/perllink.1 ${DESTDIR}${PERL5_MAN1DIR}/perllink.1; \
343 ${RM} -f ${DESTDIR}${PREFIX}/bin/perllink \ 343 ${RM} -f ${DESTDIR}${PREFIX}/bin/perllink \
344 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/perllink.1; \ 344 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/perllink.1; \
345 ${LN} -s ${PERL5_SCRIPTDIR}/perllink ${DESTDIR}${PREFIX}/bin/perllink; \ 345 ${LN} -s ${PERL5_SCRIPTDIR}/perllink ${DESTDIR}${PREFIX}/bin/perllink; \
346 ${LN} -s ${PERL5_MAN1DIR}/perllink.1 \ 346 ${LN} -s ${PERL5_MAN1DIR}/perllink.1 \
347 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/perllink.1; \ 347 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/perllink.1; \
348 { ${CAT} ${PKGDIR}/PLIST; \ 348 { ${CAT} ${PKGDIR}/PLIST; \
349 ${ECHO} "${PERL5_SCRIPTDIR}/perllink"; \ 349 ${ECHO} "${PERL5_SCRIPTDIR}/perllink"; \
350 ${ECHO} "${PERL5_MAN1DIR}/perllink.1"; \ 350 ${ECHO} "${PERL5_MAN1DIR}/perllink.1"; \
351 } | ${SED} -e "s,^"${PREFIX:Q}"/,," > ${PLIST_SRC} 351 } | ${SED} -e "s,^"${PREFIX:Q}"/,," > ${PLIST_SRC}
352.if ${OPSYS} == "Haiku" 352.if ${OPSYS} == "Haiku"
353 ${CHMOD} a+x ${DESTDIR}${PREFIX}/bin/perl 353 ${CHMOD} a+x ${DESTDIR}${PREFIX}/bin/perl
354.endif 354.endif
355 355
356.include "packlist.mk" 356.include "packlist.mk"
357.include "../../mk/bsd.pkg.mk" 357.include "../../mk/bsd.pkg.mk"
cvs diff -r1.73 -r1.74 pkgsrc/lang/perl5/distinfo (switch to unified diff)

--- pkgsrc/lang/perl5/distinfo 2011/01/30 21:35:43 1.73
+++ pkgsrc/lang/perl5/distinfo 2011/04/07 04:03:58 1.74
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1$NetBSD: distinfo,v 1.73 2011/01/30 21:35:43 wiz Exp $ 1$NetBSD: distinfo,v 1.74 2011/04/07 04:03:58 taca Exp $
2 2
3SHA1 (perl-5.12.2.tar.gz) = c157f214a93ce20fc06dc9d9c902c05ad1327cb1 3SHA1 (perl-5.12.2.tar.gz) = c157f214a93ce20fc06dc9d9c902c05ad1327cb1
4RMD160 (perl-5.12.2.tar.gz) = b1fd7f05d96fa6a263d3622654af6b584c308ce4 4RMD160 (perl-5.12.2.tar.gz) = b1fd7f05d96fa6a263d3622654af6b584c308ce4
5Size (perl-5.12.2.tar.gz) = 15143778 bytes 5Size (perl-5.12.2.tar.gz) = 15143778 bytes
6SHA1 (patch-aa) = 4c8197cdc0595a17ba377a28c7457f923c2d9bf9 6SHA1 (patch-aa) = 4c8197cdc0595a17ba377a28c7457f923c2d9bf9
7SHA1 (patch-ab) = e3aa6bf9695addb9b754297120caf8683a625d1a 7SHA1 (patch-ab) = e3aa6bf9695addb9b754297120caf8683a625d1a
8SHA1 (patch-ac) = c1893ea4cf4b89b03b3acc5dec9b5828d50c5dad 8SHA1 (patch-ac) = c1893ea4cf4b89b03b3acc5dec9b5828d50c5dad
9SHA1 (patch-ah) = aca6b4bf08809789058f3ec259c6df86df2aaf83 9SHA1 (patch-ah) = aca6b4bf08809789058f3ec259c6df86df2aaf83
10SHA1 (patch-ai) = 5abdbbddcba79088996056ab88a34db5fcd16b01 10SHA1 (patch-ai) = 5abdbbddcba79088996056ab88a34db5fcd16b01
11SHA1 (patch-aq) = 3ece22678e3e6dcd3cf641e6389ff203cbe351b9 11SHA1 (patch-aq) = 3ece22678e3e6dcd3cf641e6389ff203cbe351b9
12SHA1 (patch-ca) = e8340df59362d1d388a8b6ea36fc85d4b230a67f 12SHA1 (patch-ca) = e8340df59362d1d388a8b6ea36fc85d4b230a67f
13SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099 13SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
14SHA1 (patch-ck) = 28207b8186c9ad194a1edc696159915bc16d1097 14SHA1 (patch-ck) = 28207b8186c9ad194a1edc696159915bc16d1097
15SHA1 (patch-cn) = 7ca2b1ff19f8371637a34ec26779b37d74c74cca 15SHA1 (patch-cn) = 7ca2b1ff19f8371637a34ec26779b37d74c74cca
16SHA1 (patch-cp) = 0b22d334df24d128142855464bf6dd61d4d82975 16SHA1 (patch-cp) = 0b22d334df24d128142855464bf6dd61d4d82975
17SHA1 (patch-dm) = 8e8a0ede0f371ef0ad3a0433912967f3b8f3dd43 17SHA1 (patch-dm) = 8e8a0ede0f371ef0ad3a0433912967f3b8f3dd43
18SHA1 (patch-ds) = e14502548e2b9579b9ac654bbc83d78cd249e8ab 18SHA1 (patch-ds) = e14502548e2b9579b9ac654bbc83d78cd249e8ab
19SHA1 (patch-dt) = 4d15e650b3aa9a1c8e50e5f9db91d82db3b68b8f 19SHA1 (patch-dt) = 4d15e650b3aa9a1c8e50e5f9db91d82db3b68b8f
 20SHA1 (patch-pp.c) = fc8eaa16bfb214d4c346827fbffa7cd345f46c4b
20SHA1 (patch-ta) = 69f0d2df022eb8ff0dbcc77bde638cdc9c6391b1 21SHA1 (patch-ta) = 69f0d2df022eb8ff0dbcc77bde638cdc9c6391b1
21SHA1 (patch-zc) = c2a4c65a849f221294eaa61b52cd1fcb196e675b 22SHA1 (patch-zc) = c2a4c65a849f221294eaa61b52cd1fcb196e675b
22SHA1 (patch-zd) = 15532739b4a582da322d3e51fc364905bacbcd7e 23SHA1 (patch-zd) = 15532739b4a582da322d3e51fc364905bacbcd7e
23SHA1 (patch-ze) = 73ad81c7f4265837f5d0efca3f2432e7dde265a0 24SHA1 (patch-ze) = 73ad81c7f4265837f5d0efca3f2432e7dde265a0
File Added: pkgsrc/lang/perl5/patches/Attic/patch-pp.c
$NetBSD: patch-pp.c,v 1.1 2011/04/07 04:03:58 taca Exp $

* Fix for http://secunia.com/advisories/43921/ from perl's git repository
  (539689e74a).

--- pp.c.orig	2010-09-06 23:30:32.000000000 +0000
+++ pp.c
@@ -3949,6 +3949,8 @@ PP(pp_ucfirst)
 	    SvCUR_set(dest, need - 1);
 	}
     }
+    if (dest != source && SvTAINTED(source))
+	SvTAINT(dest);
     SvSETMAGIC(dest);
     RETURN;
 }
@@ -4222,6 +4224,8 @@ PP(pp_uc)
 	    SvCUR_set(dest, d - (U8*)SvPVX_const(dest));
 	}
     } /* End of isn't utf8 */
+    if (dest != source && SvTAINTED(source))
+	SvTAINT(dest);
     SvSETMAGIC(dest);
     RETURN;
 }
@@ -4433,6 +4437,8 @@ PP(pp_lc)
 	    SvCUR_set(dest, d - (U8*)SvPVX_const(dest));
 	}
     }
+    if (dest != source && SvTAINTED(source))
+	SvTAINT(dest);
     SvSETMAGIC(dest);
     RETURN;
 }