Make this work under solaris-sparc

14 files changed, 51 insertions, 22 deletions

diff --git a/www/communicator/Makefile b/www/communicator/Makefile
index 68e5cdfd36f..ce117bd7b47 100644
--- a/www/communicator/Makefile
+++ b/www/communicator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/07/12 00:06:57 jlam Exp $
+# $NetBSD: Makefile,v 1.18 1999/08/13 21:24:12 abs Exp $
 #
 # Every effort has been made to keep the communicator and navigator
 # Makefiles as similar as possible.
@@ -8,7 +8,12 @@ NS_VERS=	4.61
 NS_VERS_SHORT=	461
 NS_ENCRYPTION?=	export
 #
-.if (${MACHINE_ARCH} == "alpha")
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
+DISTUNAME=	sparc-sun-solaris2.5.1
+DIST_DIR_NAME=	supported/sunos551
+WRKNAME=	sparc-sun-solaris2.5.1
+.elif (${MACHINE_ARCH} == "alpha")
 .if !exists(/emul/osf1/sbin/loader)
 IGNORE=	requires Digital UNIX libraries - see compat_osf1(8)
 .endif
@@ -17,7 +22,7 @@ DIST_DIR_NAME=	supported/dec_unix40
 WRKNAME=	alpha-dec-osf4.0
 .elif (${MACHINE_ARCH} == "i386")
 .if !exists(/emul/linux/lib/ld-linux.so.2)
-IGNORE=	requires Linux libraries - see compat_linux(8)
+IGNORE=	requires Linux glibc2 libraries - see compat_linux(8)
 .endif
 DISTUNAME=	x86-unknown-linuxglibc2.0
 DIST_DIR_NAME=	supported/linux20_glibc2
@@ -85,10 +90,12 @@ do-install:
 	${SED} -e 's#@@MOZILLA_HOME@@#${MOZILLA_HOME}#g' \
 	    <${FILESDIR}/${BINNAME}.sh >${WRKDIR}/${BINNAME}.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${PKGNAME}
+	${RM} -f ${PREFIX}/bin/${BINNAME}
 	${LN} -sf ${PKGNAME} ${PREFIX}/bin/${BINNAME}
+	${RM} -f ${PREFIX}/bin/netscape
 	${LN} -sf ${PKGNAME} ${PREFIX}/bin/netscape
 
-.if (${MACHINE_ARCH} == "sparc")
+.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc"
 	# Bizarre magic to handle the NIS and DNS versions. Make DNS default.
 	@${SED} -e 's#MOZILLA_HOME/netscape#MOZILLA_HOME/netscape_nis#g' \
 	    <${WRKDIR}/${BINNAME}.sh >${WRKDIR}/${BINNAME}_nis.sh
@@ -99,8 +106,8 @@ do-install:
 	${MV} ${MOZILLA_HOME}/netscape_dns ${MOZILLA_HOME}/netscape
 .endif
 
-	${SED} -e ${NS_PLIST_SED} ${PKGDIR}/PLIST.${MACHINE_ARCH} \
-	    >>${PLIST_SRC}
+	${SED} -e ${NS_PLIST_SED} \
+		${PKGDIR}/PLIST.${LOWER_OPSYS}-${MACHINE_ARCH} >>${PLIST_SRC}
 
 	${CHOWN} -R 0:0 ${MOZILLA_HOME}
 	${CHMOD} -R go-w ${MOZILLA_HOME}
diff --git a/www/communicator/files/md5 b/www/communicator/files/md5
index e6d41bfa25d..27b65d54b18 100644
--- a/www/communicator/files/md5
+++ b/www/communicator/files/md5
@@ -1,6 +1,7 @@
-$NetBSD: md5,v 1.7 1999/06/21 08:44:29 jlam Exp $
+$NetBSD: md5,v 1.8 1999/08/13 21:24:12 abs Exp $
 
 MD5 (communicator-v461-export.alpha-dec-osf4.0.tar.gz) = b431d2de9d6340779f8bc82e7a5ceb82
+MD5 (communicator-v461-export.sparc-sun-solaris2.5.1.tar.gz) = da9ccf8189d7cd4ab0960c944c2179b6
 MD5 (communicator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = 26d2944a58d6fa8c73ff5a4a2f3d7258
 MD5 (communicator-v461-export.x86-unknown-linuxglibc2.0.tar.gz) = 2716a95847687cdb1cda0a52c0cbb1ff
 MD5 (communicator-v461-us.alpha-dec-osf4.0.tar.gz) = af72f7a77ee590ab550a1623f0879c99
diff --git a/www/communicator/pkg/PLIST.alpha b/www/communicator/pkg/PLIST.alpha
deleted file mode 100644
index 98a87855856..00000000000
--- a/www/communicator/pkg/PLIST.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.alpha,v 1.1 1999/06/14 21:43:35 cgd Exp $
-lib/netscape/communicator-${NS_VERS}/plugins/libnullplugin.so
diff --git a/www/communicator/pkg/PLIST.netbsd-alpha b/www/communicator/pkg/PLIST.netbsd-alpha
new file mode 100644
index 00000000000..8a8bc2cd1b9
--- /dev/null
+++ b/www/communicator/pkg/PLIST.netbsd-alpha
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.netbsd-alpha,v 1.1 1999/08/13 21:24:13 abs Exp $
+lib/netscape/communicator-${NS_VERS}/plugins/libnullplugin.so
diff --git a/www/communicator/pkg/PLIST.i386 b/www/communicator/pkg/PLIST.netbsd-i386
index f6967be0805..cb5cc98b73b 100644
--- a/www/communicator/pkg/PLIST.i386
+++ b/www/communicator/pkg/PLIST.netbsd-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.i386,v 1.2 1999/06/14 21:40:25 cgd Exp $
+@comment $NetBSD: PLIST.netbsd-i386,v 1.1 1999/08/13 21:24:13 abs Exp $
 lib/netscape/communicator-${NS_VERS}/libjsd.so
 lib/netscape/communicator-${NS_VERS}/dynfonts/libTrueDoc.so
 lib/netscape/communicator-${NS_VERS}/plugins/libnullplugin.so
diff --git a/www/communicator/pkg/PLIST.sparc b/www/communicator/pkg/PLIST.netbsd-sparc
index e08359ab882..36362474e3b 100644
--- a/www/communicator/pkg/PLIST.sparc
+++ b/www/communicator/pkg/PLIST.netbsd-sparc
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.sparc,v 1.5 1999/06/14 21:40:25 cgd Exp $
+@comment $NetBSD: PLIST.netbsd-sparc,v 1.1 1999/08/13 21:24:13 abs Exp $
 bin/communicator-${NS_VERS}_nis
 bin/netscape_nis
 lib/netscape/communicator-${NS_VERS}/netscape_nis
diff --git a/www/communicator/pkg/PLIST.solaris-sparc b/www/communicator/pkg/PLIST.solaris-sparc
new file mode 100644
index 00000000000..fa1d732a073
--- /dev/null
+++ b/www/communicator/pkg/PLIST.solaris-sparc
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST.solaris-sparc,v 1.1 1999/08/13 21:24:13 abs Exp $
+lib/netscape/communicator-${NS_VERS}/dynfonts/libTrueDoc.so
+lib/netscape/communicator-${NS_VERS}/plugins/libnullplugin.so
+lib/netscape/communicator-${NS_VERS}/talkback/master.ini
+@dirrm lib/netscape/communicator-${NS_VERS}/dynfonts
+@dirrm lib/netscape/communicator-${NS_VERS}/talkback
+
diff --git a/www/navigator/Makefile b/www/navigator/Makefile
index 4767d2eb751..1522c3696f5 100644
--- a/www/navigator/Makefile
+++ b/www/navigator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1999/07/12 00:06:58 jlam Exp $
+# $NetBSD: Makefile,v 1.17 1999/08/13 21:24:11 abs Exp $
 #
 # Every effort has been made to keep the communicator and navigator
 # Makefiles as similar as possible.
@@ -8,7 +8,12 @@ NS_VERS=	4.61
 NS_VERS_SHORT=	461
 NS_ENCRYPTION?=	export
 #
-.if (${MACHINE_ARCH} == "alpha")
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
+DISTUNAME=	sparc-sun-solaris2.5.1
+DIST_DIR_NAME=	supported/sunos551
+WRKNAME=	sparc-sun-solaris2.5.1
+.elif (${MACHINE_ARCH} == "alpha")
 .if !exists(/emul/osf1/sbin/loader)
 IGNORE=	requires Digital UNIX libraries - see compat_osf1(8)
 .endif
@@ -17,7 +22,7 @@ DIST_DIR_NAME=	supported/dec_unix40
 WRKNAME=	alpha-dec-osf4.0
 .elif (${MACHINE_ARCH} == "i386")
 .if !exists(/emul/linux/lib/ld-linux.so.2)
-IGNORE=	requires Linux glibc2 libraries - see compat_linux(8).
+IGNORE=	requires Linux glibc2 libraries - see compat_linux(8)
 .endif
 DISTUNAME=	x86-unknown-linuxglibc2.0
 DIST_DIR_NAME=	supported/linux20_glibc2
@@ -84,9 +89,10 @@ do-install:
 	${SED} -e 's#@@MOZILLA_HOME@@#${MOZILLA_HOME}#g' \
 	    <${FILESDIR}/${BINNAME}.sh >${WRKDIR}/${BINNAME}.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${PKGNAME}
+	${RM} -f ${PREFIX}/bin/${BINNAME}
 	${LN} -sf ${PKGNAME} ${PREFIX}/bin/${BINNAME}
 
-.if (${MACHINE_ARCH} == "sparc")
+.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc"
 	# Bizarre magic to handle the NIS and DNS versions. Make DNS default.
 	@${SED} -e 's#MOZILLA_HOME/netscape#MOZILLA_HOME/netscape_nis#g' \
 	    <${WRKDIR}/${BINNAME}.sh >${WRKDIR}/${BINNAME}_nis.sh
@@ -96,8 +102,8 @@ do-install:
 	${MV} ${MOZILLA_HOME}/netscape_dns ${MOZILLA_HOME}/netscape
 .endif
 
-	${SED} -e ${NS_PLIST_SED} ${PKGDIR}/PLIST.${MACHINE_ARCH} \
-	    >>${PLIST_SRC}
+	${SED} -e ${NS_PLIST_SED} \
+		${PKGDIR}/PLIST.${LOWER_OPSYS}-${MACHINE_ARCH} >>${PLIST_SRC}
 
 	${CHOWN} -R 0:0 ${MOZILLA_HOME}
 	${CHMOD} -R go-w ${MOZILLA_HOME}
diff --git a/www/navigator/files/md5 b/www/navigator/files/md5
index e07699547f8..6d00e13cab9 100644
--- a/www/navigator/files/md5
+++ b/www/navigator/files/md5
@@ -1,6 +1,7 @@
-$NetBSD: md5,v 1.7 1999/06/21 08:45:05 jlam Exp $
+$NetBSD: md5,v 1.8 1999/08/13 21:24:11 abs Exp $
 
 MD5 (navigator-v461-export.alpha-dec-osf4.0.tar.gz) = c044e2d82b043254de019875ca0ce91d
+MD5 (navigator-v461-export.sparc-sun-solaris2.5.1.tar.gz) = 14405703ab2c25354b77516eef52fe21
 MD5 (navigator-v461-export.sparc-sun-sunos4.1.3_U1.tar.gz) = a1bc10d5dfce9f36ddae55930d683b6d
 MD5 (navigator-v461-export.x86-unknown-linuxglibc2.0.tar.gz) = 420a7618848a884e7b408a80fe283b80
 MD5 (navigator-v461-us.alpha-dec-osf4.0.tar.gz) = 043592386899a96a94c3530c32488660
diff --git a/www/navigator/pkg/PLIST.alpha b/www/navigator/pkg/PLIST.alpha
deleted file mode 100644
index 53b448cf3e7..00000000000
--- a/www/navigator/pkg/PLIST.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.alpha,v 1.1 1999/06/14 21:43:39 cgd Exp $
-lib/netscape/navigator-${NS_VERS}/plugins/libnullplugin.so
diff --git a/www/navigator/pkg/PLIST.netbsd-alpha b/www/navigator/pkg/PLIST.netbsd-alpha
new file mode 100644
index 00000000000..a17ee1e6b25
--- /dev/null
+++ b/www/navigator/pkg/PLIST.netbsd-alpha
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.netbsd-alpha,v 1.1 1999/08/13 21:24:12 abs Exp $
+lib/netscape/navigator-${NS_VERS}/plugins/libnullplugin.so
diff --git a/www/navigator/pkg/PLIST.i386 b/www/navigator/pkg/PLIST.netbsd-i386
index 5a11c4e389e..cfb744547b7 100644
--- a/www/navigator/pkg/PLIST.i386
+++ b/www/navigator/pkg/PLIST.netbsd-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.i386,v 1.2 1999/06/14 21:40:05 cgd Exp $
+@comment $NetBSD: PLIST.netbsd-i386,v 1.1 1999/08/13 21:24:12 abs Exp $
 lib/netscape/navigator-${NS_VERS}/dynfonts/libTrueDoc.so
 lib/netscape/navigator-${NS_VERS}/plugins/libnullplugin.so
 lib/netscape/navigator-${NS_VERS}/netscape-dynMotif
diff --git a/www/navigator/pkg/PLIST.sparc b/www/navigator/pkg/PLIST.netbsd-sparc
index 1fb9ea1325a..79c3de0a35c 100644
--- a/www/navigator/pkg/PLIST.sparc
+++ b/www/navigator/pkg/PLIST.netbsd-sparc
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.sparc,v 1.5 1999/06/14 21:40:05 cgd Exp $
+@comment $NetBSD: PLIST.netbsd-sparc,v 1.1 1999/08/13 21:24:12 abs Exp $
 lib/netscape/navigator-${NS_VERS}/netscape_nis
 lib/netscape/navigator-${NS_VERS}/dynfonts/libTrueDoc.so
 lib/netscape/navigator-${NS_VERS}/plugins/libnullplugin.so
diff --git a/www/navigator/pkg/PLIST.solaris-sparc b/www/navigator/pkg/PLIST.solaris-sparc
new file mode 100644
index 00000000000..90efc3dba0a
--- /dev/null
+++ b/www/navigator/pkg/PLIST.solaris-sparc
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST.solaris-sparc,v 1.1 1999/08/13 21:24:12 abs Exp $
+lib/netscape/navigator-${NS_VERS}/dynfonts/libTrueDoc.so
+lib/netscape/navigator-${NS_VERS}/plugins/libnullplugin.so
+lib/netscape/navigator-${NS_VERS}/talkback/master.ini
+@dirrm lib/netscape/navigator-${NS_VERS}/dynfonts
+@dirrm lib/netscape/navigator-${NS_VERS}/talkback
+