Update to 4.72 - this is only for the Linux/i386 version.

and use linux22 version instead of glibc20 version.

4 files changed, 17 insertions, 15 deletions

diff --git a/www/communicator/files/md5 b/www/communicator/files/md5
index 78a4a862c71..e8c420b9871 100644
--- a/www/communicator/files/md5
+++ b/www/communicator/files/md5
@@ -1,7 +1,6 @@
-$NetBSD: md5,v 1.10 2000/01/10 01:06:43 dmcmahill Exp $
+$NetBSD: md5,v 1.11 2000/04/30 14:42:20 sakamoto Exp $
 
 MD5 (netscape/communicator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = 26d2944a58d6fa8c73ff5a4a2f3d7258
 MD5 (netscape/communicator-v47-export.alpha-dec-osf4.0.tar.gz) = 649fcbb91589553599bc707caff35a9e
 MD5 (netscape/communicator-v47-export.sparc-sun-solaris2.5.1.tar.gz) = 1e3cf250174b97aaf4091b96c4648c40
-MD5 (netscape/communicator-v47-export.x86-unknown-linuxglibc2.0.tar.gz) = b4c1de5f30ceb158021805cc201b4121
-MD5 (netscape/communicator-v47-us.x86-unknown-linuxglibc2.0.tar.gz) = 489e4cf940019056176581e43d73c153
+MD5 (netscape/communicator-v472-export.x86-unknown-linux2.2.tar.gz) = 664a1f15ca2ab62d1afbddf2b4716aee
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index e63b8505298..b5c2209c3f5 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2000/01/15 11:02:18 tron Exp $
+# $NetBSD: Makefile.common,v 1.7 2000/04/30 14:42:22 sakamoto Exp $
 #
 # Common include file for communicator and navigator packages
 
@@ -7,6 +7,7 @@
 # Note - the version will be overridden for certain architectures which
 #	 do not have the latest version available (eg: SunOS sparc)
 NS_VERS=	4.7
+LDAP_VERS=	30
 #
 # Based on OPSYS and MACHINE_ARCH, define:
 #	DISTUNAME	Used to determine DISTNAME (tarfile on ftp server)
@@ -30,11 +31,13 @@ WRKNAME=	alpha-dec-osf4.0
 VENDOR_NAME=	Tru64 UNIX
 #
 .elif (${MACHINE_ARCH} == "i386")
+NS_VERS=	4.72
+LDAP_VERS=	40
 DEPENDS=	suse_linux>=6.1:../../emulators/suse_linux
-DISTUNAME=	x86-unknown-linuxglibc2.0
-DIST_DIR_NAME=	supported/linux20_glibc2
-WRKNAME=	x86-unknown-linux2.0
-VENDOR_NAME=	Linux 2.0 (glibc)
+DISTUNAME=	x86-unknown-linux2.2
+DIST_DIR_NAME=	unsupported/linux22
+WRKNAME=	x86-unknown-linux2.2
+VENDOR_NAME=	Linux 2.2
 #
 .elif (${MACHINE_ARCH} == "sparc")
 .if !exists(/emul/sunos/usr/lib/ld.so)
@@ -76,7 +79,7 @@ NS_PLUGINS_DIR=	${PREFIX}/lib/netscape/plugins
 PLIST_SRC=	${PKGDIR}/PLIST.pre \
 		${PKGDIR}/PLIST.${LOWER_OPSYS}-${MACHINE_ARCH} \
 		${PKGDIR}/PLIST.post
-PLIST_SUBST+=	NS_VERS=${NS_VERS}
+PLIST_SUBST+=	NS_VERS=${NS_VERS} LDAP_VERS=${LDAP_VERS}
 
 .if (${NS_ENCRYPTION} == "us")
 MASTER_SITES=
@@ -101,7 +104,7 @@ do-install:
 	${MKDIR} ${MOZILLA_HOME}/java/classes
 	${INSTALL_SCRIPT} ${WRKSRC}/vreg ${MOZILLA_HOME}
 .for file in ifc11.jar iiop10.jar jae40.jar java40.jar jio40.jar jsd10.jar \
-    ldap30.jar resource.jar scd10.jar
+    ldap${LDAP_VERS}.jar resource.jar scd10.jar
 	${INSTALL_DATA} ${WRKSRC}/${file} ${MOZILLA_HOME}/java/classes
 .endfor
 	cd ${MOZILLA_HOME} ; ${GTAR} xpzf ${WRKSRC}/nethelp-v${NS_VERS_SHORT}.nif
diff --git a/www/navigator/files/md5 b/www/navigator/files/md5
index 48991d32bfc..585f016f981 100644
--- a/www/navigator/files/md5
+++ b/www/navigator/files/md5
@@ -1,7 +1,7 @@
-$NetBSD: md5,v 1.10 2000/01/09 19:29:39 tsarna Exp $
+$NetBSD: md5,v 1.11 2000/04/30 14:42:22 sakamoto Exp $
 
 MD5 (netscape/navigator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = a1bc10d5dfce9f36ddae55930d683b6d
 MD5 (netscape/navigator-v47-export.sparc-sun-solaris2.5.1.tar.gz) = 0c8a97a845456cb260ba58a6717629d9
-MD5 (netscape/navigator-v47-export.x86-unknown-linuxglibc2.0.tar.gz) = 50a51a4ce99ebfdba52c9bd91ca492b7
 MD5 (netscape/navigator-v47-export.alpha-dec-osf4.0.tar.gz) = 91244e06363f0fc8a277c2ebe6ed7b67
-MD5 (netscape/navigator-v47-us.x86-unknown-linuxglibc2.0.tar.gz) = 53dbe5f9e3f91940ec40e9409abb2f8b
+MD5 (netscape/navigator-v472-export.x86-unknown-linux2.2.tar.gz) = e1bab205e701c0bda90df2d7c37f0431
+
diff --git a/www/navigator/pkg/PLIST.pre b/www/navigator/pkg/PLIST.pre
index 821692040f3..d366421ad10 100644
--- a/www/navigator/pkg/PLIST.pre
+++ b/www/navigator/pkg/PLIST.pre
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.pre,v 1.5 1999/06/27 00:23:21 abs Exp $
+@comment $NetBSD: PLIST.pre,v 1.6 2000/04/30 14:42:22 sakamoto Exp $
 bin/navigator-${NS_VERS}
 bin/navigator
 lib/netscape/navigator-${NS_VERS}/LICENSE
@@ -64,7 +64,7 @@ lib/netscape/navigator-${NS_VERS}/java/classes/jae40.jar
 lib/netscape/navigator-${NS_VERS}/java/classes/java40.jar
 lib/netscape/navigator-${NS_VERS}/java/classes/jio40.jar
 lib/netscape/navigator-${NS_VERS}/java/classes/jsd10.jar
-lib/netscape/navigator-${NS_VERS}/java/classes/ldap30.jar
+lib/netscape/navigator-${NS_VERS}/java/classes/ldap${LDAP_VERS}.jar
 lib/netscape/navigator-${NS_VERS}/java/classes/resource.jar
 lib/netscape/navigator-${NS_VERS}/java/classes/scd10.jar
 lib/netscape/navigator-${NS_VERS}/nethelp/Back_dep.gif