Add support for Mozilla 1.4, and remove references to mozilla-vendor.

3 files changed, 10 insertions, 13 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 2c681b9c60c0..a0789ff5c976 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	epiphany
 PORTVERSION=	0.7.3
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.7
@@ -19,7 +20,7 @@ BUILD_DEPENDS=	${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed
 		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.3"
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.4"
 
 MOZILLA=	mozilla-gtk2
 HEADERS_SUFX=
@@ -31,7 +32,7 @@ HEADERS_SUFX=
 .if ${WITH_MOZILLA}=="mozilla-devel-gtk2"
 MOZILLA=	${WITH_MOZILLA}
 HEADERS_SUFX=	-devel
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.4b"
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="trunk"
 .else
 MOZILLA=	mozilla-gtk2
 HEADERS_SUFX=
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 04eadf17f01b..43ad18c7e078 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	galeon
 PORTVERSION=	1.2.11
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,21 +20,16 @@ BUILD_DEPENDS=	${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 
-MOZ_CONFIGURE_ARGS=--with-mozilla-snapshot="1.3"
+MOZ_CONFIGURE_ARGS=--with-mozilla-snapshot="1.4"
 
 .if !defined(WITH_MOZILLA)
 MOZILLA=	mozilla
 HEADERS_SUFX=
 .else
-.if ${WITH_MOZILLA}=="mozilla-vendor" || ${WITH_MOZILLA}=="mozilla-embedded-vendor"
-MOZILLA=	${WITH_MOZILLA}
-HEADERS_SUFX=	-vendor
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.0"
-.else
 .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-embedded-devel"
 MOZILLA=	${WITH_MOZILLA}
 HEADERS_SUFX=	-devel
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.4b"
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="trunk"
 .else
 .if ${WITH_MOZILLA}=="mozilla-embedded"
 MOZILLA=	mozilla-embedded
@@ -88,8 +84,7 @@ pre-everything::
 	@${ECHO_MSG} " this by defining WITH_MOZILLA to one of the following values:"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "  mozilla-devel "
-	@${ECHO_MSG} "  mozilla-embedded[-devel|-vendor] "
-	@${ECHO_MSG} "  mozilla-vendor "
+	@${ECHO_MSG} "  mozilla-embedded[-devel] "
 	@${ECHO_MSG} ""
 
 post-patch:
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index f2ff4eaa5a4b..4617f3e1c1e9 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	galeon2
 PORTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/2$//}
@@ -19,7 +20,7 @@ BUILD_DEPENDS=	${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed
 		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.3"
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.4"
 
 MOZILLA=	mozilla-gtk2
 HEADERS_SUFX=
@@ -31,7 +32,7 @@ HEADERS_SUFX=
 .if ${WITH_MOZILLA}=="mozilla-devel-gtk2"
 MOZILLA=	${WITH_MOZILLA}
 HEADERS_SUFX=	-devel
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.4b"
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="trunk"
 .else
 MOZILLA=	mozilla-gtk2
 HEADERS_SUFX=