Sync with FreeBSD ports tree.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9546 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 5 insertions, 45 deletions

diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 1cb8a72dc..e3111a060 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -84,7 +84,7 @@ PLIST_SUB+=	TCL="@comment "
 BROKEN=	does not build on 4.X
 .endif
 
-.if ${PERL_LEVEL} < 500600 || defined(WITHOUT_PERL)
+.if defined(WITHOUT_PERL)
 CONFIGURE_ARGS+=--disable-perl
 PLIST_SUB+=	PERL="@comment "
 .else
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index eb8007809..eb672fc51 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#   $MCom: ports/math/gnumeric/Makefile,v 1.35 2007/07/16 20:04:09 mezz Exp $
+#   $MCom: ports/math/gnumeric/Makefile,v 1.36 2007/07/29 19:40:59 marcus Exp $
 #
 
 PORTNAME=	gnumeric
@@ -47,12 +47,6 @@ OPTIONS=	GNOMEDB "Enable libgnomedb support" off
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500600
-PLIST_SUB+=	PERL="@comment "
-.else
-PLIST_SUB+=	PERL=""
-.endif
-
 .if defined(WITH_GNOMEDB)
 USE_GNOME+=		libgnomedb
 CONFIGURE_ARGS+=	--with-gda
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index bfffd8749..a8106b7e0 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -41,12 +41,6 @@ PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
 		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \
 		CATALOG_DIR=${CATALOG_DIR}
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-IGNORE=		gtk-doc requires Perl 5.6.x or higher
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
@@ -54,4 +48,4 @@ post-patch:
 post-install:
 	@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${CATALOG_DIR}/gtk-doc.cat
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index 98f956dd0..e73df790b 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox-devel/Makefile,v 1.36 2007/02/24 21:00:46 mezz Exp $
+#   $MCom: ports/www/firefox-devel/Makefile,v 1.38 2007/07/05 16:52:19 ahze Exp $
 
 PORTNAME=	firefox
 DISTVERSION=	3.0.a6
@@ -58,10 +58,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 a558607ca..000000000
--- 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/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index 98f956dd0..e73df790b 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox-devel/Makefile,v 1.36 2007/02/24 21:00:46 mezz Exp $
+#   $MCom: ports/www/firefox-devel/Makefile,v 1.38 2007/07/05 16:52:19 ahze Exp $
 
 PORTNAME=	firefox
 DISTVERSION=	3.0.a6
@@ -58,10 +58,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 a558607ca..000000000
--- 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:");
-