Refine PKGNAME as official format,

cope with fortify 1.4.3,
change MAINTAINER to sada,
divide COMMENT for eath regular and gold version.

I've realized PKGNAME justification by different way from
the PR notifies.

PR:		ports/12955
Submitted by:	Neil Blakey-Milner <nbm@rucus.ru.ac.za>

5 files changed, 22 insertions, 23 deletions

diff --git a/www/netscape3-gold/Makefile b/www/netscape3-gold/Makefile
index 4ada889ddb7c..878766cd46e0 100644
--- a/www/netscape3-gold/Makefile
+++ b/www/netscape3-gold/Makefile
@@ -3,12 +3,14 @@
 # Date created:		21 August 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.1 1998/11/22 22:31:23 asami Exp $
+# $Id: Makefile,v 1.2 1999/01/13 04:00:07 scrappy Exp $
 #
 
-GOLD=	yes
-MASTERDIR=	${.CURDIR}/../netscape3
+DISTNAME=	netscape-gold-3.04
+MASTER_SITES=	ftp://archive:oldies@archive.netscape.com/archive/navigator/3.04/shipping/english/unix/bsdi11/navigator_gold_complete/
 
-Y2K=		http://home.netscape.com/products/year2000/faq/client.html
+DIST_SUBDIR=	gold
+COMMENT=	${.CURDIR}/pkg/COMMENT
+MASTERDIR=	${.CURDIR}/../netscape3
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/netscape3/Makefile b/www/netscape3/Makefile
index 01156a963514..f0e9ed3fac0b 100644
--- a/www/netscape3/Makefile
+++ b/www/netscape3/Makefile
@@ -3,15 +3,15 @@
 # Date created:		21 August 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.28 1999/01/13 04:00:07 scrappy Exp $
+# $Id: Makefile,v 1.29 1999/01/26 02:37:15 steve Exp $
 #
 
-DISTNAME=       netscape-3.04
+DISTNAME?=	netscape-3.04
 CATEGORIES=	www
-MASTER_SITES=   ftp://archive:oldies@archive.netscape.com/archive/navigator/3.04/shipping/english/unix/bsdi11/navigator_complete/
+MASTER_SITES?=   ftp://archive:oldies@archive.netscape.com/archive/navigator/3.04/shipping/english/unix/bsdi11/navigator_complete/
 DISTFILES=      netscape-v304-export.x86-unknown-bsd.tar.gz
 
-MAINTAINER=     ports@FreeBSD.ORG
+MAINTAINER=	sada@FreeBSD.ORG
 
 Y2K=		http://home.netscape.com/products/year2000/faq/client.html
 
@@ -20,28 +20,27 @@ NOT_FOR_ARCHS=	alpha
 NO_LATEST_LINK=	yes
 NO_WRKSUBDIR=	yes
 
-.if defined(GOLD)
-MASTER_SITES=   ftp://archive:oldies@archive.netscape.com/archive/navigator/3.04/shipping/english/unix/bsdi11/navigator_gold_complete/
-DIST_SUBDIR=    gold
-PKGNAME=	${DISTNAME}-gold
-.endif
-
-.if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
+.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
+DISTFILES+=	${FORTIFY}.tar.gz
 RESTRICTED=     "Contains strong cryptography"
 .endif
 
+FORTIFY=	Fortify-1.4.3-unix-x86
+
 .if !defined(USE_128BIT)
 pre-extract:
 		@${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
 		@${ECHO} "and defining USA_RESIDENT to NO"
 .endif
 
+pre-install:
+	PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL
+
 post-install:
-.if defined(USE_128BIT) && defined(USA_RESIDENT) && ${USA_RESIDENT} == NO
-	cd ${WRKSRC}/Fortify-1.3.2-unix-x86 && \
+.if defined(USE_128BIT)
+	cd ${WRKDIR}/${FORTIFY} && \
 		(${ECHO} yes ; ${ECHO} no ; ${ECHO} no) | ./Fortify.sh ${PREFIX}/lib/netscape/netscape.bin
 .endif
 	@${CAT} ${PKGDIR}/DESCR
diff --git a/www/netscape3/distinfo b/www/netscape3/distinfo
index de005d4ab6c8..d7bc8e6cd043 100644
--- a/www/netscape3/distinfo
+++ b/www/netscape3/distinfo
@@ -1,3 +1,4 @@
 MD5 (netscape-v304-export.x86-unknown-bsd.tar.gz) = a08bc63c6f1a2e934045be0848c7bb09
+MD5 (Fortify-1.4.3-unix-x86.tar.gz) = 0414664e89c3a0f690f4ed9aa07dbd70
 MD5 (gold/netscape-v304-export.x86-unknown-bsd.tar.gz) = d53200dcbd0bfb1afd2e202d5736f9e0
-MD5 (Fortify-1.3.2-unix-x86.tar.gz) = 2602de68407690cf45c32f9dfef65f74
+MD5 (gold/Fortify-1.4.3-unix-x86.tar.gz) = 0414664e89c3a0f690f4ed9aa07dbd70
diff --git a/www/netscape3/pkg-comment b/www/netscape3/pkg-comment
index ac11414bc80a..8c99a083cc75 100644
--- a/www/netscape3/pkg-comment
+++ b/www/netscape3/pkg-comment
@@ -1 +1 @@
-Netscape ver 3 web-surfboard (regular or gold)
+Netscape ver 3 web-surfboard
diff --git a/www/netscape3/pkg-descr b/www/netscape3/pkg-descr
index 562904196c18..e0a83b68e9ae 100644
--- a/www/netscape3/pkg-descr
+++ b/www/netscape3/pkg-descr
@@ -6,6 +6,3 @@ Note: If Java applets fail to display.  Type this as root:
 		/usr/X11R6/bin/mkfontdir
 		chmod 444 fonts.dir
       And then exit and restart your X server.
-
-This port can install either the regular or "gold" version.
-For the latter, add "GOLD=yes" to your "make" command line.