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

1 files changed, 53 insertions, 21 deletions

diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile
index 503471718049..e9d66fc4ccdc 100644
--- a/www/netscape4-communicator/Makefile
+++ b/www/netscape4-communicator/Makefile
@@ -3,14 +3,14 @@
 # Date created:         24 Feb 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.30 1999/01/06 04:18:10 simokawa Exp $
+# $Id$
 #
 
-DISTNAME=       netscape-communicator-4.08
+DISTNAME=	netscape-${BROWSER}-${BROWSER_VER}
 CATEGORIES=	www
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/unsupported/freebsd/professional_edition/
-DISTFILES=      communicator-v408-export.x86-unknown-freebsd.tar.gz ${AUTOADMIN}
-AUTOADMIN=      autoadmin-v408.x86-unknown-freebsd.tar.gz
+MASTER_SITES?=	ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/unsupported/freebsd/professional_edition/
+DISTFILES?=	communicator-v408-export.x86-unknown-freebsd.tar.gz ${AUTOADMIN}
+AUTOADMIN=	autoadmin-v408.x86-unknown-freebsd.tar.gz
 
 MAINTAINER=     ache@FreeBSD.ORG
 
@@ -19,11 +19,21 @@ Y2K=		http://home.netscape.com/products/year2000/faq/client.html
 ONLY_FOR_ARCHS=	i386
 
 NO_FILTER_SHLIBS=	yes
-WRKSRC=         ${WRKDIR}/communicator-v408.x86-unknown-freebsd
-NO_BUILD=       Yes
+WRKSRC?=	${WRKDIR}/${BROWSER}-v408.x86-unknown-freebsd
+NO_BUILD=	Yes
+STRIP=
 
-NDIR=           ${PREFIX}/lib/netscape
+BROWSER?=	communicator
+BROWSER_VER=	4.08
+NDIR=		${PREFIX}/${NSUBDIR}
+NSUBDIR=	lib/netscape
 BINDIR=		${PREFIX}/bin
+INFILE_HEAD?=	'Communicator,4.08.0.98306'
+WRAPPER_TEMPLATE= ${MASTERDIR}/files/netscape.sh
+MAILCAP=	${MASTERDIR}/files/mailcap
+
+PLIST_SUB=	BROWSER=${BROWSER} BROWSER_VER=${BROWSER_VER} \
+		NSUBDIR=${NSUBDIR}
 
 .if defined(USE_128BIT)
 MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
@@ -32,30 +42,52 @@ DISTFILES+=	Fortify-1.3.2-unix-x86.tar.gz
 RESTRICTED=     "Contains strong cryptography"
 .endif
 
+.SILENT:
+
 .if !defined(USE_128BIT)
 pre-extract:
-		@${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
+	${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
 .endif
 
+do-configure:
+	${SED}	-e "s;@PREFIX@;${PREFIX};g" -e "s;@NSUBDIR@;${NSUBDIR};g" \
+		-e "s;@BROWSER@;${BROWSER};g" \
+		-e "s;@BROWSER_VER@;${BROWSER_VER};g" \
+		${WRAPPER_TEMPLATE} >${WRKSRC}/netscape
+	chmod +x ${WRKSRC}/netscape
+	${ECHO} -n ${INFILE_HEAD},${NDIR} >${WRKSRC}/infile
+
+pre-install:
+	PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL
+
 do-install:
-	cd ${WRKSRC} && yes "" | \
-	    LC_TIME=C MOZILLA_HOME="${NDIR}" ./ns-install
-	mv -f ${NDIR}/netscape ${NDIR}/communicator-4.08.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${BINDIR}/communicator-4.08
-	ln -sf communicator-4.08 ${BINDIR}/communicator-4
-	ln -sf communicator-4 ${BINDIR}/netscape
+	${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}/${BROWSER}-${BROWSER_VER}.bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape \
+		${BINDIR}/${BROWSER}-${BROWSER_VER}
+	${LN} -sf ${BROWSER}-${BROWSER_VER} ${BINDIR}/${BROWSER}-4
+	${LN} -sf ${BROWSER}-4 ${BINDIR}/netscape
 	if [ ! -f ${NDIR}/mailcap ] ; then \
-	    ${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}; \
+		${INSTALL_DATA} ${MAILCAP} ${NDIR}; \
 	fi
-	rm -rf ${NDIR}/movemail-src
-	tar zxvf ${DISTDIR}/${AUTOADMIN} -C ${NDIR}
-.if defined(USE_128BIT)
+	${RM} -rf ${NDIR}/movemail-src
+.if (${BROWSER} == "communicator")
+	tar zxf ${DISTDIR}/${AUTOADMIN} -C ${NDIR}
+.endif
+.if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
 	cd ${WRKDIR}/Fortify-1.3.2-unix-x86 && \
-		(${ECHO} yes ; ${ECHO} no ; ${ECHO} no) | ./Fortify.sh ${NDIR}/communicator-4.08.bin
+		(${ECHO} yes ; ${ECHO} no ; ${ECHO} no) \
+		| ./Fortify.sh ${NDIR}/${BROWSER}-${BROWSER_VER}.bin
 .endif
 	chown -R bin.bin ${NDIR}
 
 post-install:
-	@${CAT} ${PKGDIR}/DESCR
+	${CAT} ${PKGDIR}/DESCR
 
 .include <bsd.port.mk>