4 files changed, 41 insertions, 66 deletions

diff --git a/www/linux-mozilla-devel/Makefile b/www/linux-mozilla-devel/Makefile
index 7ca138bebea9..84d80e7b2a39 100644
--- a/www/linux-mozilla-devel/Makefile
+++ b/www/linux-mozilla-devel/Makefile
@@ -7,23 +7,17 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	1.6a
+PORTVERSION=	1.8a5
 CATEGORIES=	www linux
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${PORTVERSION}/linux-xpi
 
-FORBIDDEN=	"http://vuxml.freebsd.org/a4fd8f53-05eb-11d9-b45d-000c41e2cdad.html (security)"
-
 PKGNAMEPREFIX=	linux-
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=	linux-mozilla/${PORTVERSION}
 
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	trevor
-PATCHFILES=	linux-mozilla-${PORTVERSION}-generated-files.tar.bz2
-
 MAINTAINER=	trevor@FreeBSD.org
-COMMENT=Browser, HTML editor, MUA and newsreader for Linux plugins (unstable)
+COMMENT=Browser, HTML editor, MUA, news, and IRC client for Linux (unstable)
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
@@ -54,12 +48,14 @@ pre-everything::
 .endif
 .endif
 DISTFILES=	browser.xpi \
+		chatzilla.xpi \
 		deflenus.xpi \
 		inspector.xpi \
 		langenus.xpi \
 		mail.xpi \
 		psm.xpi \
 		regus.xpi \
+		spellcheck.xpi \
 		talkback.xpi \
 		venkman.xpi \
 		xpcom.xpi
@@ -70,30 +66,12 @@ DISTFILES!=	${CAT} ${WRKDIRPREFIX}${.CURDIR}/work/xpi/components.conf
 do-extract:
 	${MKDIR} ${WRKSRC}
 .for i in ${DISTFILES}
-	unzip -qo ${DISTDIR}/${DIST_SUBDIR}/${i} -d ${WRKSRC}
+	${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${i} -d ${WRKSRC}
+	${CHMOD} -R a-w ${WRKSRC}
+	${CHOWN} -R 0:0 ${WRKSRC}
 .endfor
 
-do-patch:
-	${MKDIR} ${WRKSRC}/tmp
-	${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} | \
-		${TAR} -C ${WRKSRC}/bin -xf -
-	${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} | \
-		${TAR} -C ${WRKSRC}/tmp -xf -
-	for j in chatzilla cookie inspector messenger pippki venkman; do \
-		if [ ! -e ${WRKSRC}/bin/chrome/$$j.jar ]; then \
-			for i in communicator editor messenger navigator; do \
-				${GREP} -v $$j ${WRKSRC}/tmp/chrome/overlayinfo/$$i/content/overlays.rdf > \
-					${WRKSRC}/bin/chrome/overlayinfo/$$i/content/overlays.rdf; \
-				${CP} ${WRKSRC}/bin/chrome/overlayinfo/$$i/content/overlays.rdf \
-					${WRKSRC}/tmp/chrome/overlayinfo/$$i/content/overlays.rdf; \
-			done; \
-			${RM} -f ${WRKSRC}/bin/chrome/overlayinfo/$$j/content/overlays.rdf; \
-		fi; \
-	done;
-
 do-configure:
-#	- kldload linux
-#	${SETENV} $DISPLAY="NONE" ${WRKSRC}/bin/mozilla file:///dev/null
 	${ECHO_CMD} "#!/bin/sh"		>${WRKDIR}/${STARTUP_CMD}
 	${ECHO_CMD} -n "cd "		>>${WRKDIR}/${STARTUP_CMD}
 	${ECHO_CMD} ${FULL_INSTALL_DIR}		>>${WRKDIR}/${STARTUP_CMD}
diff --git a/www/linux-mozilla-devel/distinfo b/www/linux-mozilla-devel/distinfo
index ba087bebb53d..276d4d8b7575 100644
--- a/www/linux-mozilla-devel/distinfo
+++ b/www/linux-mozilla-devel/distinfo
@@ -1,23 +1,23 @@
 $FreeBSD$
-MD5 (linux-mozilla/1.6a/browser.xpi) = 107050f8734521f6114ded3e0b15139d
-SIZE (linux-mozilla/1.6a/browser.xpi) = 9304561
-MD5 (linux-mozilla/1.6a/deflenus.xpi) = 4ca66c39c1f5f689c44b18bff8292ee4
-SIZE (linux-mozilla/1.6a/deflenus.xpi) = 8191
-MD5 (linux-mozilla/1.6a/inspector.xpi) = fa1ec9dd8201e0d8c2fe83d17183eb35
-SIZE (linux-mozilla/1.6a/inspector.xpi) = 126169
-MD5 (linux-mozilla/1.6a/langenus.xpi) = 40a443019089d48a13024c6f399398f4
-SIZE (linux-mozilla/1.6a/langenus.xpi) = 534771
-MD5 (linux-mozilla/1.6a/linux-mozilla-1.6a-generated-files.tar.bz2) = 969636590e885007c07f82abde419c60
-SIZE (linux-mozilla/1.6a/linux-mozilla-1.6a-generated-files.tar.bz2) = 58650
-MD5 (linux-mozilla/1.6a/mail.xpi) = 08e1d13f94fffae5d77e0f9a4ad2068e
-SIZE (linux-mozilla/1.6a/mail.xpi) = 2017236
-MD5 (linux-mozilla/1.6a/psm.xpi) = cf71997bfce59ad24403c8f2e2762910
-SIZE (linux-mozilla/1.6a/psm.xpi) = 811257
-MD5 (linux-mozilla/1.6a/regus.xpi) = be80d02574a81603b4047279cb45b69d
-SIZE (linux-mozilla/1.6a/regus.xpi) = 26116
-MD5 (linux-mozilla/1.6a/talkback.xpi) = 4105205b6730b5ddfcb4bac53f1ccea5
-SIZE (linux-mozilla/1.6a/talkback.xpi) = 824040
-MD5 (linux-mozilla/1.6a/venkman.xpi) = 265e007d4c7550820a368d767c1c7c2c
-SIZE (linux-mozilla/1.6a/venkman.xpi) = 211205
-MD5 (linux-mozilla/1.6a/xpcom.xpi) = b7a88bdbc3125d563dd4935cc55fe408
-SIZE (linux-mozilla/1.6a/xpcom.xpi) = 888967
+MD5 (linux-mozilla/1.8a5/browser.xpi) = d7aaf89752f4675a7f35df7dd08bd5ac
+SIZE (linux-mozilla/1.8a5/browser.xpi) = 7809589
+MD5 (linux-mozilla/1.8a5/deflenus.xpi) = a5423d45730c471fb50a8959ad148ea8
+SIZE (linux-mozilla/1.8a5/deflenus.xpi) = 7533
+MD5 (linux-mozilla/1.8a5/langenus.xpi) = 9cb8d7a0198ee11552b6163b88ea2db9
+SIZE (linux-mozilla/1.8a5/langenus.xpi) = 475125
+MD5 (linux-mozilla/1.8a5/psm.xpi) = fc4e41717a20a2030e169cb4dc80b41f
+SIZE (linux-mozilla/1.8a5/psm.xpi) = 826821
+MD5 (linux-mozilla/1.8a5/regus.xpi) = 2c6cff2a025c17d4fabd1b602da19169
+SIZE (linux-mozilla/1.8a5/regus.xpi) = 21914
+MD5 (linux-mozilla/1.8a5/xpcom.xpi) = c81c3e5dbc8b6d8e00260e90d8f08a38
+SIZE (linux-mozilla/1.8a5/xpcom.xpi) = 882696
+MD5 (linux-mozilla/1.8a5/chatzilla.xpi) = 64dde6531974d31d9201e5ca3e27b1e6
+SIZE (linux-mozilla/1.8a5/chatzilla.xpi) = 219654
+MD5 (linux-mozilla/1.8a5/inspector.xpi) = 41e96c88d06c425e1a23e4a90ffd38a1
+SIZE (linux-mozilla/1.8a5/inspector.xpi) = 123023
+MD5 (linux-mozilla/1.8a5/mail.xpi) = c967cc6cc8f151c97cf699cf246bbf87
+SIZE (linux-mozilla/1.8a5/mail.xpi) = 1972067
+MD5 (linux-mozilla/1.8a5/spellcheck.xpi) = e8eaf4c2325de9461223dd34b71ff689
+SIZE (linux-mozilla/1.8a5/spellcheck.xpi) = 281063
+MD5 (linux-mozilla/1.8a5/venkman.xpi) = 38c428740bb9613d807a438196e7cd6e
+SIZE (linux-mozilla/1.8a5/venkman.xpi) = 213654
diff --git a/www/linux-mozilla-devel/pkg-descr b/www/linux-mozilla-devel/pkg-descr
index fa428f490fc7..8475ab0f11e5 100644
--- a/www/linux-mozilla-devel/pkg-descr
+++ b/www/linux-mozilla-devel/pkg-descr
@@ -1,12 +1,10 @@
 This is the unstable version of the Mozilla suite (Web browser,
-HTML editor, mail user agent, news reader, and address book)
-pre-compiled for Linux.  The Linux version is necessary for running
-plugins which are only available as Linux binaries.
+HTML editor, mail user agent, news reader, and IRC client) pre-compiled
+for Linux.  Instead of using this port, another way to run plugins
+which are only available as Linux binaries is to install the
+linuxpluginwrapper port.
 
-The Chatzilla IRC client is not installed by this port, due to a
-security bug.
-
-This port is compatible with the www/linuxflashplugin port and with
-the Flash and Java plugins from the www/netscape7 port.
+If you find a Java plugin which works with this port, please tell
+the maintainer.
 
 WWW:  http://mozilla.org/
diff --git a/www/linux-mozilla-devel/scripts/configure b/www/linux-mozilla-devel/scripts/configure
index 3d926889995f..df589965b31a 100644
--- a/www/linux-mozilla-devel/scripts/configure
+++ b/www/linux-mozilla-devel/scripts/configure
@@ -9,18 +9,17 @@ fi
 
 tempfile=`/usr/bin/mktemp -t checklist`
 
-echo "browser langenus regus xpcom" > /tmp/checklist.tmp.$$;
+echo "browser deflenus langenus psm regus xpcom" > /tmp/checklist.tmp.$$;
 
 /usr/bin/dialog --title "Mozilla component selection" --clear \
 	--checklist "\n\
 Choose which components of Mozilla to download and install. \n\
 Press the space bar to toggle selections." -1 -1 6 \
-"deflenus"	"American English profile defaults (8 kB)"		ON \
-"inspector"	"DOM inspector (124 kB)"				ON \
-"mail"		"Mozilla Mail and News (2000 kB)"			ON \
-"psm"		"Personal Security Manager--recommended (816 kB)"	ON \
-"talkback"	"sends crash logs to Mozilla staff (832 kB)"		ON \
-"venkman"	"JavaScript debugger (224 kB)"				ON \
+"chatzilla"	"IRC client (240 kB)"					ON \
+"inspector"	"DOM inspector (122 kB)"				ON \
+"mail"		"mail and news client (1952 kB)"			ON \
+"spellcheck"	"Spelling checker for mail and news (304 kB)"		ON \
+"venkman"	"JavaScript debugger (240 kB)"				ON \
 2>> /tmp/checklist.tmp.$$
 
 retval=$?