git: 43a7f4dccc5d - main - lang/mlton: Refactor

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Tue, 12 Dec 2023 16:44:51 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=43a7f4dccc5d3b81885d981abf4a337260578e7b

commit 43a7f4dccc5d3b81885d981abf4a337260578e7b
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-12-12 16:40:01 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-12-12 16:40:01 +0000

    lang/mlton: Refactor
    
    - Remove previously maintained by as these are informations are no longer
      allowed in Makefile
    - Remove FreeBSD 11 related bootstrap files as FreeBSD 11 is no longer a
      supported version in the tree
    - Remove non-default OPTION WINE and MINGW32 as mingw32* has been
      removed from the tree
    
    Approved by:    portmgr (blanket)
---
 lang/mlton/Makefile | 32 +++-----------------------------
 lang/mlton/distinfo |  4 ----
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/lang/mlton/Makefile b/lang/mlton/Makefile
index 72932f0a4b96..748bcfcd811d 100644
--- a/lang/mlton/Makefile
+++ b/lang/mlton/Makefile
@@ -1,7 +1,3 @@
-# Previously maintained by Jesper Louis Andersen
-# (jesper.louis.andersen@gmail.com) and Geoffrey Mainland
-# (mainland@apeiron.net)
-#
 # Because MLton is written in SML, it needs an SML compiler to build.
 # It is easiest to use another (earlier) binary version of MLton as
 # the SML compiler.  So, this Makefile fetches and installs an
@@ -14,9 +10,7 @@ MASTER_SITES+=	https://github.com/beyert/mlton-freebsd_bootstrap/raw/c7371c1/:bo
 DISTFILES+=	${BOOTNAME}.i386-${OPSYS:tl}-13.txz:bootstrap \
 		${BOOTNAME}.amd64-${OPSYS:tl}-13.txz:bootstrap \
 		${BOOTNAME}.i386-${OPSYS:tl}-12.txz:bootstrap \
-		${BOOTNAME}.amd64-${OPSYS:tl}-12.txz:bootstrap \
-		${BOOTNAME}.i386-${OPSYS:tl}-11.txz:bootstrap \
-		${BOOTNAME}.amd64-${OPSYS:tl}-11.txz:bootstrap
+		${BOOTNAME}.amd64-${OPSYS:tl}-12.txz:bootstrap
 
 MAINTAINER=	beyert@cs.ucr.edu
 COMMENT=	Optimizing Standard ML compiler
@@ -44,15 +38,13 @@ BOOTOSMAJ=	${OSREL:R}
 OPTIONS_DEFINE=			DOCS EXAMPLES
 OPTIONS_DEFAULT=		MLTON NATIVE
 OPTIONS_SINGLE=			BOOTSTRAP TARGET
-OPTIONS_SINGLE_BOOTSTRAP=	MLTON POLYML SMLNJ WINE
-OPTIONS_SINGLE_TARGET=		MINGW32 NATIVE
+OPTIONS_SINGLE_BOOTSTRAP=	MLTON POLYML SMLNJ
+OPTIONS_SINGLE_TARGET=		NATIVE
 
-MINGW32_DESC=	Add mingw32 Windows target (requires wine)
 MLTON_DESC=	Bootstrap with MLton (ideal if supported)
 NATIVE_DESC=	Use default target for given architecture
 POLYML_DESC=	Bootstrap with PolyML
 SMLNJ_DESC=	Bootstrap with SML/NJ (can take many hours)
-WINE_DESC=	Bootstrap MINGW32 with wine
 
 DOCS_BUILD_DEPENDS=		htmldoc:textproc/htmldoc
 DOCS_USES=			tex
@@ -63,7 +55,6 @@ DOCS_ALL_TARGET=		install-docs all
 DOCS_ALL_TARGET_OFF=		all
 DOCS_INSTALL_TARGET=		install-docs install
 DOCS_INSTALL_TARGET_OFF=	install
-MINGW32_BROKEN=			not yet implemented MINGW32 option in modern versions of ${PORTNAME}
 MLTON_MAKE_ARGS=		DESTDIR='' \
 				LIB=${BOOT_WRKSRC}/lib \
 				MLTON_VERSION=${PORTVERSION} \
@@ -104,19 +95,6 @@ BOOTOSMAJ=	13
 
 BOOT_DIST_NEW=	${PKGNAME}${DISTVERSIONSUFFIX}.${ARCH}-${OPSYS:tl}-${OSREL:R}-${HOST}${BOOT_SUFX}
 
-.if ${PORT_OPTIONS:MMINGW32} && ${PORT_OPTIONS:MWINE}
-BUILD_DEPENDS+=	${LOCALBASE}/mingw32/lib/libgmp.a:math/mingw32-libgmp \
-		mingw32-gcc:devel/mingw32-gcc \
-		wine:emulators/wine
-RUN_DEPENDS+=	${LOCALBASE}/mingw32/lib/libgmp.a:math/mingw32-libgmp \
-		mingw32-gcc:devel/mingw32-gcc
-SSP_CFLAGS?=	-fstack-protector # XXX -strong isn't supported by GCC < 4.9
-
-PLIST_SUB+=	MINGW32CROSS=""
-.else
-PLIST_SUB+=	MINGW32CROSS="@comment "
-.endif
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	MLton
 GH_PROJECT=	mlton
@@ -195,8 +173,4 @@ makebootstrap: all
 	@${MV} ${BOOT_WRKTMP}/${BOOT_DIST_NEW} ${MASTERDIR}/
 ##	@${RMDIR} ${BOOT_WRKTMP}
 
-post-build-MINGW32-on:
-	@${ECHO} Adding mingw32 target...
-	${WRKSRC}/bin/add-local-cross mingw32 x86 mingw
-
 .include <bsd.port.mk>
diff --git a/lang/mlton/distinfo b/lang/mlton/distinfo
index 86709166813c..0332b07e115c 100644
--- a/lang/mlton/distinfo
+++ b/lang/mlton/distinfo
@@ -7,9 +7,5 @@ SHA256 (mlton-20210816.i386-freebsd-12.txz) = a6d173463c36b2c79ba48c9d94c7857e84
 SIZE (mlton-20210816.i386-freebsd-12.txz) = 4582828
 SHA256 (mlton-20210816.amd64-freebsd-12.txz) = d289134bd1371d0c4f090b2945a2fa87052d5e298b9612420dbbb6335440a763
 SIZE (mlton-20210816.amd64-freebsd-12.txz) = 5517216
-SHA256 (mlton-20210816.i386-freebsd-11.txz) = bcc21ef73dcb1eb773cbe076b5a79a9ffad9e431cae4eeac317078741055b91d
-SIZE (mlton-20210816.i386-freebsd-11.txz) = 4613016
-SHA256 (mlton-20210816.amd64-freebsd-11.txz) = b8ddde2adcb08ca76fc6ba3ff6d7186ee7074b3a7b4be6e982a5b1d2fe10eefd
-SIZE (mlton-20210816.amd64-freebsd-11.txz) = 5656260
 SHA256 (MLton-mlton-20210816-b2fca3d_GH0.tar.gz) = 9809f100308c3330803d3d52052ecdc00774b74869f57ec20880c46ba796ea6d
 SIZE (MLton-mlton-20210816-b2fca3d_GH0.tar.gz) = 14307327