lang/chez-scheme: Update to 10.0.0

- Remove the bootstraps, not needed anymore
- Add support for more architectures

3 files changed, 31 insertions, 37 deletions

diff --git a/lang/chez-scheme/Makefile b/lang/chez-scheme/Makefile
index 88dcc6c25cff..ba9d2100f274 100644
--- a/lang/chez-scheme/Makefile
+++ b/lang/chez-scheme/Makefile
@@ -1,14 +1,9 @@
 PORTNAME=	chez-scheme
-PORTVERSION=	9.6.4
+PORTVERSION=	10.0.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang
-MASTER_SITES=	https://github.com/cisco/ChezScheme/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ \
-		http://distfiles.pirateparty.in/ashish/:boot \
-		LOCAL/ashish:boot
+MASTER_SITES=	https://github.com/cisco/ChezScheme/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 DISTNAME=	csv${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${PORTNAME}-boot-ta6fb-${PORTVERSION}.tar.xz:boot \
-		${PORTNAME}-boot-ti3fb-${PORTVERSION}.tar.xz:boot
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Chez Scheme system
@@ -17,7 +12,7 @@ WWW=		https://cisco.github.io/ChezScheme
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-ONLY_FOR_ARCHS=	amd64 i386
+ONLY_FOR_ARCHS=	amd64 i386 aarch64 armv7
 
 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
 		libossp-uuid.so:misc/ossp-uuid
@@ -31,14 +26,16 @@ HAS_CONFIGURE=	yes
 ALL_TARGET=	build
 CONFLICTS_INSTALL=	petite-chez
 STRIP_FILES=	bin/petite bin/${PORTNAME} bin/${PORTNAME}-script
-CHEZ_LIBDIR=	lib/${DISTNAME:S/.0$//}
+CHEZ_LIBDIR=	lib/${DISTNAME}
 CFLAGS+=	-fPIC
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -luuid
 CONFIGURE_ARGS=	--installprefix=${PREFIX} \
 		--temproot=${STAGEDIR} \
 		--installschemename=${PORTNAME} \
-		--installscriptname=${PORTNAME}-script
+		--installscriptname=${PORTNAME}-script \
+		--installman=${PREFIX}/share/man \
+		--threads
 PLIST_SUB=	PORTNAME=${PORTNAME} \
 		CHEZ_ARCH=${CHEZ_ARCH} \
 		CHEZ_LIBDIR=${CHEZ_LIBDIR}
@@ -48,11 +45,13 @@ X11_USE=	XORG=x11
 .include <bsd.port.pre.mk>
 
 .if (${ARCH} == "amd64")
-CONFIGURE_ARGS+=	--threads --64 -m=ta6fb
 CHEZ_ARCH=	ta6fb
 .elif (${ARCH} == "i386")
-CONFIGURE_ARGS+=	--threads --32 -m=ti3fb
 CHEZ_ARCH=	ti3fb
+.elif (${ARCH} == "aarch64")
+CHEZ_ARCH=	tarm64fb
+.elif (${ARCH} == "armv7")
+CHEZ_ARCH=	tarm32fb
 .endif
 
 .if defined(NCURSES_RPATH)
@@ -61,13 +60,10 @@ NCURSES_REPL=	-e 's|-Wl,-rpath,${NCURSESRPATH}||g'
 NCURSES_REPL=
 .endif
 
-post-patch:
-	${LN} -sf ${WRKDIR}/${CHEZ_ARCH} ${WRKSRC}/boot/
-
-post-configure:
+pre-configure:
 	${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \
 		-e 's,/usr/local,${LOCALBASE},g' ${NCURSES_REPL} \
-		-e 's,-liconv,${ICONV_LIB},g' ${WRKSRC}/${CHEZ_ARCH}/c/Mf-config ${WRKSRC}/c/Mf-${CHEZ_ARCH}
+		-e 's,-liconv,${ICONV_LIB},g' ${WRKSRC}/configure
 
 pre-build-X11-off:
 	${ECHO_CMD} '#undef LIBX11' >>${WRKSRC}/c/version.h
@@ -78,9 +74,5 @@ post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f}
 	@${CHMOD} -w ${STAGEDIR}${PREFIX}/${f}
 .endfor
-.if ("lib/${DISTNAME}" != "${CHEZ_LIBDIR}")
-	@${MV} ${STAGEDIR}${PREFIX}/lib/${DISTNAME} ${STAGEDIR}${PREFIX}/${CHEZ_LIBDIR}
-.endif
-	@${LN} -sf scheme.boot ${STAGEDIR}${PREFIX}/${CHEZ_LIBDIR}/${CHEZ_ARCH}/${PORTNAME}-script.boot
 
 .include <bsd.port.post.mk>
diff --git a/lang/chez-scheme/distinfo b/lang/chez-scheme/distinfo
index 5e13392cf4df..701d49f71480 100644
--- a/lang/chez-scheme/distinfo
+++ b/lang/chez-scheme/distinfo
@@ -1,7 +1,3 @@
-TIMESTAMP = 1697534558
-SHA256 (csv9.6.4.tar.gz) = f5827682fa259c47975ffe078785fb561e4a5c54f764331ef66c32132843685d
-SIZE (csv9.6.4.tar.gz) = 35679113
-SHA256 (chez-scheme-boot-ta6fb-9.6.4.tar.xz) = c6993e0cfe712c2f85ccb8578f510918e4c41ab1ac86b82679533c7c8fc6215f
-SIZE (chez-scheme-boot-ta6fb-9.6.4.tar.xz) = 2131520
-SHA256 (chez-scheme-boot-ti3fb-9.6.4.tar.xz) = 3496605c4b7fda6c8e6b9f7fcea8734ec1401cdc794cd857728542081d231b07
-SIZE (chez-scheme-boot-ti3fb-9.6.4.tar.xz) = 2078340
+TIMESTAMP = 1707241687
+SHA256 (csv10.0.0.tar.gz) = d37199012b5ed1985c4069d6a87ff18e5e1f5a2df27e402991faf45dc4f2232c
+SIZE (csv10.0.0.tar.gz) = 9109529
diff --git a/lang/chez-scheme/pkg-plist b/lang/chez-scheme/pkg-plist
index ae5cf1c14004..844ad8a3522f 100644
--- a/lang/chez-scheme/pkg-plist
+++ b/lang/chez-scheme/pkg-plist
@@ -1,12 +1,8 @@
-bin/petite
 bin/%%PORTNAME%%
 bin/%%PORTNAME%%-script
-%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/petite.boot
-%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/%%PORTNAME%%-script.boot
-%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/%%PORTNAME%%.boot
-%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/scheme.boot
-%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/scheme.h
+bin/petite
 %%CHEZ_LIBDIR%%/examples/Makefile
+%%CHEZ_LIBDIR%%/examples/build.zuo
 %%CHEZ_LIBDIR%%/examples/compat.ss
 %%CHEZ_LIBDIR%%/examples/crepl.c
 %%CHEZ_LIBDIR%%/examples/csocket.c
@@ -34,8 +30,18 @@ bin/%%PORTNAME%%-script
 %%CHEZ_LIBDIR%%/examples/socket.ss
 %%CHEZ_LIBDIR%%/examples/template.ss
 %%CHEZ_LIBDIR%%/examples/unify.ss
-%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/kernel.o
+%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/%%PORTNAME%%
+%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/%%PORTNAME%%-script
+%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/%%PORTNAME%%-script.boot
+%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/%%PORTNAME%%.boot
+%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/libkernel.a
+%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/liblz4.a
+%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/libz.a
 %%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/main.o
+%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/petite
+%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/petite.boot
 %%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/revision
-man/man1/petite.1.gz
-man/man1/%%PORTNAME%%.1.gz
+%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/scheme.boot
+%%CHEZ_LIBDIR%%/%%CHEZ_ARCH%%/scheme.h
+share/man/man1/%%PORTNAME%%.1.gz
+share/man/man1/petite.1.gz