Update to SML/NJ 110.71.

Numerous changes since version 110.42 include AMD64 support and loads of bug fixes,
detailed list of changes is at http://www.smlnj.org/dist/working/110.71/NOTES/HISTORY

1 files changed, 15 insertions, 20 deletions

diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
index 7698d04fff5..160033c8447 100644
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2008/05/26 02:13:21 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2009/09/22 14:48:47 asau Exp $
 #
 
 DISTNAME=	boot.${BOX}-unix
 PKGNAME=	smlnj-${SML_VERSION}
-PKGREVISION=	3
 CATEGORIES=	lang
-MASTER_SITES=	ftp://flint.cs.yale.edu/pub/smlnj/working/${SML_VERSION}/ \
-		http://smlnj.cs.uchicago.edu/dist/working/${SML_VERSION}/ \
-		ftp://flint.cs.yale.edu/pub/smlnj/working/${SML_VERSION}/
+MASTER_SITES=	http://smlnj.cs.uchicago.edu/dist/working/${SML_VERSION}/
 DISTFILES=	MLRISC.tgz			\
 		boot.${BOX}-unix.tgz		\
 		ckit.tgz			\
@@ -18,8 +15,7 @@ DISTFILES=	MLRISC.tgz			\
 		eXene.tgz			\
 		ml-burg.tgz			\
 		ml-lex.tgz			\
-		ml-nlffi-lib.tgz		\
-		ml-nlffigen.tgz			\
+		nlffi.tgz			\
 		ml-yacc.tgz			\
 		runtime.tgz			\
 		smlnj-lib.tgz			\
@@ -29,14 +25,12 @@ MAINTAINER=	richards+netbsd@CS.Princeton.EDU
 HOMEPAGE=	http://www.smlnj.org/index.html
 COMMENT=	Popular functional language from Bell Labs
 
-SML_VERSION=	110.42
+SML_VERSION=	110.71
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 # 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/
 
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	smlnj-${SML_VERSION}
@@ -52,20 +46,18 @@ SML_SCRIPTS=	_link-sml _run-sml _ml-build _ml-makedepend
 
 .include "../../lang/smlnj/Makefile.common"
 
-INSTALLATION_DIRS+=	bin
-
 # create parent directory for the runtime system
 pre-extract:
 	${MKDIR} ${WRKDIR}/src || ${TRUE}
 
 # make it easier to patch the runtime system
 do-extract:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	extract_file="${_DISTDIR}/config.tgz"; export extract_file;	\
+	${RUN} extract_file="${_DISTDIR}/config.tgz"; export extract_file;	\
 		cd ${WRKDIR}; ${EXTRACT_CMD}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	extract_file="${_DISTDIR}/runtime.tgz"; export extract_file;	\
+	${RUN} extract_file="${_DISTDIR}/runtime.tgz"; export extract_file;	\
 		cd ${WRKDIR}/src; ${EXTRACT_CMD}
+	${RUN} extract_file="${_DISTDIR}/runtime.tgz"; export extract_file;	\
+		mkdir ${WRKDIR}/base; cd ${WRKDIR}/base; ${EXTRACT_CMD}
 
 # make symlinks to the dist files
 post-extract:
@@ -73,7 +65,12 @@ post-extract:
 
 # resolve definition of SML_BASE, CFLAGS in patched files
 do-configure:
-	${CPP} ${FILESDIR}/targets > ${WRKSRC}/config/targets.customized
+	if [ ${MACHINE_ARCH} = "powerpc" ]; then		\
+		${AWK} '(! /^request nlffi$$/) { print }' \
+		< ${WRKDIR}/config/targets			\
+		> ${WRKDIR}/temp;				\
+		${MV} ${WRKDIR}/temp ${WRKDIR}/config/targets;	\
+	fi
 	cd ${WRKDIR}/config;				\
 	for f in ${SML_SCRIPTS}; do			\
 		${CP} "$${f}" "$${f}.tmp";		\
@@ -93,14 +90,12 @@ do-build:
 	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
 		SMLNJ_HOME="${WRKDIR}" ./config/install.sh
 
-post-build:
-	chmod -R go-w ${WRKSRC}
-
 # install target
 # (see ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.38/INSTALL)
 # 1. create installation directories
 # 2. copy the ./bin and ./lib directories across
 # 3. install links to executables in $PREFIX/bin
+INSTALLATION_DIRS=	bin
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${SML_BASE}
 	cd ${WRKDIR} && pax -rw -pam bin lib ${DESTDIR}${SML_BASE}