CVS commit: pkgsrc/lang/perl5

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Nov 19 21:02:21 UTC 2024

Modified Files:
        pkgsrc/lang/perl5: Makefile hacks.mk

Log Message:
perl5: stop two she-bang replacements that broke tests

after discussion with upstream

pkglint cleanups while here.


To generate a diff of this commit:
cvs rdiff -u -r1.280 -r1.281 pkgsrc/lang/perl5/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/perl5/hacks.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/perl5/Makefile
diff -u pkgsrc/lang/perl5/Makefile:1.280 pkgsrc/lang/perl5/Makefile:1.281
--- pkgsrc/lang/perl5/Makefile:1.280    Sat Nov 16 11:55:57 2024
+++ pkgsrc/lang/perl5/Makefile  Tue Nov 19 21:02:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.280 2024/11/16 11:55:57 wiz Exp $
+# $NetBSD: Makefile,v 1.281 2024/11/19 21:02:20 wiz Exp $
 
 .include "license.mk"
 .include "Makefile.common"
@@ -21,7 +21,8 @@ SUPERSEDES+=  p5-experimental<=0.007
 
 # XXX: requires that gcc use an external perl to avoid circular dependencies
 USE_GCC_RUNTIME=       yes
-USE_LANGUAGES=         c c99
+USE_LANGUAGES=         c
+USE_CC_FEATURES+=      c99
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -189,11 +190,18 @@ SUBST_MESSAGE.mirbsd-paths=       Do not use n
 
 # Replace our perl as the interpreter
 REPLACE_PERL+=         cpan/Getopt-Long/lib/Getopt/Long.pm
-REPLACE_PERL+=         cpan/version/lib/version.pm
 REPLACE_PERL+=         dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp
 REPLACE_PERL+=         ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
 REPLACE_PERL+=         ext/File-DosGlob/lib/File/DosGlob.pm
-REPLACE_PERL+=         lib/unicore/mktables
+
+# leads to test errors, shebang not necessary according to upstream
+# shebang will be removed in 5.42
+# https://github.com/Perl/perl5/issues/22751#issuecomment-2486616440
+#REPLACE_PERL+=                cpan/version/lib/version.pm
+# this file is not installed, and its checksums are in multiple places, breaking
+# tests, so do not replace the shebang here.
+# https://github.com/Perl/perl5/issues/22751
+#REPLACE_PERL+=                lib/unicore/mktables
 
 .if ${PKGSRC_COMPILER:Mxlc}
 SUBST_CLASSES+=                cpprun

Index: pkgsrc/lang/perl5/hacks.mk
diff -u pkgsrc/lang/perl5/hacks.mk:1.31 pkgsrc/lang/perl5/hacks.mk:1.32
--- pkgsrc/lang/perl5/hacks.mk:1.31     Tue Nov  7 09:54:49 2023
+++ pkgsrc/lang/perl5/hacks.mk  Tue Nov 19 21:02:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.31 2023/11/07 09:54:49 nia Exp $
+# $NetBSD: hacks.mk,v 1.32 2024/11/19 21:02:20 wiz Exp $
 
 .if !defined(PERL5_HACKS_MK)
 PERL5_HACKS_MK=        defined
@@ -48,10 +48,10 @@ LDFLAGS+=   ${COMPILER_RPATH_FLAG}/usr/sfw
 ### causes opmini.c to be miscompiled, and perl build fails.
 ###
 .if ${CC_VERSION:Mgcc-4.5.*} && ${OPSYS} == "NetBSD"
-.  if (${MACHINE_ARCH} == "vax" ||     \
-       ${MACHINE_CPU} == "mips" ||     \
-       ${MACHINE_ARCH} == "sparc" ||   \
-       ${MACHINE_ARCH} == "sparc64")
+.  if ${MACHINE_ARCH} == "vax" ||      \
+      ${MACHINE_CPU} == "mips" ||      \
+      ${MACHINE_ARCH} == "sparc" ||    \
+      ${MACHINE_ARCH} == "sparc64"
 PKG_HACKS+=    gcc-4.5-codegen
 CFLAGS+=       -fno-reorder-blocks
 .  endif