1: Check whether aout libs exist at installation time.

2: Make netscape4-communicator's Makefile enable to be included
   from other netscape ports, and make netscape4-navigator to
   use it.
3: Make netscape4-communicator not to use `ns-install' and
   activate `make reinstall'.
PR:		ports/9932

2 files changed, 156 insertions, 206 deletions

diff --git a/www/netscape4-navigator/Makefile b/www/netscape4-navigator/Makefile
index bf339a5c6674..814e1bebfbb2 100644
--- a/www/netscape4-navigator/Makefile
+++ b/www/netscape4-navigator/Makefile
@@ -3,70 +3,20 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.36 1999/01/13 04:00:09 scrappy Exp $
+# $Id$
 #
 
-DISTNAME=       netscape-navigator-4.08
-CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/unsupported/freebsd/navigator_standalone/
+MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/${BROWSER_VER}/english/unix/unsupported/freebsd/navigator_standalone/
 DISTFILES=	navigator-v408-export.x86-unknown-freebsd.tar.gz
 
 MAINTAINER=     sada@FreeBSD.ORG
 
-Y2K=		http://home.netscape.com/products/year2000/faq/client.html
+MASTERDIR=	${.CURDIR}/../netscape4-communicator
+FILESDIR=	${.CURDIR}/files
+PKGDIR=		${.CURDIR}/pkg
+PKGREQ=		${MASTERDIR}/pkg/REQ
 
-ONLY_FOR_ARCHS=	i386
+BROWSER=	navigator
+INFILE_HEAD=	'Navigator,4.08.0.98306'
 
-WRKSRC=		${WRKDIR}/navigator-v408.x86-unknown-freebsd
-NO_BUILD=       Yes
-STRIP=
-
-NDIR=           ${PREFIX}/lib/netscape
-BINDIR=		${PREFIX}/bin
-INFILE_HEAD=	'Navigator,4.08.0.98306,'
-
-.if defined(USE_128BIT)
-MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
-		ftp://ftp.za.freebsd.org/pub/Fortify/
-DISTFILES+=	Fortify-1.3.2-unix-x86.tar.gz
-RESTRICTED=     "Contains strong cryptography"
-.endif
-
-.if !defined(USE_128BIT)
-pre-extract:
-		@${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
-.endif
-
-do-configure:
-	${ECHO} -n ${INFILE_HEAD} > ${WRKSRC}/infile
-	${ECHO} ${NDIR} >> ${WRKSRC}/infile
-	${SED} -e "s;@X11BASE@;${X11BASE};g" -e "s;@PREFIX@;${PREFIX};g" \
-		${FILESDIR}/netscape.sh >${WRKSRC}/netscape
-	chmod +x ${WRKSRC}/netscape
-
-do-install:
-	${MKDIR} ${NDIR}/java/classes
-	${INSTALL_DATA} ${WRKSRC}/*.jar ${NDIR}/java/classes
-	${INSTALL_PROGRAM} ${WRKSRC}/vreg ${NDIR}
-	for i in ${WRKSRC}/*.nif; do \
-		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} $${i} ${EXTRACT_AFTER_ARGS} -C ${NDIR}; \
-	done
-	${WRKSRC}/vreg ${NDIR}/registry ${WRKSRC}/infile
-	${MV} -f ${NDIR}/netscape ${NDIR}/navigator-4.08.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/navigator-4.08
-	ln -sf navigator-4.08 ${BINDIR}/navigator-4
-	ln -sf navigator-4 ${BINDIR}/netscape
-	if [ ! -f ${NDIR}/mailcap ] ; then \
-	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
-	fi
-	${RM} -rf ${NDIR}/movemail-src
-.if defined(USE_128BIT)
-	cd ${WRKDIR}/Fortify-1.3.2-unix-x86 && \
-		(${ECHO} yes ; ${ECHO} no ; ${ECHO} no) | ./Fortify.sh ${NDIR}/navigator-4.08.bin
-.endif
-	chown -R bin.bin ${NDIR}
-
-post-install:
-	@${CAT} ${PKGDIR}/DESCR
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/www/netscape4-navigator/pkg-plist b/www/netscape4-navigator/pkg-plist
index 2956518d8460..e0d5cfd71201 100644
--- a/www/netscape4-navigator/pkg-plist
+++ b/www/netscape4-navigator/pkg-plist
@@ -1,151 +1,151 @@
-bin/navigator-4.08
+bin/navigator-%%BROWSER_VER%%
 @exec ln -sf %f %B/navigator-4
 @exec ln -sf navigator-4 %B/netscape
 @unexec rm -f %B/netscape
 @unexec rm -f %B/navigator-4
-lib/netscape/LICENSE
-lib/netscape/Netscape.ad
-lib/netscape/README
-lib/netscape/XKeysymDB
-lib/netscape/bookmark.htm
-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
-lib/netscape/java/classes/font.properties.el
-lib/netscape/java/classes/font.properties.hu
-lib/netscape/java/classes/font.properties.ja
-lib/netscape/java/classes/font.properties.ko
-lib/netscape/java/classes/font.properties.lt
-lib/netscape/java/classes/font.properties.lv
-lib/netscape/java/classes/font.properties.pl
-lib/netscape/java/classes/font.properties.ru
-lib/netscape/java/classes/font.properties.tr
-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/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
-lib/netscape/java/classes/hpux/font.properties.el
-lib/netscape/java/classes/hpux/font.properties.hr
-lib/netscape/java/classes/hpux/font.properties.hu
-lib/netscape/java/classes/hpux/font.properties.ja
-lib/netscape/java/classes/hpux/font.properties.ko
-lib/netscape/java/classes/hpux/font.properties.pl
-lib/netscape/java/classes/hpux/font.properties.ro
-lib/netscape/java/classes/hpux/font.properties.ru
-lib/netscape/java/classes/hpux/font.properties.sk
-lib/netscape/java/classes/hpux/font.properties.sl
-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/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
-lib/netscape/java/classes/irix/font.properties.hu
-lib/netscape/java/classes/irix/font.properties.ja
-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/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/mailcap
-lib/netscape/navigator-4.08.bin
-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
-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/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/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/Wait.gif
-lib/netscape/nethelp/netscape/collabra/coll.htm
-lib/netscape/nethelp/netscape/collabra/collHdr.htm
-lib/netscape/nethelp/netscape/collabra/help.hpf
-lib/netscape/nethelp/netscape/collabra/security.gif
-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/navigatr/help.hpf
-lib/netscape/nethelp/netscape/navigatr/nav.htm
-lib/netscape/nethelp/netscape/navigatr/navHdr.htm
-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/netcastr.gif
-lib/netscape/nethelp/netscape/shared/Contents.htm
-lib/netscape/nethelp/netscape/shared/NetHelp1.css
-lib/netscape/nethelp/netscape/shared/collIcon.gif
-lib/netscape/nethelp/netscape/shared/commIcon.gif
-lib/netscape/nethelp/netscape/shared/navIcon.gif
-lib/netscape/nethelp/netscape/shared/netIcon.gif
-lib/netscape/plugins/libnullplugin.so
-lib/netscape/registry
-lib/netscape/vreg
-@dirrm lib/netscape/plugins
-@dirrm lib/netscape/nethelp/netscape/shared
-@dirrm lib/netscape/nethelp/netscape/netcastr
-@dirrm lib/netscape/nethelp/netscape/navigatr
-@dirrm lib/netscape/nethelp/netscape/home
-@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
+%%NSUBDIR%%/LICENSE
+%%NSUBDIR%%/Netscape.ad
+%%NSUBDIR%%/README
+%%NSUBDIR%%/XKeysymDB
+%%NSUBDIR%%/bookmark.htm
+%%NSUBDIR%%/java/classes/aix/font.properties
+%%NSUBDIR%%/java/classes/aix/font.properties.cs
+%%NSUBDIR%%/java/classes/aix/font.properties.hu
+%%NSUBDIR%%/java/classes/aix/font.properties.ja
+%%NSUBDIR%%/java/classes/aix/font.properties.ko
+%%NSUBDIR%%/java/classes/aix/font.properties.pl
+%%NSUBDIR%%/java/classes/aix/font.properties.ru
+%%NSUBDIR%%/java/classes/aix/font.properties.zh
+%%NSUBDIR%%/java/classes/aix/font.properties.zh_TW
+%%NSUBDIR%%/java/classes/awt.properties
+%%NSUBDIR%%/java/classes/font.properties
+%%NSUBDIR%%/java/classes/font.properties.cs
+%%NSUBDIR%%/java/classes/font.properties.el
+%%NSUBDIR%%/java/classes/font.properties.hu
+%%NSUBDIR%%/java/classes/font.properties.ja
+%%NSUBDIR%%/java/classes/font.properties.ko
+%%NSUBDIR%%/java/classes/font.properties.lt
+%%NSUBDIR%%/java/classes/font.properties.lv
+%%NSUBDIR%%/java/classes/font.properties.pl
+%%NSUBDIR%%/java/classes/font.properties.ru
+%%NSUBDIR%%/java/classes/font.properties.tr
+%%NSUBDIR%%/java/classes/font.properties.zh
+%%NSUBDIR%%/java/classes/font.properties.zh_GB2312
+%%NSUBDIR%%/java/classes/font.properties.zh_TW
+%%NSUBDIR%%/java/classes/font.properties.zh_TW_Big5
+%%NSUBDIR%%/java/classes/font.properties.zh_TW_CNS11643
+%%NSUBDIR%%/java/classes/hpux/font.properties
+%%NSUBDIR%%/java/classes/hpux/font.properties.bg
+%%NSUBDIR%%/java/classes/hpux/font.properties.cs
+%%NSUBDIR%%/java/classes/hpux/font.properties.el
+%%NSUBDIR%%/java/classes/hpux/font.properties.hr
+%%NSUBDIR%%/java/classes/hpux/font.properties.hu
+%%NSUBDIR%%/java/classes/hpux/font.properties.ja
+%%NSUBDIR%%/java/classes/hpux/font.properties.ko
+%%NSUBDIR%%/java/classes/hpux/font.properties.pl
+%%NSUBDIR%%/java/classes/hpux/font.properties.ro
+%%NSUBDIR%%/java/classes/hpux/font.properties.ru
+%%NSUBDIR%%/java/classes/hpux/font.properties.sk
+%%NSUBDIR%%/java/classes/hpux/font.properties.sl
+%%NSUBDIR%%/java/classes/hpux/font.properties.tr
+%%NSUBDIR%%/java/classes/hpux/font.properties.zh_GB2312
+%%NSUBDIR%%/java/classes/hpux/font.properties.zh_TW_Big5
+%%NSUBDIR%%/java/classes/hpux/font.properties.zh_TW_CNS11643
+%%NSUBDIR%%/java/classes/ifc11.jar
+%%NSUBDIR%%/java/classes/iiop10.jar
+%%NSUBDIR%%/java/classes/irix/font.properties
+%%NSUBDIR%%/java/classes/irix/font.properties.cs
+%%NSUBDIR%%/java/classes/irix/font.properties.el
+%%NSUBDIR%%/java/classes/irix/font.properties.hu
+%%NSUBDIR%%/java/classes/irix/font.properties.ja
+%%NSUBDIR%%/java/classes/irix/font.properties.ko
+%%NSUBDIR%%/java/classes/irix/font.properties.zh_GB2312
+%%NSUBDIR%%/java/classes/irix/font.properties.zh_TW_Big5
+%%NSUBDIR%%/java/classes/irix/font.properties.zh_TW_CNS11643
+%%NSUBDIR%%/java/classes/jae40.jar
+%%NSUBDIR%%/java/classes/java40.jar
+%%NSUBDIR%%/java/classes/jio40.jar
+%%NSUBDIR%%/java/classes/jsd10.jar
+%%NSUBDIR%%/java/classes/ldap10.jar
+%%NSUBDIR%%/java/classes/scd10.jar
+%%NSUBDIR%%/mailcap
+%%NSUBDIR%%/navigator-4.08.bin
+%%NSUBDIR%%/nethelp/Back_dep.gif
+%%NSUBDIR%%/nethelp/Back_dis.gif
+%%NSUBDIR%%/nethelp/Back_sel.gif
+%%NSUBDIR%%/nethelp/Back_up.gif
+%%NSUBDIR%%/nethelp/Blank.htm
+%%NSUBDIR%%/nethelp/Button.js
+%%NSUBDIR%%/nethelp/CntData.js
+%%NSUBDIR%%/nethelp/CntTool.htm
+%%NSUBDIR%%/nethelp/CntTool.js
+%%NSUBDIR%%/nethelp/Exit_dep.gif
+%%NSUBDIR%%/nethelp/Exit_sel.gif
+%%NSUBDIR%%/nethelp/Exit_up.gif
+%%NSUBDIR%%/nethelp/Forw_dep.gif
+%%NSUBDIR%%/nethelp/Forw_dis.gif
+%%NSUBDIR%%/nethelp/Forw_sel.gif
+%%NSUBDIR%%/nethelp/Forw_up.gif
+%%NSUBDIR%%/nethelp/Header.js
+%%NSUBDIR%%/nethelp/IdxData.js
+%%NSUBDIR%%/nethelp/IdxFill.htm
+%%NSUBDIR%%/nethelp/IdxKey.htm
+%%NSUBDIR%%/nethelp/IdxTool.htm
+%%NSUBDIR%%/nethelp/IdxTopic.htm
+%%NSUBDIR%%/nethelp/Local-1.js
+%%NSUBDIR%%/nethelp/NSHIfrm.htm
+%%NSUBDIR%%/nethelp/NavUI.htm
+%%NSUBDIR%%/nethelp/NoJSerr.htm
+%%NSUBDIR%%/nethelp/Prnt_dep.gif
+%%NSUBDIR%%/nethelp/Prnt_sel.gif
+%%NSUBDIR%%/nethelp/Prnt_up.gif
+%%NSUBDIR%%/nethelp/Stack.js
+%%NSUBDIR%%/nethelp/Status.htm
+%%NSUBDIR%%/nethelp/System.htm
+%%NSUBDIR%%/nethelp/System.js
+%%NSUBDIR%%/nethelp/ToolUI.htm
+%%NSUBDIR%%/nethelp/Tool_dep.gif
+%%NSUBDIR%%/nethelp/Tool_sel.gif
+%%NSUBDIR%%/nethelp/Tool_up.gif
+%%NSUBDIR%%/nethelp/Topic.js
+%%NSUBDIR%%/nethelp/Utility.js
+%%NSUBDIR%%/nethelp/Wait.gif
+%%NSUBDIR%%/nethelp/netscape/collabra/coll.htm
+%%NSUBDIR%%/nethelp/netscape/collabra/collHdr.htm
+%%NSUBDIR%%/nethelp/netscape/collabra/help.hpf
+%%NSUBDIR%%/nethelp/netscape/collabra/security.gif
+%%NSUBDIR%%/nethelp/netscape/home/help.hpf
+%%NSUBDIR%%/nethelp/netscape/home/home.gif
+%%NSUBDIR%%/nethelp/netscape/home/home.htm
+%%NSUBDIR%%/nethelp/netscape/home/homeHdr.htm
+%%NSUBDIR%%/nethelp/netscape/navigatr/help.hpf
+%%NSUBDIR%%/nethelp/netscape/navigatr/nav.htm
+%%NSUBDIR%%/nethelp/netscape/navigatr/navHdr.htm
+%%NSUBDIR%%/nethelp/netscape/navigatr/navigatr.gif
+%%NSUBDIR%%/nethelp/netscape/netcastr/help.hpf
+%%NSUBDIR%%/nethelp/netscape/netcastr/net.htm
+%%NSUBDIR%%/nethelp/netscape/netcastr/netHdr.htm
+%%NSUBDIR%%/nethelp/netscape/netcastr/netcastr.gif
+%%NSUBDIR%%/nethelp/netscape/shared/Contents.htm
+%%NSUBDIR%%/nethelp/netscape/shared/NetHelp1.css
+%%NSUBDIR%%/nethelp/netscape/shared/collIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/commIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/navIcon.gif
+%%NSUBDIR%%/nethelp/netscape/shared/netIcon.gif
+%%NSUBDIR%%/plugins/libnullplugin.so
+%%NSUBDIR%%/registry
+%%NSUBDIR%%/vreg
+@dirrm %%NSUBDIR%%/plugins
+@dirrm %%NSUBDIR%%/nethelp/netscape/shared
+@dirrm %%NSUBDIR%%/nethelp/netscape/netcastr
+@dirrm %%NSUBDIR%%/nethelp/netscape/navigatr
+@dirrm %%NSUBDIR%%/nethelp/netscape/home
+@dirrm %%NSUBDIR%%/nethelp/netscape/collabra
+@dirrm %%NSUBDIR%%/nethelp/netscape
+@dirrm %%NSUBDIR%%/nethelp
+@dirrm %%NSUBDIR%%/java/classes/irix
+@dirrm %%NSUBDIR%%/java/classes/hpux
+@dirrm %%NSUBDIR%%/java/classes/aix
+@dirrm %%NSUBDIR%%/java/classes
+@dirrm %%NSUBDIR%%/java
+@dirrm %%NSUBDIR%%