Fri Apr 1 16:39:12 2022 UTC ()
perl5: update to 5.34.1

*  Modules and Pragmata

**  Updated Modules and Pragmata

B::Deparse has been upgraded from version 1.56 to 1.57.
Encode has been upgraded from version 3.08 to 3.08_01.
GDBM_File has been upgraded from version 1.19 to 1.19_01.
Module::CoreList has been upgraded from version 5.20210520 to 5.20220313.
perl5db.pl has been upgraded from version 1.60 to 1.60_01.

*  Testing

Tests were added and changed to reflect the other additions and changes in this
release.

*  Selected Bug Fixes

B::Deparse now correctly handles try/catch blocks with more complex scopes.


(wiz)
diff -r1.54 -r1.55 pkgsrc/databases/p5-gdbm/Makefile
diff -r1.274 -r1.275 pkgsrc/lang/perl5/Makefile
diff -r1.43 -r1.44 pkgsrc/lang/perl5/Makefile.common
diff -r1.175 -r1.176 pkgsrc/lang/perl5/distinfo
diff -r1.2 -r0 pkgsrc/lang/perl5/patches/patch-cpan_Encode_Encode.pm
cvs diff -r1.54 -r1.55 pkgsrc/databases/p5-gdbm/Makefile (switch to unified diff)

--- pkgsrc/databases/p5-gdbm/Makefile 2021/05/24 19:49:43 1.54
+++ pkgsrc/databases/p5-gdbm/Makefile 2022/04/01 16:39:12 1.55
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.54 2021/05/24 19:49:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.55 2022/04/01 16:39:12 wiz Exp $
2 2
3PKGREVISION= 1 
4.include "../../lang/perl5/Makefile.common" 3.include "../../lang/perl5/Makefile.common"
 4
5PKGNAME= p5-${DISTNAME:S/perl/gdbm/} 5PKGNAME= p5-${DISTNAME:S/perl/gdbm/}
6CATEGORIES= databases perl5 6CATEGORIES= databases perl5
7 7
8#PATCHDIR= ${.CURDIR}/../../lang/perl5/patches 8#PATCHDIR= ${.CURDIR}/../../lang/perl5/patches
9DISTINFO_FILE= ${.CURDIR}/../../lang/perl5/distinfo 9DISTINFO_FILE= ${.CURDIR}/../../lang/perl5/distinfo
10 10
11COMMENT= Perl interface to gdbm - GNU database manager 11COMMENT= Perl interface to gdbm - GNU database manager
12LICENSE= ${PERL5_LICENSE} 12LICENSE= ${PERL5_LICENSE}
13 13
14EXTRACT_ELEMENTS= ${DISTNAME}/ext/GDBM_File 14EXTRACT_ELEMENTS= ${DISTNAME}/ext/GDBM_File
15WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS} 15WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS}
16 16
17PERL5_PACKLIST= auto/GDBM_File/.packlist 17PERL5_PACKLIST= auto/GDBM_File/.packlist
18 18
19.include "../../databases/gdbm/buildlink3.mk" 19.include "../../databases/gdbm/buildlink3.mk"
20.include "../../lang/perl5/module.mk" 20.include "../../lang/perl5/module.mk"
21.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.274 -r1.275 pkgsrc/lang/perl5/Makefile (switch to unified diff)

--- pkgsrc/lang/perl5/Makefile 2021/12/26 15:50:16 1.274
+++ pkgsrc/lang/perl5/Makefile 2022/04/01 16:39:12 1.275
@@ -1,252 +1,251 @@ @@ -1,252 +1,251 @@
1# $NetBSD: Makefile,v 1.274 2021/12/26 15:50:16 nia Exp $ 1# $NetBSD: Makefile,v 1.275 2022/04/01 16:39:12 wiz Exp $
2 2
3PKGREVISION= 3 
4.include "license.mk" 3.include "license.mk"
5.include "Makefile.common" 4.include "Makefile.common"
6 5
7COMMENT= Practical Extraction and Report Language 6COMMENT= Practical Extraction and Report Language
8 7
9CONFLICTS+= perl-base-[0-9]* perl-thread-[0-9]* 8CONFLICTS+= perl-base-[0-9]* perl-thread-[0-9]*
10 9
11# when updating perl, you can remove packages that are included 10# when updating perl, you can remove packages that are included
12# in perl core, see 11# in perl core, see
13# corelist -diff ${PREV_PKGVERSION} ${PKGVERSION} 12# corelist -diff ${PREV_PKGVERSION} ${PKGVERSION}
14 13
15SUPERSEDES+= p5-Tie-File<=0.99 14SUPERSEDES+= p5-Tie-File<=0.99
16SUPERSEDES+= p5-Time-HiRes-[0-9]* 15SUPERSEDES+= p5-Time-HiRes-[0-9]*
17SUPERSEDES+= p5-DB_File-[0-9]* 16SUPERSEDES+= p5-DB_File-[0-9]*
18SUPERSEDES+= p5-Memoize<=1.03 17SUPERSEDES+= p5-Memoize<=1.03
19SUPERSEDES+= p5-I18N-LangTags<=0.39 18SUPERSEDES+= p5-I18N-LangTags<=0.39
20SUPERSEDES+= p5-Locale-Maketext<=1.23 19SUPERSEDES+= p5-Locale-Maketext<=1.23
21SUPERSEDES+= p5-experimental<=0.007 20SUPERSEDES+= p5-experimental<=0.007
22 21
23# XXX: requires that gcc use an external perl to avoid circular dependencies 22# XXX: requires that gcc use an external perl to avoid circular dependencies
24USE_GCC_RUNTIME= yes 23USE_GCC_RUNTIME= yes
25USE_LANGUAGES= c c99 24USE_LANGUAGES= c c99
26 25
27.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
28 27
29# Determine the Perl API version from the patchlevel.h file from the 28# Determine the Perl API version from the patchlevel.h file from the
30# source distribution. 29# source distribution.
31# 30#
32PERL5_API_VERS= ${PERL5_API_VERS_cmd:sh} 31PERL5_API_VERS= ${PERL5_API_VERS_cmd:sh}
33PERL5_API_VERS_cmd= \ 32PERL5_API_VERS_cmd= \
34 if ${TEST} -f ${WRKSRC}/patchlevel.h; then \ 33 if ${TEST} -f ${WRKSRC}/patchlevel.h; then \
35 ${AWK} '/\#define[ ]*PERL_API_REVISION/ { R = $$3 }\ 34 ${AWK} '/\#define[ ]*PERL_API_REVISION/ { R = $$3 }\
36 /\#define[ ]*PERL_API_VERSION/ { r = "."$$3 } \ 35 /\#define[ ]*PERL_API_VERSION/ { r = "."$$3 } \
37 /\#define[ ]*PERL_API_SUBVERSION/ { s = "."$$3 } \ 36 /\#define[ ]*PERL_API_SUBVERSION/ { s = "."$$3 } \
38 END { printf "%s%s%s\n", R, r, s }' \ 37 END { printf "%s%s%s\n", R, r, s }' \
39 ${WRKSRC}/patchlevel.h; \ 38 ${WRKSRC}/patchlevel.h; \
40 else \ 39 else \
41 ${ECHO} "unknown"; \ 40 ${ECHO} "unknown"; \
42 fi 41 fi
43 42
44.include "dirs.mk" 43.include "dirs.mk"
45 44
46.include "../../mk/compiler.mk" 45.include "../../mk/compiler.mk"
47 46
48HAS_CONFIGURE= yes 47HAS_CONFIGURE= yes
49CONFIGURE_SCRIPT= ./Configure 48CONFIGURE_SCRIPT= ./Configure
50CONFIGURE_ARGS+= -sde 49CONFIGURE_ARGS+= -sde
51CONFIGURE_ARGS+= -Dldflags=${LDFLAGS:Q} 50CONFIGURE_ARGS+= -Dldflags=${LDFLAGS:Q}
52MAKE_ENV+= LC_ALL="C" 51MAKE_ENV+= LC_ALL="C"
53LDFLAGS.QNX+= -lm 52LDFLAGS.QNX+= -lm
54 53
55TEST_TARGET= test 54TEST_TARGET= test
56 55
57# Policy.sh generation 56# Policy.sh generation
58# (see comments in files/Policy.sh) 57# (see comments in files/Policy.sh)
59SUBST_CLASSES+= policysh 58SUBST_CLASSES+= policysh
60SUBST_STAGE.policysh= pre-configure 59SUBST_STAGE.policysh= pre-configure
61SUBST_FILES.policysh= Policy.sh 60SUBST_FILES.policysh= Policy.sh
62SUBST_VARS.policysh+= MACHINE_ARCH 61SUBST_VARS.policysh+= MACHINE_ARCH
63SUBST_VARS.policysh+= LOWER_OPSYS 62SUBST_VARS.policysh+= LOWER_OPSYS
64SUBST_VARS.policysh+= OBJECT_FMT 63SUBST_VARS.policysh+= OBJECT_FMT
65SUBST_VARS.policysh+= CC 64SUBST_VARS.policysh+= CC
66SUBST_VARS.policysh+= CFLAGS 65SUBST_VARS.policysh+= CFLAGS
67SUBST_VARS.policysh+= LDFLAGS 66SUBST_VARS.policysh+= LDFLAGS
68SUBST_VARS.policysh+= COMPILER_RPATH_FLAG 67SUBST_VARS.policysh+= COMPILER_RPATH_FLAG
69SUBST_VARS.policysh+= PERL5_PREFIX 68SUBST_VARS.policysh+= PERL5_PREFIX
70SUBST_VARS.policysh+= PERL5_SITEPREFIX 69SUBST_VARS.policysh+= PERL5_SITEPREFIX
71SUBST_VARS.policysh+= PERL5_VENDORPREFIX 70SUBST_VARS.policysh+= PERL5_VENDORPREFIX
72SUBST_VARS.policysh+= PERL5_PERLBASE 71SUBST_VARS.policysh+= PERL5_PERLBASE
73SUBST_VARS.policysh+= PERL5_SITEBASE 72SUBST_VARS.policysh+= PERL5_SITEBASE
74SUBST_VARS.policysh+= PERL5_SITEBIN 73SUBST_VARS.policysh+= PERL5_SITEBIN
75SUBST_VARS.policysh+= PERL5_VENDORBASE 74SUBST_VARS.policysh+= PERL5_VENDORBASE
76SUBST_VARS.policysh+= PERL5_PRIVLIB 75SUBST_VARS.policysh+= PERL5_PRIVLIB
77SUBST_VARS.policysh+= PERL5_SITELIB 76SUBST_VARS.policysh+= PERL5_SITELIB
78SUBST_VARS.policysh+= PERL5_VENDORLIB 77SUBST_VARS.policysh+= PERL5_VENDORLIB
79SUBST_VARS.policysh+= PKGMANDIR 78SUBST_VARS.policysh+= PKGMANDIR
80SUBST_VARS.policysh+= LOCALBASE 79SUBST_VARS.policysh+= LOCALBASE
81SUBST_VARS.policysh+= PTHREAD_LDFLAGS 80SUBST_VARS.policysh+= PTHREAD_LDFLAGS
82 81
83# Avoid the ${TOOLS_BIN} path getting written to installed files. 82# Avoid the ${TOOLS_BIN} path getting written to installed files.
84SUBST_CLASSES+= toolsbin 83SUBST_CLASSES+= toolsbin
85SUBST_STAGE.toolsbin= pre-configure 84SUBST_STAGE.toolsbin= pre-configure
86SUBST_FILES.toolsbin= Configure 85SUBST_FILES.toolsbin= Configure
87SUBST_VARS.toolsbin= TOOLS_RM 86SUBST_VARS.toolsbin= TOOLS_RM
88 87
89SUBST_CLASSES+= pwd 88SUBST_CLASSES+= pwd
90SUBST_STAGE.pwd= pre-configure 89SUBST_STAGE.pwd= pre-configure
91SUBST_FILES.pwd= dist/PathTools/Cwd.pm 90SUBST_FILES.pwd= dist/PathTools/Cwd.pm
92SUBST_SED.pwd+= -e "s,/bin/pwd,${TOOLS_PLATFORM.pwd},g" 91SUBST_SED.pwd+= -e "s,/bin/pwd,${TOOLS_PLATFORM.pwd},g"
93 92
94.if ${OPSYS} == "Darwin" || ${OPSYS} == "Cygwin" 93.if ${OPSYS} == "Darwin" || ${OPSYS} == "Cygwin"
95# 94#
96# The Perl build attempts to work around case-insensitivity problems on 95# The Perl build attempts to work around case-insensitivity problems on
97# HFS filesystems by using GNUmakefiles, so we need to use GNU make. 96# HFS filesystems by using GNUmakefiles, so we need to use GNU make.
98# 97#
99USE_TOOLS+= gmake 98USE_TOOLS+= gmake
100MAKE_FILE= GNUmakefile 99MAKE_FILE= GNUmakefile
101.endif 100.endif
102 101
103# 102#
104# For the moment disable the building of a shared libperl.dylib on Darwin 103# For the moment disable the building of a shared libperl.dylib on Darwin
105# => 9.0 as it breaks the build. This should just be considered a temporary 104# => 9.0 as it breaks the build. This should just be considered a temporary
106# work around until the actual problem can be fixed as this worked for 105# work around until the actual problem can be fixed as this worked for
107# Darwin < 9.0. 106# Darwin < 9.0.
108# 107#
109.if empty(MACHINE_PLATFORM:MDarwin-9.*-*) 108.if empty(MACHINE_PLATFORM:MDarwin-9.*-*)
110CONFIGURE_ARGS+= -Duseshrplib 109CONFIGURE_ARGS+= -Duseshrplib
111.endif 110.endif
112 111
113# Perl embeds the full paths to the following tools in several installed 112# Perl embeds the full paths to the following tools in several installed
114# files, so make sure the paths to the ones in ${TOOLS_DIR} aren't used. 113# files, so make sure the paths to the ones in ${TOOLS_DIR} aren't used.
115# 114#
116USE_TOOLS+= hostname ln rm sed test 115USE_TOOLS+= hostname ln rm sed test
117SUBST_VARS.policysh+= TOOLS_HOSTNAME_CMD 116SUBST_VARS.policysh+= TOOLS_HOSTNAME_CMD
118SUBST_VARS.policysh+= TOOLS_LN 117SUBST_VARS.policysh+= TOOLS_LN
119TOOLS_ALIASES.sed= ${TOOLS_SED:T} 118TOOLS_ALIASES.sed= ${TOOLS_SED:T}
120SUBST_VARS.policysh+= TOOLS_SED 119SUBST_VARS.policysh+= TOOLS_SED
121SUBST_VARS.policysh+= TOOLS_SH 120SUBST_VARS.policysh+= TOOLS_SH
122SUBST_VARS.policysh+= TOOLS_TEST 121SUBST_VARS.policysh+= TOOLS_TEST
123SUBST_VARS.policysh+= FALSE 122SUBST_VARS.policysh+= FALSE
124 123
125# Nail down the needed libraries for each platform here to avoid hidden 124# Nail down the needed libraries for each platform here to avoid hidden
126# dependencies. If this isn't defined, then use the perl defaults for the 125# dependencies. If this isn't defined, then use the perl defaults for the
127# particular operating system. 126# particular operating system.
128# 127#
129LIBSWANTED.Bitrig= m crypt 128LIBSWANTED.Bitrig= m crypt
130LIBSWANTED.Cygwin= m crypt dl 129LIBSWANTED.Cygwin= m crypt dl
131LIBSWANTED.Darwin= m c 130LIBSWANTED.Darwin= m c
132LIBSWANTED.DragonFly= m crypt 131LIBSWANTED.DragonFly= m crypt
133LIBSWANTED.FreeBSD= m crypt 132LIBSWANTED.FreeBSD= m crypt
134LIBSWANTED.GNUkFreeBSD= m crypt dl nsl 133LIBSWANTED.GNUkFreeBSD= m crypt dl nsl
135LIBSWANTED.Haiku= network 134LIBSWANTED.Haiku= network
136LIBSWANTED.HPUX= cl pthread $$libswanted # see Perl's README.hpux 135LIBSWANTED.HPUX= cl pthread $$libswanted # see Perl's README.hpux
137LIBSWANTED.IRIX= m crypt 136LIBSWANTED.IRIX= m crypt
138LIBSWANTED.Interix= m dl 137LIBSWANTED.Interix= m dl
139LIBSWANTED.Linux= m crypt dl nsl 138LIBSWANTED.Linux= m crypt dl nsl
140LIBSWANTED.Minix= m crypt c 139LIBSWANTED.Minix= m crypt c
141LIBSWANTED.MirBSD= m crypt 140LIBSWANTED.MirBSD= m crypt
142LIBSWANTED.NetBSD= m crypt 141LIBSWANTED.NetBSD= m crypt
143LIBSWANTED.OpenBSD= m crypt 142LIBSWANTED.OpenBSD= m crypt
144LIBSWANTED.SunOS= m crypt dl socket nsl 143LIBSWANTED.SunOS= m crypt dl socket nsl
145LIBSWANTED.AIX= m crypt dl socket nsl bind c 144LIBSWANTED.AIX= m crypt dl socket nsl bind c
146LIBSWANTED.SCO_SV= m crypt socket 145LIBSWANTED.SCO_SV= m crypt socket
147LIBSWANTED.UnixWare= m crypt socket 146LIBSWANTED.UnixWare= m crypt socket
148LIBSWANTED= ${LIBSWANTED.${OPSYS}} 147LIBSWANTED= ${LIBSWANTED.${OPSYS}}
149SUBST_VARS.policysh+= LIBSWANTED 148SUBST_VARS.policysh+= LIBSWANTED
150 149
151# Nail down the directories in which the system libraries may be found. 150# Nail down the directories in which the system libraries may be found.
152# If this isn't defined, then use the perl defaults for the particular 151# If this isn't defined, then use the perl defaults for the particular
153# operating system. 152# operating system.
154# 153#
155SYSLIBPATH.Bitrig= /usr/lib 154SYSLIBPATH.Bitrig= /usr/lib
156SYSLIBPATH.Cygwin= /usr/lib 155SYSLIBPATH.Cygwin= /usr/lib
157SYSLIBPATH.Darwin= /usr/lib 156SYSLIBPATH.Darwin= /usr/lib
158SYSLIBPATH.DragonFly= /usr/lib 157SYSLIBPATH.DragonFly= /usr/lib
159SYSLIBPATH.FreeBSD= /usr/lib 158SYSLIBPATH.FreeBSD= /usr/lib
160SYSLIBPATH.Interix= /usr/lib 159SYSLIBPATH.Interix= /usr/lib
161SYSLIBPATH.Minix= /usr/lib 160SYSLIBPATH.Minix= /usr/lib
162SYSLIBPATH.MirBSD= /usr/lib 161SYSLIBPATH.MirBSD= /usr/lib
163SYSLIBPATH.NetBSD= /usr/lib 162SYSLIBPATH.NetBSD= /usr/lib
164SYSLIBPATH.OpenBSD= /usr/lib 163SYSLIBPATH.OpenBSD= /usr/lib
165SYSLIBPATH.SunOS= /usr/lib 164SYSLIBPATH.SunOS= /usr/lib
166SYSLIBPATH.AIX= /usr/lib 165SYSLIBPATH.AIX= /usr/lib
167SYSLIBPATH.SCO_SV= /usr/lib 166SYSLIBPATH.SCO_SV= /usr/lib
168SYSLIBPATH= ${SYSLIBPATH.${OPSYS}:U${COMPILER_LIB_DIRS}} 167SYSLIBPATH= ${SYSLIBPATH.${OPSYS}:U${COMPILER_LIB_DIRS}}
169SUBST_VARS.policysh+= SYSLIBPATH 168SUBST_VARS.policysh+= SYSLIBPATH
170 169
171.include "../../mk/dlopen.buildlink3.mk" 170.include "../../mk/dlopen.buildlink3.mk"
172.include "options.mk" 171.include "options.mk"
173 172
174.if ${MACHINE_PLATFORM} == "MirBSD" 173.if ${MACHINE_PLATFORM} == "MirBSD"
175SUBST_CLASSES+= mirbsd-paths 174SUBST_CLASSES+= mirbsd-paths
176SUBST_STAGE.mirbsd-paths= pre-configure 175SUBST_STAGE.mirbsd-paths= pre-configure
177SUBST_FILES.mirbsd-paths= hints/mirbsd.sh 176SUBST_FILES.mirbsd-paths= hints/mirbsd.sh
178SUBST_SED.mirbsd-paths= -e 's,/usr/mpkg,${PREFIX},g' 177SUBST_SED.mirbsd-paths= -e 's,/usr/mpkg,${PREFIX},g'
179SUBST_MESSAGE.mirbsd-paths= Do not use non-pkgsrc paths on MirBSD. 178SUBST_MESSAGE.mirbsd-paths= Do not use non-pkgsrc paths on MirBSD.
180.endif 179.endif
181 180
182# Replace our perl as the interpreter 181# Replace our perl as the interpreter
183REPLACE_PERL+= cpan/Config-Perl-V/V.pm 182REPLACE_PERL+= cpan/Config-Perl-V/V.pm
184REPLACE_PERL+= cpan/Getopt-Long/lib/Getopt/Long.pm 183REPLACE_PERL+= cpan/Getopt-Long/lib/Getopt/Long.pm
185REPLACE_PERL+= cpan/version/lib/version.pm 184REPLACE_PERL+= cpan/version/lib/version.pm
186REPLACE_PERL+= dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp 185REPLACE_PERL+= dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp
187REPLACE_PERL+= ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm 186REPLACE_PERL+= ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
188REPLACE_PERL+= ext/File-DosGlob/lib/File/DosGlob.pm 187REPLACE_PERL+= ext/File-DosGlob/lib/File/DosGlob.pm
189REPLACE_PERL+= lib/unicore/mktables 188REPLACE_PERL+= lib/unicore/mktables
190 189
191.if ${PKGSRC_COMPILER:Mxlc} 190.if ${PKGSRC_COMPILER:Mxlc}
192SUBST_CLASSES+= cpprun 191SUBST_CLASSES+= cpprun
193SUBST_STAGE.cpprun= pre-install 192SUBST_STAGE.cpprun= pre-install
194SUBST_FILES.cpprun= lib/Config_heavy.pl 193SUBST_FILES.cpprun= lib/Config_heavy.pl
195. if !empty(PKG_OPTIONS:Mthreads) 194. if !empty(PKG_OPTIONS:Mthreads)
196SUBST_SED.cpprun= -e "s/cpprun=''/cpprun='cc_r -E'/" 195SUBST_SED.cpprun= -e "s/cpprun=''/cpprun='cc_r -E'/"
197. else 196. else
198SUBST_SED.cpprun= -e "s/cpprun=''/cpprun='cc -E'/" 197SUBST_SED.cpprun= -e "s/cpprun=''/cpprun='cc -E'/"
199. endif 198. endif
200.endif 199.endif
201 200
202# Some platforms may want the directory mode not to be 0755. This 201# Some platforms may want the directory mode not to be 0755. This
203# is, unfortunately, hardcoded in quite a few places in Perl, so 202# is, unfortunately, hardcoded in quite a few places in Perl, so
204# let's substitute what pkgsrc says instead. 203# let's substitute what pkgsrc says instead.
205# 204#
206SUBST_CLASSES+= dirmode 205SUBST_CLASSES+= dirmode
207SUBST_STAGE.dirmode= pre-configure 206SUBST_STAGE.dirmode= pre-configure
208SUBST_FILES.dirmode= install_lib.pl 207SUBST_FILES.dirmode= install_lib.pl
209SUBST_SED.dirmode= -e "s/755/${PKGDIRMODE}/g;/umask(/d" 208SUBST_SED.dirmode= -e "s/755/${PKGDIRMODE}/g;/umask(/d"
210 209
211post-extract: 210post-extract:
212 ${CP} ${FILESDIR}/Policy.sh ${WRKSRC}/Policy.sh 211 ${CP} ${FILESDIR}/Policy.sh ${WRKSRC}/Policy.sh
213 212
214pre-configure: 213pre-configure:
215 ${FIND} ${WRKSRC} -name "*.orig" -type f -exec rm -f {} \; 214 ${FIND} ${WRKSRC} -name "*.orig" -type f -exec rm -f {} \;
216 215
217post-build: 216post-build:
218 ${SED} -e "s,@PERL5@,"${PERL5:Q}",g" \ 217 ${SED} -e "s,@PERL5@,"${PERL5:Q}",g" \
219 -e "s,@SH@,"${SH:Q}",g" \ 218 -e "s,@SH@,"${SH:Q}",g" \
220 -e "s,@PKGMANDIR@,"${PKGMANDIR}",g" \ 219 -e "s,@PKGMANDIR@,"${PKGMANDIR}",g" \
221 ${FILESDIR}/perllink.in > ${WRKDIR}/perllink.sh 220 ${FILESDIR}/perllink.in > ${WRKDIR}/perllink.sh
222 221
223INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 222INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
224PERL5_PACKLIST_DIR_cmd= . ${WRKSRC}/config.sh; echo $$installarchlib 223PERL5_PACKLIST_DIR_cmd= . ${WRKSRC}/config.sh; echo $$installarchlib
225PERL5_PACKLIST_DIR= ${PERL5_PACKLIST_DIR_cmd:sh} 224PERL5_PACKLIST_DIR= ${PERL5_PACKLIST_DIR_cmd:sh}
226PERL5_PACKLIST= .packlist 225PERL5_PACKLIST= .packlist
227PERL5_PACKLIST_DESTDIR= no 226PERL5_PACKLIST_DESTDIR= no
228FILES_SUBST+= PERL5_COMMENT=\# 227FILES_SUBST+= PERL5_COMMENT=\#
229FILES_SUBST+= PERL5_PACKLIST= 228FILES_SUBST+= PERL5_PACKLIST=
230 229
231.PHONY: perl5-post-install 230.PHONY: perl5-post-install
232post-install: perl5-post-install 231post-install: perl5-post-install
233perl5-post-install: 232perl5-post-install:
234 ${RUN}if ${TEST} -x ${DESTDIR}${PREFIX}/bin/a2p; then \ 233 ${RUN}if ${TEST} -x ${DESTDIR}${PREFIX}/bin/a2p; then \
235 strip ${DESTDIR}${PREFIX}/bin/a2p; \ 234 strip ${DESTDIR}${PREFIX}/bin/a2p; \
236 fi 235 fi
237 ${INSTALL_SCRIPT} ${WRKDIR}/perllink.sh \ 236 ${INSTALL_SCRIPT} ${WRKDIR}/perllink.sh \
238 ${DESTDIR}${PERL5_PERLBASE}/bin/perllink 237 ${DESTDIR}${PERL5_PERLBASE}/bin/perllink
239 ${INSTALL_MAN} ${FILESDIR}/perllink.1 \ 238 ${INSTALL_MAN} ${FILESDIR}/perllink.1 \
240 ${DESTDIR}${PERL5_PERLBASE}/${PKGMANDIR}/man1/perllink.1 239 ${DESTDIR}${PERL5_PERLBASE}/${PKGMANDIR}/man1/perllink.1
241 ${RM} -f ${DESTDIR}${PREFIX}/bin/perllink \ 240 ${RM} -f ${DESTDIR}${PREFIX}/bin/perllink \
242 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/perllink.1 241 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/perllink.1
243 ${LN} -s ${PERL5_PERLBASE}/bin/perllink \ 242 ${LN} -s ${PERL5_PERLBASE}/bin/perllink \
244 ${DESTDIR}${PREFIX}/bin/perllink 243 ${DESTDIR}${PREFIX}/bin/perllink
245 ${LN} -s ${PERL5_PERLBASE}/${PKGMANDIR}/man1/perllink.1 \ 244 ${LN} -s ${PERL5_PERLBASE}/${PKGMANDIR}/man1/perllink.1 \
246 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/perllink.1 245 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/perllink.1
247.if ${OPSYS} == "Haiku" 246.if ${OPSYS} == "Haiku"
248 ${CHMOD} a+x ${DESTDIR}${PREFIX}/bin/perl 247 ${CHMOD} a+x ${DESTDIR}${PREFIX}/bin/perl
249.endif 248.endif
250 249
251.include "packlist.mk" 250.include "packlist.mk"
252.include "../../mk/bsd.pkg.mk" 251.include "../../mk/bsd.pkg.mk"
cvs diff -r1.43 -r1.44 pkgsrc/lang/perl5/Makefile.common (switch to unified diff)

--- pkgsrc/lang/perl5/Makefile.common 2021/05/24 17:46:25 1.43
+++ pkgsrc/lang/perl5/Makefile.common 2022/04/01 16:39:12 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.43 2021/05/24 17:46:25 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.44 2022/04/01 16:39:12 wiz Exp $
2# 2#
3# used by lang/perl5/Makefile 3# used by lang/perl5/Makefile
4# used by databases/p5-gdbm/Makefile 4# used by databases/p5-gdbm/Makefile
5 5
6DISTNAME= perl-5.34.0 6DISTNAME= perl-5.34.1
7CATEGORIES= lang devel perl5 7CATEGORIES= lang devel perl5
8MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/5.0/,} 8MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/5.0/,}
9DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} 9DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= https://www.perl.org/ 13HOMEPAGE= https://www.perl.org/
14LICENSE= ${PERL5_LICENSE} 14LICENSE= ${PERL5_LICENSE}
cvs diff -r1.175 -r1.176 pkgsrc/lang/perl5/distinfo (switch to unified diff)

--- pkgsrc/lang/perl5/distinfo 2021/10/26 10:51:47 1.175
+++ pkgsrc/lang/perl5/distinfo 2022/04/01 16:39:12 1.176
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1$NetBSD: distinfo,v 1.175 2021/10/26 10:51:47 nia Exp $ 1$NetBSD: distinfo,v 1.176 2022/04/01 16:39:12 wiz Exp $
2 2
3BLAKE2s (perl-5.34.0.tar.xz) = db521090d12fa27e5074237af943ff558ac5c64c88866986b383c7269bddfbad 3BLAKE2s (perl-5.34.1.tar.xz) = 4fffbd2e2c84f68bd264587a19ccf12dedfb097468cfa928d45d2891c14c2140
4SHA512 (perl-5.34.0.tar.xz) = 691b4b31eacec357191fba777612b4e3eae59e946a22998a50766697c0d61db1d42a9b3bc1e41abf0d1ca1893e4a7c06d7bf3290480cf03d7f79befd7a8a3267 4SHA512 (perl-5.34.1.tar.xz) = 9261958291b49eea30c120a89e5ee32dc6a5fd46de4869c89c3d6a4c1162d6cf192ebe429d01a293eda93d8680ce15294af27717fd4ec4c75f511c1fa820fdac
5Size (perl-5.34.0.tar.xz) = 12881416 bytes 5Size (perl-5.34.1.tar.xz) = 12760168 bytes
6SHA1 (patch-Configure) = a72983dba63f32f57418f2702b039585ba7236a7 6SHA1 (patch-Configure) = a72983dba63f32f57418f2702b039585ba7236a7
7SHA1 (patch-Makefile.SH) = 56203aea57c429a94760f039a978463b8859b0a9 7SHA1 (patch-Makefile.SH) = 56203aea57c429a94760f039a978463b8859b0a9
8SHA1 (patch-caretx.c) = b76b4175a58123fa4dfd2adf36b2207dcb6cf65a 8SHA1 (patch-caretx.c) = b76b4175a58123fa4dfd2adf36b2207dcb6cf65a
9SHA1 (patch-cflags.SH) = e940e4452768ccc1bdf21d435094e7efffceb925 9SHA1 (patch-cflags.SH) = e940e4452768ccc1bdf21d435094e7efffceb925
10SHA1 (patch-cpan_Encode_Encode.pm) = 2254ec5c3dd57a2e3dd587f18924d58dc972462d 
11SHA1 (patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__BeOS.pm) = 79e5aeccfa272ca5ec08bffc616d8053ae90ac51 10SHA1 (patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__BeOS.pm) = 79e5aeccfa272ca5ec08bffc616d8053ae90ac51
12SHA1 (patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Unix.pm) = 7b1caaea7327ebf492f8cde6b459286ecf7dd5ad 11SHA1 (patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Unix.pm) = 7b1caaea7327ebf492f8cde6b459286ecf7dd5ad
13SHA1 (patch-cpan_ExtUtils-MakeMaker_t_MM__BeOS.t) = 9b0e7ab85fdab4887b1754599a8879bd7d9f36cc 12SHA1 (patch-cpan_ExtUtils-MakeMaker_t_MM__BeOS.t) = 9b0e7ab85fdab4887b1754599a8879bd7d9f36cc
14SHA1 (patch-dist_PathTools_Cwd.pm) = 2a62c7e7a71c103138d9960578431cab0f49435b 13SHA1 (patch-dist_PathTools_Cwd.pm) = 2a62c7e7a71c103138d9960578431cab0f49435b
15SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470 14SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470
16SHA1 (patch-hints_linux.sh) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7 15SHA1 (patch-hints_linux.sh) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7
17SHA1 (patch-hints_netbsd.sh) = 0d549a48800372d75fe34b783529a78cba90f646 16SHA1 (patch-hints_netbsd.sh) = 0d549a48800372d75fe34b783529a78cba90f646
18SHA1 (patch-hints_solaris__2.sh) = 364a28ca57dbabe1f902b601e336532996db6a0e 17SHA1 (patch-hints_solaris__2.sh) = 364a28ca57dbabe1f902b601e336532996db6a0e
19SHA1 (patch-installperl) = b129d64cc17b898b44fe6282b8b1df36e342d0ef 18SHA1 (patch-installperl) = b129d64cc17b898b44fe6282b8b1df36e342d0ef
20SHA1 (patch-lib_File_Copy.pm) = 99304793777e37ae13aa71607906e7648dcdbc65 19SHA1 (patch-lib_File_Copy.pm) = 99304793777e37ae13aa71607906e7648dcdbc65
21SHA1 (patch-numeric.c) = 53dc8da40ad21d97072e8e2000f0a16c3353ff41 20SHA1 (patch-numeric.c) = 53dc8da40ad21d97072e8e2000f0a16c3353ff41
File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-cpan_Encode_Encode.pm