3 files changed, 19 insertions, 103 deletions

diff --git a/lang/polyml/Makefile b/lang/polyml/Makefile
index b9faa033597a..4dcdd11476ec 100644
--- a/lang/polyml/Makefile
+++ b/lang/polyml/Makefile
@@ -6,70 +6,31 @@
 #
 
 PORTNAME=	polyml
-PORTVERSION=	4.2.0
+PORTVERSION=	5.0
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	driver.420.tar.gz \
-		mlsource.420.tar.gz \
-		basis.420.tar.gz \
-		DB420.i386.unix.gz
+DISTNAME=	${PORTNAME}.${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	driver.420.tar.gz \
-		mlsource.420.tar.gz \
-		basis.420.tar.gz
 
 MAINTAINER=	timbob@bigpond.com
 COMMENT=	Fast open-source implementation of Standard ML
 
-WRKSRC=		${WRKDIR}/driver
-
-ONLY_FOR_ARCHS=	i386
-
 USE_GCC=	3.2+
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	${PREFIX}
-
-SUB_FILES=	poly
-PLIST_FILES=	bin/poly \
-		lib/polyml/poly \
-		lib/polyml/COPYING \
-		lib/polyml/ML_dbase \
-		lib/polyml/DB420.i386.unix
-PLIST_DIRS=	lib/polyml
-
-NO_INSTALL_MANPAGES=yes
-
-post-extract:
-	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/DB420.i386.unix.gz \
-		> ${WRKDIR}/DB420.i386.unix
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|gcc|${CC}|g" ${WRKSRC}/configure
-
-post-build:
-	(cd ${WRKDIR}/mlsource/MLCompiler/CodeTree; ${LN} -fs CodeCons.i386 CodeCons)
-	(cd ${WRKDIR}; ./driver/poly DB420.i386.unix < mlsource/BuildAll.sml)
-
-post-install:
-	${INSTALL_DATA} ${WRKDIR}/DB420.i386.unix ${PREFIX}/lib/polyml/
-	${INSTALL_SCRIPT} ${WRKDIR}/poly ${PREFIX}/bin/poly
-	@(cd ${PREFIX}/lib/polyml; ${LN} -fs ./DB420.i386.unix ML_dbase)
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-install-user:
-.if !exists (${LOCALBASE}/lib/polyml/ML_dbase)
-	@${ECHO_CMD}
-	@${ECHO_CMD} "You need to install the Poly/ML port first!"
-	@${ECHO_CMD}
-.elif exists (${HOME}/.polyml/ML_dbase)
-	@${ECHO_CMD}
-	@${ECHO_CMD} "User copy of database already exists. Aborting!"
-	@${ECHO_CMD}
-.else
-	@${MKDIR} ${HOME}/.polyml
-	@${CP} ${LOCALBASE}/lib/polyml/ML_dbase ${HOME}/.polyml
-	@${CHMOD} 0600 ${HOME}/.polyml/ML_dbase
-.endif
+CONFIGURE_ARGS=	--prefix=${PREFIX} --without-x
+USE_LDCONFIG=	yes
+
+PLIST_FILES=	bin/poly		\
+		bin/polyimport		\
+		lib/libpolymain.a	\
+		lib/libpolymain.la	\
+		lib/libpolyml.a		\
+		lib/libpolyml.la	\
+		lib/libpolyml.so	\
+		lib/libpolyml.so.0
+
+MAN1=		poly.1 polyimport.1
+MANCOMPRESSED=	no
 
 .include <bsd.port.mk>
diff --git a/lang/polyml/distinfo b/lang/polyml/distinfo
index b638bf9049b5..03dea5967570 100644
--- a/lang/polyml/distinfo
+++ b/lang/polyml/distinfo
@@ -1,12 +1,3 @@
-MD5 (polyml/driver.420.tar.gz) = 3855385041e1a7d860ba72734c153ce4
-SHA256 (polyml/driver.420.tar.gz) = e9113992bd911a70de0d830e2f5bb2e6b314e00f24702a270f7116cc1515e84f
-SIZE (polyml/driver.420.tar.gz) = 496596
-MD5 (polyml/mlsource.420.tar.gz) = 873b02beab2e083232d6a8bbddab5225
-SHA256 (polyml/mlsource.420.tar.gz) = ebe29bd4290c95882b012b193dc25bda0d5a575d67d6a8ab8239314ee3de250a
-SIZE (polyml/mlsource.420.tar.gz) = 923393
-MD5 (polyml/basis.420.tar.gz) = fa307ceda8a6556d8407c4b5edc6e303
-SHA256 (polyml/basis.420.tar.gz) = bb381d5b99987b08064a707001766ea64113de4b1a75a12ad443ca8c9d0675cc
-SIZE (polyml/basis.420.tar.gz) = 148810
-MD5 (polyml/DB420.i386.unix.gz) = 7591ad2e94002c3827918c4846c0a4c4
-SHA256 (polyml/DB420.i386.unix.gz) = 6f3c40c2ac8f479a4e7307e20907e53af29b3a75e05fdd34184ee2b9b29309bf
-SIZE (polyml/DB420.i386.unix.gz) = 1848015
+MD5 (polyml/polyml.5.0.tar.gz) = 61537cf2b0ca983d42845778fe3bd42f
+SHA256 (polyml/polyml.5.0.tar.gz) = 0eb3ee7f05eabedf6cd62e0ac2476882ecf92ad08f52b85e13dd6399d17a52da
+SIZE (polyml/polyml.5.0.tar.gz) = 4183140
diff --git a/lang/polyml/pkg-install b/lang/polyml/pkg-install
deleted file mode 100644
index 35cd94efe874..000000000000
--- a/lang/polyml/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "POST-INSTALL" ]; then
-	if test `ulimit -Hd` -lt 917504; then
-		cat <<END
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! Poly/ML memory regions (heaps, database and IO Area) are stored at !
-! fixed addresses in the processes virtual memory space, for reasons !
-! of speed.                                                          !
-!                                                                    !
-! The address space available to FreeBSD processes for heap and      !
-! data storage is limited by an administrative setting:              !
-!   sh:  ulimit -Hd                                                  !
-!   csh: limit -h datasize                                           !
-!                                                                    !
-! The maximum administrative setting is limited in turn by a kernel  !
-! parameter: maxdsiz. If the maximum datasize is too low, the        !
-! dynamic linker will load libraries into the memory regions used    !
-! by Poly/ML -- this may cause problems, including non-termination   !
-! when committing large databases.                                   !
-!                                                                    !
-! One fix is to add the following line to /boot/loader.conf before   !
-! restarting:                                                        !
-!    kern.maxdsiz="896M"                                             !
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! In order to be able to commit changes to Poly/ML's database, each  !
-! user needs to have her/his own writable copy.                      !
-!                                                                    !
-! Please login with the user you plan to use Poly/ML with and run    !
-! "make install-user" from ports/lang/polyml.                        !
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-END
-	fi
-fi