- Re-enable Chatzilla;

- remove non-working freetype workaround;
- correct name of the freetype library, so that it is easier to get AA fonts
  working.

Bump PORTREVISION.

3 files changed, 31 insertions, 2 deletions

diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile
index 9ce118bc5ae2..7e97c7b3a033 100644
--- a/www/mozilla-vendor/Makefile
+++ b/www/mozilla-vendor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	0.9.9
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
@@ -65,13 +66,12 @@ CONFIGURE_ARGS=					\
 		--with-system-png=${LOCALBASE}	\
 		--with-pthreads
 .if !defined(WITHOUT_CHATZILLA)
-CONFIGURE_ARGS+=	--with-extensions=default,irc
+CONFIGURE_ARGS+=	--enable-extensions=default,irc,xmlterm
 .endif
 CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
 		MOZ_INTERNAL_LIBART_LGPL=1
 ALL_TARGET=	default
-CFLAGS:=	-I${LOCALBASE}/include/freetype2 ${CFLAGS}
 
 post-build:
 	${SED} -e "s;@PREFIX@;${PREFIX};g" \
diff --git a/www/mozilla-vendor/files/patch-modules::libpref::src::unix::unix.js b/www/mozilla-vendor/files/patch-modules::libpref::src::unix::unix.js
new file mode 100644
index 000000000000..bd39a70bf05d
--- /dev/null
+++ b/www/mozilla-vendor/files/patch-modules::libpref::src::unix::unix.js
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- modules/libpref/src/unix/unix.js	2002/03/14 15:04:20	1.1
++++ modules/libpref/src/unix/unix.js	2002/03/14 15:04:38
+@@ -227,7 +227,7 @@
+ 
+ // TrueType
+ pref("font.FreeType2.enable", false);
+-pref("font.freetype2.shared-library", "libfreetype.so.6");
++pref("font.freetype2.shared-library", "libfreetype.so.9");
+ // if libfreetype was built without hinting compiled in
+ // it is best to leave hinting off
+ pref("font.FreeType2.autohinted", false);
diff --git a/www/mozilla-vendor/pkg-plist b/www/mozilla-vendor/pkg-plist
index c19f4c4cbf18..65c0d4c618c7 100644
--- a/www/mozilla-vendor/pkg-plist
+++ b/www/mozilla-vendor/pkg-plist
@@ -1,10 +1,14 @@
 bin/mozilla
+lib/mozilla/DocStream
+lib/mozilla/HelloWorld
+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
 lib/mozilla/chrome/chrome.rdf
 lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
@@ -30,6 +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
 lib/mozilla/component.reg
 lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
@@ -40,6 +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
 lib/mozilla/components/chrome.xpt
 lib/mozilla/components/commandhandler.xpt
 lib/mozilla/components/composer.xpt
@@ -174,6 +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
 lib/mozilla/components/libxpconnect.so
 lib/mozilla/components/libxpinstall.so
 lib/mozilla/components/libxremote_client.so
@@ -257,6 +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
 lib/mozilla/components/xpcom_base.xpt
 lib/mozilla/components/xpcom_components.xpt
 lib/mozilla/components/xpcom_ds.xpt
@@ -302,6 +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
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
 lib/mozilla/libgkgfx.so
@@ -515,7 +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
 lib/mozilla/timebombgen
+lib/mozilla/xcat
+lib/mozilla/xenv
+lib/mozilla/xls
+lib/mozilla/xmlterm
 lib/mozilla/xpcshell
 lib/mozilla/xpicleanup
 lib/mozilla/xpidl