Don't treat the ${WITHOUT_CHATZILLA} (default) build as gratuitously

different from the one with ChatZilla.  This means building otherwise
the exact same extensions.

10 files changed, 75 insertions, 65 deletions

diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 02a79a5a9135..003497d49bba 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	mozilla
 PORTVERSION=	1.0.rc2
 PORTEPOCH=	1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		http://people.FreeBSD.org/~marcus/:local
@@ -69,6 +70,7 @@ CONFIGURE_ARGS=					\
 CONFIGURE_ARGS+=	--enable-extensions=default,irc,xmlterm
 PLIST_SUB+=	CHATZILLA=""
 .else
+CONFIGURE_ARGS+=	--enable-extensions=default,xmlterm
 PLIST_SUB+=	CHATZILLA="@comment "
 .endif
 CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1
diff --git a/www/mozilla-devel/pkg-plist b/www/mozilla-devel/pkg-plist
index 33e44f317e7a..13017797fff0 100644
--- a/www/mozilla-devel/pkg-plist
+++ b/www/mozilla-devel/pkg-plist
@@ -1,7 +1,7 @@
 bin/mozilla
-%%CHATZILLA%%lib/mozilla/DocStream
-%%CHATZILLA%%lib/mozilla/HelloWorld
-%%CHATZILLA%%lib/mozilla/INSTALL.xmlterm
+lib/mozilla/DocStream
+lib/mozilla/HelloWorld
+lib/mozilla/INSTALL.xmlterm
 lib/mozilla/TestGtkEmbed
 lib/mozilla/TestGtkEmbedChild
 lib/mozilla/TestGtkEmbedNotebook
@@ -35,7 +35,7 @@ lib/mozilla/chrome/pipnss.jar
 lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
 lib/mozilla/chrome/venkman.jar
-%%CHATZILLA%%lib/mozilla/chrome/xmlterm.jar
+lib/mozilla/chrome/xmlterm.jar
 lib/mozilla/component.reg
 lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
@@ -187,7 +187,7 @@ lib/mozilla/components/libwalletviewers.so
 lib/mozilla/components/libwebbrwsr.so
 lib/mozilla/components/libwidget_gtk.so
 lib/mozilla/components/libxmlextras.so
-%%CHATZILLA%%lib/mozilla/components/libxmlterm.so
+lib/mozilla/components/libxmlterm.so
 lib/mozilla/components/libxpconnect.so
 lib/mozilla/components/libxpinstall.so
 lib/mozilla/components/libxremote_client.so
@@ -275,8 +275,8 @@ lib/mozilla/components/xml-rpc.xpt
 lib/mozilla/components/xmlextras.xpt
 lib/mozilla/components/xmlschema.xpt
 lib/mozilla/components/xmlsoap.xpt
-%%CHATZILLA%%lib/mozilla/components/xmlterm-service.js
-%%CHATZILLA%%lib/mozilla/components/xmlterm.xpt
+lib/mozilla/components/xmlterm-service.js
+lib/mozilla/components/xmlterm.xpt
 lib/mozilla/components/xpcom_base.xpt
 lib/mozilla/components/xpcom_components.xpt
 lib/mozilla/components/xpcom_ds.xpt
@@ -323,7 +323,7 @@ lib/mozilla/defaults/wallet/SchemaStrings.tbl
 lib/mozilla/defaults/wallet/StateSchema.tbl
 lib/mozilla/defaults/wallet/VcardSchema.tbl
 lib/mozilla/dirver
-%%CHATZILLA%%lib/mozilla/escape
+lib/mozilla/escape
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
 lib/mozilla/libgkgfx.so
@@ -539,12 +539,12 @@ lib/mozilla/searchplugins/lxrmozilla.gif
 lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
-%%CHATZILLA%%lib/mozilla/teststream
+lib/mozilla/teststream
 lib/mozilla/timebombgen
-%%CHATZILLA%%lib/mozilla/xcat
-%%CHATZILLA%%lib/mozilla/xenv
-%%CHATZILLA%%lib/mozilla/xls
-%%CHATZILLA%%lib/mozilla/xmlterm
+lib/mozilla/xcat
+lib/mozilla/xenv
+lib/mozilla/xls
+lib/mozilla/xmlterm
 lib/mozilla/xpcshell
 lib/mozilla/xpicleanup
 lib/mozilla/xpidl
diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile
index 02a79a5a9135..003497d49bba 100644
--- a/www/mozilla-vendor/Makefile
+++ b/www/mozilla-vendor/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	mozilla
 PORTVERSION=	1.0.rc2
 PORTEPOCH=	1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		http://people.FreeBSD.org/~marcus/:local
@@ -69,6 +70,7 @@ CONFIGURE_ARGS=					\
 CONFIGURE_ARGS+=	--enable-extensions=default,irc,xmlterm
 PLIST_SUB+=	CHATZILLA=""
 .else
+CONFIGURE_ARGS+=	--enable-extensions=default,xmlterm
 PLIST_SUB+=	CHATZILLA="@comment "
 .endif
 CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1
diff --git a/www/mozilla-vendor/pkg-plist b/www/mozilla-vendor/pkg-plist
index 33e44f317e7a..13017797fff0 100644
--- a/www/mozilla-vendor/pkg-plist
+++ b/www/mozilla-vendor/pkg-plist
@@ -1,7 +1,7 @@
 bin/mozilla
-%%CHATZILLA%%lib/mozilla/DocStream
-%%CHATZILLA%%lib/mozilla/HelloWorld
-%%CHATZILLA%%lib/mozilla/INSTALL.xmlterm
+lib/mozilla/DocStream
+lib/mozilla/HelloWorld
+lib/mozilla/INSTALL.xmlterm
 lib/mozilla/TestGtkEmbed
 lib/mozilla/TestGtkEmbedChild
 lib/mozilla/TestGtkEmbedNotebook
@@ -35,7 +35,7 @@ lib/mozilla/chrome/pipnss.jar
 lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
 lib/mozilla/chrome/venkman.jar
-%%CHATZILLA%%lib/mozilla/chrome/xmlterm.jar
+lib/mozilla/chrome/xmlterm.jar
 lib/mozilla/component.reg
 lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
@@ -187,7 +187,7 @@ lib/mozilla/components/libwalletviewers.so
 lib/mozilla/components/libwebbrwsr.so
 lib/mozilla/components/libwidget_gtk.so
 lib/mozilla/components/libxmlextras.so
-%%CHATZILLA%%lib/mozilla/components/libxmlterm.so
+lib/mozilla/components/libxmlterm.so
 lib/mozilla/components/libxpconnect.so
 lib/mozilla/components/libxpinstall.so
 lib/mozilla/components/libxremote_client.so
@@ -275,8 +275,8 @@ lib/mozilla/components/xml-rpc.xpt
 lib/mozilla/components/xmlextras.xpt
 lib/mozilla/components/xmlschema.xpt
 lib/mozilla/components/xmlsoap.xpt
-%%CHATZILLA%%lib/mozilla/components/xmlterm-service.js
-%%CHATZILLA%%lib/mozilla/components/xmlterm.xpt
+lib/mozilla/components/xmlterm-service.js
+lib/mozilla/components/xmlterm.xpt
 lib/mozilla/components/xpcom_base.xpt
 lib/mozilla/components/xpcom_components.xpt
 lib/mozilla/components/xpcom_ds.xpt
@@ -323,7 +323,7 @@ lib/mozilla/defaults/wallet/SchemaStrings.tbl
 lib/mozilla/defaults/wallet/StateSchema.tbl
 lib/mozilla/defaults/wallet/VcardSchema.tbl
 lib/mozilla/dirver
-%%CHATZILLA%%lib/mozilla/escape
+lib/mozilla/escape
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
 lib/mozilla/libgkgfx.so
@@ -539,12 +539,12 @@ lib/mozilla/searchplugins/lxrmozilla.gif
 lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
-%%CHATZILLA%%lib/mozilla/teststream
+lib/mozilla/teststream
 lib/mozilla/timebombgen
-%%CHATZILLA%%lib/mozilla/xcat
-%%CHATZILLA%%lib/mozilla/xenv
-%%CHATZILLA%%lib/mozilla/xls
-%%CHATZILLA%%lib/mozilla/xmlterm
+lib/mozilla/xcat
+lib/mozilla/xenv
+lib/mozilla/xls
+lib/mozilla/xmlterm
 lib/mozilla/xpcshell
 lib/mozilla/xpicleanup
 lib/mozilla/xpidl
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 02a79a5a9135..003497d49bba 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	mozilla
 PORTVERSION=	1.0.rc2
 PORTEPOCH=	1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		http://people.FreeBSD.org/~marcus/:local
@@ -69,6 +70,7 @@ CONFIGURE_ARGS=					\
 CONFIGURE_ARGS+=	--enable-extensions=default,irc,xmlterm
 PLIST_SUB+=	CHATZILLA=""
 .else
+CONFIGURE_ARGS+=	--enable-extensions=default,xmlterm
 PLIST_SUB+=	CHATZILLA="@comment "
 .endif
 CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1
diff --git a/www/mozilla/pkg-plist b/www/mozilla/pkg-plist
index 33e44f317e7a..13017797fff0 100644
--- a/www/mozilla/pkg-plist
+++ b/www/mozilla/pkg-plist
@@ -1,7 +1,7 @@
 bin/mozilla
-%%CHATZILLA%%lib/mozilla/DocStream
-%%CHATZILLA%%lib/mozilla/HelloWorld
-%%CHATZILLA%%lib/mozilla/INSTALL.xmlterm
+lib/mozilla/DocStream
+lib/mozilla/HelloWorld
+lib/mozilla/INSTALL.xmlterm
 lib/mozilla/TestGtkEmbed
 lib/mozilla/TestGtkEmbedChild
 lib/mozilla/TestGtkEmbedNotebook
@@ -35,7 +35,7 @@ lib/mozilla/chrome/pipnss.jar
 lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
 lib/mozilla/chrome/venkman.jar
-%%CHATZILLA%%lib/mozilla/chrome/xmlterm.jar
+lib/mozilla/chrome/xmlterm.jar
 lib/mozilla/component.reg
 lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
@@ -187,7 +187,7 @@ lib/mozilla/components/libwalletviewers.so
 lib/mozilla/components/libwebbrwsr.so
 lib/mozilla/components/libwidget_gtk.so
 lib/mozilla/components/libxmlextras.so
-%%CHATZILLA%%lib/mozilla/components/libxmlterm.so
+lib/mozilla/components/libxmlterm.so
 lib/mozilla/components/libxpconnect.so
 lib/mozilla/components/libxpinstall.so
 lib/mozilla/components/libxremote_client.so
@@ -275,8 +275,8 @@ lib/mozilla/components/xml-rpc.xpt
 lib/mozilla/components/xmlextras.xpt
 lib/mozilla/components/xmlschema.xpt
 lib/mozilla/components/xmlsoap.xpt
-%%CHATZILLA%%lib/mozilla/components/xmlterm-service.js
-%%CHATZILLA%%lib/mozilla/components/xmlterm.xpt
+lib/mozilla/components/xmlterm-service.js
+lib/mozilla/components/xmlterm.xpt
 lib/mozilla/components/xpcom_base.xpt
 lib/mozilla/components/xpcom_components.xpt
 lib/mozilla/components/xpcom_ds.xpt
@@ -323,7 +323,7 @@ lib/mozilla/defaults/wallet/SchemaStrings.tbl
 lib/mozilla/defaults/wallet/StateSchema.tbl
 lib/mozilla/defaults/wallet/VcardSchema.tbl
 lib/mozilla/dirver
-%%CHATZILLA%%lib/mozilla/escape
+lib/mozilla/escape
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
 lib/mozilla/libgkgfx.so
@@ -539,12 +539,12 @@ lib/mozilla/searchplugins/lxrmozilla.gif
 lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
-%%CHATZILLA%%lib/mozilla/teststream
+lib/mozilla/teststream
 lib/mozilla/timebombgen
-%%CHATZILLA%%lib/mozilla/xcat
-%%CHATZILLA%%lib/mozilla/xenv
-%%CHATZILLA%%lib/mozilla/xls
-%%CHATZILLA%%lib/mozilla/xmlterm
+lib/mozilla/xcat
+lib/mozilla/xenv
+lib/mozilla/xls
+lib/mozilla/xmlterm
 lib/mozilla/xpcshell
 lib/mozilla/xpicleanup
 lib/mozilla/xpidl
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 02a79a5a9135..003497d49bba 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	mozilla
 PORTVERSION=	1.0.rc2
 PORTEPOCH=	1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		http://people.FreeBSD.org/~marcus/:local
@@ -69,6 +70,7 @@ CONFIGURE_ARGS=					\
 CONFIGURE_ARGS+=	--enable-extensions=default,irc,xmlterm
 PLIST_SUB+=	CHATZILLA=""
 .else
+CONFIGURE_ARGS+=	--enable-extensions=default,xmlterm
 PLIST_SUB+=	CHATZILLA="@comment "
 .endif
 CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1
diff --git a/www/seamonkey/pkg-plist b/www/seamonkey/pkg-plist
index 33e44f317e7a..13017797fff0 100644
--- a/www/seamonkey/pkg-plist
+++ b/www/seamonkey/pkg-plist
@@ -1,7 +1,7 @@
 bin/mozilla
-%%CHATZILLA%%lib/mozilla/DocStream
-%%CHATZILLA%%lib/mozilla/HelloWorld
-%%CHATZILLA%%lib/mozilla/INSTALL.xmlterm
+lib/mozilla/DocStream
+lib/mozilla/HelloWorld
+lib/mozilla/INSTALL.xmlterm
 lib/mozilla/TestGtkEmbed
 lib/mozilla/TestGtkEmbedChild
 lib/mozilla/TestGtkEmbedNotebook
@@ -35,7 +35,7 @@ lib/mozilla/chrome/pipnss.jar
 lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
 lib/mozilla/chrome/venkman.jar
-%%CHATZILLA%%lib/mozilla/chrome/xmlterm.jar
+lib/mozilla/chrome/xmlterm.jar
 lib/mozilla/component.reg
 lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
@@ -187,7 +187,7 @@ lib/mozilla/components/libwalletviewers.so
 lib/mozilla/components/libwebbrwsr.so
 lib/mozilla/components/libwidget_gtk.so
 lib/mozilla/components/libxmlextras.so
-%%CHATZILLA%%lib/mozilla/components/libxmlterm.so
+lib/mozilla/components/libxmlterm.so
 lib/mozilla/components/libxpconnect.so
 lib/mozilla/components/libxpinstall.so
 lib/mozilla/components/libxremote_client.so
@@ -275,8 +275,8 @@ lib/mozilla/components/xml-rpc.xpt
 lib/mozilla/components/xmlextras.xpt
 lib/mozilla/components/xmlschema.xpt
 lib/mozilla/components/xmlsoap.xpt
-%%CHATZILLA%%lib/mozilla/components/xmlterm-service.js
-%%CHATZILLA%%lib/mozilla/components/xmlterm.xpt
+lib/mozilla/components/xmlterm-service.js
+lib/mozilla/components/xmlterm.xpt
 lib/mozilla/components/xpcom_base.xpt
 lib/mozilla/components/xpcom_components.xpt
 lib/mozilla/components/xpcom_ds.xpt
@@ -323,7 +323,7 @@ lib/mozilla/defaults/wallet/SchemaStrings.tbl
 lib/mozilla/defaults/wallet/StateSchema.tbl
 lib/mozilla/defaults/wallet/VcardSchema.tbl
 lib/mozilla/dirver
-%%CHATZILLA%%lib/mozilla/escape
+lib/mozilla/escape
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
 lib/mozilla/libgkgfx.so
@@ -539,12 +539,12 @@ lib/mozilla/searchplugins/lxrmozilla.gif
 lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
-%%CHATZILLA%%lib/mozilla/teststream
+lib/mozilla/teststream
 lib/mozilla/timebombgen
-%%CHATZILLA%%lib/mozilla/xcat
-%%CHATZILLA%%lib/mozilla/xenv
-%%CHATZILLA%%lib/mozilla/xls
-%%CHATZILLA%%lib/mozilla/xmlterm
+lib/mozilla/xcat
+lib/mozilla/xenv
+lib/mozilla/xls
+lib/mozilla/xmlterm
 lib/mozilla/xpcshell
 lib/mozilla/xpicleanup
 lib/mozilla/xpidl
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 02a79a5a9135..003497d49bba 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	mozilla
 PORTVERSION=	1.0.rc2
 PORTEPOCH=	1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		http://people.FreeBSD.org/~marcus/:local
@@ -69,6 +70,7 @@ CONFIGURE_ARGS=					\
 CONFIGURE_ARGS+=	--enable-extensions=default,irc,xmlterm
 PLIST_SUB+=	CHATZILLA=""
 .else
+CONFIGURE_ARGS+=	--enable-extensions=default,xmlterm
 PLIST_SUB+=	CHATZILLA="@comment "
 .endif
 CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1
diff --git a/www/seamonkey2/pkg-plist b/www/seamonkey2/pkg-plist
index 33e44f317e7a..13017797fff0 100644
--- a/www/seamonkey2/pkg-plist
+++ b/www/seamonkey2/pkg-plist
@@ -1,7 +1,7 @@
 bin/mozilla
-%%CHATZILLA%%lib/mozilla/DocStream
-%%CHATZILLA%%lib/mozilla/HelloWorld
-%%CHATZILLA%%lib/mozilla/INSTALL.xmlterm
+lib/mozilla/DocStream
+lib/mozilla/HelloWorld
+lib/mozilla/INSTALL.xmlterm
 lib/mozilla/TestGtkEmbed
 lib/mozilla/TestGtkEmbedChild
 lib/mozilla/TestGtkEmbedNotebook
@@ -35,7 +35,7 @@ lib/mozilla/chrome/pipnss.jar
 lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
 lib/mozilla/chrome/venkman.jar
-%%CHATZILLA%%lib/mozilla/chrome/xmlterm.jar
+lib/mozilla/chrome/xmlterm.jar
 lib/mozilla/component.reg
 lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
@@ -187,7 +187,7 @@ lib/mozilla/components/libwalletviewers.so
 lib/mozilla/components/libwebbrwsr.so
 lib/mozilla/components/libwidget_gtk.so
 lib/mozilla/components/libxmlextras.so
-%%CHATZILLA%%lib/mozilla/components/libxmlterm.so
+lib/mozilla/components/libxmlterm.so
 lib/mozilla/components/libxpconnect.so
 lib/mozilla/components/libxpinstall.so
 lib/mozilla/components/libxremote_client.so
@@ -275,8 +275,8 @@ lib/mozilla/components/xml-rpc.xpt
 lib/mozilla/components/xmlextras.xpt
 lib/mozilla/components/xmlschema.xpt
 lib/mozilla/components/xmlsoap.xpt
-%%CHATZILLA%%lib/mozilla/components/xmlterm-service.js
-%%CHATZILLA%%lib/mozilla/components/xmlterm.xpt
+lib/mozilla/components/xmlterm-service.js
+lib/mozilla/components/xmlterm.xpt
 lib/mozilla/components/xpcom_base.xpt
 lib/mozilla/components/xpcom_components.xpt
 lib/mozilla/components/xpcom_ds.xpt
@@ -323,7 +323,7 @@ lib/mozilla/defaults/wallet/SchemaStrings.tbl
 lib/mozilla/defaults/wallet/StateSchema.tbl
 lib/mozilla/defaults/wallet/VcardSchema.tbl
 lib/mozilla/dirver
-%%CHATZILLA%%lib/mozilla/escape
+lib/mozilla/escape
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
 lib/mozilla/libgkgfx.so
@@ -539,12 +539,12 @@ lib/mozilla/searchplugins/lxrmozilla.gif
 lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
-%%CHATZILLA%%lib/mozilla/teststream
+lib/mozilla/teststream
 lib/mozilla/timebombgen
-%%CHATZILLA%%lib/mozilla/xcat
-%%CHATZILLA%%lib/mozilla/xenv
-%%CHATZILLA%%lib/mozilla/xls
-%%CHATZILLA%%lib/mozilla/xmlterm
+lib/mozilla/xcat
+lib/mozilla/xenv
+lib/mozilla/xls
+lib/mozilla/xmlterm
 lib/mozilla/xpcshell
 lib/mozilla/xpicleanup
 lib/mozilla/xpidl