22 files changed, 0 insertions, 161 deletions

diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index 06a77b659a56..a24494175aef 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -66,10 +66,6 @@ MOZ_OPTIONS+=	--disable-svg
 #MOZ_OPTIONS+=	--enable-svg --enable-svg-renderer=cairo
 #.endif
 
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
-.endif
-
 post-extract::
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
diff --git a/www/firefox-devel/files/extra-patch-config_make-jars.pl b/www/firefox-devel/files/extra-patch-config_make-jars.pl
deleted file mode 100644
index a558607ca459..000000000000
--- a/www/firefox-devel/files/extra-patch-config_make-jars.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/make-jars.pl.orig	Wed Oct 13 16:17:11 2004
-+++ config/make-jars.pl	Wed Oct 13 16:17:07 2004
-@@ -40,6 +40,7 @@
-   last if ($arg eq "--");
- }
- my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
-+splice @ARGV, $ddindex, $#ARGV;
- 
- getopts("d:s:t:f:avlD:o:p:xz:");
- 
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index d8974c4157c9..c5ffc67d4ddf 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -64,10 +64,6 @@ IGNORE=	does not run, update to 6.2-RELEASE or newer
 MOZ_OPTIONS+=	--enable-svg --enable-svg-renderer=cairo
 .endif
 
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
-.endif
-
 post-extract::
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
diff --git a/www/firefox-esr/files/extra-patch-config_make-jars.pl b/www/firefox-esr/files/extra-patch-config_make-jars.pl
deleted file mode 100644
index a558607ca459..000000000000
--- a/www/firefox-esr/files/extra-patch-config_make-jars.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/make-jars.pl.orig	Wed Oct 13 16:17:11 2004
-+++ config/make-jars.pl	Wed Oct 13 16:17:07 2004
-@@ -40,6 +40,7 @@
-   last if ($arg eq "--");
- }
- my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
-+splice @ARGV, $ddindex, $#ARGV;
- 
- getopts("d:s:t:f:avlD:o:p:xz:");
- 
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index d8974c4157c9..c5ffc67d4ddf 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -64,10 +64,6 @@ IGNORE=	does not run, update to 6.2-RELEASE or newer
 MOZ_OPTIONS+=	--enable-svg --enable-svg-renderer=cairo
 .endif
 
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
-.endif
-
 post-extract::
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
diff --git a/www/firefox/files/extra-patch-config_make-jars.pl b/www/firefox/files/extra-patch-config_make-jars.pl
deleted file mode 100644
index a558607ca459..000000000000
--- a/www/firefox/files/extra-patch-config_make-jars.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/make-jars.pl.orig	Wed Oct 13 16:17:11 2004
-+++ config/make-jars.pl	Wed Oct 13 16:17:07 2004
-@@ -40,6 +40,7 @@
-   last if ($arg eq "--");
- }
- my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
-+splice @ARGV, $ddindex, $#ARGV;
- 
- getopts("d:s:t:f:avlD:o:p:xz:");
- 
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index d6159384b2eb..f0f7d3fd2170 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -63,10 +63,6 @@ IGNORE=	core dumps on ${ARCH}, kern.osreldate>=601101 needed
 MOZ_OPTIONS+=	--enable-svg --enable-svg-renderer=cairo
 .endif
 
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
-.endif
-
 post-extract::
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
 		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
diff --git a/www/firefox15/files/extra-patch-config_make-jars.pl b/www/firefox15/files/extra-patch-config_make-jars.pl
deleted file mode 100644
index a558607ca459..000000000000
--- a/www/firefox15/files/extra-patch-config_make-jars.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/make-jars.pl.orig	Wed Oct 13 16:17:11 2004
-+++ config/make-jars.pl	Wed Oct 13 16:17:07 2004
-@@ -40,6 +40,7 @@
-   last if ($arg eq "--");
- }
- my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
-+splice @ARGV, $ddindex, $#ARGV;
- 
- getopts("d:s:t:f:avlD:o:p:xz:");
- 
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index 06a77b659a56..a24494175aef 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -66,10 +66,6 @@ MOZ_OPTIONS+=	--disable-svg
 #MOZ_OPTIONS+=	--enable-svg --enable-svg-renderer=cairo
 #.endif
 
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
-.endif
-
 post-extract::
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
diff --git a/www/firefox3-devel/files/extra-patch-config_make-jars.pl b/www/firefox3-devel/files/extra-patch-config_make-jars.pl
deleted file mode 100644
index a558607ca459..000000000000
--- a/www/firefox3-devel/files/extra-patch-config_make-jars.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/make-jars.pl.orig	Wed Oct 13 16:17:11 2004
-+++ config/make-jars.pl	Wed Oct 13 16:17:07 2004
-@@ -40,6 +40,7 @@
-   last if ($arg eq "--");
- }
- my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
-+splice @ARGV, $ddindex, $#ARGV;
- 
- getopts("d:s:t:f:avlD:o:p:xz:");
- 
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 06a77b659a56..a24494175aef 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -66,10 +66,6 @@ MOZ_OPTIONS+=	--disable-svg
 #MOZ_OPTIONS+=	--enable-svg --enable-svg-renderer=cairo
 #.endif
 
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
-.endif
-
 post-extract::
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
diff --git a/www/firefox35/files/extra-patch-config_make-jars.pl b/www/firefox35/files/extra-patch-config_make-jars.pl
deleted file mode 100644
index a558607ca459..000000000000
--- a/www/firefox35/files/extra-patch-config_make-jars.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/make-jars.pl.orig	Wed Oct 13 16:17:11 2004
-+++ config/make-jars.pl	Wed Oct 13 16:17:07 2004
-@@ -40,6 +40,7 @@
-   last if ($arg eq "--");
- }
- my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
-+splice @ARGV, $ddindex, $#ARGV;
- 
- getopts("d:s:t:f:avlD:o:p:xz:");
- 
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index d8974c4157c9..c5ffc67d4ddf 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -64,10 +64,6 @@ IGNORE=	does not run, update to 6.2-RELEASE or newer
 MOZ_OPTIONS+=	--enable-svg --enable-svg-renderer=cairo
 .endif
 
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
-.endif
-
 post-extract::
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
diff --git a/www/firefox36/files/extra-patch-config_make-jars.pl b/www/firefox36/files/extra-patch-config_make-jars.pl
deleted file mode 100644
index a558607ca459..000000000000
--- a/www/firefox36/files/extra-patch-config_make-jars.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/make-jars.pl.orig	Wed Oct 13 16:17:11 2004
-+++ config/make-jars.pl	Wed Oct 13 16:17:07 2004
-@@ -40,6 +40,7 @@
-   last if ($arg eq "--");
- }
- my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
-+splice @ARGV, $ddindex, $#ARGV;
- 
- getopts("d:s:t:f:avlD:o:p:xz:");
- 
diff --git a/www/flock/Makefile b/www/flock/Makefile
index 12bc78324b0e..c6a611a51ca4 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -68,10 +68,6 @@ IGNORE=	core dumps on ${ARCH}, need kern.osreldate>=601101
 MOZ_OPTIONS+=	--enable-svg --enable-svg-renderer=cairo
 .endif
 
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
-.endif
-
 post-extract::
 	@${SED} -e 's|@FLOCK_ICON@|${FLOCK_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
diff --git a/www/flock/files/extra-patch-config_make-jars.pl b/www/flock/files/extra-patch-config_make-jars.pl
deleted file mode 100644
index a558607ca459..000000000000
--- a/www/flock/files/extra-patch-config_make-jars.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/make-jars.pl.orig	Wed Oct 13 16:17:11 2004
-+++ config/make-jars.pl	Wed Oct 13 16:17:07 2004
-@@ -40,6 +40,7 @@
-   last if ($arg eq "--");
- }
- my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
-+splice @ARGV, $ddindex, $#ARGV;
- 
- getopts("d:s:t:f:avlD:o:p:xz:");
- 
diff --git a/www/kompozer/Makefile b/www/kompozer/Makefile
index 8ab7005a0c67..2d9b718b20ac 100644
--- a/www/kompozer/Makefile
+++ b/www/kompozer/Makefile
@@ -37,10 +37,6 @@ BROKEN=		does not build
 IGNORE=		does not build
 .endif
 
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
-.endif
-
 post-patch:
 	@${RM} -f ${WRKSRC}/config.status ${WRKSRC}/config.cache
 	@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/Makefile.in
diff --git a/www/kompozer/files/extra-patch-config_make-jars.pl b/www/kompozer/files/extra-patch-config_make-jars.pl
deleted file mode 100644
index a558607ca459..000000000000
--- a/www/kompozer/files/extra-patch-config_make-jars.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/make-jars.pl.orig	Wed Oct 13 16:17:11 2004
-+++ config/make-jars.pl	Wed Oct 13 16:17:07 2004
-@@ -40,6 +40,7 @@
-   last if ($arg eq "--");
- }
- my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
-+splice @ARGV, $ddindex, $#ARGV;
- 
- getopts("d:s:t:f:avlD:o:p:xz:");
- 
diff --git a/www/nvu/Makefile b/www/nvu/Makefile
index 8ab7005a0c67..2d9b718b20ac 100644
--- a/www/nvu/Makefile
+++ b/www/nvu/Makefile
@@ -37,10 +37,6 @@ BROKEN=		does not build
 IGNORE=		does not build
 .endif
 
-.if ${PERL_LEVEL} < 500600
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
-.endif
-
 post-patch:
 	@${RM} -f ${WRKSRC}/config.status ${WRKSRC}/config.cache
 	@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/Makefile.in
diff --git a/www/nvu/files/extra-patch-config_make-jars.pl b/www/nvu/files/extra-patch-config_make-jars.pl
deleted file mode 100644
index a558607ca459..000000000000
--- a/www/nvu/files/extra-patch-config_make-jars.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/make-jars.pl.orig	Wed Oct 13 16:17:11 2004
-+++ config/make-jars.pl	Wed Oct 13 16:17:07 2004
-@@ -40,6 +40,7 @@
-   last if ($arg eq "--");
- }
- my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
-+splice @ARGV, $ddindex, $#ARGV;
- 
- getopts("d:s:t:f:avlD:o:p:xz:");
- 
diff --git a/www/p5-CGI-Kwiki/Makefile b/www/p5-CGI-Kwiki/Makefile
index 29b71aac0ff6..f484cf7d21b3 100644
--- a/www/p5-CGI-Kwiki/Makefile
+++ b/www/p5-CGI-Kwiki/Makefile
@@ -50,15 +50,6 @@ post-configure:
 		     -e 'if (/manifypods :/) {$$_ .= "\tlib/CGI/Kwiki/Config.pm \\\n\tlib/CGI/Kwiki/Config_yaml.pm \\\n" };' \
 		     -e 'if (/\@\$$\(POD2MAN\)/) { $$_ .= "\tlib/CGI/Kwiki/Config.pm \\\n\t\$$(INST_MAN3DIR)/CGI::Kwiki::Config.\$$(MAN3EXT) \\\n\tlib/CGI/Kwiki/Config_yaml.pm \\\n\t\$$(INST_MAN3DIR)/CGI::Kwiki::Config_yaml.\$$(MAN3EXT) \\\n"};' \
 			${WRKSRC}/Makefile
-.if ${PERL_LEVEL} < 500601
-EXTRA_PATCHES=	${FILESDIR}/p5005-patch-CGI-Kwiki-Template.pm
-post-patch:
-	${PERL} -pi -e '$$_ = "" if /warnings/;' \
-	             -e 's/\$$\w+(->\w+)?->\$$\w+\b(?!\()/$$&()/g;' \
-		     ${WRKSRC}/lib/CGI/Kwiki/New.pm \
-		     ${WRKSRC}/lib/CGI/Kwiki/Prefs.pm
-	@${FIND} ${WRKSRC} -name \*.orig | ${XARGS} ${RM}
-.endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-CGI-Kwiki/files/p5005-patch-CGI-Kwiki-Template.pm b/www/p5-CGI-Kwiki/files/p5005-patch-CGI-Kwiki-Template.pm
deleted file mode 100644
index 23bf24573e53..000000000000
--- a/www/p5-CGI-Kwiki/files/p5005-patch-CGI-Kwiki-Template.pm
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/CGI/Kwiki/Template.pm.orig	Fri Aug 29 09:30:19 2003
-+++ lib/CGI/Kwiki/Template.pm	Wed Oct 15 11:37:23 2003
-@@ -71,7 +71,8 @@
-     my ($self, $text, $v) = @_;
-     my $re;
-     $text = $self->loc($text);
--    $re = qr/\[((?:(?>[^\[\]]+)|(??{$re}))*)\]/;
-+    #$re = qr/\[((?:(?>[^\[\]]+)|(??{$re}))*)\]/;
-+    $re = qr/\[((?:(?>[^\[\]]+)|\[[^\[\]]*\])*)\]/;
-     $text =~ s{$re}
-               {<a href="[% script %]?$1">$1</a>}g;
-     $text =~ s{\[%\s+(\w+)\s+%\]\n?}