- Unbreak for 5-CURRENT

- calm processor warnings for assembler code on 5-CURRENT
- mark the Alpha as currently unsupported
- update WWW: link.

Submitted by:	Johannes 5 Joemann <joemann@beefree.free.de> [MAINTAINER]

5 files changed, 69 insertions, 12 deletions

diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile
index 61e56177a270..da334e8de634 100644
--- a/lang/sml-nj-devel/Makefile
+++ b/lang/sml-nj-devel/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES=	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PORTVERSION}
 DISTFILES=	config.tgz runtime.tgz
 .if (${MACHINE_ARCH} == "i386")
 DISTFILES+=	boot.x86-unix.tgz
-.elif (${MACHINE_ARCH} == "alpha")
-DISTFILES+=	boot.alpha32-unix.tgz
+#.elif (${MACHINE_ARCH} == "alpha")
+#DISTFILES+=	boot.alpha32-unix.tgz
 .endif
 DISTFILES+=	ml-yacc.tgz ml-lex.tgz smlnj-lib.tgz cml.tgz
 .if defined(WITH_EVERYTHING) || defined(WITH_RECOMPILE) || defined(WITH_FLINT)
@@ -35,12 +35,14 @@ USE_GMAKE=	yes
 
 NO_LATEST_LINK=	yes
 
+ONLY_FOR_ARCHS=	i386
+
 .if (${MACHINE_ARCH} == "i386")
 MLARCH=		x86
-.elif (${MACHINE_ARCH} == "alpha")
-MLARCH=		alpha32
-.else
-BROKEN=		not ported to ${MACHINE_ARCH}
+#.elif (${MACHINE_ARCH} == "alpha")
+#MLARCH=		alpha32
+#.else
+#BROKEN=		not ported to ${MACHINE_ARCH}
 .endif
 
 .if defined(WITH_FLINT)
@@ -121,7 +123,8 @@ MLFLINTPATCH=	optional-patch-flint-access
 
 do-build:
 .if defined(WITH_RECOMPILE)
-	${MV} "${WRKDIR}/config/targets.customized" "${WRKDIR}/config/targets.customized.later"
+	${MV} "${WRKDIR}/config/targets.customized" \
+	"${WRKDIR}/config/targets.customized.later"
 	${SED} -E -e '/^#request[        ]+src-smlnj$$/s/^#//' \
 	"${WRKDIR}/config/targets" > "${WRKDIR}/config/targets.customized"
 .endif
@@ -172,7 +175,8 @@ PLIST_SUB=	MLARCH=${MLARCH}
 do-install:
 	${MKDIR} "${MLROOT}"
 .if defined(WITH_RECOMPILE)
-	${MV} "${WRKDIR}/config/targets.customized" "${WRKDIR}/config/targets.customized.later"
+	${MV} "${WRKDIR}/config/targets.customized" \
+	"${WRKDIR}/config/targets.customized.later"
 	${ECHO_CMD} -n > "${WRKDIR}/config/targets.customized"
 .endif
 	cd ${WRKDIR} && unset PWD && \
diff --git a/lang/sml-nj-devel/files/do-patch-src-genposixnames b/lang/sml-nj-devel/files/do-patch-src-genposixnames
new file mode 100644
index 000000000000..b59f441d0803
--- /dev/null
+++ b/lang/sml-nj-devel/files/do-patch-src-genposixnames
@@ -0,0 +1,33 @@
+--- src/runtime/config/gen-posix-names.sh.orig	Mon Nov 27 14:24:39 2000
++++ src/runtime/config/gen-posix-names.sh	Tue Mar 11 23:09:11 2003
+@@ -39,17 +39,20 @@
+   echo "#include <unistd.h>" > $SRCFILE
+   $CPP $SRCFILE > $INCLFILE
+   rm -f $SRCFILE
+-elif [ -r "/usr/include/sys/unistd.h" ]; then
+-  INCLFILE=/usr/include/sys/unistd.h
+-elif [ -r "/usr/include/confname.h" ]; then
+-  INCLFILE=/usr/include/confname.h
+-elif [ -r "/usr/include/unistd.h" ]; then
+-  INCLFILE=/usr/include/unistd.h
+-elif [ -r "/usr/include/bsd/unistd.h" ]; then
+-  INCLFILE=/usr/include/bsd/unistd.h
+ else
+-  echo "gen-posix-names.sh: unable to find <unistd.h>"
+-  exit 1
++  INCLFILE=""
++  for f in "/usr/include/sys/unistd.h" \
++    "/usr/include/confname.h"          \
++    "/usr/include/unistd.h"            \
++    "/usr/include/bsd/unistd.h"; do
++    if [ -r "$f" ]; then
++      INCLFILE="$INCLFILE $f"
++    fi
++  done
++  if [ -z "$INCLFILE" ]; then
++    echo "gen-posix-names.sh: unable to find <unistd.h>"
++    exit 1
++  fi
+ fi
+ 
+ echo "/* $OUTF" >> $OUTF
diff --git a/lang/sml-nj-devel/files/do-patch-src-mk.x86-freebsd b/lang/sml-nj-devel/files/do-patch-src-mk.x86-freebsd
new file mode 100644
index 000000000000..2b0a9d02c6dd
--- /dev/null
+++ b/lang/sml-nj-devel/files/do-patch-src-mk.x86-freebsd
@@ -0,0 +1,11 @@
+--- src/runtime/objs/mk.x86-freebsd.orig	Mon Nov  6 22:41:04 2000
++++ src/runtime/objs/mk.x86-freebsd	Mon Mar 17 01:43:31 2003
+@@ -10,7 +10,7 @@
+ ARFLAGS =	Trcv
+ CC =		gcc -ansi
+ CFLAGS =	-O2
+-CPP =		gcc -x c -E -P -ansi
++CPP =		gcc -x assembler-with-cpp -E -P -ansi
+ #CPP =		/usr/bin/cpp -P
+ 
+ XOBJS =
diff --git a/lang/sml-nj-devel/files/patch-ab b/lang/sml-nj-devel/files/patch-ab
index bf21fbe172c1..718c362fbfaa 100644
--- a/lang/sml-nj-devel/files/patch-ab
+++ b/lang/sml-nj-devel/files/patch-ab
@@ -1,5 +1,5 @@
 --- config/install.sh.orig	Thu Oct 17 15:07:53 2002
-+++ config/install.sh	Sun Nov 10 23:59:17 2002
++++ config/install.sh	Mon Mar 17 02:11:26 2003
 @@ -550,6 +550,28 @@
  ######################################################################
  
@@ -29,7 +29,16 @@
  # create the various sub directories
  #
  for dir in $BINDIR $HEAPDIR $RUNDIR $LIBDIR $SRCDIR ; do
-@@ -664,7 +686,7 @@
+@@ -656,6 +678,8 @@
+ # build the run-time system
+ #
+ unpack "run-time" $SRCDIR runtime runtime
++do_patch do-patch-src-genposixnames
++do_patch do-patch-src-mk.x86-freebsd
+ if [ -x $RUNDIR/run.$ARCH-$OPSYS ]; then
+     vsay $this: Run-time system already exists.
+ else
+@@ -664,7 +688,7 @@
      $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
      if [ -x run.$ARCH-$OPSYS ]; then
  	mv run.$ARCH-$OPSYS $RUNDIR
@@ -38,7 +47,7 @@
      else
  	complain "$this: !!! Run-time system build failed for some reason."
      fi
-@@ -728,6 +750,8 @@
+@@ -728,6 +752,8 @@
  	do
  	    unpack $src $ROOT/src $src $src
          done
diff --git a/lang/sml-nj-devel/pkg-descr b/lang/sml-nj-devel/pkg-descr
index 4d44ff2f2c05..0a0047e2d006 100644
--- a/lang/sml-nj-devel/pkg-descr
+++ b/lang/sml-nj-devel/pkg-descr
@@ -1,7 +1,7 @@
 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
+WWW:    http://www.smlnj.org/
 
 If you are interested in a lighter weight implementation of ML, 
 the Moscow-ML port is recommended.