upgrade to 4.72

4 files changed, 32 insertions, 30 deletions

diff --git a/www/bsdi-netscape47-communicator/Makefile b/www/bsdi-netscape47-communicator/Makefile
index 468deb02089..46178ebaed8 100644
--- a/www/bsdi-netscape47-communicator/Makefile
+++ b/www/bsdi-netscape47-communicator/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for: netscape (communicator suite)
-# Version required:	4.7
+# Version required:     4.7*
 # Date created:		24 Feb 1997
 # Whom:			thepish
 #
@@ -11,24 +11,25 @@
 .endif
 
 .if ${ARCH} == "i386"
-MASTER_SITES?=	ftp://ftp.netscape.com./pub/communicator/english/4.7/unix/unsupported/freebsd/complete_install/
-DISTFILES?=	communicator-v47-export.x86-unknown-freebsd.tar.gz
+MASTER_SITES?=  ftp://ftp.netscape.com./pub/communicator/english/4.72/unix/unsupported/freebsd/complete_install/
+DISTFILES?=     communicator-v472-export.x86-unknown-freebsd.tar.gz
 .elif ${ARCH} == "alpha"
-MASTER_SITES?=	ftp://ftp.netscape.com./pub/communicator/english/4.7/unix/supported/dec_unix40/complete_install/
-DISTFILES?=	communicator-v47-export.alpha-dec-osf4.0.tar.gz
+MASTER_SITES?=  ftp://ftp.netscape.com./pub/communicator/english/4.72/unix/supported/dec_unix40/complete_install/
+DISTFILES?=     communicator-v472-export.alpha-dec-osf4.0.tar.gz
 .endif
 
 ONLY_FOR_ARCHS=	i386 alpha
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
 .if ${ARCH} == "i386"
-WRKSRC?=	${WRKDIR}/${BROWSER}-v47.x86-unknown-freebsd
+WRKSRC?=        ${WRKDIR}/${BROWSER}-v472.x86-unknown-freebsd
 .elif ${ARCH} == "alpha"
-WRKSRC?=	${WRKDIR}/${BROWSER}-v47.alpha-dec-osf4.0
+WRKSRC?=        ${WRKDIR}/${BROWSER}-v472.alpha-dec-osf4.0
 .endif
 
-BROWSER_VER=	4.7
-INFILE_HEAD?=	'Communicator,4.7.0.19990915'
+BROWSER_VER=    4.72
+#	taken from ,${BLDVERS} in ns-install
+INFILE_HEAD?=	'Communicator,4.72.0.20000131'
 NO_AUTOADMIN=	yes
 
 PRE_MK_INCLUDED=	yes
diff --git a/www/bsdi-netscape47-communicator/pkg-plist b/www/bsdi-netscape47-communicator/pkg-plist
index 2f17e88a7b6..19759a3e72f 100644
--- a/www/bsdi-netscape47-communicator/pkg-plist
+++ b/www/bsdi-netscape47-communicator/pkg-plist
@@ -1,14 +1,14 @@
-bin/communicator-%%BROWSER_VER%%
-@exec ln -sf %f %B/communicator-4
-@exec ln -sf communicator-4 %B/netscape
+bin/%%BROWSER%%-%%BROWSER_VER%%
+@exec ln -sf %f %B/%%BROWSER%%-4
+@exec ln -sf %%BROWSER%%-4 %B/netscape
 @unexec rm -f %B/netscape
-@unexec rm -f %B/communicator-4
+@unexec rm -f %B/%%BROWSER%%-4
 %%NSUBDIR%%/LICENSE
 %%NSUBDIR%%/Netscape.ad
 %%NSUBDIR%%/README
 %%NSUBDIR%%/XKeysymDB
 %%NSUBDIR%%/bookmark.htm
-%%NSUBDIR%%/communicator-%%BROWSER_VER%%.bin
+%%NSUBDIR%%/%%BROWSER%%-%%BROWSER_VER%%.bin
 %%NSUBDIR%%/java/classes/aix/font.properties
 %%NSUBDIR%%/java/classes/aix/font.properties.cs
 %%NSUBDIR%%/java/classes/aix/font.properties.hu
@@ -68,7 +68,7 @@ bin/communicator-%%BROWSER_VER%%
 %%NSUBDIR%%/java/classes/jio40.jar
 %%NSUBDIR%%/java/classes/joptio40.jar
 %%NSUBDIR%%/java/classes/jsd10.jar
-%%NSUBDIR%%/java/classes/ldap30.jar
+%%NSUBDIR%%/java/classes/ldap40.jar
 %%NSUBDIR%%/java/classes/resource.jar
 %%NSUBDIR%%/java/classes/scd10.jar
 %%NSUBDIR%%/libjsd.so.1.0
diff --git a/www/netscape47-communicator/Makefile b/www/netscape47-communicator/Makefile
index 468deb02089..46178ebaed8 100644
--- a/www/netscape47-communicator/Makefile
+++ b/www/netscape47-communicator/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for: netscape (communicator suite)
-# Version required:	4.7
+# Version required:     4.7*
 # Date created:		24 Feb 1997
 # Whom:			thepish
 #
@@ -11,24 +11,25 @@
 .endif
 
 .if ${ARCH} == "i386"
-MASTER_SITES?=	ftp://ftp.netscape.com./pub/communicator/english/4.7/unix/unsupported/freebsd/complete_install/
-DISTFILES?=	communicator-v47-export.x86-unknown-freebsd.tar.gz
+MASTER_SITES?=  ftp://ftp.netscape.com./pub/communicator/english/4.72/unix/unsupported/freebsd/complete_install/
+DISTFILES?=     communicator-v472-export.x86-unknown-freebsd.tar.gz
 .elif ${ARCH} == "alpha"
-MASTER_SITES?=	ftp://ftp.netscape.com./pub/communicator/english/4.7/unix/supported/dec_unix40/complete_install/
-DISTFILES?=	communicator-v47-export.alpha-dec-osf4.0.tar.gz
+MASTER_SITES?=  ftp://ftp.netscape.com./pub/communicator/english/4.72/unix/supported/dec_unix40/complete_install/
+DISTFILES?=     communicator-v472-export.alpha-dec-osf4.0.tar.gz
 .endif
 
 ONLY_FOR_ARCHS=	i386 alpha
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
 .if ${ARCH} == "i386"
-WRKSRC?=	${WRKDIR}/${BROWSER}-v47.x86-unknown-freebsd
+WRKSRC?=        ${WRKDIR}/${BROWSER}-v472.x86-unknown-freebsd
 .elif ${ARCH} == "alpha"
-WRKSRC?=	${WRKDIR}/${BROWSER}-v47.alpha-dec-osf4.0
+WRKSRC?=        ${WRKDIR}/${BROWSER}-v472.alpha-dec-osf4.0
 .endif
 
-BROWSER_VER=	4.7
-INFILE_HEAD?=	'Communicator,4.7.0.19990915'
+BROWSER_VER=    4.72
+#	taken from ,${BLDVERS} in ns-install
+INFILE_HEAD?=	'Communicator,4.72.0.20000131'
 NO_AUTOADMIN=	yes
 
 PRE_MK_INCLUDED=	yes
diff --git a/www/netscape47-communicator/pkg-plist b/www/netscape47-communicator/pkg-plist
index 2f17e88a7b6..19759a3e72f 100644
--- a/www/netscape47-communicator/pkg-plist
+++ b/www/netscape47-communicator/pkg-plist
@@ -1,14 +1,14 @@
-bin/communicator-%%BROWSER_VER%%
-@exec ln -sf %f %B/communicator-4
-@exec ln -sf communicator-4 %B/netscape
+bin/%%BROWSER%%-%%BROWSER_VER%%
+@exec ln -sf %f %B/%%BROWSER%%-4
+@exec ln -sf %%BROWSER%%-4 %B/netscape
 @unexec rm -f %B/netscape
-@unexec rm -f %B/communicator-4
+@unexec rm -f %B/%%BROWSER%%-4
 %%NSUBDIR%%/LICENSE
 %%NSUBDIR%%/Netscape.ad
 %%NSUBDIR%%/README
 %%NSUBDIR%%/XKeysymDB
 %%NSUBDIR%%/bookmark.htm
-%%NSUBDIR%%/communicator-%%BROWSER_VER%%.bin
+%%NSUBDIR%%/%%BROWSER%%-%%BROWSER_VER%%.bin
 %%NSUBDIR%%/java/classes/aix/font.properties
 %%NSUBDIR%%/java/classes/aix/font.properties.cs
 %%NSUBDIR%%/java/classes/aix/font.properties.hu
@@ -68,7 +68,7 @@ bin/communicator-%%BROWSER_VER%%
 %%NSUBDIR%%/java/classes/jio40.jar
 %%NSUBDIR%%/java/classes/joptio40.jar
 %%NSUBDIR%%/java/classes/jsd10.jar
-%%NSUBDIR%%/java/classes/ldap30.jar
+%%NSUBDIR%%/java/classes/ldap40.jar
 %%NSUBDIR%%/java/classes/resource.jar
 %%NSUBDIR%%/java/classes/scd10.jar
 %%NSUBDIR%%/libjsd.so.1.0