Make this package compile on Solaris/sparc.

3 files changed, 83 insertions, 69 deletions

diff --git a/lang/sml-nj/Makefile b/lang/sml-nj/Makefile
index 8e21442a9c3..0796f016d34 100644
--- a/lang/sml-nj/Makefile
+++ b/lang/sml-nj/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.2 1999/12/08 15:52:59 proff Exp $
+# $NetBSD: Makefile,v 1.3 1999/12/09 16:35:18 agc Exp $
 # FreeBSD Id: ports/lang/sml-nj/Makefile,v 1.9 1999/08/25 06:35:27 obrien Exp
 
-DISTNAME=	${SML_VERSION}-bin.x86-unix
+DISTNAME=	${SML_VERSION}-bin.${BOX}-unix
 PKGNAME=	smlnj-${SML_VERSION}
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${SML_VERSION}/ \
 		ftp://ftp.diku.dk/pub/smlnj/working/${SML_VERSION}/ \
 		ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/smlnj/working/${SML_VERSION}/ \
 		ftp://compiler.kaist.ac.kr/pub/sml/working/${SML_VERSION}/
-DISTFILES=	${SML_VERSION}-bin.x86-unix.tar.Z ${SML_VERSION}-cm.tar.Z ${SML_VERSION}-cml.tar.Z \
+DISTFILES=	${SML_VERSION}-bin.${BOX}-unix.tar.Z ${SML_VERSION}-cm.tar.Z ${SML_VERSION}-cml.tar.Z \
 		${SML_VERSION}-config.tar.Z ${SML_VERSION}-eXene.tar.Z \
 		${SML_VERSION}-ml-burg.tar.Z ${SML_VERSION}-ml-lex.tar.Z ${SML_VERSION}-ml-yacc.tar.Z \
 		${SML_VERSION}-runtime.tar.Z ${SML_VERSION}-smlnj-c.tar.Z \
@@ -20,9 +20,9 @@ HOMEPAGE=	http://cm.bell-labs.com/cm/cs/what/smlnj/index.html
 SML_VERSION=	110.9.1
 
 # sml-nj also supports hppa, sparc, ppc, mlrisc & alpha
-# pkg support for those platforms, and say, solarix-x86
+# pkg support for those platforms, and say, solaris-x86
 # is left as an (easy) exercise for the reader.
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
+ONLY_FOR_PLATFORM=	NetBSD-*-i386 SunOS-*-sparc
 
 # Other mirror sites that generally carry only released versions of SML
 # 	ftp://rodin.stanford.edu/pub/smlnj/release/
@@ -42,6 +42,18 @@ SML_BINDIR=	${SML_BASE}/bin
 SML_SRCDIR=	${SML_BASE}/src
 SML_EXES=	ml-burg ml-lex ml-yacc sml
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
+BOX=		sparc
+OS=		${LOWER_OPSYS}
+.elif ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
+BOX=		x86
+OS=		bsd
+.endif
+
+PLIST_SUBST+=	BOX=${BOX} OS=${OS}
+
 # make symlinks to the dist files
 post-extract:
 	cd ${WRKDIR} && ${LN} -sf ${_DISTDIR}/*  .
@@ -62,20 +74,21 @@ do-build:
 # 7. install links to executables in $PREFIX/bin
 do-install:
 	${MKDIR} ${SML_BASE} ${SML_BINDIR} ${SML_LIBDIR}
-	tar -C ${WRKDIR} -cf - bin | tar -C ${SML_BASE} -xf -
+	${GTAR} -C ${WRKDIR} -cf - bin | ${GTAR} -C ${SML_BASE} -xf -
 	${RM} -f ${SML_BINDIR}/.run-sml
 	${SED} -e "s,^BIN_DIR=.*\$$,BIN_DIR=${SML_BINDIR}," \
 		< ${WRKDIR}/bin/.run-sml > ${SML_BINDIR}/.run-sml
 	${CHMOD} 755 ${SML_BINDIR}/.run-sml
-	cd ${WRKDIR} && tar -cf - `find . -name '*.stable' | ${GREP} CM` | \
-		tar -C ${SML_BASE} -xf -
-	cd ${WRKDIR} && tar -cf - `${SCRIPTDIR}/get-cm ${WRKDIR}` | \
-		tar -C ${SML_BASE} -xf -
+	cd ${WRKDIR} && ${GTAR} -cf - `find . -name '*.stable' | ${GREP} CM` | \
+		${GTAR} -C ${SML_BASE} -xf -
+	cd ${WRKDIR} && ${GTAR} -cf - `${SCRIPTDIR}/get-cm ${WRKDIR}` | \
+		${GTAR} -C ${SML_BASE} -xf -
 	for file in ${WRKDIR}/lib/*; do\
 		${SED} -e "s,${WRKDIR},${SML_BASE}," < $$file > \
 			${SML_LIBDIR}/`${BASENAME} $$file`; \
 	done
 .for file in ${SML_EXES}
+	-${RM} -f ${PREFIX}/bin/${file}
 	-${LN} -s ${SML_BINDIR}/${file} ${PREFIX}/bin/${file}
 .endfor
 
diff --git a/lang/sml-nj/files/md5 b/lang/sml-nj/files/md5
index e1ae7c0a2c8..1663d153140 100644
--- a/lang/sml-nj/files/md5
+++ b/lang/sml-nj/files/md5
@@ -1,5 +1,6 @@
-$NetBSD: md5,v 1.2 1999/12/08 15:52:59 proff Exp $
+$NetBSD: md5,v 1.3 1999/12/09 16:35:19 agc Exp $
 
+MD5 (sml-nj/110.9.1-bin.sparc-unix.tar.Z) = 313c8c3cd2c58c160253686c78e84dcd
 MD5 (sml-nj/110.9.1-bin.x86-unix.tar.Z) = a8d2a792ef392a0ddd8ece325fd4b892
 MD5 (sml-nj/110.9.1-cm.tar.Z) = ee3987dbee99b5f0b59cb09c1a956a0d
 MD5 (sml-nj/110.9.1-cml.tar.Z) = 8c33edee5e75fd18600ef9f0b5b253ae
diff --git a/lang/sml-nj/pkg/PLIST b/lang/sml-nj/pkg/PLIST
index 777b9da8ad0..230958086c5 100644
--- a/lang/sml-nj/pkg/PLIST
+++ b/lang/sml-nj/pkg/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 1999/12/08 15:52:59 proff Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/12/09 16:35:20 agc Exp $
 bin/ml-burg
 bin/ml-lex
 bin/ml-yacc
 bin/sml
-lib/sml-nj/bin/.heap/sml.x86-bsd
-lib/sml-nj/bin/.heap/ml-yacc.x86-bsd
-lib/sml-nj/bin/.heap/ml-lex.x86-bsd
-lib/sml-nj/bin/.heap/ml-burg.x86-bsd
-lib/sml-nj/bin/.run/run.x86-netbsd
+lib/sml-nj/bin/.heap/sml.${BOX}-${OS}
+lib/sml-nj/bin/.heap/ml-yacc.${BOX}-${OS}
+lib/sml-nj/bin/.heap/ml-lex.${BOX}-${OS}
+lib/sml-nj/bin/.heap/ml-burg.${BOX}-${OS}
+lib/sml-nj/bin/.run/run.${BOX}-netbsd
 lib/sml-nj/bin/.arch-n-opsys
 lib/sml-nj/bin/.run-sml
 lib/sml-nj/bin/ml-burg
@@ -24,138 +24,138 @@ lib/sml-nj/lib/reactive-lib.cm
 lib/sml-nj/lib/regexp-lib.cm
 lib/sml-nj/lib/smlnj-lib.cm
 lib/sml-nj/lib/unix-lib.cm
-lib/sml-nj/src/ml-yacc/lib/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/ml-yacc/lib/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/ml-yacc/lib/sources.cm
-lib/sml-nj/src/smlnj-lib/HTML/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/smlnj-lib/HTML/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/smlnj-lib/HTML/sources.cm
-lib/sml-nj/src/smlnj-lib/PP/devices/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/smlnj-lib/PP/devices/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/smlnj-lib/PP/devices/sources.cm
-lib/sml-nj/src/smlnj-lib/PP/src/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/smlnj-lib/PP/src/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/smlnj-lib/PP/src/sources.cm
-lib/sml-nj/src/smlnj-lib/PP/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/smlnj-lib/PP/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/smlnj-lib/PP/sources.cm
-lib/sml-nj/src/smlnj-lib/Reactive/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/smlnj-lib/Reactive/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/smlnj-lib/Reactive/sources.cm
-lib/sml-nj/src/smlnj-lib/RegExp/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/smlnj-lib/RegExp/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/smlnj-lib/RegExp/sources.cm
-lib/sml-nj/src/smlnj-lib/Unix/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/smlnj-lib/Unix/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/smlnj-lib/Unix/sources.cm
-lib/sml-nj/src/smlnj-lib/Util/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/smlnj-lib/Util/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/smlnj-lib/Util/sources.cm
-lib/sml-nj/src/cml/cml-lib/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/cml/cml-lib/CM/x86-unix/trace-cml.cm.stable
+lib/sml-nj/src/cml/cml-lib/CM/${BOX}-unix/sources.cm.stable
+lib/sml-nj/src/cml/cml-lib/CM/${BOX}-unix/trace-cml.cm.stable
 lib/sml-nj/src/cml/cml-lib/sources.cm
 lib/sml-nj/src/cml/cml-lib/trace-cml.cm
-lib/sml-nj/src/cml/src/IO/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/cml/src/IO/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/cml/src/IO/sources.cm
-lib/sml-nj/src/cml/src/OS/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/cml/src/OS/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/cml/src/OS/sources.cm
-lib/sml-nj/src/cml/src/Sockets/CM/x86-unix/layer2.cm.stable
-lib/sml-nj/src/cml/src/Sockets/CM/x86-unix/layer3.cm.stable
-lib/sml-nj/src/cml/src/Sockets/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/Sockets/CM/x86-unix/layer1.cm.stable
+lib/sml-nj/src/cml/src/Sockets/CM/${BOX}-unix/layer2.cm.stable
+lib/sml-nj/src/cml/src/Sockets/CM/${BOX}-unix/layer3.cm.stable
+lib/sml-nj/src/cml/src/Sockets/CM/${BOX}-unix/sources.cm.stable
+lib/sml-nj/src/cml/src/Sockets/CM/${BOX}-unix/layer1.cm.stable
 lib/sml-nj/src/cml/src/Sockets/layer1.cm
 lib/sml-nj/src/cml/src/Sockets/layer2.cm
 lib/sml-nj/src/cml/src/Sockets/layer3.cm
 lib/sml-nj/src/cml/src/Sockets/sources.cm
-lib/sml-nj/src/cml/src/Unix/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/Unix/CM/x86-unix/os.cm.stable
+lib/sml-nj/src/cml/src/Unix/CM/${BOX}-unix/sources.cm.stable
+lib/sml-nj/src/cml/src/Unix/CM/${BOX}-unix/os.cm.stable
 lib/sml-nj/src/cml/src/Unix/os.cm
 lib/sml-nj/src/cml/src/Unix/sources.cm
-lib/sml-nj/src/cml/src/core-cml/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/cml/src/core-cml/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/cml/src/core-cml/sources.cm
-lib/sml-nj/src/cml/src/glue/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/cml/src/glue/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/cml/src/glue/sources.cm
-lib/sml-nj/src/cml/src/util/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/cml/src/util/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/cml/src/util/sources.cm
-lib/sml-nj/src/cml/src/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/cml/src/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/cml/src/sources.cm
-lib/sml-nj/src/eXene/graph-util/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/eXene/graph-util/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/eXene/graph-util/sources.cm
-lib/sml-nj/src/eXene/lib/CM/x86-unix/base.cm.stable
-lib/sml-nj/src/eXene/lib/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/eXene/lib/CM/${BOX}-unix/base.cm.stable
+lib/sml-nj/src/eXene/lib/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/eXene/lib/base.cm
 lib/sml-nj/src/eXene/lib/sources.cm
-lib/sml-nj/src/eXene/styles/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/eXene/styles/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/eXene/styles/sources.cm
-lib/sml-nj/src/eXene/widgets/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/eXene/widgets/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/eXene/widgets/sources.cm
-lib/sml-nj/src/eXene/CM/x86-unix/sources.cm.stable
+lib/sml-nj/src/eXene/CM/${BOX}-unix/sources.cm.stable
 lib/sml-nj/src/eXene/sources.cm
 @dirrm lib/sml-nj/bin/.heap
 @dirrm lib/sml-nj/bin/.run
 @dirrm lib/sml-nj/bin
 @dirrm lib/sml-nj/lib
-@dirrm lib/sml-nj/src/ml-yacc/lib/CM/x86-unix
+@dirrm lib/sml-nj/src/ml-yacc/lib/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/ml-yacc/lib/CM
 @dirrm lib/sml-nj/src/ml-yacc/lib
 @dirrm lib/sml-nj/src/ml-yacc
-@dirrm lib/sml-nj/src/smlnj-lib/HTML/CM/x86-unix
+@dirrm lib/sml-nj/src/smlnj-lib/HTML/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/smlnj-lib/HTML/CM
 @dirrm lib/sml-nj/src/smlnj-lib/HTML
-@dirrm lib/sml-nj/src/smlnj-lib/PP/devices/CM/x86-unix
+@dirrm lib/sml-nj/src/smlnj-lib/PP/devices/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/smlnj-lib/PP/devices/CM
 @dirrm lib/sml-nj/src/smlnj-lib/PP/devices
-@dirrm lib/sml-nj/src/smlnj-lib/PP/src/CM/x86-unix
+@dirrm lib/sml-nj/src/smlnj-lib/PP/src/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/smlnj-lib/PP/src/CM
 @dirrm lib/sml-nj/src/smlnj-lib/PP/src
-@dirrm lib/sml-nj/src/smlnj-lib/PP/CM/x86-unix
+@dirrm lib/sml-nj/src/smlnj-lib/PP/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/smlnj-lib/PP/CM
 @dirrm lib/sml-nj/src/smlnj-lib/PP
-@dirrm lib/sml-nj/src/smlnj-lib/Reactive/CM/x86-unix
+@dirrm lib/sml-nj/src/smlnj-lib/Reactive/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/smlnj-lib/Reactive/CM
 @dirrm lib/sml-nj/src/smlnj-lib/Reactive
-@dirrm lib/sml-nj/src/smlnj-lib/RegExp/CM/x86-unix
+@dirrm lib/sml-nj/src/smlnj-lib/RegExp/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/smlnj-lib/RegExp/CM
 @dirrm lib/sml-nj/src/smlnj-lib/RegExp
-@dirrm lib/sml-nj/src/smlnj-lib/Unix/CM/x86-unix
+@dirrm lib/sml-nj/src/smlnj-lib/Unix/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/smlnj-lib/Unix/CM
 @dirrm lib/sml-nj/src/smlnj-lib/Unix
-@dirrm lib/sml-nj/src/smlnj-lib/Util/CM/x86-unix
+@dirrm lib/sml-nj/src/smlnj-lib/Util/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/smlnj-lib/Util/CM
 @dirrm lib/sml-nj/src/smlnj-lib/Util
 @dirrm lib/sml-nj/src/smlnj-lib
-@dirrm lib/sml-nj/src/cml/cml-lib/CM/x86-unix
+@dirrm lib/sml-nj/src/cml/cml-lib/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/cml/cml-lib/CM
 @dirrm lib/sml-nj/src/cml/cml-lib
-@dirrm lib/sml-nj/src/cml/src/IO/CM/x86-unix
+@dirrm lib/sml-nj/src/cml/src/IO/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/cml/src/IO/CM
 @dirrm lib/sml-nj/src/cml/src/IO
-@dirrm lib/sml-nj/src/cml/src/OS/CM/x86-unix
+@dirrm lib/sml-nj/src/cml/src/OS/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/cml/src/OS/CM
 @dirrm lib/sml-nj/src/cml/src/OS
-@dirrm lib/sml-nj/src/cml/src/Sockets/CM/x86-unix
+@dirrm lib/sml-nj/src/cml/src/Sockets/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/cml/src/Sockets/CM
 @dirrm lib/sml-nj/src/cml/src/Sockets
-@dirrm lib/sml-nj/src/cml/src/Unix/CM/x86-unix
+@dirrm lib/sml-nj/src/cml/src/Unix/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/cml/src/Unix/CM
 @dirrm lib/sml-nj/src/cml/src/Unix
-@dirrm lib/sml-nj/src/cml/src/core-cml/CM/x86-unix
+@dirrm lib/sml-nj/src/cml/src/core-cml/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/cml/src/core-cml/CM
 @dirrm lib/sml-nj/src/cml/src/core-cml
-@dirrm lib/sml-nj/src/cml/src/glue/CM/x86-unix
+@dirrm lib/sml-nj/src/cml/src/glue/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/cml/src/glue/CM
 @dirrm lib/sml-nj/src/cml/src/glue
-@dirrm lib/sml-nj/src/cml/src/util/CM/x86-unix
+@dirrm lib/sml-nj/src/cml/src/util/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/cml/src/util/CM
 @dirrm lib/sml-nj/src/cml/src/util
-@dirrm lib/sml-nj/src/cml/src/CM/x86-unix
+@dirrm lib/sml-nj/src/cml/src/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/cml/src/CM
 @dirrm lib/sml-nj/src/cml/src
 @dirrm lib/sml-nj/src/cml
-@dirrm lib/sml-nj/src/eXene/graph-util/CM/x86-unix
+@dirrm lib/sml-nj/src/eXene/graph-util/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/eXene/graph-util/CM
 @dirrm lib/sml-nj/src/eXene/graph-util
-@dirrm lib/sml-nj/src/eXene/lib/CM/x86-unix
+@dirrm lib/sml-nj/src/eXene/lib/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/eXene/lib/CM
 @dirrm lib/sml-nj/src/eXene/lib
-@dirrm lib/sml-nj/src/eXene/styles/CM/x86-unix
+@dirrm lib/sml-nj/src/eXene/styles/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/eXene/styles/CM
 @dirrm lib/sml-nj/src/eXene/styles
-@dirrm lib/sml-nj/src/eXene/widgets/CM/x86-unix
+@dirrm lib/sml-nj/src/eXene/widgets/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/eXene/widgets/CM
 @dirrm lib/sml-nj/src/eXene/widgets
-@dirrm lib/sml-nj/src/eXene/CM/x86-unix
+@dirrm lib/sml-nj/src/eXene/CM/${BOX}-unix
 @dirrm lib/sml-nj/src/eXene/CM
 @dirrm lib/sml-nj/src/eXene
 @dirrm lib/sml-nj/src