Upgrade to 4.74.

Master-site list is increased and applied changes to
hold it common between other netscape47 ports.

Last committion 1.24 was a mistake, I've updated
only l-n47-c/Makefile for this change.

PR:		ports/20162
Submitted by:	maintainer

4 files changed, 30 insertions, 21 deletions

diff --git a/www/linux-netscape47-communicator/pkg-plist b/www/linux-netscape47-communicator/pkg-plist
index f1a4ef7a5ce2..a06a30e75583 100644
--- a/www/linux-netscape47-communicator/pkg-plist
+++ b/www/linux-netscape47-communicator/pkg-plist
@@ -170,8 +170,10 @@ bin/%%BROWSER%%-%%BROWSER_VER%%
 %%NSUBDIR%%/XKeysymDB
 %%NSUBDIR%%/movemail
 %%NSUBDIR%%/netscape-dynMotif
-%%NSUBDIR%%/plugins/libnullplugin.so
+%%NSUBDIR%%/plugins/ShockwaveFlash.class
 %%NSUBDIR%%/plugins/cpPack1.jar
+%%NSUBDIR%%/plugins/libflashplayer.so
+%%NSUBDIR%%/plugins/libnullplugin.so
 %%NSUBDIR%%/libnullplugin-dynMotif.so
 %%NSUBDIR%%/libjsd.so
 %%NSUBDIR%%/bookmark.htm
diff --git a/www/netscape4-communicator/distinfo b/www/netscape4-communicator/distinfo
index 2c8a3967bed4..532aa70930b0 100644
--- a/www/netscape4-communicator/distinfo
+++ b/www/netscape4-communicator/distinfo
@@ -1,13 +1,12 @@
 MD5 (Fortify-1.4.6-unix-x86.tar.gz) = 93fd03a90dcfbf8d55ce0785d2a42ffc
 MD5 (autoadmin-v408.x86-unknown-freebsd.tar.gz) = 0435245b83fc5d9be6844ebfa1a242f0
 MD5 (communicator-v408-export.x86-unknown-freebsd.tar.gz) = dfe7005dd39ac900fe336d6f052acfdb
-MD5 (communicator-v47-us.x86-unknown-freebsd.tar.gz) = fae5e2d150dfe9c05c5d8b577e99a8c3
 MD5 (communicator-v473-export.x86-bsdi-bsd2.tar.gz) = fd7975f7aeb2c6ebac9ca96724b0afb6
-MD5 (communicator-v473-export.x86-unknown-linuxglibc2.0.tar.gz) = e5434d67a50f1328a21825033055584c
 MD5 (communicator-v473-us.x86-bsdi-bsd2.tar.gz) = 1512e2ab43b097377cbc1c3d6b3993b0
+MD5 (communicator-v474-us.x86-unknown-linux2.2.tar.gz) = f9004cf09b6147d6f56c7302447bfcfe
 MD5 (communicator-v474-us.x86-unknown-freebsd.tar.gz) = c263ce8213ecb99d15cde03815774c77
 MD5 (navigator-v408-export.x86-unknown-freebsd.tar.gz) = 63d607f8e861471f4dcd14d048e1f652
 MD5 (navigator-v473-export.x86-bsdi-bsd2.tar.gz) = af6995971ae513e25ac760c9c8d3565b
-MD5 (navigator-v473-export.x86-unknown-linuxglibc2.0.tar.gz) = 022693778a13275d1e3993fef3844e54
 MD5 (navigator-v473-us.x86-bsdi-bsd2.tar.gz) = 2c611a53c5a9b9e9cf5e4ff8b44d6551
 MD5 (navigator-v474-us.x86-unknown-freebsd.tar.gz) = fd174c0ffef1f6f6cccae321b29cd4c0
+MD5 (navigator-v474-us.x86-unknown-linux2.2.tar.gz) = 04faccc952e0d5a78a3c13e0f04e6c5b
diff --git a/www/netscape47-communicator/Makefile b/www/netscape47-communicator/Makefile
index 99bcd9d7c14a..c682c86fd6c6 100644
--- a/www/netscape47-communicator/Makefile
+++ b/www/netscape47-communicator/Makefile
@@ -12,26 +12,35 @@ PORTVERSION?=	${BROWSER_VER}
 .include <bsd.port.pre.mk>
 .endif
 
-.if ${ARCH} == "i386"
-MASTER_SITES?=	ftp://ftp.netscape.com./pub/communicator/english/4.74/unix/unsupported/freebsd/complete_install/
-DISTFILES?=	communicator-v474-us.x86-unknown-freebsd.tar.gz
-.elif ${ARCH} == "alpha"
-MASTER_SITES?=	ftp://ftp.netscape.com./pub/communicator/english/4.74/unix/supported/dec_unix40/complete_install/
-DISTFILES?=	communicator-v474-us.alpha-dec-osf4.0.tar.gz
-.endif
+MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/english/${NETSCAPE_DIST_SUBDIR}/ \
+		ftp://ftp.spin.ad.jp/pub/WWW/netscape/communicator/english/${NETSCAPE_DIST_SUBDIR}/ \
+		ftp://ftp.sunet.se/pub/www/Netscape/communicator/english/${NETSCAPE_DIST_SUBDIR}/ \
+		ftp://ftp.hi.is/pub/mirrors/ftp.netscape.com/pub/communicator/english/${NETSCAPE_DIST_SUBDIR}/ \
+		ftp://ftp.unicamp.br/pub6/netscape/communicator/english/${NETSCAPE_DIST_SUBDIR}/ \
+		ftp://the.ausmac.net/wd2a/security/cryptography/128bit-browsers/Netscape/${NETSCAPE_DIST_SUBDIR}/
+DISTFILES=	${BROWSER}-v474-us.${NETSCAPE_DIST_TAG}.tar.gz
 
+MASTERDIR=	${.CURDIR}/../netscape4-communicator
+WRKSRC?=	${WRKDIR}/${BROWSER}-v474.${NETSCAPE_DIST_TAG}
 ONLY_FOR_ARCHS?=	i386 alpha
 
-MASTERDIR=	${.CURDIR}/../netscape4-communicator
-.if ${ARCH} == "i386"
-WRKSRC?=	${WRKDIR}/${BROWSER}-v474.x86-unknown-freebsd
-.elif ${ARCH} == "alpha"
-WRKSRC?=	${WRKDIR}/${BROWSER}-v474.alpha-dec-osf4.0
+.if ${ARCH} == "alpha"
+NETSCAPE_DIST_ARCH=	supported/dec_unix40
+NETSCAPE_DIST_TAG=	alpha-dec-osf4.0
+.endif
+
+NETSCAPE_DIST_ARCH?=	unsupported/freebsd # | supported/dec_unix40 | supported/linux22 | unsupported/bsdi21
+NETSCAPE_DIST_GRADE?=	complete_install # | navigator_standalone
+NETSCAPE_DIST_SUBDIR?=	${BROWSER_VER}/unix/${NETSCAPE_DIST_ARCH}/${NETSCAPE_DIST_GRADE}
+NETSCAPE_DIST_TAG?=	x86-unknown-freebsd # | x86-unknown-linux2.2 | x86-bsdi-bsd2 | alpha-dec-osf4.0
+
+.if defined(BROWSER) && ${BROWSER} == 'navigator'
+NETSCAPE_DIST_GRADE=	navigator_standalone
 .endif
 
 BROWSER_VER=	4.74
 INFILE_HEAD?=	'Communicator,4.74.0.20000707'
-NO_AUTOADMIN=	yes
-NO_FORTIFY=	'Not available for current version'
+NO_AUTOADMIN=	'Not available'
+NO_FORTIFY=	'No need for 4.74'
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/netscape48-communicator/distinfo b/www/netscape48-communicator/distinfo
index 2c8a3967bed4..532aa70930b0 100644
--- a/www/netscape48-communicator/distinfo
+++ b/www/netscape48-communicator/distinfo
@@ -1,13 +1,12 @@
 MD5 (Fortify-1.4.6-unix-x86.tar.gz) = 93fd03a90dcfbf8d55ce0785d2a42ffc
 MD5 (autoadmin-v408.x86-unknown-freebsd.tar.gz) = 0435245b83fc5d9be6844ebfa1a242f0
 MD5 (communicator-v408-export.x86-unknown-freebsd.tar.gz) = dfe7005dd39ac900fe336d6f052acfdb
-MD5 (communicator-v47-us.x86-unknown-freebsd.tar.gz) = fae5e2d150dfe9c05c5d8b577e99a8c3
 MD5 (communicator-v473-export.x86-bsdi-bsd2.tar.gz) = fd7975f7aeb2c6ebac9ca96724b0afb6
-MD5 (communicator-v473-export.x86-unknown-linuxglibc2.0.tar.gz) = e5434d67a50f1328a21825033055584c
 MD5 (communicator-v473-us.x86-bsdi-bsd2.tar.gz) = 1512e2ab43b097377cbc1c3d6b3993b0
+MD5 (communicator-v474-us.x86-unknown-linux2.2.tar.gz) = f9004cf09b6147d6f56c7302447bfcfe
 MD5 (communicator-v474-us.x86-unknown-freebsd.tar.gz) = c263ce8213ecb99d15cde03815774c77
 MD5 (navigator-v408-export.x86-unknown-freebsd.tar.gz) = 63d607f8e861471f4dcd14d048e1f652
 MD5 (navigator-v473-export.x86-bsdi-bsd2.tar.gz) = af6995971ae513e25ac760c9c8d3565b
-MD5 (navigator-v473-export.x86-unknown-linuxglibc2.0.tar.gz) = 022693778a13275d1e3993fef3844e54
 MD5 (navigator-v473-us.x86-bsdi-bsd2.tar.gz) = 2c611a53c5a9b9e9cf5e4ff8b44d6551
 MD5 (navigator-v474-us.x86-unknown-freebsd.tar.gz) = fd174c0ffef1f6f6cccae321b29cd4c0
+MD5 (navigator-v474-us.x86-unknown-linux2.2.tar.gz) = 04faccc952e0d5a78a3c13e0f04e6c5b