changes for NetBSD

5 files changed, 42 insertions, 36 deletions

diff --git a/lang/sml-nj/Makefile b/lang/sml-nj/Makefile
index 08f2263442e..8e21442a9c3 100644
--- a/lang/sml-nj/Makefile
+++ b/lang/sml-nj/Makefile
@@ -1,43 +1,46 @@
-# New ports collection makefile for: sml/nj
-# Version required:    110
-# Date created:        7 July 1998
-# Whom:                jkoshy
-#
-# $FreeBSD: ports/lang/sml-nj/Makefile,v 1.9 1999/08/25 06:35:27 obrien Exp $
-#
+# $NetBSD: Makefile,v 1.2 1999/12/08 15:52:59 proff Exp $
+# FreeBSD Id: ports/lang/sml-nj/Makefile,v 1.9 1999/08/25 06:35:27 obrien Exp
 
-DISTNAME=     110.9.1-bin.x86-unix
-PKGNAME=      smlnj-110.9.1
-CATEGORIES=   lang
-MASTER_SITES= ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.9.1/ \
-	      ftp://ftp.diku.dk/pub/smlnj/working/110.9.1/ \
-	      ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/smlnj/working/110.9.1/ \
-	      ftp://compiler.kaist.ac.kr/pub/sml/working/110.9.1/
-DISTFILES=    110.9.1-bin.x86-unix.tar.Z 110.9.1-cm.tar.Z 110.9.1-cml.tar.Z \
-	      110.9.1-config.tar.Z 110.9.1-eXene.tar.Z \
-	      110.9.1-ml-burg.tar.Z 110.9.1-ml-lex.tar.Z 110.9.1-ml-yacc.tar.Z \
-	      110.9.1-runtime.tar.Z 110.9.1-smlnj-c.tar.Z \
-	      110.9.1-smlnj-lib.tar.Z
+DISTNAME=	${SML_VERSION}-bin.x86-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 \
+		${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 \
+		${SML_VERSION}-smlnj-lib.tar.Z
 
-MAINTAINER=   jkoshy@freebsd.org
+MAINTAINER=	packages@netbsd.org
+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
+# is left as an (easy) exercise for the reader.
+ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 # Other mirror sites that generally carry only released versions of SML
 # 	ftp://rodin.stanford.edu/pub/smlnj/release/
 # 	ftp://ftp.cl.cam.ac.uk/MIRRORED/smlnj/release/
 # 	ftp://ftp.ntua.gr/pub/lang/smlnj/release/
 # Mirror sites that keep files around in gzipped format
-# 	ftp://flint.cs.yale.edu/pub/smlnj/working/110.9.1/
+# 	ftp://flint.cs.yale.edu/pub/smlnj/working/${SML_VERSION}/
 
-DIST_SUBDIR=  sml-nj
-NO_WRKSUBDIR= yes
-EXTRACT_ONLY= 110.9.1-config.tar.Z
-USE_GMAKE=    yes
+DIST_SUBDIR=	sml-nj
+NO_WRKSUBDIR=	yes
+EXTRACT_ONLY=	${SML_VERSION}-config.tar.Z
+USE_GMAKE=	yes
 
-SML_BASE=     ${PREFIX}/lib/sml-nj
-SML_LIBDIR=   ${SML_BASE}/lib
-SML_BINDIR=   ${SML_BASE}/bin
-SML_SRCDIR=   ${SML_BASE}/src
-SML_EXES=     ml-burg ml-lex ml-yacc sml
+SML_BASE=	${PREFIX}/lib/sml-nj
+SML_LIBDIR=	${SML_BASE}/lib
+SML_BINDIR=	${SML_BASE}/bin
+SML_SRCDIR=	${SML_BASE}/src
+SML_EXES=	ml-burg ml-lex ml-yacc sml
 
 # make symlinks to the dist files
 post-extract:
@@ -76,4 +79,4 @@ do-install:
 	-${LN} -s ${SML_BINDIR}/${file} ${PREFIX}/bin/${file}
 .endfor
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/sml-nj/files/md5 b/lang/sml-nj/files/md5
index 7b0f4172554..e1ae7c0a2c8 100644
--- a/lang/sml-nj/files/md5
+++ b/lang/sml-nj/files/md5
@@ -1,3 +1,5 @@
+$NetBSD: md5,v 1.2 1999/12/08 15:52:59 proff Exp $
+
 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/patches/patch-ab b/lang/sml-nj/patches/patch-ab
index 122da2bf99a..d2bef7a4baa 100644
--- a/lang/sml-nj/patches/patch-ab
+++ b/lang/sml-nj/patches/patch-ab
@@ -1,3 +1,5 @@
+$NetBSD: patch-ab,v 1.2 1999/12/08 15:52:59 proff Exp $
+
 --- config/install.sh.orig	Wed Aug  5 13:43:43 1998
 +++ config/install.sh	Tue Feb  2 12:57:13 1999
 @@ -181,6 +181,12 @@
diff --git a/lang/sml-nj/pkg/DESCR b/lang/sml-nj/pkg/DESCR
index 4d44ff2f2c0..91299a90439 100644
--- a/lang/sml-nj/pkg/DESCR
+++ b/lang/sml-nj/pkg/DESCR
@@ -1,10 +1,8 @@
 A Standard ML implementation from Bell-Labs.  Implements the SML '97 definition
 including the new Basis library with a few minor omissions and discrepancies.
 
-WWW:    http://cm.bell-labs.com/cm/cs/what/smlnj/index.html
-
 If you are interested in a lighter weight implementation of ML, 
 the Moscow-ML port is recommended.
 
-- Joseph Koshy
-  <jkoshy@freebsd.org>
+- Joseph Koshy  <jkoshy@freebsd.org>
+- Julian Assange <proff@iq.org>
diff --git a/lang/sml-nj/pkg/PLIST b/lang/sml-nj/pkg/PLIST
index 6fec3f1eab4..777b9da8ad0 100644
--- a/lang/sml-nj/pkg/PLIST
+++ b/lang/sml-nj/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 1999/12/08 15:52:59 proff Exp $
 bin/ml-burg
 bin/ml-lex
 bin/ml-yacc
@@ -6,7 +7,7 @@ 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-freebsd
+lib/sml-nj/bin/.run/run.x86-netbsd
 lib/sml-nj/bin/.arch-n-opsys
 lib/sml-nj/bin/.run-sml
 lib/sml-nj/bin/ml-burg