2 files changed, 18 insertions, 15 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 6ccbee4bf62c..3adb055a2613 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -66,6 +66,9 @@ CONFIGURE_ARGS=					\
 		--with-pthreads
 .if !defined(WITHOUT_CHATZILLA)
 CONFIGURE_ARGS+=	--enable-extensions=default,irc,xmlterm
+PLIST_SUB+=	CHATZILLA=""
+.else
+PLIST_SUB+=	CHATZILLA="@comment "
 .endif
 CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
diff --git a/www/mozilla/pkg-plist b/www/mozilla/pkg-plist
index 65c0d4c618c7..7389061de9af 100644
--- a/www/mozilla/pkg-plist
+++ b/www/mozilla/pkg-plist
@@ -1,14 +1,14 @@
 bin/mozilla
-lib/mozilla/DocStream
-lib/mozilla/HelloWorld
-lib/mozilla/INSTALL.xmlterm
+%%CHATZILLA%%lib/mozilla/DocStream
+%%CHATZILLA%%lib/mozilla/HelloWorld
+%%CHATZILLA%%lib/mozilla/INSTALL.xmlterm
 lib/mozilla/TestGtkEmbed
 lib/mozilla/TestGtkEmbedChild
 lib/mozilla/TestGtkEmbedNotebook
 lib/mozilla/TestGtkEmbedSocket
 lib/mozilla/bloaturls.txt
 lib/mozilla/chrome/US.jar
-lib/mozilla/chrome/chatzilla.jar
+%%CHATZILLA%%lib/mozilla/chrome/chatzilla.jar
 lib/mozilla/chrome/chrome.rdf
 lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
@@ -34,7 +34,7 @@ lib/mozilla/chrome/pipnss.jar
 lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
 lib/mozilla/chrome/venkman.jar
-lib/mozilla/chrome/xmlterm.jar
+%%CHATZILLA%%lib/mozilla/chrome/xmlterm.jar
 lib/mozilla/component.reg
 lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
@@ -45,7 +45,7 @@ lib/mozilla/components/autoconfig.xpt
 lib/mozilla/components/bookmarks.xpt
 lib/mozilla/components/caps.xpt
 lib/mozilla/components/chardet.xpt
-lib/mozilla/components/chatzilla-service.js
+%%CHATZILLA%%lib/mozilla/components/chatzilla-service.js
 lib/mozilla/components/chrome.xpt
 lib/mozilla/components/commandhandler.xpt
 lib/mozilla/components/composer.xpt
@@ -180,7 +180,7 @@ lib/mozilla/components/libwalletviewers.so
 lib/mozilla/components/libwebbrwsr.so
 lib/mozilla/components/libwidget_gtk.so
 lib/mozilla/components/libxmlextras.so
-lib/mozilla/components/libxmlterm.so
+%%CHATZILLA%%lib/mozilla/components/libxmlterm.so
 lib/mozilla/components/libxpconnect.so
 lib/mozilla/components/libxpinstall.so
 lib/mozilla/components/libxremote_client.so
@@ -264,8 +264,8 @@ lib/mozilla/components/xml-rpc.xpt
 lib/mozilla/components/xmlextras.xpt
 lib/mozilla/components/xmlschema.xpt
 lib/mozilla/components/xmlsoap.xpt
-lib/mozilla/components/xmlterm-service.js
-lib/mozilla/components/xmlterm.xpt
+%%CHATZILLA%%lib/mozilla/components/xmlterm-service.js
+%%CHATZILLA%%lib/mozilla/components/xmlterm.xpt
 lib/mozilla/components/xpcom_base.xpt
 lib/mozilla/components/xpcom_components.xpt
 lib/mozilla/components/xpcom_ds.xpt
@@ -311,7 +311,7 @@ lib/mozilla/defaults/wallet/SchemaStrings.tbl
 lib/mozilla/defaults/wallet/StateSchema.tbl
 lib/mozilla/defaults/wallet/VcardSchema.tbl
 lib/mozilla/dirver
-lib/mozilla/escape
+%%CHATZILLA%%lib/mozilla/escape
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
 lib/mozilla/libgkgfx.so
@@ -525,12 +525,12 @@ lib/mozilla/searchplugins/lxrmozilla.gif
 lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
-lib/mozilla/teststream
+%%CHATZILLA%%lib/mozilla/teststream
 lib/mozilla/timebombgen
-lib/mozilla/xcat
-lib/mozilla/xenv
-lib/mozilla/xls
-lib/mozilla/xmlterm
+%%CHATZILLA%%lib/mozilla/xcat
+%%CHATZILLA%%lib/mozilla/xenv
+%%CHATZILLA%%lib/mozilla/xls
+%%CHATZILLA%%lib/mozilla/xmlterm
 lib/mozilla/xpcshell
 lib/mozilla/xpicleanup
 lib/mozilla/xpidl