6 files changed, 44 insertions, 42 deletions

diff --git a/www/linux-mozilla-devel/Makefile b/www/linux-mozilla-devel/Makefile
index 09604419cfab..54f731b312b0 100644
--- a/www/linux-mozilla-devel/Makefile
+++ b/www/linux-mozilla-devel/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.9.2002050810
+PORTVERSION=	1.0
 CATEGORIES=	www linux
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	mozilla/nightly/2002-05-08-10-1.0.0/linux-xpi
+MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${PORTVERSION}/linux-xpi
 
 PKGNAMEPREFIX=	linux-
 DIST_SUBDIR=	linux-mozilla/${PORTVERSION}
@@ -47,6 +47,7 @@ pre-everything::
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
 DISTFILES=	browser.xpi \
+		chatzilla.xpi \
 		deflenus.xpi \
 		inspector.xpi \
 		langenus.xpi \
@@ -101,7 +102,7 @@ do-patch:
 	${MKDIR} ${WRKSRC}/tmp
 	${TAR} -C ${WRKSRC}/tmp -xzf ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES}
 	${TAR} -C ${WRKSRC}/bin -xzf ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES}
-	for j in chatzilla inspector messenger pippki venkman; do \
+	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 > \
@@ -125,7 +126,7 @@ do-configure:
 	${ECHO_CMD} "cd ${PREFIX}/lib/linux-mozilla/plugins"	>>${WRKDIR}/linkfarm
 	${ECHO_CMD} -n "${FIND} ../../netscape-linux/plugins/*"	>>${WRKDIR}/linkfarm
 	${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null"	>>${WRKDIR}/linkfarm
-	${ECHO_CMD} -n "${FIND} ../../linux-netscape6/plugins"	>>${WRKDIR}/linkfarm
+	${ECHO_CMD} -n "${FIND} ../../linux-netscape6*/plugins"	>>${WRKDIR}/linkfarm
 	${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null"	>>${WRKDIR}/linkfarm
 
 pre-install:
diff --git a/www/linux-mozilla-devel/distinfo b/www/linux-mozilla-devel/distinfo
index 6ca9f12d2a9e..3f4b301c9aaa 100644
--- a/www/linux-mozilla-devel/distinfo
+++ b/www/linux-mozilla-devel/distinfo
@@ -1,13 +1,13 @@
-MD5 (linux-mozilla/0.9.9.2002050810/browser.xpi) = e23ac79e083e6c9b3ea3d58191a7ef7d
-MD5 (linux-mozilla/0.9.9.2002050810/langenus.xpi) = d0a38737967e44f14af88359bea4c424
-MD5 (linux-mozilla/0.9.9.2002050810/regus.xpi) = e2a9f6ef783555979ca1b4a98d50cc95
-MD5 (linux-mozilla/0.9.9.2002050810/venkman.xpi) = 3fda2f90fca4e6acd9aaf300ed053536
-MD5 (linux-mozilla/0.9.9.2002050810/xpcom.xpi) = 7cf508f187d9a43ad783a96ad476e05f
-MD5 (linux-mozilla/0.9.9.2002050810/chatzilla.xpi) = 68c859de0f0067b4723947ca90350a06
-MD5 (linux-mozilla/0.9.9.2002050810/deflenus.xpi) = 826f84250ed40ea98d192c83e4f783c3
-MD5 (linux-mozilla/0.9.9.2002050810/inspector.xpi) = 830146e23da8029d0680126fe7ba675d
-MD5 (linux-mozilla/0.9.9.2002050810/mail.xpi) = 3487e7678bb67f5d31695800a3737faf
-MD5 (linux-mozilla/0.9.9.2002050810/psm.xpi) = 9b76b5b5c37ca911378c551db4805033
-MD5 (linux-mozilla/0.9.9.2002050810/talkback.xpi) = c18c22a30456b4cde49b934b7a250b76
-MD5 (linux-mozilla/0.9.9.2002050810/venkman.xpi) = 3fda2f90fca4e6acd9aaf300ed053536
-MD5 (linux-mozilla/0.9.9.2002050810/linux-mozilla-0.9.9.2002050810-generated-files.tar.gz) = 34ddae7fc59e3fa9d55a04f83ccbf165
+MD5 (linux-mozilla/1.0/browser.xpi) = f773828f035affb022c8989045c690d0
+MD5 (linux-mozilla/1.0/chatzilla.xpi) = a6be6ff71051f94d988ab5b3af8724cc
+MD5 (linux-mozilla/1.0/deflenus.xpi) = 13cd011c36b2b2ff8ec5f5c6b612d106
+MD5 (linux-mozilla/1.0/inspector.xpi) = e5647eca938a877055917ba908392167
+MD5 (linux-mozilla/1.0/langenus.xpi) = 6b28aa34476527ac4c44aa946f38f3fd
+MD5 (linux-mozilla/1.0/linux-mozilla-1.0-generated-files.tar.gz) = 35557f81dd7908e737a810c6f5e3aeef
+MD5 (linux-mozilla/1.0/mail.xpi) = f2c1094e218fee49583726789ab96510
+MD5 (linux-mozilla/1.0/psm.xpi) = 66fed4679661d0c0c640d1dbafa36af7
+MD5 (linux-mozilla/1.0/regus.xpi) = 1c2e0712d07130d88d7253015934a8ce
+MD5 (linux-mozilla/1.0/talkback.xpi) = f99bb9daf49c9e919cde5d54fdcfe059
+MD5 (linux-mozilla/1.0/venkman.xpi) = 94d39361968acbb2f745eddd97263feb
+MD5 (linux-mozilla/1.0/xpcom.xpi) = b85671bdd3fe50b5806a8a11a696ed08
+MD5 (linux-mozilla/1.0/bogus.xpi) = IGNORE
diff --git a/www/linux-mozilla-devel/scripts/configure b/www/linux-mozilla-devel/scripts/configure
index a2989a552c02..8a08672e56c4 100644
--- a/www/linux-mozilla-devel/scripts/configure
+++ b/www/linux-mozilla-devel/scripts/configure
@@ -9,17 +9,17 @@ fi
 
 tempfile=`/usr/bin/mktemp -t checklist`
 
-echo "browser langenus regus venkman xpcom" > /tmp/checklist.tmp.$$;
+echo "browser langenus 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 7 \
-"chatzilla"	"IRC client (102 kB) DO NOT USE:  HAS SECURITY BUG!"	OFF \
+"chatzilla"	"IRC client (104 kB)"					ON \
 "deflenus"	"American English profile defaults (8 kB)"		ON \
 "inspector"	"DOM inspector (240 kB)"				ON \
-"mail"		"Mozilla Mail and News (1728 kB)"			ON \
-"psm"		"Personal Security Manager--recommended (656 kB)"	ON \
+"mail"		"Mozilla Mail and News (1856 kB)"			ON \
+"psm"		"Personal Security Manager--recommended (784 kB)"	ON \
 "talkback"	"sends crash logs to Mozilla staff (832 kB)"		ON \
 "venkman"	"JavaScript debugger (150 kB)"				ON \
 2>> /tmp/checklist.tmp.$$
diff --git a/www/linux-mozilla/Makefile b/www/linux-mozilla/Makefile
index 09604419cfab..54f731b312b0 100644
--- a/www/linux-mozilla/Makefile
+++ b/www/linux-mozilla/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.9.2002050810
+PORTVERSION=	1.0
 CATEGORIES=	www linux
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	mozilla/nightly/2002-05-08-10-1.0.0/linux-xpi
+MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${PORTVERSION}/linux-xpi
 
 PKGNAMEPREFIX=	linux-
 DIST_SUBDIR=	linux-mozilla/${PORTVERSION}
@@ -47,6 +47,7 @@ pre-everything::
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
 DISTFILES=	browser.xpi \
+		chatzilla.xpi \
 		deflenus.xpi \
 		inspector.xpi \
 		langenus.xpi \
@@ -101,7 +102,7 @@ do-patch:
 	${MKDIR} ${WRKSRC}/tmp
 	${TAR} -C ${WRKSRC}/tmp -xzf ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES}
 	${TAR} -C ${WRKSRC}/bin -xzf ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES}
-	for j in chatzilla inspector messenger pippki venkman; do \
+	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 > \
@@ -125,7 +126,7 @@ do-configure:
 	${ECHO_CMD} "cd ${PREFIX}/lib/linux-mozilla/plugins"	>>${WRKDIR}/linkfarm
 	${ECHO_CMD} -n "${FIND} ../../netscape-linux/plugins/*"	>>${WRKDIR}/linkfarm
 	${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null"	>>${WRKDIR}/linkfarm
-	${ECHO_CMD} -n "${FIND} ../../linux-netscape6/plugins"	>>${WRKDIR}/linkfarm
+	${ECHO_CMD} -n "${FIND} ../../linux-netscape6*/plugins"	>>${WRKDIR}/linkfarm
 	${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null"	>>${WRKDIR}/linkfarm
 
 pre-install:
diff --git a/www/linux-mozilla/distinfo b/www/linux-mozilla/distinfo
index 6ca9f12d2a9e..3f4b301c9aaa 100644
--- a/www/linux-mozilla/distinfo
+++ b/www/linux-mozilla/distinfo
@@ -1,13 +1,13 @@
-MD5 (linux-mozilla/0.9.9.2002050810/browser.xpi) = e23ac79e083e6c9b3ea3d58191a7ef7d
-MD5 (linux-mozilla/0.9.9.2002050810/langenus.xpi) = d0a38737967e44f14af88359bea4c424
-MD5 (linux-mozilla/0.9.9.2002050810/regus.xpi) = e2a9f6ef783555979ca1b4a98d50cc95
-MD5 (linux-mozilla/0.9.9.2002050810/venkman.xpi) = 3fda2f90fca4e6acd9aaf300ed053536
-MD5 (linux-mozilla/0.9.9.2002050810/xpcom.xpi) = 7cf508f187d9a43ad783a96ad476e05f
-MD5 (linux-mozilla/0.9.9.2002050810/chatzilla.xpi) = 68c859de0f0067b4723947ca90350a06
-MD5 (linux-mozilla/0.9.9.2002050810/deflenus.xpi) = 826f84250ed40ea98d192c83e4f783c3
-MD5 (linux-mozilla/0.9.9.2002050810/inspector.xpi) = 830146e23da8029d0680126fe7ba675d
-MD5 (linux-mozilla/0.9.9.2002050810/mail.xpi) = 3487e7678bb67f5d31695800a3737faf
-MD5 (linux-mozilla/0.9.9.2002050810/psm.xpi) = 9b76b5b5c37ca911378c551db4805033
-MD5 (linux-mozilla/0.9.9.2002050810/talkback.xpi) = c18c22a30456b4cde49b934b7a250b76
-MD5 (linux-mozilla/0.9.9.2002050810/venkman.xpi) = 3fda2f90fca4e6acd9aaf300ed053536
-MD5 (linux-mozilla/0.9.9.2002050810/linux-mozilla-0.9.9.2002050810-generated-files.tar.gz) = 34ddae7fc59e3fa9d55a04f83ccbf165
+MD5 (linux-mozilla/1.0/browser.xpi) = f773828f035affb022c8989045c690d0
+MD5 (linux-mozilla/1.0/chatzilla.xpi) = a6be6ff71051f94d988ab5b3af8724cc
+MD5 (linux-mozilla/1.0/deflenus.xpi) = 13cd011c36b2b2ff8ec5f5c6b612d106
+MD5 (linux-mozilla/1.0/inspector.xpi) = e5647eca938a877055917ba908392167
+MD5 (linux-mozilla/1.0/langenus.xpi) = 6b28aa34476527ac4c44aa946f38f3fd
+MD5 (linux-mozilla/1.0/linux-mozilla-1.0-generated-files.tar.gz) = 35557f81dd7908e737a810c6f5e3aeef
+MD5 (linux-mozilla/1.0/mail.xpi) = f2c1094e218fee49583726789ab96510
+MD5 (linux-mozilla/1.0/psm.xpi) = 66fed4679661d0c0c640d1dbafa36af7
+MD5 (linux-mozilla/1.0/regus.xpi) = 1c2e0712d07130d88d7253015934a8ce
+MD5 (linux-mozilla/1.0/talkback.xpi) = f99bb9daf49c9e919cde5d54fdcfe059
+MD5 (linux-mozilla/1.0/venkman.xpi) = 94d39361968acbb2f745eddd97263feb
+MD5 (linux-mozilla/1.0/xpcom.xpi) = b85671bdd3fe50b5806a8a11a696ed08
+MD5 (linux-mozilla/1.0/bogus.xpi) = IGNORE
diff --git a/www/linux-mozilla/scripts/configure b/www/linux-mozilla/scripts/configure
index a2989a552c02..8a08672e56c4 100644
--- a/www/linux-mozilla/scripts/configure
+++ b/www/linux-mozilla/scripts/configure
@@ -9,17 +9,17 @@ fi
 
 tempfile=`/usr/bin/mktemp -t checklist`
 
-echo "browser langenus regus venkman xpcom" > /tmp/checklist.tmp.$$;
+echo "browser langenus 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 7 \
-"chatzilla"	"IRC client (102 kB) DO NOT USE:  HAS SECURITY BUG!"	OFF \
+"chatzilla"	"IRC client (104 kB)"					ON \
 "deflenus"	"American English profile defaults (8 kB)"		ON \
 "inspector"	"DOM inspector (240 kB)"				ON \
-"mail"		"Mozilla Mail and News (1728 kB)"			ON \
-"psm"		"Personal Security Manager--recommended (656 kB)"	ON \
+"mail"		"Mozilla Mail and News (1856 kB)"			ON \
+"psm"		"Personal Security Manager--recommended (784 kB)"	ON \
 "talkback"	"sends crash logs to Mozilla staff (832 kB)"		ON \
 "venkman"	"JavaScript debugger (150 kB)"				ON \
 2>> /tmp/checklist.tmp.$$