mingw/mingw-packages/mingw-w64-perl/003-replace-batch-scripts-with-bare-perl.patch

diff --git a/installperl b/installperl
index 6cd65a0..36ab6ec 100644
--- a/installperl
+++ b/installperl
@@ -27,7 +27,7 @@ BEGIN {
 my $SO_MODE     = $Is_AmigaOS ? 0777 : 0555;
 my $NON_SO_MODE = $Is_AmigaOS ? 0666 : 0444;
 
-my $scr_ext = ($Is_VMS ? '.Com' : $Is_W32 ? '.bat' : '');
+my $scr_ext = ($Is_VMS ? '.Com' : '');
 
 use File::Find;
 use File::Compare;
diff --git a/win32/GNUmakefile b/win32/GNUmakefile
index 3fb67dd..15a1658 100644
--- a/win32/GNUmakefile
+++ b/win32/GNUmakefile
@@ -980,34 +980,7 @@ PERLDEP = $(PERLIMPLIB)
 PL2BAT		= bin\pl2bat.pl
 
 UTILS		=			\
-		..\utils\h2ph		\
-		..\utils\splain		\
-		..\utils\perlbug	\
-		..\utils\pl2pm 		\
-		..\utils\h2xs		\
-		..\utils\perldoc	\
-		..\utils\perlivp	\
-		..\utils\libnetcfg	\
-		..\utils\enc2xs		\
-		..\utils\encguess	\
-		..\utils\piconv		\
-		..\utils\corelist	\
-		..\utils\cpan		\
-		..\utils\xsubpp		\
-		..\utils\pod2html	\
-		..\utils\prove		\
-		..\utils\ptar		\
-		..\utils\ptardiff	\
-		..\utils\ptargrep	\
-		..\utils\zipdetails	\
-		..\utils\shasum		\
-		..\utils\instmodsh	\
-		..\utils\json_pp	\
-		bin\exetype.pl		\
-		bin\runperl.pl		\
-		bin\pl2bat.pl		\
-		bin\perlglob.pl		\
-		bin\search.pl
+		bin\runperl.pl
 
 ifeq ($(CCTYPE),GCC)
 
@@ -1899,6 +1872,37 @@ installbare : utils ..\pod\perltoc.pod
 	$(XCOPY) $(GLOBEXE) $(INST_BIN)\$(NULL)
 	if exist ..\perl*.pdb $(XCOPY) ..\perl*.pdb $(INST_BIN)\$(NULL)
 	$(XCOPY) "bin\*.bat" $(INST_SCRIPT)\$(NULL)
+	$(XCOPY) ..\utils\h2ph $(INST_SCRIPT)
+	$(XCOPY) ..\utils\splain $(INST_SCRIPT)
+	$(XCOPY) ..\utils\perlbug $(INST_SCRIPT)
+	$(XCOPY) ..\utils\pl2pm $(INST_SCRIPT)
+	$(XCOPY) ..\utils\h2xs $(INST_SCRIPT)
+	$(XCOPY) ..\utils\perldoc $(INST_SCRIPT)
+	$(XCOPY) ..\utils\perlivp $(INST_SCRIPT)
+	$(XCOPY) ..\utils\libnetcfg $(INST_SCRIPT)
+	$(XCOPY) ..\utils\enc2xs $(INST_SCRIPT)
+	$(XCOPY) ..\utils\encguess $(INST_SCRIPT)
+	$(XCOPY) ..\utils\piconv $(INST_SCRIPT)
+	$(XCOPY) ..\utils\corelist $(INST_SCRIPT)
+	$(XCOPY) ..\utils\cpan $(INST_SCRIPT)
+	$(XCOPY) ..\utils\xsubpp $(INST_SCRIPT)
+	$(XCOPY) ..\utils\pod2html $(INST_SCRIPT)
+	$(XCOPY) ..\utils\prove $(INST_SCRIPT)
+	$(XCOPY) ..\utils\ptar $(INST_SCRIPT)
+	$(XCOPY) ..\utils\ptardiff $(INST_SCRIPT)
+	$(XCOPY) ..\utils\ptargrep $(INST_SCRIPT)
+	$(XCOPY) ..\utils\zipdetails $(INST_SCRIPT)
+	$(XCOPY) ..\utils\shasum $(INST_SCRIPT)
+	$(XCOPY) ..\utils\instmodsh $(INST_SCRIPT)
+	$(XCOPY) ..\utils\json_pp $(INST_SCRIPT)
+	$(XCOPY) bin\exetype.pl $(INST_SCRIPT)
+	$(XCOPY) bin\pl2bat.pl $(INST_SCRIPT)
+	$(XCOPY) bin\perlglob.pl $(INST_SCRIPT)
+	$(XCOPY) bin\search.pl $(INST_SCRIPT)
+	rename $(INST_SCRIPT)\exetype.pl exetype
+	rename $(INST_SCRIPT)\pl2bat.pl pl2bat
+	rename $(INST_SCRIPT)\perlglob.pl perlglob
+	rename $(INST_SCRIPT)\search.pl search
 
 installhtml : doc
 	$(RCOPY) $(HTMLDIR)\*.* $(INST_HTML)\$(NULL)
diff --git a/win32/bin/pl2bat.pl b/win32/bin/pl2bat.pl
index 443f590..f3e1e55 100644
--- a/win32/bin/pl2bat.pl
+++ b/win32/bin/pl2bat.pl
@@ -1,5 +1,4 @@
-    eval 'exec perl -x -S "$0" ${1+"$@"}'
-	if 0;	# In case running under some shell
+#!perl -w
 
 require 5;
 use Getopt::Std;
diff --git a/win32/bin/search.pl b/win32/bin/search.pl
index 21d936e..c3211ae 100644
--- a/win32/bin/search.pl
+++ b/win32/bin/search.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!perl -w
 'di';
 'ig00';
 ##############################################################################
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 6a7fff6..fcd06d7 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -925,35 +925,7 @@ PERLDEP = $(PERLIMPLIB)
 PL2BAT		= bin\pl2bat.pl
 
 UTILS		=			\
-		..\utils\h2ph		\
-		..\utils\splain		\
-		..\utils\perlbug	\
-		..\utils\pl2pm 		\
-		..\utils\h2xs		\
-		..\utils\perldoc	\
-		..\utils\perlivp	\
-		..\utils\libnetcfg	\
-		..\utils\enc2xs		\
-		..\utils\encguess	\
-		..\utils\piconv		\
-		..\utils\corelist	\
-		..\utils\cpan		\
-		..\utils\xsubpp		\
-		..\utils\pod2html	\
-		..\utils\prove		\
-		..\utils\ptar		\
-		..\utils\ptardiff	\
-		..\utils\ptargrep	\
-		..\utils\zipdetails	\
-		..\utils\shasum		\
-		..\utils\instmodsh	\
-		..\utils\json_pp	\
-		..\utils\streamzip	\
-		bin\exetype.pl		\
-		bin\runperl.pl		\
-		bin\pl2bat.pl		\
-		bin\perlglob.pl		\
-		bin\search.pl
+		bin\runperl.pl
 
 .IF "$(CCTYPE)" == "GCC"
 
@@ -1818,6 +1790,37 @@ installbare : utils ..\pod\perltoc.pod
 	$(XCOPY) $(GLOBEXE) $(INST_BIN)\*.*
 	if exist ..\perl*.pdb $(XCOPY) ..\perl*.pdb $(INST_BIN)\*.*
 	$(XCOPY) bin\*.bat $(INST_SCRIPT)\*.*
+	$(XCOPY) ..\utils\h2ph $(INST_SCRIPT)
+	$(XCOPY) ..\utils\splain $(INST_SCRIPT)
+	$(XCOPY) ..\utils\perlbug $(INST_SCRIPT)
+	$(XCOPY) ..\utils\pl2pm $(INST_SCRIPT)
+	$(XCOPY) ..\utils\h2xs $(INST_SCRIPT)
+	$(XCOPY) ..\utils\perldoc $(INST_SCRIPT)
+	$(XCOPY) ..\utils\perlivp $(INST_SCRIPT)
+	$(XCOPY) ..\utils\libnetcfg $(INST_SCRIPT)
+	$(XCOPY) ..\utils\enc2xs $(INST_SCRIPT)
+	$(XCOPY) ..\utils\encguess $(INST_SCRIPT)
+	$(XCOPY) ..\utils\piconv $(INST_SCRIPT)
+	$(XCOPY) ..\utils\corelist $(INST_SCRIPT)
+	$(XCOPY) ..\utils\cpan $(INST_SCRIPT)
+	$(XCOPY) ..\utils\xsubpp $(INST_SCRIPT)
+	$(XCOPY) ..\utils\pod2html $(INST_SCRIPT)
+	$(XCOPY) ..\utils\prove $(INST_SCRIPT)
+	$(XCOPY) ..\utils\ptar $(INST_SCRIPT)
+	$(XCOPY) ..\utils\ptardiff $(INST_SCRIPT)
+	$(XCOPY) ..\utils\ptargrep $(INST_SCRIPT)
+	$(XCOPY) ..\utils\zipdetails $(INST_SCRIPT)
+	$(XCOPY) ..\utils\shasum $(INST_SCRIPT)
+	$(XCOPY) ..\utils\instmodsh $(INST_SCRIPT)
+	$(XCOPY) ..\utils\json_pp $(INST_SCRIPT)
+	$(XCOPY) bin\exetype.pl $(INST_SCRIPT)
+	$(XCOPY) bin\pl2bat.pl $(INST_SCRIPT)
+	$(XCOPY) bin\perlglob.pl $(INST_SCRIPT)
+	$(XCOPY) bin\search.pl $(INST_SCRIPT)
+	rename $(INST_SCRIPT)\exetype.pl exetype
+	rename $(INST_SCRIPT)\pl2bat.pl pl2bat
+	rename $(INST_SCRIPT)\perlglob.pl perlglob
+	rename $(INST_SCRIPT)\search.pl search
 
 installhtml : doc
 	$(RCOPY) $(HTMLDIR)\*.* $(INST_HTML)\*.*
-- 
2.31.1.windows.1