Create the PLIST dynamically, instead of using pre-determined ones.

This allows the the user to choose 'custom' as an installation method
as well as 'complete' or 'recommended'.  This obsoletes the NS_INST
variable and reduces likeliness of errors due to not properly set PKG_LANG.

Some more re-organizing wrt Linux-emul root etc:  the installer behaves
differently according to who runs 'make'.  (Try to) clean up parts of
the emul root if it was used, too.

These changes should help address some of the issues pointed out in
PR pkg/18606 and PR pkg/18615.

12 files changed, 61 insertions, 787 deletions

diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index 3b83d06c0cc..cc5bb71a19d 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2002/10/11 03:51:04 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2002/10/11 20:50:42 jschauma Exp $
 #
 
 DISTNAME=		netscape-i686-pc-linux-gnu-sea
 PKGNAME=		netscape${VERS_MAJ}-${VERS_MIN}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		www
 MASTER_SITES=		ftp://ftp.netscape.com/pub/netscape7/${SUB}/ \
 			ftp://sunsite.utk.edu/pub/netscape/netscape7/${SUB}/ \
@@ -24,24 +24,18 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 ONLY_FOR_PLATFORM=	Linux-*-i[3-6]86 NetBSD-*-i386
 INTERACTIVE_STAGE=	build
 
+PKG_LANG?=		english
 VERS_MAJ=		7
 VERS_MIN=		0
 SUB=			${PKG_LANG}/${VERS_MAJ}.${VERS_MIN}/unix/${DIST_DIR_NAME}/sea
 DIST_SUBDIR=		netscape7/${PKG_LANG}
 WRKSRC=			${WRKDIR}/netscape-installer
 
-PKG_LANG?=		english
-NS_INST?=		recommended
-
 .if ${PKG_LANG} != english
 DISTINFO_FILE=		${PKGDIR}/distinfo.${PKG_LANG}
 .endif
 
-.if ${NS_INST} == "complete"
-PLIST_SRC+=		${PKGDIR}/PLIST.extra
-.endif
-
-PLIST_SRC+=		${PKGDIR}/PLIST.${PKG_LANG} ${PKGDIR}/PLIST
+PLIST_SRC=		${WRKDIR}/PLIST
 
 pre-fetch:
 	@${CAT} ${FILESDIR}/fetch-message
@@ -50,23 +44,43 @@ pre-build:
 	${SED} -e "s|@PREFIX@|${PREFIX}|g" ${FILESDIR}/netscape.sh > 	\
 		${WRKDIR}/netscape7
 	@delay=10;							\
-	${SED} -e "s|@NS_INST@|${NS_INST}|g" -e "s|@WRKSRC@|${WRKSRC}|g"\
-		 -e "s|@delay@|$${delay}|g"				\
+	${SED} -e "s|@WRKSRC@|${WRKSRC}|g" -e "s|@delay@|$${delay}|g"	\
 		${FILESDIR}/extract_instructions;			\
 	sleep $${delay};						\
 	${MKDIR} ${WRKSRC}/dest
 
+# we must wait for netscape to start up after build!
 do-build:
 	cd ${WRKSRC} && ${SH} netscape-installer
+	@sleep 10
+
+# dynamic PLIST generation
+pre-install:
+	if [ -f ${INSTDIR}/plugins/libjavaplugin_oji.so ]; then	\
+		cd ${INSTDIR}/plugins && ${LN} -sf 			\
+			java2/plugin/i386/ns600/libjavaplugin_oji.so	\
+			libjavaplugin_oji.so;				\
+	fi
+	@${RM} -f ${PLIST_SRC}
+	@${TOUCH} ${PLIST_SRC}
+	@cd ${INSTDIR} && 						\
+		${FIND} . ! -name "xpti.dat" \( -type f -or -type l \)  \
+			-print |					\
+		${SED} -e 's,^\.,lib/netscape/netscape7,' >> ${PLIST_SRC}
+	@${ECHO} "@unexec \$${RM} %D/lib/netscape/netscape7/components/xpti.dat 2>/dev/null || \$${TRUE}" \
+		>> ${PLIST_SRC}
+	@cd ${INSTDIR} && 						\
+			${FIND} . ${FIND_ARG} \( -type d ! -name "." \) \
+			-print |					\
+		${SED} -e 's,^\.,@dirrm lib/netscape/netscape7,' >>	\
+			${PLIST_SRC}
+	@${ECHO} "@dirrm lib/netscape/netscape7" >> ${PLIST_SRC}
+	@${ECHO} "@unexec \$${RMDIR} %D/lib/netscape 2>/dev/null || \$${TRUE}" \
+		>> ${PLIST_SRC}
 
 do-install:
-.if ${NS_INST} == "complete"
-	cd ${WRKSRC}/dest/plugins && ${LN} -sf 				\
-		java2/plugin/i386/ns600/libjavaplugin_oji.so		\
-		libjavaplugin_oji.so
-.endif
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/lib/netscape/netscape7
-	cd ${WRKSRC}/dest && ${PAX} -rw . ${PREFIX}/lib/netscape/netscape7
+	cd ${INSTDIR} && ${PAX} -rw . ${PREFIX}/lib/netscape/netscape7
 	${INSTALL_SCRIPT} ${WRKDIR}/netscape7 ${PREFIX}/bin
 	${CHMOD} 755 ${PREFIX}/bin/netscape7
 
diff --git a/www/netscape7/Makefile.Linux.i386 b/www/netscape7/Makefile.Linux.i386
index e12da1757c2..d0e7ced4e41 100644
--- a/www/netscape7/Makefile.Linux.i386
+++ b/www/netscape7/Makefile.Linux.i386
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.Linux.i386,v 1.5 2002/10/02 01:09:06 jschauma Exp $
+# $NetBSD: Makefile.Linux.i386,v 1.6 2002/10/11 20:50:42 jschauma Exp $
 #
 
 DIST_DIR_NAME=		linux22
 
 DEPENDS+=		gtk+>=1.2.10:../../x11/gtk
-PLIST_SRC+=		${PKGDIR}/PLIST.linux
+INSTDIR=		${WRKSRC}/dest
+FIND_ARG=		-depth
 
 post-extract:
 	${MKDIR} ${WRKSRC}/dest
diff --git a/www/netscape7/Makefile.NetBSD.i386 b/www/netscape7/Makefile.NetBSD.i386
index aa3cc3b0404..e53c6ed0993 100644
--- a/www/netscape7/Makefile.NetBSD.i386
+++ b/www/netscape7/Makefile.NetBSD.i386
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.4 2002/10/02 01:09:06 jschauma Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.5 2002/10/11 20:50:42 jschauma Exp $
 #
 
 DIST_DIR_NAME=		linux22
@@ -7,19 +7,30 @@ DEPENDS+=		suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
 DEPENDS+=		suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
 DEPENDS+=		suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk
 
-INSTDIR=		${PREFIX}/emul/linux${WRKSRC}/dest
 MESSAGE_SRC=		${PKGDIR}/MESSAGE.${OPSYS}
+FIND_ARG=		-d
+
+# installing over emulation files doesn't work (huh?), so clean out any
+# existing files first
+post-extract:
+	if [ "${INSTDIR}" != "${WRKSRC}/dest" ]; then		\
+		${RM} -fr ${INSTDIR};				\
+	fi
+
+# try to keep emul root clean
+pre-clean:
+	if [ "${INSTDIR}" != "${WRKSRC}/dest" ] && [ -d ${INSTDIR} ]; then	\
+		cd ${INSTDIR}/../../ && ${RM} -fr *;				\
+	fi
+
+.include "../../emulators/suse_linux/Makefile.application"
 
 # The installer starts netscape - under linux emulation, nontheless!
 # If the user running 'make' has permission to do so, the installer will
-# create ${INSTDIR} and install there.
-# Since we need the files that are generated during the first run, we need to
-# fetch them and install them now.
-post-install:
-	if [ -d ${INSTDIR} ]; then \
-		cd ${INSTDIR} && ${PAX} -rw . ${PREFIX}/lib/netscape/netscape7; \
-		${RM} -fr ${PREFIX}/emul/linux/root/.mozilla; \
-		${RM} -fr ${PREFIX}/emul/linux/root/.fullcircle; \
-	fi;
+# create files in the emulation root.
 
-.include "../../emulators/suse_linux/Makefile.application"
+.if exists(${WRKSRC}/dest/plugins)
+INSTDIR=		${WRKSRC}/dest
+.else
+INSTDIR=		${PREFIX}/emul/linux${WRKSRC}/dest
+.endif
diff --git a/www/netscape7/PLIST b/www/netscape7/PLIST
deleted file mode 100644
index 4bf3cf7462a..00000000000
--- a/www/netscape7/PLIST
+++ /dev/null
@@ -1,406 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/09/29 22:58:44 jschauma Exp $
-bin/netscape7
-lib/netscape/netscape7/Cool/CoolBos.so
-lib/netscape/netscape7/Cool/CoolBos.so.1
-lib/netscape/netscape7/Cool/CoolBucky.so
-lib/netscape/netscape7/Cool/CoolBucky.so.1
-lib/netscape/netscape7/Cool/CoolHttp.so
-lib/netscape/netscape7/Cool/CoolHttp.so.1
-lib/netscape/netscape7/Cool/CoolIcq.so
-lib/netscape/netscape7/Cool/CoolIcq.so.1
-lib/netscape/netscape7/Cool/CoolPeer.so
-lib/netscape/netscape7/Cool/CoolPeer.so.1
-lib/netscape/netscape7/Cool/CoolSocket.so
-lib/netscape/netscape7/Cool/CoolSocket.so.1
-lib/netscape/netscape7/Cool/CoolSos.so
-lib/netscape/netscape7/Cool/CoolSos.so.1
-lib/netscape/netscape7/Cool/CoolTih.so
-lib/netscape/netscape7/Cool/CoolTih.so.1
-lib/netscape/netscape7/chrome/aim.jar
-lib/netscape/netscape7/chrome/chrome.rdf
-lib/netscape/netscape7/chrome/classic.jar
-lib/netscape/netscape7/chrome/comm.jar
-lib/netscape/netscape7/chrome/content-packs.jar
-lib/netscape/netscape7/chrome/forms.jar
-lib/netscape/netscape7/chrome/help.jar
-lib/netscape/netscape7/chrome/installed-chrome.txt
-lib/netscape/netscape7/chrome/messenger.jar
-lib/netscape/netscape7/chrome/modern.jar
-lib/netscape/netscape7/chrome/overlayinfo/communicator/content/overlays.rdf
-lib/netscape/netscape7/chrome/overlayinfo/content-packs/content/overlays.rdf
-lib/netscape/netscape7/chrome/overlayinfo/cookie/content/overlays.rdf
-lib/netscape/netscape7/chrome/overlayinfo/editor/content/overlays.rdf
-lib/netscape/netscape7/chrome/overlayinfo/messenger/content/overlays.rdf
-lib/netscape/netscape7/chrome/overlayinfo/navigator/content/overlays.rdf
-lib/netscape/netscape7/chrome/overlayinfo/navigator/skin/stylesheets.rdf
-lib/netscape/netscape7/chrome/pipnss.jar
-lib/netscape/netscape7/chrome/pippki.jar
-lib/netscape/netscape7/chrome/toolkit.jar
-lib/netscape/netscape7/components/AIMGlue.xpt
-lib/netscape/netscape7/components/browser.xpt
-lib/netscape/netscape7/components/jsconsole-clhandler.js
-lib/netscape/netscape7/components/libIMGlue.so
-lib/netscape/netscape7/components/libabsyncmj.so
-lib/netscape/netscape7/components/libabsyncsvc.so
-lib/netscape/netscape7/components/libabupgrade.so
-lib/netscape/netscape7/components/libactivation.so
-lib/netscape/netscape7/components/libaddrbook.so
-lib/netscape/netscape7/components/libaimstat.so
-lib/netscape/netscape7/components/libappcomps.so
-lib/netscape/netscape7/components/libautoconfig.so
-lib/netscape/netscape7/components/libcaps.so
-lib/netscape/netscape7/components/libchardet.so
-lib/netscape/netscape7/components/libchrome.so
-lib/netscape/netscape7/components/libcomposer.so
-lib/netscape/netscape7/components/libcookie.so
-lib/netscape/netscape7/components/libdocshell.so
-lib/netscape/netscape7/components/libeditor.so
-lib/netscape/netscape7/components/libembedcomponents.so
-lib/netscape/netscape7/components/libfileview.so
-lib/netscape/netscape7/components/libgfx2.so
-lib/netscape/netscape7/components/libgfx_gtk.so
-lib/netscape/netscape7/components/libgfxps.so
-lib/netscape/netscape7/components/libgfxxprint.so
-lib/netscape/netscape7/components/libgkcontent.so
-lib/netscape/netscape7/components/libgklayout.so
-lib/netscape/netscape7/components/libgkplugin.so
-lib/netscape/netscape7/components/libgkview.so
-lib/netscape/netscape7/components/libhtmlpars.so
-lib/netscape/netscape7/components/libimgbmp.so
-lib/netscape/netscape7/components/libimggif.so
-lib/netscape/netscape7/components/libimgjpeg.so
-lib/netscape/netscape7/components/libimglib2.so
-lib/netscape/netscape7/components/libimgmng.so
-lib/netscape/netscape7/components/libimgpng.so
-lib/netscape/netscape7/components/libimgppm.so
-lib/netscape/netscape7/components/libimgxbm.so
-lib/netscape/netscape7/components/libimpComm4x.so
-lib/netscape/netscape7/components/libimpComm4xMail.so
-lib/netscape/netscape7/components/libimpText.so
-lib/netscape/netscape7/components/libimport.so
-lib/netscape/netscape7/components/libjar50.so
-lib/netscape/netscape7/components/libjsd.so
-lib/netscape/netscape7/components/libjsdom.so
-lib/netscape/netscape7/components/libjsloader.so
-lib/netscape/netscape7/components/libjsurl.so
-lib/netscape/netscape7/components/liblocalmail.so
-lib/netscape/netscape7/components/liblwbrk.so
-lib/netscape/netscape7/components/libmailnews.so
-lib/netscape/netscape7/components/libmime.so
-lib/netscape/netscape7/components/libmimeemitter.so
-lib/netscape/netscape7/components/libmork.so
-lib/netscape/netscape7/components/libmozbrwsr.so
-lib/netscape/netscape7/components/libmozfind.so
-lib/netscape/netscape7/components/libmozldap.so
-lib/netscape/netscape7/components/libmozxfer.so
-lib/netscape/netscape7/components/libmsgcompose.so
-lib/netscape/netscape7/components/libmsgdb.so
-lib/netscape/netscape7/components/libmsgimap.so
-lib/netscape/netscape7/components/libmsgmdn.so
-lib/netscape/netscape7/components/libmsgnews.so
-lib/netscape/netscape7/components/libmsgsmime.so
-lib/netscape/netscape7/components/libnecko.so
-lib/netscape/netscape7/components/libnecko2.so
-lib/netscape/netscape7/components/libnkcache.so
-lib/netscape/netscape7/components/libnsappshell.so
-lib/netscape/netscape7/components/libnslocale.so
-lib/netscape/netscape7/components/libnsprefm.so
-lib/netscape/netscape7/components/liboji.so
-lib/netscape/netscape7/components/libp3p.so
-lib/netscape/netscape7/components/libpipboot.so
-lib/netscape/netscape7/components/libpipnss.so
-lib/netscape/netscape7/components/libpippki.so
-lib/netscape/netscape7/components/libpref.so
-lib/netscape/netscape7/components/libprofile.so
-lib/netscape/netscape7/components/libqfaservices.so
-lib/netscape/netscape7/components/librdf.so
-lib/netscape/netscape7/components/libregviewer.so
-lib/netscape/netscape7/components/libshistory.so
-lib/netscape/netscape7/components/libstrres.so
-lib/netscape/netscape7/components/libtransformiix.so
-lib/netscape/netscape7/components/libtxmgr.so
-lib/netscape/netscape7/components/libtxtsvc.so
-lib/netscape/netscape7/components/libuconv.so
-lib/netscape/netscape7/components/libucvcn.so
-lib/netscape/netscape7/components/libucvibm.so
-lib/netscape/netscape7/components/libucvja.so
-lib/netscape/netscape7/components/libucvko.so
-lib/netscape/netscape7/components/libucvlatin.so
-lib/netscape/netscape7/components/libucvmath.so
-lib/netscape/netscape7/components/libucvtw.so
-lib/netscape/netscape7/components/libucvtw2.so
-lib/netscape/netscape7/components/libunicharutil.so
-lib/netscape/netscape7/components/libuniversalchardet.so
-lib/netscape/netscape7/components/liburiloader.so
-lib/netscape/netscape7/components/libvcard.so
-lib/netscape/netscape7/components/libwallet.so
-lib/netscape/netscape7/components/libwalletviewers.so
-lib/netscape/netscape7/components/libwebbrwsr.so
-lib/netscape/netscape7/components/libwidget_gtk.so
-lib/netscape/netscape7/components/libxmlextras.so
-lib/netscape/netscape7/components/libxpconnect.so
-lib/netscape/netscape7/components/libxpinstall.so
-lib/netscape/netscape7/components/libxremote_client.so
-lib/netscape/netscape7/components/libxremoteservice.so
-lib/netscape/netscape7/components/mail.xpt
-lib/netscape/netscape7/components/mdn-service.js
-lib/netscape/netscape7/components/nsDictionary.js
-lib/netscape/netscape7/components/nsDownloadProgressListener.js
-lib/netscape/netscape7/components/nsFilePicker.js
-lib/netscape/netscape7/components/nsHelperAppDlg.js
-lib/netscape/netscape7/components/nsJSAimChatRendezvous.js
-lib/netscape/netscape7/components/nsJSAimFileXferRendezvous.js
-lib/netscape/netscape7/components/nsJSAimKeywords.js
-lib/netscape/netscape7/components/nsJSAimOdirEntry.js
-lib/netscape/netscape7/components/nsLDAPPrefsService.js
-lib/netscape/netscape7/components/nsProgressDialog.js
-lib/netscape/netscape7/components/nsProxyAutoConfig.js
-lib/netscape/netscape7/components/nsSetPref.js
-lib/netscape/netscape7/components/nsSidebar.js
-lib/netscape/netscape7/components/nsUpdateNotifier.js
-lib/netscape/netscape7/components/nsXmlRpcClient.js
-lib/netscape/netscape7/components/psm.xpt
-lib/netscape/netscape7/components/qfaservices.xpt
-lib/netscape/netscape7/components/smime-service.js
-lib/netscape/netscape7/components/spellchecker/libspellchk.so
-lib/netscape/netscape7/components/spellchecker/netscape.dic
-lib/netscape/netscape7/components/spellchecker/pen4s324.dat
-lib/netscape/netscape7/components/talkback/XTalkback.ad
-lib/netscape/netscape7/components/talkback/master.ini
-lib/netscape/netscape7/components/talkback/talkback
-lib/netscape/netscape7/components/talkback/talkback.so
-lib/netscape/netscape7/components/xpti.dat
-lib/netscape/netscape7/defaults/autoconfig/prefcalls.js
-lib/netscape/netscape7/defaults/isp/aol.rdf
-lib/netscape/netscape7/defaults/isp/nswebmail.rdf
-lib/netscape/netscape7/defaults/messenger/webMailSignature.html
-lib/netscape/netscape7/defaults/pref/aim.js
-lib/netscape/netscape7/defaults/pref/all-ns.js
-lib/netscape/netscape7/defaults/pref/all.js
-lib/netscape/netscape7/defaults/pref/config.js
-lib/netscape/netscape7/defaults/pref/editor.js
-lib/netscape/netscape7/defaults/pref/initpref.js
-lib/netscape/netscape7/defaults/pref/inspector.js
-lib/netscape/netscape7/defaults/pref/mailnews-ns.js
-lib/netscape/netscape7/defaults/pref/mailnews.js
-lib/netscape/netscape7/defaults/pref/mdn.js
-lib/netscape/netscape7/defaults/pref/security-prefs.js
-lib/netscape/netscape7/defaults/pref/smime.js
-lib/netscape/netscape7/defaults/pref/unix.js
-lib/netscape/netscape7/defaults/pref/xpinstall.js
-lib/netscape/netscape7/defaults/profile/bookmarks.html
-lib/netscape/netscape7/defaults/profile/default-connections.rdf
-lib/netscape/netscape7/defaults/profile/default-invite.rdf
-lib/netscape/netscape7/defaults/profile/default-messages-icq.rdf
-lib/netscape/netscape7/defaults/profile/default-messages.rdf
-lib/netscape/netscape7/defaults/profile/localstore.rdf
-lib/netscape/netscape7/defaults/profile/mimeTypes.rdf
-lib/netscape/netscape7/defaults/profile/panels.rdf
-lib/netscape/netscape7/defaults/profile/search.rdf
-lib/netscape/netscape7/defaults/wallet/DistinguishedSchema.tbl
-lib/netscape/netscape7/defaults/wallet/FieldSchema.tbl
-lib/netscape/netscape7/defaults/wallet/PositionalSchema.tbl
-lib/netscape/netscape7/defaults/wallet/SchemaConcat.tbl
-lib/netscape/netscape7/defaults/wallet/SchemaStrings.tbl
-lib/netscape/netscape7/defaults/wallet/StateSchema.tbl
-lib/netscape/netscape7/defaults/wallet/VcardSchema.tbl
-lib/netscape/netscape7/icons/mozicon16.xpm
-lib/netscape/netscape7/icons/mozicon50.xpm
-lib/netscape/netscape7/install.log
-lib/netscape/netscape7/libXpcs.so
-lib/netscape/netscape7/libXpcs.so.1
-lib/netscape/netscape7/libXprt.so
-lib/netscape/netscape7/libXprt.so.1
-lib/netscape/netscape7/libXptl.so
-lib/netscape/netscape7/libXptl.so.1
-lib/netscape/netscape7/libgkgfx.so
-lib/netscape/netscape7/libgtkembedmoz.so
-lib/netscape/netscape7/libgtksuperwin.so
-lib/netscape/netscape7/libgtkxtbin.so
-lib/netscape/netscape7/libjsj.so
-lib/netscape/netscape7/libldap50.so
-lib/netscape/netscape7/libmozjs.so
-lib/netscape/netscape7/libmozz.so
-lib/netscape/netscape7/libmsgbaseutil.so
-lib/netscape/netscape7/libnspr4.so
-lib/netscape/netscape7/libnss3.so
-lib/netscape/netscape7/libnssckbi.so
-lib/netscape/netscape7/libplc4.so
-lib/netscape/netscape7/libplds4.so
-lib/netscape/netscape7/libprldap50.so
-lib/netscape/netscape7/libsmime3.so
-lib/netscape/netscape7/libsoftokn3.so
-lib/netscape/netscape7/libssl3.so
-lib/netscape/netscape7/libxlibrgb.so
-lib/netscape/netscape7/libxpcom.so
-lib/netscape/netscape7/libxpistub.so
-lib/netscape/netscape7/mozilla-xremote-client
-lib/netscape/netscape7/netscape
-lib/netscape/netscape7/netscape-bin
-lib/netscape/netscape7/plugins/ShockwaveFlash.class
-lib/netscape/netscape7/plugins/libflashplayer.so
-lib/netscape/netscape7/plugins/libnullplugin.so
-lib/netscape/netscape7/regExport
-lib/netscape/netscape7/regchrome
-lib/netscape/netscape7/registry
-lib/netscape/netscape7/regxpcom
-lib/netscape/netscape7/res/arrow.gif
-lib/netscape/netscape7/res/broken-image.gif
-lib/netscape/netscape7/res/builtin/htmlBindings.xml
-lib/netscape/netscape7/res/builtin/platformHTMLBindings.xml
-lib/netscape/netscape7/res/charsetData.properties
-lib/netscape/netscape7/res/charsetalias.properties
-lib/netscape/netscape7/res/cmessage.txt
-lib/netscape/netscape7/res/dtd/mathml.dtd
-lib/netscape/netscape7/res/dtd/xhtml11.dtd
-lib/netscape/netscape7/res/entityTables/html40Latin1.properties
-lib/netscape/netscape7/res/entityTables/html40Special.properties
-lib/netscape/netscape7/res/entityTables/html40Symbols.properties
-lib/netscape/netscape7/res/entityTables/htmlEntityVersions.properties
-lib/netscape/netscape7/res/entityTables/transliterate.properties
-lib/netscape/netscape7/res/fonts/mathfont.properties
-lib/netscape/netscape7/res/fonts/mathfontCMEX10.properties
-lib/netscape/netscape7/res/fonts/mathfontCMSY10.properties
-lib/netscape/netscape7/res/fonts/mathfontMTExtra.properties
-lib/netscape/netscape7/res/fonts/mathfontMath1.properties
-lib/netscape/netscape7/res/fonts/mathfontMath2.properties
-lib/netscape/netscape7/res/fonts/mathfontMath4.properties
-lib/netscape/netscape7/res/fonts/mathfontPUA.properties
-lib/netscape/netscape7/res/fonts/mathfontSymbol.properties
-lib/netscape/netscape7/res/forms.css
-lib/netscape/netscape7/res/html.css
-lib/netscape/netscape7/res/html/gopher-audio.gif
-lib/netscape/netscape7/res/html/gopher-binary.gif
-lib/netscape/netscape7/res/html/gopher-find.gif
-lib/netscape/netscape7/res/html/gopher-image.gif
-lib/netscape/netscape7/res/html/gopher-menu.gif
-lib/netscape/netscape7/res/html/gopher-movie.gif
-lib/netscape/netscape7/res/html/gopher-sound.gif
-lib/netscape/netscape7/res/html/gopher-telnet.gif
-lib/netscape/netscape7/res/html/gopher-text.gif
-lib/netscape/netscape7/res/html/gopher-unknown.gif
-lib/netscape/netscape7/res/langGroups.properties
-lib/netscape/netscape7/res/language.properties
-lib/netscape/netscape7/res/loading-image.gif
-lib/netscape/netscape7/res/mathml.css
-lib/netscape/netscape7/res/quirk.css
-lib/netscape/netscape7/res/rdf/article.gif
-lib/netscape/netscape7/res/rdf/document.gif
-lib/netscape/netscape7/res/rdf/folder-closed.gif
-lib/netscape/netscape7/res/rdf/folder-open.gif
-lib/netscape/netscape7/res/rdf/loading.gif
-lib/netscape/netscape7/res/samples/Anieyes.gif
-lib/netscape/netscape7/res/samples/aform.css
-lib/netscape/netscape7/res/samples/beeptest.html
-lib/netscape/netscape7/res/samples/bform.css
-lib/netscape/netscape7/res/samples/bg.jpg
-lib/netscape/netscape7/res/samples/cform.css
-lib/netscape/netscape7/res/samples/checkboxTest.xul
-lib/netscape/netscape7/res/samples/colorpicker.xul
-lib/netscape/netscape7/res/samples/demoform.css
-lib/netscape/netscape7/res/samples/dexopenchrome.xul
-lib/netscape/netscape7/res/samples/dexparamdialog.html
-lib/netscape/netscape7/res/samples/dexparamdialog.xul
-lib/netscape/netscape7/res/samples/find.html
-lib/netscape/netscape7/res/samples/gear1.gif
-lib/netscape/netscape7/res/samples/hidetoolicon.css
-lib/netscape/netscape7/res/samples/hidetoolicon.xul
-lib/netscape/netscape7/res/samples/image_props.html
-lib/netscape/netscape7/res/samples/mozform.css
-lib/netscape/netscape7/res/samples/printsetup.html
-lib/netscape/netscape7/res/samples/raptor.jpg
-lib/netscape/netscape7/res/samples/rock_gra.gif
-lib/netscape/netscape7/res/samples/sampleimages/bongo.gif
-lib/netscape/netscape7/res/samples/sampleimages/down.gif
-lib/netscape/netscape7/res/samples/sampleimages/left.gif
-lib/netscape/netscape7/res/samples/sampleimages/right.gif
-lib/netscape/netscape7/res/samples/sampleimages/up.gif
-lib/netscape/netscape7/res/samples/scrollbarTest1.xul
-lib/netscape/netscape7/res/samples/scrollbarTest2.xul
-lib/netscape/netscape7/res/samples/sliderTest1.xul
-lib/netscape/netscape7/res/samples/soundtest.html
-lib/netscape/netscape7/res/samples/tab.xul
-lib/netscape/netscape7/res/samples/test.wav
-lib/netscape/netscape7/res/samples/test0.html
-lib/netscape/netscape7/res/samples/test1.html
-lib/netscape/netscape7/res/samples/test10.html
-lib/netscape/netscape7/res/samples/test11.html
-lib/netscape/netscape7/res/samples/test12.html
-lib/netscape/netscape7/res/samples/test13.html
-lib/netscape/netscape7/res/samples/test14.html
-lib/netscape/netscape7/res/samples/test15.html
-lib/netscape/netscape7/res/samples/test16.html
-lib/netscape/netscape7/res/samples/test2.html
-lib/netscape/netscape7/res/samples/test3.html
-lib/netscape/netscape7/res/samples/test4.html
-lib/netscape/netscape7/res/samples/test5.html
-lib/netscape/netscape7/res/samples/test6.html
-lib/netscape/netscape7/res/samples/test7.html
-lib/netscape/netscape7/res/samples/test8-1.html
-lib/netscape/netscape7/res/samples/test8.html
-lib/netscape/netscape7/res/samples/test8dom.html
-lib/netscape/netscape7/res/samples/test8sca.html
-lib/netscape/netscape7/res/samples/test8siz.html
-lib/netscape/netscape7/res/samples/test8tab.html
-lib/netscape/netscape7/res/samples/test9.html
-lib/netscape/netscape7/res/samples/test9a.html
-lib/netscape/netscape7/res/samples/test9b.html
-lib/netscape/netscape7/res/samples/test_ed.html
-lib/netscape/netscape7/res/samples/test_form.html
-lib/netscape/netscape7/res/samples/test_gfx.html
-lib/netscape/netscape7/res/samples/test_lbox.html
-lib/netscape/netscape7/res/samples/test_pr.html
-lib/netscape/netscape7/res/samples/test_weight.html
-lib/netscape/netscape7/res/samples/toolbarTest1.xul
-lib/netscape/netscape7/res/samples/treeTest1.css
-lib/netscape/netscape7/res/samples/treeTest1.xul
-lib/netscape/netscape7/res/samples/widgets.xul
-lib/netscape/netscape7/res/samples/xpmenu.xul
-lib/netscape/netscape7/res/samples/xulTest.css
-lib/netscape/netscape7/res/ua.css
-lib/netscape/netscape7/res/unixcharset.properties
-lib/netscape/netscape7/res/viewsource.css
-lib/netscape/netscape7/run-mozilla.sh
-lib/netscape/netscape7/systemSignature.jar
-lib/netscape/netscape7/xpicleanup
-@dirrm lib/netscape/netscape7/searchplugins
-@dirrm lib/netscape/netscape7/res/samples/sampleimages
-@dirrm lib/netscape/netscape7/res/samples
-@dirrm lib/netscape/netscape7/res/rdf
-@dirrm lib/netscape/netscape7/res/html
-@dirrm lib/netscape/netscape7/res/fonts
-@dirrm lib/netscape/netscape7/res/entityTables
-@dirrm lib/netscape/netscape7/res/dtd
-@dirrm lib/netscape/netscape7/res/builtin
-@dirrm lib/netscape/netscape7/res
-@dirrm lib/netscape/netscape7/plugins
-@dirrm lib/netscape/netscape7/icons
-@dirrm lib/netscape/netscape7/defaults/wallet
-@dirrm lib/netscape/netscape7/defaults/profile
-@dirrm lib/netscape/netscape7/defaults/pref
-@dirrm lib/netscape/netscape7/defaults/messenger
-@dirrm lib/netscape/netscape7/defaults/isp
-@dirrm lib/netscape/netscape7/defaults/autoconfig
-@dirrm lib/netscape/netscape7/defaults
-@dirrm lib/netscape/netscape7/components/spellchecker
-@dirrm lib/netscape/netscape7/components/talkback
-@dirrm lib/netscape/netscape7/components
-@dirrm lib/netscape/netscape7/chrome/overlayinfo/navigator/skin
-@dirrm lib/netscape/netscape7/chrome/overlayinfo/navigator/content
-@dirrm lib/netscape/netscape7/chrome/overlayinfo/navigator
-@dirrm lib/netscape/netscape7/chrome/overlayinfo/messenger/content
-@dirrm lib/netscape/netscape7/chrome/overlayinfo/messenger
-@dirrm lib/netscape/netscape7/chrome/overlayinfo/editor/content
-@dirrm lib/netscape/netscape7/chrome/overlayinfo/editor
-@dirrm lib/netscape/netscape7/chrome/overlayinfo/cookie/content
-@dirrm lib/netscape/netscape7/chrome/overlayinfo/cookie
-@dirrm lib/netscape/netscape7/chrome/overlayinfo/content-packs/content
-@dirrm lib/netscape/netscape7/chrome/overlayinfo/content-packs
-@dirrm lib/netscape/netscape7/chrome/overlayinfo/communicator/content
-@dirrm lib/netscape/netscape7/chrome/overlayinfo/communicator
-@dirrm lib/netscape/netscape7/chrome/overlayinfo
-@dirrm lib/netscape/netscape7/chrome
-@unexec ${RM} %D/lib/netscape/netscape7/Cool/Xpcs\ Registry.dat 2>/dev/null || ${TRUE}
-@dirrm lib/netscape/netscape7/Cool
-@unexec ${RMDIR} %D/lib/netscape/netscape7 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/netscape 2>/dev/null || ${TRUE}
diff --git a/www/netscape7/PLIST.english b/www/netscape7/PLIST.english
deleted file mode 100644
index f2188d69143..00000000000
--- a/www/netscape7/PLIST.english
+++ /dev/null
@@ -1,37 +0,0 @@
-@comment $NetBSD: PLIST.english,v 1.2 2002/09/30 13:47:26 jschauma Exp $
-lib/netscape/netscape7/chrome/US.jar
-lib/netscape/netscape7/chrome/en-US.jar
-lib/netscape/netscape7/chrome/en-mac.jar
-lib/netscape/netscape7/chrome/en-unix.jar
-lib/netscape/netscape7/chrome/en-win.jar
-lib/netscape/netscape7/component.reg
-lib/netscape/netscape7/defaults/isp/US/aol.rdf
-lib/netscape/netscape7/defaults/isp/US/nswebmail.rdf
-lib/netscape/netscape7/defaults/messenger/Templates
-lib/netscape/netscape7/defaults/messenger/US/Templates
-lib/netscape/netscape7/defaults/messenger/US/webMailSignature.html
-lib/netscape/netscape7/defaults/profile/US/bookmarks.html
-lib/netscape/netscape7/defaults/profile/US/chrome/userChrome-example.css
-lib/netscape/netscape7/defaults/profile/US/chrome/userContent-example.css
-lib/netscape/netscape7/defaults/profile/US/default-connections.rdf
-lib/netscape/netscape7/defaults/profile/US/default-invite.rdf
-lib/netscape/netscape7/defaults/profile/US/default-messages-icq.rdf
-lib/netscape/netscape7/defaults/profile/US/default-messages.rdf
-lib/netscape/netscape7/defaults/profile/US/localstore.rdf
-lib/netscape/netscape7/defaults/profile/US/mimeTypes.rdf
-lib/netscape/netscape7/defaults/profile/US/panels.rdf
-lib/netscape/netscape7/defaults/profile/US/search.rdf
-lib/netscape/netscape7/searchplugins/SBMus_01.gif
-lib/netscape/netscape7/searchplugins/SBMus_01.src
-lib/netscape/netscape7/searchplugins/SBWeb_01.gif
-lib/netscape/netscape7/searchplugins/SBWeb_01.src
-lib/netscape/netscape7/searchplugins/SBWeb_02.gif
-lib/netscape/netscape7/searchplugins/SBWeb_02.src
-lib/netscape/netscape7/searchplugins/SBWeb_04.gif
-lib/netscape/netscape7/searchplugins/SBWeb_04.src
-lib/netscape/netscape7/searchplugins/SBWeb_06.gif
-lib/netscape/netscape7/searchplugins/SBWeb_06.src
-@dirrm lib/netscape/netscape7/defaults/profile/US/chrome
-@dirrm lib/netscape/netscape7/defaults/profile/US
-@dirrm lib/netscape/netscape7/defaults/messenger/US
-@dirrm lib/netscape/netscape7/defaults/isp/US
diff --git a/www/netscape7/PLIST.extra b/www/netscape7/PLIST.extra
deleted file mode 100644
index ed1e60c5503..00000000000
--- a/www/netscape7/PLIST.extra
+++ /dev/null
@@ -1,205 +0,0 @@
-@comment $NetBSD: PLIST.extra,v 1.1 2002/10/01 03:55:44 jschauma Exp $
-lib/netscape/netscape7/plugins/java2/CHANGES
-lib/netscape/netscape7/plugins/java2/COPYRIGHT
-lib/netscape/netscape7/plugins/java2/ControlPanel.html
-lib/netscape/netscape7/plugins/java2/LICENSE
-lib/netscape/netscape7/plugins/java2/README
-lib/netscape/netscape7/plugins/java2/Welcome.html
-lib/netscape/netscape7/plugins/java2/bin/.java_wrapper
-lib/netscape/netscape7/plugins/java2/bin/ControlPanel
-lib/netscape/netscape7/plugins/java2/bin/awt_robot
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/appletviewer
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/extcheck
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/idlj
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/jar
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/jarsigner
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/java
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/javac
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/javadoc
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/javah
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/javap
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/jdb
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/keytool
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/native2ascii
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/oldjava
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/oldjavac
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/oldjdb
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/policytool
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/rmic
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/rmid
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/rmiregistry
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/serialver
-lib/netscape/netscape7/plugins/java2/bin/i386/green_threads/tnameserv
-lib/netscape/netscape7/plugins/java2/bin/i386/native_threads/java
-lib/netscape/netscape7/plugins/java2/bin/i386/native_threads/java_vm
-lib/netscape/netscape7/plugins/java2/bin/i386/native_threads/keytool
-lib/netscape/netscape7/plugins/java2/bin/i386/native_threads/policytool
-lib/netscape/netscape7/plugins/java2/bin/i386/native_threads/rmid
-lib/netscape/netscape7/plugins/java2/bin/i386/native_threads/rmiregistry
-lib/netscape/netscape7/plugins/java2/bin/i386/native_threads/tnameserv
-lib/netscape/netscape7/plugins/java2/bin/i386/realpath
-lib/netscape/netscape7/plugins/java2/bin/java
-lib/netscape/netscape7/plugins/java2/bin/keytool
-lib/netscape/netscape7/plugins/java2/bin/policytool
-lib/netscape/netscape7/plugins/java2/bin/realpath
-lib/netscape/netscape7/plugins/java2/bin/rmid
-lib/netscape/netscape7/plugins/java2/bin/rmiregistry
-lib/netscape/netscape7/plugins/java2/bin/tnameserv
-lib/netscape/netscape7/plugins/java2/lib/audio/soundbank.gm
-lib/netscape/netscape7/plugins/java2/lib/cmm/CIEXYZ.pf
-lib/netscape/netscape7/plugins/java2/lib/cmm/GRAY.pf
-lib/netscape/netscape7/plugins/java2/lib/cmm/LINEAR_RGB.pf
-lib/netscape/netscape7/plugins/java2/lib/cmm/PYCC.pf
-lib/netscape/netscape7/plugins/java2/lib/cmm/sRGB.pf
-lib/netscape/netscape7/plugins/java2/lib/content-types.properties
-lib/netscape/netscape7/plugins/java2/lib/flavormap.properties
-lib/netscape/netscape7/plugins/java2/lib/font.properties
-lib/netscape/netscape7/plugins/java2/lib/font.properties.ja
-lib/netscape/netscape7/plugins/java2/lib/font.properties.zh
-lib/netscape/netscape7/plugins/java2/lib/fonts/LucidaBrightDemiBold.ttf
-lib/netscape/netscape7/plugins/java2/lib/fonts/LucidaBrightDemiItalic.ttf
-lib/netscape/netscape7/plugins/java2/lib/fonts/LucidaBrightItalic.ttf
-lib/netscape/netscape7/plugins/java2/lib/fonts/LucidaBrightRegular.ttf
-lib/netscape/netscape7/plugins/java2/lib/fonts/LucidaSansDemiBold.ttf
-lib/netscape/netscape7/plugins/java2/lib/fonts/LucidaSansDemiOblique.ttf
-lib/netscape/netscape7/plugins/java2/lib/fonts/LucidaSansOblique.ttf
-lib/netscape/netscape7/plugins/java2/lib/fonts/LucidaSansRegular.ttf
-lib/netscape/netscape7/plugins/java2/lib/fonts/LucidaTypewriterBold.ttf
-lib/netscape/netscape7/plugins/java2/lib/fonts/LucidaTypewriterBoldOblique.ttf
-lib/netscape/netscape7/plugins/java2/lib/fonts/LucidaTypewriterOblique.ttf
-lib/netscape/netscape7/plugins/java2/lib/fonts/LucidaTypewriterRegular.ttf
-lib/netscape/netscape7/plugins/java2/lib/fonts/fonts.dir
-lib/netscape/netscape7/plugins/java2/lib/i18n.jar
-lib/netscape/netscape7/plugins/java2/lib/i386/classic/Xusage.txt
-lib/netscape/netscape7/plugins/java2/lib/i386/classic/libjvm.so
-lib/netscape/netscape7/plugins/java2/lib/i386/client/Xusage.txt
-lib/netscape/netscape7/plugins/java2/lib/i386/client/libjvm.so
-lib/netscape/netscape7/plugins/java2/lib/i386/green_threads/libhpi.so
-lib/netscape/netscape7/plugins/java2/lib/i386/hotspot/Xusage.txt
-lib/netscape/netscape7/plugins/java2/lib/i386/hotspot/libjvm.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libJdbcOdbc.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libagent.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libawt.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libcmm.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libdcpr.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libfontmanager.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libhprof.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libioser12.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libjava.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libjavaplugin_jni.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libjawt.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libjcov.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libjpeg.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libjsound.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libmlib_image.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libnet.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libpreemptive_close.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libverify.so
-lib/netscape/netscape7/plugins/java2/lib/i386/libzip.so
-lib/netscape/netscape7/plugins/java2/lib/i386/native_threads/libhpi.so
-lib/netscape/netscape7/plugins/java2/lib/i386/server/Xusage.txt
-lib/netscape/netscape7/plugins/java2/lib/i386/server/libjvm.so
-lib/netscape/netscape7/plugins/java2/lib/images/cursors/cursors.properties
-lib/netscape/netscape7/plugins/java2/lib/images/cursors/invalid32x32.gif
-lib/netscape/netscape7/plugins/java2/lib/images/cursors/motif_CopyDrop32x32.gif
-lib/netscape/netscape7/plugins/java2/lib/images/cursors/motif_CopyNoDrop32x32.gif
-lib/netscape/netscape7/plugins/java2/lib/images/cursors/motif_LinkDrop32x32.gif
-lib/netscape/netscape7/plugins/java2/lib/images/cursors/motif_LinkNoDrop32x32.gif
-lib/netscape/netscape7/plugins/java2/lib/images/cursors/motif_MoveDrop32x32.gif
-lib/netscape/netscape7/plugins/java2/lib/images/cursors/motif_MoveNoDrop32x32.gif
-lib/netscape/netscape7/plugins/java2/lib/javaplugin.jar
-lib/netscape/netscape7/plugins/java2/lib/jvm.cfg
-lib/netscape/netscape7/plugins/java2/lib/jvm.hprof.txt
-lib/netscape/netscape7/plugins/java2/lib/jvm.jcov.txt
-lib/netscape/netscape7/plugins/java2/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
-lib/netscape/netscape7/plugins/java2/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo
-lib/netscape/netscape7/plugins/java2/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo
-lib/netscape/netscape7/plugins/java2/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo
-lib/netscape/netscape7/plugins/java2/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo
-lib/netscape/netscape7/plugins/java2/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo
-lib/netscape/netscape7/plugins/java2/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo
-lib/netscape/netscape7/plugins/java2/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo
-lib/netscape/netscape7/plugins/java2/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo
-lib/netscape/netscape7/plugins/java2/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
-lib/netscape/netscape7/plugins/java2/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
-lib/netscape/netscape7/plugins/java2/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
-lib/netscape/netscape7/plugins/java2/lib/psfont.properties.ja
-lib/netscape/netscape7/plugins/java2/lib/psfontj2d.properties
-lib/netscape/netscape7/plugins/java2/lib/rt.jar
-lib/netscape/netscape7/plugins/java2/lib/security/cacerts
-lib/netscape/netscape7/plugins/java2/lib/security/java.policy
-lib/netscape/netscape7/plugins/java2/lib/security/java.security
-lib/netscape/netscape7/plugins/java2/lib/sunrsasign.jar
-lib/netscape/netscape7/plugins/java2/lib/tzmappings
-lib/netscape/netscape7/plugins/java2/man/ja/man1/java.1
-lib/netscape/netscape7/plugins/java2/man/ja/man1/keytool.1
-lib/netscape/netscape7/plugins/java2/man/ja/man1/rmid.1
-lib/netscape/netscape7/plugins/java2/man/ja/man1/rmiregistry.1
-lib/netscape/netscape7/plugins/java2/man/ja/man1/tnameserv.1
-lib/netscape/netscape7/plugins/java2/man/ja_JP.eucJP/man1/java.1
-lib/netscape/netscape7/plugins/java2/man/ja_JP.eucJP/man1/keytool.1
-lib/netscape/netscape7/plugins/java2/man/ja_JP.eucJP/man1/rmid.1
-lib/netscape/netscape7/plugins/java2/man/ja_JP.eucJP/man1/rmiregistry.1
-lib/netscape/netscape7/plugins/java2/man/ja_JP.eucJP/man1/tnameserv.1
-lib/netscape/netscape7/plugins/java2/man/man1/java.1
-lib/netscape/netscape7/plugins/java2/man/man1/keytool.1
-lib/netscape/netscape7/plugins/java2/man/man1/rmid.1
-lib/netscape/netscape7/plugins/java2/man/man1/rmiregistry.1
-lib/netscape/netscape7/plugins/java2/man/man1/tnameserv.1
-lib/netscape/netscape7/plugins/java2/plugin/i386/ns4/javaplugin.so
-lib/netscape/netscape7/plugins/java2/plugin/i386/ns600/libjavaplugin_oji.so
-lib/netscape/netscape7/plugins/libjavaplugin_oji.so
-@dirrm lib/netscape/netscape7/plugins/java2/plugin/i386/ns600
-@dirrm lib/netscape/netscape7/plugins/java2/plugin/i386/ns4
-@dirrm lib/netscape/netscape7/plugins/java2/plugin/i386
-@dirrm lib/netscape/netscape7/plugins/java2/plugin
-@dirrm lib/netscape/netscape7/plugins/java2/man/man1
-@dirrm lib/netscape/netscape7/plugins/java2/man/ja_JP.eucJP/man1
-@dirrm lib/netscape/netscape7/plugins/java2/man/ja_JP.eucJP
-@dirrm lib/netscape/netscape7/plugins/java2/man/ja/man1
-@dirrm lib/netscape/netscape7/plugins/java2/man/ja
-@dirrm lib/netscape/netscape7/plugins/java2/man
-@dirrm lib/netscape/netscape7/plugins/java2/lib/security
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/zh_TW/LC_MESSAGES
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/zh_TW.BIG5/LC_MESSAGES
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/zh_TW.BIG5
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/zh_TW
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/zh/LC_MESSAGES
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/zh.GBK/LC_MESSAGES
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/zh.GBK
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/zh
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/sv/LC_MESSAGES
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/sv
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/ko/LC_MESSAGES
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/ko.UTF-8/LC_MESSAGES
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/ko.UTF-8
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/ko
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/ja/LC_MESSAGES
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/ja
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/it/LC_MESSAGES
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/it
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/fr/LC_MESSAGES
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/fr
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/es/LC_MESSAGES
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/es
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/de/LC_MESSAGES
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale/de
-@dirrm lib/netscape/netscape7/plugins/java2/lib/locale
-@dirrm lib/netscape/netscape7/plugins/java2/lib/images/cursors
-@dirrm lib/netscape/netscape7/plugins/java2/lib/images
-@dirrm lib/netscape/netscape7/plugins/java2/lib/i386/server
-@dirrm lib/netscape/netscape7/plugins/java2/lib/i386/native_threads
-@dirrm lib/netscape/netscape7/plugins/java2/lib/i386/hotspot
-@dirrm lib/netscape/netscape7/plugins/java2/lib/i386/green_threads
-@dirrm lib/netscape/netscape7/plugins/java2/lib/i386/client
-@dirrm lib/netscape/netscape7/plugins/java2/lib/i386/classic
-@dirrm lib/netscape/netscape7/plugins/java2/lib/i386
-@dirrm lib/netscape/netscape7/plugins/java2/lib/fonts
-@dirrm lib/netscape/netscape7/plugins/java2/lib/cmm
-@dirrm lib/netscape/netscape7/plugins/java2/lib/audio
-@dirrm lib/netscape/netscape7/plugins/java2/lib
-@dirrm lib/netscape/netscape7/plugins/java2/bin/i386/native_threads
-@dirrm lib/netscape/netscape7/plugins/java2/bin/i386/green_threads
-@dirrm lib/netscape/netscape7/plugins/java2/bin/i386
-@dirrm lib/netscape/netscape7/plugins/java2/bin
-@dirrm lib/netscape/netscape7/plugins/java2
diff --git a/www/netscape7/PLIST.french b/www/netscape7/PLIST.french
deleted file mode 100644
index e47bfb61cd9..00000000000
--- a/www/netscape7/PLIST.french
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $NetBSD: PLIST.french,v 1.1 2002/09/30 13:45:45 jschauma Exp $
-lib/netscape/netscape7/chrome/FR.jar
-lib/netscape/netscape7/chrome/fr-FR.jar
-lib/netscape/netscape7/chrome/fr-mac.jar
-lib/netscape/netscape7/chrome/fr-unix.jar
-lib/netscape/netscape7/chrome/fr-win.jar
-lib/netscape/netscape7/component.reg
-lib/netscape/netscape7/components/spellchecker/pfr2s331.dat
-lib/netscape/netscape7/defaults/isp/FR/aol.rdf
-lib/netscape/netscape7/defaults/isp/FR/nswebmail.rdf
-lib/netscape/netscape7/defaults/messenger/Templates
-lib/netscape/netscape7/defaults/messenger/FR/Templates
-lib/netscape/netscape7/defaults/messenger/FR/webMailSignature.html
-lib/netscape/netscape7/defaults/profile/FR/bookmarks.html
-lib/netscape/netscape7/defaults/profile/FR/chrome/userChrome-example.css
-lib/netscape/netscape7/defaults/profile/FR/chrome/userContent-example.css
-lib/netscape/netscape7/defaults/profile/FR/default-connections.rdf
-lib/netscape/netscape7/defaults/profile/FR/default-invite.rdf
-lib/netscape/netscape7/defaults/profile/FR/default-messages-icq.rdf
-lib/netscape/netscape7/defaults/profile/FR/default-messages.rdf
-lib/netscape/netscape7/defaults/profile/FR/localstore.rdf
-lib/netscape/netscape7/defaults/profile/FR/mimeTypes.rdf
-lib/netscape/netscape7/defaults/profile/FR/panels.rdf
-lib/netscape/netscape7/defaults/profile/FR/search.rdf
-lib/netscape/netscape7/license.txt
-lib/netscape/netscape7/readme.txt
-lib/netscape/netscape7/searchplugins/Netscape_France.gif
-lib/netscape/netscape7/searchplugins/Netscape_France.src
-@dirrm lib/netscape/netscape7/defaults/profile/FR/chrome
-@dirrm lib/netscape/netscape7/defaults/profile/FR
-@dirrm lib/netscape/netscape7/defaults/messenger/FR
-@dirrm lib/netscape/netscape7/defaults/isp/FR
diff --git a/www/netscape7/PLIST.german b/www/netscape7/PLIST.german
deleted file mode 100644
index af23e6e62f1..00000000000
--- a/www/netscape7/PLIST.german
+++ /dev/null
@@ -1,34 +0,0 @@
-@comment $NetBSD: PLIST.german,v 1.1 2002/09/30 13:45:46 jschauma Exp $
-lib/netscape/netscape7/chrome/DE.jar
-lib/netscape/netscape7/chrome/de-DE.jar
-lib/netscape/netscape7/chrome/de-mac.jar
-lib/netscape/netscape7/chrome/de-unix.jar
-lib/netscape/netscape7/chrome/de-win.jar
-lib/netscape/netscape7/component.reg
-lib/netscape/netscape7/components/spellchecker/pgr2s321.dat
-lib/netscape/netscape7/defaults/isp/DE/aol.rdf
-lib/netscape/netscape7/defaults/isp/DE/nswebmail.rdf
-lib/netscape/netscape7/defaults/messenger/Templates
-lib/netscape/netscape7/defaults/messenger/DE/Templates
-lib/netscape/netscape7/defaults/messenger/DE/webMailSignature.html
-lib/netscape/netscape7/defaults/profile/DE/bookmarks.html
-lib/netscape/netscape7/defaults/profile/DE/chrome/userChrome-example.css
-lib/netscape/netscape7/defaults/profile/DE/chrome/userContent-example.css
-lib/netscape/netscape7/defaults/profile/DE/default-connections.rdf
-lib/netscape/netscape7/defaults/profile/DE/default-invite.rdf
-lib/netscape/netscape7/defaults/profile/DE/default-messages-icq.rdf
-lib/netscape/netscape7/defaults/profile/DE/default-messages.rdf
-lib/netscape/netscape7/defaults/profile/DE/localstore.rdf
-lib/netscape/netscape7/defaults/profile/DE/mimeTypes.rdf
-lib/netscape/netscape7/defaults/profile/DE/panels.rdf
-lib/netscape/netscape7/defaults/profile/DE/search.rdf
-lib/netscape/netscape7/license.txt
-lib/netscape/netscape7/readme.txt
-lib/netscape/netscape7/searchplugins/Netscape_Germany.gif
-lib/netscape/netscape7/searchplugins/Netscape_Germany.src
-lib/netscape/netscape7/searchplugins/SBWeb_04.gif
-lib/netscape/netscape7/searchplugins/SBWeb_04.src
-@dirrm lib/netscape/netscape7/defaults/profile/DE/chrome
-@dirrm lib/netscape/netscape7/defaults/profile/DE
-@dirrm lib/netscape/netscape7/defaults/messenger/DE
-@dirrm lib/netscape/netscape7/defaults/isp/DE
diff --git a/www/netscape7/PLIST.japanese b/www/netscape7/PLIST.japanese
deleted file mode 100644
index 3469a825869..00000000000
--- a/www/netscape7/PLIST.japanese
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $NetBSD: PLIST.japanese,v 1.1 2002/09/30 13:45:46 jschauma Exp $
-lib/netscape/netscape7/chrome/JP.jar
-lib/netscape/netscape7/chrome/ja-JP.jar
-lib/netscape/netscape7/chrome/ja-mac.jar
-lib/netscape/netscape7/chrome/ja-unix.jar
-lib/netscape/netscape7/chrome/ja-win.jar
-lib/netscape/netscape7/component.reg
-lib/netscape/netscape7/defaults/isp/JP/aol.rdf
-lib/netscape/netscape7/defaults/isp/JP/nswebmail.rdf
-lib/netscape/netscape7/defaults/messenger/JP/webMailSignature.html
-lib/netscape/netscape7/defaults/profile/JP/bookmarks.html
-lib/netscape/netscape7/defaults/profile/JP/chrome/userChrome-example.css
-lib/netscape/netscape7/defaults/profile/JP/chrome/userContent-example.css
-lib/netscape/netscape7/defaults/profile/JP/default-connections.rdf
-lib/netscape/netscape7/defaults/profile/JP/default-invite.rdf
-lib/netscape/netscape7/defaults/profile/JP/default-messages-icq.rdf
-lib/netscape/netscape7/defaults/profile/JP/default-messages.rdf
-lib/netscape/netscape7/defaults/profile/JP/localstore.rdf
-lib/netscape/netscape7/defaults/profile/JP/mimeTypes.rdf
-lib/netscape/netscape7/defaults/profile/JP/panels.rdf
-lib/netscape/netscape7/defaults/profile/JP/search.rdf
-lib/netscape/netscape7/searchplugins/Netscape_Japan.gif
-lib/netscape/netscape7/searchplugins/Netscape_Japan.src
-@dirrm lib/netscape/netscape7/defaults/profile/JP/chrome
-@dirrm lib/netscape/netscape7/defaults/profile/JP
-@dirrm lib/netscape/netscape7/defaults/messenger/JP
-@dirrm lib/netscape/netscape7/defaults/isp/JP
diff --git a/www/netscape7/PLIST.linux b/www/netscape7/PLIST.linux
deleted file mode 100644
index 2e31eb42d1b..00000000000
--- a/www/netscape7/PLIST.linux
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.linux,v 1.3 2002/09/30 13:45:47 jschauma Exp $
-lib/netscape/netscape7/libgmodule-1.2.so.0
-lib/netscape/netscape7/libglib-1.2.so.0
-lib/netscape/netscape7/libstdc++-libc6.1-1.so.2
diff --git a/www/netscape7/files/extract_instructions b/www/netscape7/files/extract_instructions
index bac3ffc714c..dc82241bc7c 100644
--- a/www/netscape7/files/extract_instructions
+++ b/www/netscape7/files/extract_instructions
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: extract_instructions,v 1.4 2002/10/01 03:55:45 jschauma Exp $
+$NetBSD: extract_instructions,v 1.5 2002/10/11 20:50:43 jschauma Exp $
 
     Now running the Netscape 7 installation program.  Note that the
     installation requires the DISPLAY environment variable to be set.
@@ -8,7 +8,7 @@ $NetBSD: extract_instructions,v 1.4 2002/10/01 03:55:45 jschauma Exp $
 
     2) Choose 'Accept' on the End-User License Agreement (EULA)
 
-    3) On the next screen, select "@NS_INST@" and change the
+    3) On the next screen, select your preferred installation and change the
        "Destination Directory" to:
 
         @WRKSRC@/dest
diff --git a/www/netscape7/files/fetch-message b/www/netscape7/files/fetch-message
index c11458e6638..c1769f1184e 100644
--- a/www/netscape7/files/fetch-message
+++ b/www/netscape7/files/fetch-message
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: fetch-message,v 1.3 2002/10/07 21:44:20 wiz Exp $
+$NetBSD: fetch-message,v 1.4 2002/10/11 20:50:43 jschauma Exp $
 
     If you would like to install a localized version of Netscape 7, you
     can specify the PKG_LANG environment variable to be one of:
@@ -8,11 +8,4 @@ $NetBSD: fetch-message,v 1.3 2002/10/07 21:44:20 wiz Exp $
 
     Note that this needs to be done *before* you fetch the distfile!
 
-    Furthermore, if you would like to perform a "complete" install rather
-    than the default "recommended" install, you can set the variable
-    NS_INST to "complete".
-
-    Please note that if you set these variables, you also need to set them 
-    as root before running 'make install'!
-
 ===========================================================================