Cleanups from maintainer.

PR:		9928
Submitted by:	maintainer

4 files changed, 95 insertions, 134 deletions

diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index b7c31a6d6a1d..8518ff4e485b 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -3,38 +3,39 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.6 1998/12/24 06:29:59 steve Exp $
+# $Id: Makefile,v 1.7 1999/01/06 04:18:06 simokawa Exp $
 #
 
-DISTNAME=       linux-netscape-4.08
+DISTNAME=	communicator-v408-export.x86-unknown-linux2.0_libc5
+PKGNAME=	linux-netscape-4.08
 CATEGORIES=	www
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/supported/linux12/base_install/ \
-		ftp://sunsite.doc.ic.ac.uk/Mirrors/ftp.netscape.com/pub/communicator/4.08/english/unix/supported/linux12/base_install/
-DISTFILES=      communicator-v408-export.x86-unknown-linux1.2.tar.gz
+MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/supported/linux20/base_install/ \
+		ftp://sunsite.doc.ic.ac.uk/Mirrors/ftp.netscape.com/pub/communicator/4.08/english/unix/supported/linux20/base_install/ \
+		ftp://ftp.funet.fi/pub/mirrors/ftp.netscape.com/pub/communicator/4.08/english/unix/supported/linux20/base_install/ \
+		ftp://ftp.sunsite.auc.dk/disk4/mirrorsite.netscape.com/pub/communicator/4.08/english/unix/supported/linux20/base_install/
 
-MAINTAINER=     tom@eborcom.com
+MAINTAINER=	tom@eborcom.com
 
-RUN_DEPENDS=    /compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_lib
-BUILD_DEPENDS=  /compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_lib
+RUN_DEPENDS=	/compat/linux/lib/ld.so:${PORTSDIR}/emulators/linux_lib
 
 ONLY_FOR_ARCHS=	i386
 
-WRKSRC=		${WRKDIR}/communicator-v408.x86-unknown-linux1.2
-NO_BUILD=       Yes
+WRKSRC=		${WRKDIR}/communicator-v408.x86-unknown-linux2.0
+NO_BUILD=	Yes
 
-NDIR=           ${PREFIX}/lib/netscape
+NDIR=		${PREFIX}/lib/netscape
 BINDIR=		${PREFIX}/bin
 
 do-install:
 	cd ${WRKSRC} && yes "" | \
 	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	${MV} ${NDIR}/netscape ${NDIR}/netscape.bin
+	${MV} -f ${NDIR}/netscape ${NDIR}/netscape.bin
 	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}
 	if [ ! -f ${NDIR}/mailcap ] ; then \
 	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
 	fi
 	${RM} -rf ${NDIR}/nls ${NDIR}/movemail-src ${NDIR}/XKeysymDB
-	chown -R bin.bin ${NDIR}
+	chown -R ${BINOWN}.${BINGRP} ${NDIR}
 
 post-install:
 	@${CAT} ${PKGDIR}/DESCR
diff --git a/www/netscape7/pkg-comment b/www/netscape7/pkg-comment
index 54c86d664507..1c63c7b111f4 100644
--- a/www/netscape7/pkg-comment
+++ b/www/netscape7/pkg-comment
@@ -1 +1 @@
-netscape web-surfboard
+Linux version of Netscape Communicator.
diff --git a/www/netscape7/pkg-descr b/www/netscape7/pkg-descr
index 83a8fd2db890..aa08381f3bcb 100644
--- a/www/netscape7/pkg-descr
+++ b/www/netscape7/pkg-descr
@@ -1,2 +1,5 @@
-This is the netscape web-surfboard.  Please read the file
-"/usr/local/lib/netscape/LICENSE" for the licensing terms.
+This is the Linux version of Netscape Communicator. You might wish
+to use this version if you wish to run Linux plugins, for example.
+
+Please read the file "/usr/local/lib/netscape/LICENSE" for
+the licensing terms.
diff --git a/www/netscape7/pkg-plist b/www/netscape7/pkg-plist
index cbc90dac4361..b565cfbeedf2 100644
--- a/www/netscape7/pkg-plist
+++ b/www/netscape7/pkg-plist
@@ -1,9 +1,18 @@
-lib/netscape/README
+bin/netscape
 lib/netscape/LICENSE
-lib/netscape/mailcap
 lib/netscape/Netscape.ad
-lib/netscape/movemail
+lib/netscape/README
 lib/netscape/bookmark.htm
+lib/netscape/dynfonts/libTrueDoc.so
+lib/netscape/java/classes/aix/font.properties
+lib/netscape/java/classes/aix/font.properties.cs
+lib/netscape/java/classes/aix/font.properties.hu
+lib/netscape/java/classes/aix/font.properties.ja
+lib/netscape/java/classes/aix/font.properties.ko
+lib/netscape/java/classes/aix/font.properties.pl
+lib/netscape/java/classes/aix/font.properties.ru
+lib/netscape/java/classes/aix/font.properties.zh
+lib/netscape/java/classes/aix/font.properties.zh_TW
 lib/netscape/java/classes/awt.properties
 lib/netscape/java/classes/font.properties
 lib/netscape/java/classes/font.properties.cs
@@ -20,15 +29,7 @@ lib/netscape/java/classes/font.properties.zh
 lib/netscape/java/classes/font.properties.zh_GB2312
 lib/netscape/java/classes/font.properties.zh_TW
 lib/netscape/java/classes/font.properties.zh_TW_Big5
-lib/netscape/java/classes/aix/font.properties
-lib/netscape/java/classes/aix/font.properties.cs
-lib/netscape/java/classes/aix/font.properties.hu
-lib/netscape/java/classes/aix/font.properties.ja
-lib/netscape/java/classes/aix/font.properties.ko
-lib/netscape/java/classes/aix/font.properties.pl
-lib/netscape/java/classes/aix/font.properties.ru
-lib/netscape/java/classes/aix/font.properties.zh
-lib/netscape/java/classes/aix/font.properties.zh_TW
+lib/netscape/java/classes/font.properties.zh_TW_CNS11643
 lib/netscape/java/classes/hpux/font.properties
 lib/netscape/java/classes/hpux/font.properties.bg
 lib/netscape/java/classes/hpux/font.properties.cs
@@ -46,7 +47,8 @@ lib/netscape/java/classes/hpux/font.properties.tr
 lib/netscape/java/classes/hpux/font.properties.zh_GB2312
 lib/netscape/java/classes/hpux/font.properties.zh_TW_Big5
 lib/netscape/java/classes/hpux/font.properties.zh_TW_CNS11643
-lib/netscape/java/classes/font.properties.zh_TW_CNS11643
+lib/netscape/java/classes/ifc11.jar
+lib/netscape/java/classes/iiop10.jar
 lib/netscape/java/classes/irix/font.properties
 lib/netscape/java/classes/irix/font.properties.cs
 lib/netscape/java/classes/irix/font.properties.el
@@ -56,72 +58,25 @@ lib/netscape/java/classes/irix/font.properties.ko
 lib/netscape/java/classes/irix/font.properties.zh_GB2312
 lib/netscape/java/classes/irix/font.properties.zh_TW_Big5
 lib/netscape/java/classes/irix/font.properties.zh_TW_CNS11643
-lib/netscape/java/classes/ifc11.jar
-lib/netscape/java/classes/iiop10.jar
 lib/netscape/java/classes/jae40.jar
 lib/netscape/java/classes/java40.jar
 lib/netscape/java/classes/jio40.jar
 lib/netscape/java/classes/jsd10.jar
 lib/netscape/java/classes/ldap10.jar
 lib/netscape/java/classes/scd10.jar
-lib/netscape/java/classes.old/awt.properties
-lib/netscape/java/classes.old/font.properties
-lib/netscape/java/classes.old/font.properties.cs
-lib/netscape/java/classes.old/font.properties.el
-lib/netscape/java/classes.old/font.properties.hu
-lib/netscape/java/classes.old/font.properties.ja
-lib/netscape/java/classes.old/font.properties.ko
-lib/netscape/java/classes.old/font.properties.lt
-lib/netscape/java/classes.old/font.properties.lv
-lib/netscape/java/classes.old/font.properties.pl
-lib/netscape/java/classes.old/font.properties.ru
-lib/netscape/java/classes.old/font.properties.tr
-lib/netscape/java/classes.old/font.properties.zh
-lib/netscape/java/classes.old/font.properties.zh_GB2312
-lib/netscape/java/classes.old/font.properties.zh_TW
-lib/netscape/java/classes.old/font.properties.zh_TW_Big5
-lib/netscape/java/classes.old/aix/font.properties
-lib/netscape/java/classes.old/aix/font.properties.cs
-lib/netscape/java/classes.old/aix/font.properties.hu
-lib/netscape/java/classes.old/aix/font.properties.ja
-lib/netscape/java/classes.old/aix/font.properties.ko
-lib/netscape/java/classes.old/aix/font.properties.pl
-lib/netscape/java/classes.old/aix/font.properties.ru
-lib/netscape/java/classes.old/aix/font.properties.zh
-lib/netscape/java/classes.old/aix/font.properties.zh_TW
-lib/netscape/java/classes.old/hpux/font.properties
-lib/netscape/java/classes.old/hpux/font.properties.bg
-lib/netscape/java/classes.old/hpux/font.properties.cs
-lib/netscape/java/classes.old/hpux/font.properties.el
-lib/netscape/java/classes.old/hpux/font.properties.hr
-lib/netscape/java/classes.old/hpux/font.properties.hu
-lib/netscape/java/classes.old/hpux/font.properties.ja
-lib/netscape/java/classes.old/hpux/font.properties.ko
-lib/netscape/java/classes.old/hpux/font.properties.pl
-lib/netscape/java/classes.old/hpux/font.properties.ro
-lib/netscape/java/classes.old/hpux/font.properties.ru
-lib/netscape/java/classes.old/hpux/font.properties.sk
-lib/netscape/java/classes.old/hpux/font.properties.sl
-lib/netscape/java/classes.old/hpux/font.properties.tr
-lib/netscape/java/classes.old/hpux/font.properties.zh_GB2312
-lib/netscape/java/classes.old/hpux/font.properties.zh_TW_Big5
-lib/netscape/java/classes.old/hpux/font.properties.zh_TW_CNS11643
-lib/netscape/java/classes.old/font.properties.zh_TW_CNS11643
-lib/netscape/java/classes.old/irix/font.properties
-lib/netscape/java/classes.old/irix/font.properties.cs
-lib/netscape/java/classes.old/irix/font.properties.el
-lib/netscape/java/classes.old/irix/font.properties.hu
-lib/netscape/java/classes.old/irix/font.properties.ja
-lib/netscape/java/classes.old/irix/font.properties.ko
-lib/netscape/java/classes.old/irix/font.properties.zh_GB2312
-lib/netscape/java/classes.old/irix/font.properties.zh_TW_Big5
-lib/netscape/java/classes.old/irix/font.properties.zh_TW_CNS11643
-lib/netscape/java/classes.old/ldap10.jar
-lib/netscape/java/classes.old/scd10.jar
+lib/netscape/libjsd.so
+lib/netscape/libnullplugin-dynMotif.so
+lib/netscape/mailcap
+lib/netscape/movemail
 lib/netscape/nethelp/Back_dep.gif
 lib/netscape/nethelp/Back_dis.gif
 lib/netscape/nethelp/Back_sel.gif
 lib/netscape/nethelp/Back_up.gif
+lib/netscape/nethelp/Blank.htm
+lib/netscape/nethelp/Button.js
+lib/netscape/nethelp/CntData.js
+lib/netscape/nethelp/CntTool.htm
+lib/netscape/nethelp/CntTool.js
 lib/netscape/nethelp/Exit_dep.gif
 lib/netscape/nethelp/Exit_sel.gif
 lib/netscape/nethelp/Exit_up.gif
@@ -129,84 +84,79 @@ lib/netscape/nethelp/Forw_dep.gif
 lib/netscape/nethelp/Forw_dis.gif
 lib/netscape/nethelp/Forw_sel.gif
 lib/netscape/nethelp/Forw_up.gif
-lib/netscape/nethelp/Prnt_dep.gif
-lib/netscape/nethelp/Prnt_sel.gif
-lib/netscape/nethelp/Prnt_up.gif
-lib/netscape/nethelp/Tool_dep.gif
-lib/netscape/nethelp/Tool_sel.gif
-lib/netscape/nethelp/Tool_up.gif
-lib/netscape/nethelp/Wait.gif
-lib/netscape/nethelp/netwatch.gif
-lib/netscape/nethelp/Blank.htm
-lib/netscape/nethelp/CntTool.htm
+lib/netscape/nethelp/Header.js
+lib/netscape/nethelp/IdxData.js
 lib/netscape/nethelp/IdxFill.htm
 lib/netscape/nethelp/IdxKey.htm
 lib/netscape/nethelp/IdxTool.htm
 lib/netscape/nethelp/IdxTopic.htm
+lib/netscape/nethelp/Local-1.js
 lib/netscape/nethelp/NSHIfrm.htm
 lib/netscape/nethelp/NavUI.htm
 lib/netscape/nethelp/NoJSerr.htm
+lib/netscape/nethelp/Prnt_dep.gif
+lib/netscape/nethelp/Prnt_sel.gif
+lib/netscape/nethelp/Prnt_up.gif
+lib/netscape/nethelp/Stack.js
 lib/netscape/nethelp/Status.htm
 lib/netscape/nethelp/System.htm
-lib/netscape/nethelp/ToolUI.htm
-lib/netscape/nethelp/picsfail.htm
-lib/netscape/nethelp/picsfail.jar
-lib/netscape/nethelp/Button.js
-lib/netscape/nethelp/CntData.js
-lib/netscape/nethelp/CntTool.js
-lib/netscape/nethelp/Header.js
-lib/netscape/nethelp/IdxData.js
-lib/netscape/nethelp/Local-1.js
-lib/netscape/nethelp/Stack.js
 lib/netscape/nethelp/System.js
+lib/netscape/nethelp/ToolUI.htm
+lib/netscape/nethelp/Tool_dep.gif
+lib/netscape/nethelp/Tool_sel.gif
+lib/netscape/nethelp/Tool_up.gif
 lib/netscape/nethelp/Topic.js
 lib/netscape/nethelp/Utility.js
-lib/netscape/nethelp/netscape/collabra/collabra.gif
-lib/netscape/nethelp/netscape/collabra/discgrps.gif
+lib/netscape/nethelp/Wait.gif
 lib/netscape/nethelp/netscape/collabra/coll.htm
 lib/netscape/nethelp/netscape/collabra/collHdr.htm
+lib/netscape/nethelp/netscape/collabra/collabra.gif
+lib/netscape/nethelp/netscape/collabra/discgrps.gif
 lib/netscape/nethelp/netscape/collabra/help.hpf
+lib/netscape/nethelp/netscape/composer/comp.htm
+lib/netscape/nethelp/netscape/composer/compHdr.htm
 lib/netscape/nethelp/netscape/composer/composer.gif
 lib/netscape/nethelp/netscape/composer/comtlbr2.gif
 lib/netscape/nethelp/netscape/composer/fmtlbr3.gif
-lib/netscape/nethelp/netscape/composer/tagicon2.gif
-lib/netscape/nethelp/netscape/composer/comp.htm
-lib/netscape/nethelp/netscape/composer/compHdr.htm
 lib/netscape/nethelp/netscape/composer/help.hpf
+lib/netscape/nethelp/netscape/composer/tagicon2.gif
 lib/netscape/nethelp/netscape/confernc/brws2.gif
 lib/netscape/nethelp/netscape/confernc/chat2.gif
 lib/netscape/nethelp/netscape/confernc/circle2.gif
+lib/netscape/nethelp/netscape/confernc/conf.htm
+lib/netscape/nethelp/netscape/confernc/confHdr.htm
 lib/netscape/nethelp/netscape/confernc/confernc.gif
 lib/netscape/nethelp/netscape/confernc/eraser2.gif
 lib/netscape/nethelp/netscape/confernc/fhndtl2.gif
 lib/netscape/nethelp/netscape/confernc/filex2.gif
+lib/netscape/nethelp/netscape/confernc/help.hpf
 lib/netscape/nethelp/netscape/confernc/horline2.gif
 lib/netscape/nethelp/netscape/confernc/line2.gif
 lib/netscape/nethelp/netscape/confernc/pointer2.gif
 lib/netscape/nethelp/netscape/confernc/rect2.gif
 lib/netscape/nethelp/netscape/confernc/txttool2.gif
 lib/netscape/nethelp/netscape/confernc/whtbd2.gif
-lib/netscape/nethelp/netscape/confernc/conf.htm
-lib/netscape/nethelp/netscape/confernc/confHdr.htm
-lib/netscape/nethelp/netscape/confernc/help.hpf
+lib/netscape/nethelp/netscape/home/help.hpf
 lib/netscape/nethelp/netscape/home/home.gif
 lib/netscape/nethelp/netscape/home/home.htm
 lib/netscape/nethelp/netscape/home/homeHdr.htm
-lib/netscape/nethelp/netscape/home/help.hpf
+lib/netscape/nethelp/netscape/messengr/help.hpf
 lib/netscape/nethelp/netscape/messengr/mailbox.gif
-lib/netscape/nethelp/netscape/messengr/messengr.gif
-lib/netscape/nethelp/netscape/messengr/mpctrl.gif
 lib/netscape/nethelp/netscape/messengr/mess.htm
 lib/netscape/nethelp/netscape/messengr/messHdr.htm
-lib/netscape/nethelp/netscape/messengr/help.hpf
-lib/netscape/nethelp/netscape/navigatr/navigatr.gif
+lib/netscape/nethelp/netscape/messengr/messengr.gif
+lib/netscape/nethelp/netscape/messengr/mpctrl.gif
+lib/netscape/nethelp/netscape/navigatr/help.hpf
 lib/netscape/nethelp/netscape/navigatr/nav.htm
 lib/netscape/nethelp/netscape/navigatr/navHdr.htm
-lib/netscape/nethelp/netscape/navigatr/help.hpf
-lib/netscape/nethelp/netscape/netcastr/netcastr.gif
+lib/netscape/nethelp/netscape/navigatr/navigatr.gif
+lib/netscape/nethelp/netscape/netcastr/help.hpf
 lib/netscape/nethelp/netscape/netcastr/net.htm
 lib/netscape/nethelp/netscape/netcastr/netHdr.htm
-lib/netscape/nethelp/netscape/netcastr/help.hpf
+lib/netscape/nethelp/netscape/netcastr/netcastr.gif
+lib/netscape/nethelp/netscape/nscal/index.html
+lib/netscape/nethelp/netscape/shared/Contents.htm
+lib/netscape/nethelp/netscape/shared/NetHelp1.css
 lib/netscape/nethelp/netscape/shared/admnIcon.gif
 lib/netscape/nethelp/netscape/shared/calIcon.gif
 lib/netscape/nethelp/netscape/shared/collIcon.gif
@@ -217,16 +167,19 @@ lib/netscape/nethelp/netscape/shared/ibmIcon.gif
 lib/netscape/nethelp/netscape/shared/messIcon.gif
 lib/netscape/nethelp/netscape/shared/navIcon.gif
 lib/netscape/nethelp/netscape/shared/netIcon.gif
-lib/netscape/nethelp/netscape/shared/Contents.htm
-lib/netscape/nethelp/netscape/shared/NetHelp1.css
-lib/netscape/nethelp/netscape/nscal/index.html
+lib/netscape/nethelp/netwatch.gif
+lib/netscape/nethelp/picsfail.htm
+lib/netscape/nethelp/picsfail.jar
+lib/netscape/netscape-dynMotif
+lib/netscape/netscape.bin
+lib/netscape/plugins/libnullplugin.so
+lib/netscape/registry
 lib/netscape/spell/netscape.dic
 lib/netscape/spell/pen4s324.dat
 lib/netscape/vreg
-lib/netscape/registry
-lib/netscape/netscape.bin
-lib/netscape/vreg.old
-@dirrm lib/netscape/spell lib/netscape/nethelp/netscape/shared
+@dirrm lib/netscape/spell
+@dirrm lib/netscape/plugins
+@dirrm lib/netscape/nethelp/netscape/shared
 @dirrm lib/netscape/nethelp/netscape/nscal
 @dirrm lib/netscape/nethelp/netscape/netcastr
 @dirrm lib/netscape/nethelp/netscape/navigatr
@@ -234,9 +187,13 @@ lib/netscape/vreg.old
 @dirrm lib/netscape/nethelp/netscape/home
 @dirrm lib/netscape/nethelp/netscape/confernc
 @dirrm lib/netscape/nethelp/netscape/composer
-@dirrm lib/netscape/nethelp/netscape/collabra lib/netscape/nethelp/netscape
-@dirrm lib/netscape/nethelp lib/netscape/java/classes/irix
-@dirrm lib/netscape/java/classes/hpux lib/netscape/java/classes/aix
-@dirrm lib/netscape/java/classes.old/irix lib/netscape/java/classes.old/hpux
-@dirrm lib/netscape/java/classes.old/aix lib/netscape/java/classes.old
-@dirrm lib/netscape/java/classes lib/netscape/java lib/netscape/
+@dirrm lib/netscape/nethelp/netscape/collabra
+@dirrm lib/netscape/nethelp/netscape
+@dirrm lib/netscape/nethelp
+@dirrm lib/netscape/java/classes/irix
+@dirrm lib/netscape/java/classes/hpux
+@dirrm lib/netscape/java/classes/aix
+@dirrm lib/netscape/java/classes
+@dirrm lib/netscape/java
+@dirrm lib/netscape/dynfonts
+@dirrm lib/netscape