Update to 1.4.

Change the configuration process, so that extraneous files are not
downloaded.

3 files changed, 21 insertions, 15 deletions

diff --git a/www/linux-mozilla/Makefile b/www/linux-mozilla/Makefile
index 38a8ed1f8ea5..42f65f916eaa 100644
--- a/www/linux-mozilla/Makefile
+++ b/www/linux-mozilla/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	1.3.1
+PORTVERSION=	1.4
 CATEGORIES=	www linux
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	mozilla/releases/mozilla${PORTVERSION}/linux-xpi
@@ -44,9 +44,11 @@ IS_INTERACTIVE=	yes
 
 pre-everything::
 	${MKDIR} ${WRKSRC}
+.if !exists(${WRKDIRPREFIX}${.CURDIR}/work/netscape-installer/xpi/components.conf)
 .if !defined(BATCH)
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
+.endif
 DISTFILES=	browser.xpi \
 		deflenus.xpi \
 		inspector.xpi \
diff --git a/www/linux-mozilla/distinfo b/www/linux-mozilla/distinfo
index 8f1163acf85e..aa131a08c79c 100644
--- a/www/linux-mozilla/distinfo
+++ b/www/linux-mozilla/distinfo
@@ -1,11 +1,11 @@
-MD5 (linux-mozilla/1.3.1/browser.xpi) = 92a7003c3519414f8bd31b4919850d32
-MD5 (linux-mozilla/1.3.1/deflenus.xpi) = 59cc5c1284e2f2f6c7374b46c913b205
-MD5 (linux-mozilla/1.3.1/inspector.xpi) = 18d0b7c0280f5a78013ac551776c55a9
-MD5 (linux-mozilla/1.3.1/langenus.xpi) = 55e43c7c5dec6092da7f98c52cd1e3a2
-MD5 (linux-mozilla/1.3.1/mail.xpi) = 3c0af84b09adfbb52f800f274bf618e5
-MD5 (linux-mozilla/1.3.1/psm.xpi) = 1a327f5673a5912dcb093a436bc792cf
-MD5 (linux-mozilla/1.3.1/regus.xpi) = 49c998376d6507f4e368b85f689a4d80
-MD5 (linux-mozilla/1.3.1/talkback.xpi) = 8ddd3a4f89c71931b40136bbe3612d11
-MD5 (linux-mozilla/1.3.1/venkman.xpi) = a7d0a977d9f75e0e5db6b9583826ba19
-MD5 (linux-mozilla/1.3.1/xpcom.xpi) = dd9f9fbbccc64a5903c488b844a9b213
-MD5 (linux-mozilla/1.3.1/linux-mozilla-1.3.1-generated-files.tar.bz2) = f1fad63cea882300854af611d1b6f195
+MD5 (linux-mozilla/1.4/browser.xpi) = 2633b57df0ad8f41f0f72a2242b8a568
+MD5 (linux-mozilla/1.4/deflenus.xpi) = 0c771e7ab529b454f46bdc162857d30f
+MD5 (linux-mozilla/1.4/inspector.xpi) = 4b2b13a5bd5b277729b1a99f1aa68b28
+MD5 (linux-mozilla/1.4/langenus.xpi) = 55953283d9c5b8bf4694ad9e96d5ec8b
+MD5 (linux-mozilla/1.4/linux-mozilla-1.4-generated-files.tar.bz2) = f1fad63cea882300854af611d1b6f195
+MD5 (linux-mozilla/1.4/mail.xpi) = 4e584ccdb719c6124aa8b8132f2a9d14
+MD5 (linux-mozilla/1.4/psm.xpi) = 2997514b66deaf1e102e28463ad68040
+MD5 (linux-mozilla/1.4/regus.xpi) = 886fff60b3a84d595b24e80dd4c98be7
+MD5 (linux-mozilla/1.4/talkback.xpi) = b90901659af6209de09d1541e8fa435e
+MD5 (linux-mozilla/1.4/venkman.xpi) = 53a48ee58d1c91c7c4148def36c98a22
+MD5 (linux-mozilla/1.4/xpcom.xpi) = 766adef7ab4f52809f162c0baa98d38b
diff --git a/www/linux-mozilla/scripts/configure b/www/linux-mozilla/scripts/configure
index f51afff58430..2d7954b31fdc 100644
--- a/www/linux-mozilla/scripts/configure
+++ b/www/linux-mozilla/scripts/configure
@@ -16,11 +16,11 @@ echo "browser langenus regus xpcom" > /tmp/checklist.tmp.$$;
 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 (240 kB)"				ON \
-"mail"		"Mozilla Mail and News (1824 kB)"			ON \
+"inspector"	"DOM inspector (154 kB)"				ON \
+"mail"		"Mozilla Mail and News (1808 kB)"			ON \
 "psm"		"Personal Security Manager--recommended (768 kB)"	ON \
 "talkback"	"sends crash logs to Mozilla staff (832 kB)"		ON \
-"venkman"	"JavaScript debugger (256 kB)"				ON \
+"venkman"	"JavaScript debugger (224 kB)"				ON \
 2>> /tmp/checklist.tmp.$$
 
 retval=$?
@@ -42,3 +42,7 @@ echo "$choice" \
 	| sed -e "s/$/.xpi/g" \
 	| perl -pi -e "s/ /\n/g" \
 	> ${WRKSRC}/components.conf
+
+echo "* Your choices are saved.  You must run the \"make\" command again to"
+echo "* complete the build.  Ignore the \"Error code 1\" below."
+exit 1