From 86e509e85314625f5b352a13ed3bb4ded2f8da77 Mon Sep 17 00:00:00 2001
From: Joseph Koshy <jkoshy@FreeBSD.org>
Date: Fri, 31 Dec 2004 07:51:03 +0000
Subject: [PATCH] Use "install.sh" during build and also during install as done
 in lang/sml-nj-devel to resolve PR 40866.

Submitted by:	Johannes 5 Joemann <joemann@beefree.free.de>
---
 lang/sml-nj/Makefile       |  9 +++++++--
 lang/sml-nj/files/patch-ab | 17 +++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/lang/sml-nj/Makefile b/lang/sml-nj/Makefile
index 806a301a9066..493e01b4d41d 100644
--- a/lang/sml-nj/Makefile
+++ b/lang/sml-nj/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	110.0.7
 PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.research.bell-labs.com/dist/smlnj/release/110.0.7/ \
-		ftp://rodin.stanford.edu/pub/smlnj/release/110.0.7/ \
-		ftp://ftp.ntua.gr//pub/lang/smlnj/release/110.0.7/ \
+		http://smlnj.cs.uchicago.edu/dist/release/110.0.7/ \
+		ftp://flint.cs.yale.edu/pub/smlnj/release/110.0.7/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=	bin.x86-unix.tar.Z cm.tar.Z cml.tar.Z \
@@ -76,6 +76,11 @@ do-install:
 		${SED} -e "s,${WRKDIR},${SML_BASE}," < $$file > \
 			${SML_LIBDIR}/`${BASENAME} $$file`; \
 	done
+	# do a minimal re-"install" to fix autoloading problems
+	# as reported in PR ports/40866
+	${CP} -pr ${WRKDIR}/config ${SML_BASE}
+	cd ${SML_BASE} && config/install.sh
+	${RM} -rf ${SML_BASE}/config
 	@${CHOWN} -R ${BINOWN}:${BINGRP} ${SML_BINDIR}
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SML_SRCDIR}
 .for file in ${SML_EXES}
diff --git a/lang/sml-nj/files/patch-ab b/lang/sml-nj/files/patch-ab
index 0329e1b1a454..098fdcb823ff 100644
--- a/lang/sml-nj/files/patch-ab
+++ b/lang/sml-nj/files/patch-ab
@@ -1,9 +1,17 @@
---- config/install.sh.orig	Fri Oct 20 16:02:25 2000
-+++ config/install.sh	Tue Mar 11 22:30:59 2003
-@@ -155,6 +155,26 @@
+--- config/install.sh.orig	Fri Oct 20 18:02:25 2000
++++ config/install.sh	Tue Dec 21 06:22:34 2004
+@@ -151,11 +151,34 @@
+ #
+ # build the run-time system
+ #
++if [ -x $RUNDIR/run.$ARCH-$OPSYS ]; then
++  echo "$RUNDIR/run.$ARCH-$OPSYS already exists"
++else
+ $CONFIGDIR/unpack.sh "run-time" $SRCDIR runtime $ROOT/runtime.tar
  if [ "$?" != "0" ]; then
    exit $?
  fi
+-if [ ! -x $RUNDIR/run.$ARCH-$OPSYS ]; then
 +# we need to patch just before build
 +echo "applying source patches"
 +patch_file="${FILESDIR}/extra-patch-cpp"
@@ -24,6 +32,7 @@
 +		$PATCH $PATCH_ARGS < $patch_file
 +	fi
 +fi
- if [ ! -x $RUNDIR/run.$ARCH-$OPSYS ]; then
++#if [ ! -x $RUNDIR/run.$ARCH-$OPSYS ]; then
    cd $SRCDIR/runtime/objs
    echo "compiling the run-time system"
+   $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS