From 00f73ebba87aa60e09d70a9e772a2df283b0b4e0 Mon Sep 17 00:00:00 2001
From: Mikhail Teterin <mi@FreeBSD.org>
Date: Thu, 4 Jan 2024 18:26:36 -0500
Subject: [PATCH] lang/scm: depend on lang/slib instead of bundling own slib.

Also, disable compiler optimization again. Although -O2 works
on FreeBSD-11/i386, it breaks self-testing on FreeBSD-14/amd64.
---
 lang/scm/Makefile             |  23 ++---
 lang/scm/distinfo             |   8 +-
 lang/scm/files/require.scm.in |   2 +-
 lang/scm/pkg-install          |   2 +-
 lang/scm/pkg-plist            | 165 +---------------------------------
 5 files changed, 20 insertions(+), 180 deletions(-)

diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index 528b8d5298ca..5a8b882fae9b 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	scm
 PORTVERSION=	5f3
 CATEGORIES=	lang scheme
-MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/%SUBDIR%/
-MASTER_SITE_SUBDIR=	. OLD
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} slib-3b7.zip slib-psd1-3.tar.gz
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} slib-3b7.zip
+MASTER_SITES=	GNU:scm	\
+		http://groups.csail.mit.edu/mac/ftpdir/scm/:psd1
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:scm slib-psd1-3.tar.gz:psd1
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Scheme interpreter
@@ -14,15 +14,16 @@ LICENSE=	LGPL3+
 LICENSE_FILES=	${WRKSRC}/COPYING.LESSER
 
 LIB_DEPENDS=	libgnuregex.so:devel/libgnuregex
+BUILD_DEPENDS=	${LOCALBASE}/share/slib/require.scm:lang/slib
+RUN_DEPENDS=	${LOCALBASE}/share/slib/require.scm:lang/slib
 
-USES=		readline zip
+USES=		readline
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	--prefix=${PREFIX}
 MAKE_JOBS_UNSAFE=	yes
 
-#CFLAGS:=	${CFLAGS:N-O*} -O0
+CFLAGS:=	${CFLAGS:N-O*} -O0
 CFLAGS+=	-Wall -Wwrite-strings -Wmissing-declarations -Wredundant-decls -Wcast-qual
 CFLAGS+=	-Wno-unused-label -Wno-uninitialized
 
@@ -52,6 +53,9 @@ SCM_MODULES=	byte.so bytenumb.so differ.so edline.so gsubr.so \
 		socket.so unix.so
 SCM_MODULES_X11=x.so
 
+post-extract:
+	${LN} -s ${LOCALBASE}/share/slib ${WRKDIR}
+
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc64*}
@@ -98,8 +102,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/lib/scm
 	${INSTALL_LIB} ${SCM_MODULES:S|^|${WRKSRC}/|} \
 		${STAGEDIR}${PREFIX}/lib/scm
-	${TAR} -C ${STAGEDIR}${PREFIX}/lib/scm -xf ${DISTDIR}/${DISTFILES:Mslib*.tar.gz} '*.scm'
-	${INSTALL_DATA} ${WRKDIR}/slib/*.scm ${STAGEDIR}${PREFIX}/lib/scm/slib/
-	${INSTALL_DATA} ${WRKDIR}/scm/scm.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
+	${TAR} -C ${STAGEDIR}${PREFIX}/lib/scm -xf ${DISTDIR}/${_DISTFILES:Mslib*.tar.gz} '*.scm'
+	${INSTALL_DATA} ${WRKSRC}/scm.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 .include <bsd.port.post.mk>
diff --git a/lang/scm/distinfo b/lang/scm/distinfo
index 1952079fb44e..e6e7428d2706 100644
--- a/lang/scm/distinfo
+++ b/lang/scm/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1704393750
-SHA256 (scm-5f3.zip) = 27c944b871c319a820e0fb1698bccb27d929db197f9e44d9ad4650f52aa4bdcb
-SIZE (scm-5f3.zip) = 950983
-SHA256 (slib-3b7.zip) = f5d5cdad335395a5a5aa37effe28aa8078b216ea39911f651929678f1ac228b6
-SIZE (slib-3b7.zip) = 1118050
+TIMESTAMP = 1704405648
+SHA256 (scm-5f3.tar.gz) = 9f40d420e89e00978abe491d2253d69c9e58c9ae4f8be6128dd091fa7340c0ad
+SIZE (scm-5f3.tar.gz) = 915357
 SHA256 (slib-psd1-3.tar.gz) = 1665fc6cf572e6d8d99e81b4f6b1e65b04a095b69baebd85d0085ad552dc2955
 SIZE (slib-psd1-3.tar.gz) = 62397
diff --git a/lang/scm/files/require.scm.in b/lang/scm/files/require.scm.in
index 32a79586de01..537e08ee4a07 100644
--- a/lang/scm/files/require.scm.in
+++ b/lang/scm/files/require.scm.in
@@ -1,2 +1,2 @@
-(define (library-vicinity) "%%PREFIX%%/lib/scm/slib/")
+(define (library-vicinity) "%%LOCALBASE%%/share/slib/")
 (load (in-vicinity (library-vicinity) "require"))
diff --git a/lang/scm/pkg-install b/lang/scm/pkg-install
index 22908d4a1f46..4d676f5236e1 100644
--- a/lang/scm/pkg-install
+++ b/lang/scm/pkg-install
@@ -2,7 +2,7 @@
 
 if [ "$2" = "POST-INSTALL" ]; then
 	cd $PKG_PREFIX/lib/scm && $PKG_PREFIX/bin/scm -l mkimpcat.scm
-	cd $PKG_PREFIX/lib/scm && $PKG_PREFIX/bin/scm -l slib/mklibcat.scm
+	cd $PKG_PREFIX/lib/scm && $PKG_PREFIX/bin/scm -l ${PKG_PREFIX}/share/slib/mklibcat.scm
 elif [ "$2" = "DEINSTALL" ] ; then
 	rm -f $PKG_PREFIX/lib/scm/slibcat
 	rm -f $PKG_PREFIX/lib/scm/implcat
diff --git a/lang/scm/pkg-plist b/lang/scm/pkg-plist
index 1b0517f896f9..d77587b418ae 100644
--- a/lang/scm/pkg-plist
+++ b/lang/scm/pkg-plist
@@ -29,105 +29,12 @@ lib/scm/r4rstest.scm
 lib/scm/ramap.so
 lib/scm/record.so
 lib/scm/require.scm
-lib/scm/slib/rmdsff.scm
 lib/scm/rgx.so
 lib/scm/sc2.so
 lib/scm/scmhob.h
 lib/scm/scmhob.scm
-lib/scm/slib/Bev2slib.scm
-lib/scm/slib/Template.scm
-lib/scm/slib/alist.scm
-lib/scm/slib/alistab.scm
-lib/scm/slib/array.scm
-lib/scm/slib/arraymap.scm
-lib/scm/slib/batch.scm
-lib/scm/slib/break.scm
-lib/scm/slib/byte.scm
-lib/scm/slib/bytenumb.scm
-lib/scm/slib/chap.scm
-lib/scm/slib/charplot.scm
-lib/scm/slib/clrnamdb.scm
-lib/scm/slib/cltime.scm
-lib/scm/slib/coerce.scm
-lib/scm/slib/collect.scm
-lib/scm/slib/collectx.scm
-lib/scm/slib/color.scm
-lib/scm/slib/colornam.scm
-lib/scm/slib/colorspc.scm
-lib/scm/slib/comlist.scm
-lib/scm/slib/comparse.scm
-lib/scm/slib/crc.scm
-lib/scm/slib/cring.scm
-lib/scm/slib/cvs.scm
-lib/scm/slib/daylight.scm
-lib/scm/slib/db2html.scm
-lib/scm/slib/dbcom.scm
-lib/scm/slib/dbinterp.scm
-lib/scm/slib/dbrowse.scm
-lib/scm/slib/dbsyn.scm
-lib/scm/slib/dbutil.scm
-lib/scm/slib/debug.scm
-lib/scm/slib/defmacex.scm
-lib/scm/slib/determ.scm
-lib/scm/slib/dft.scm
-lib/scm/slib/differ.scm
-lib/scm/slib/dirs.scm
-lib/scm/slib/dwindtst.scm
-lib/scm/slib/dynamic.scm
-lib/scm/slib/dynwind.scm
-lib/scm/slib/eval.scm
-lib/scm/slib/factor.scm
-lib/scm/slib/fluid-let.scm
-lib/scm/slib/fluidlet.scm
-lib/scm/slib/format.scm
-lib/scm/slib/formatst.scm
-lib/scm/slib/genwrite.scm
-lib/scm/slib/getopt.scm
-lib/scm/slib/getparam.scm
-lib/scm/slib/glob.scm
-lib/scm/slib/grapheps.scm
-lib/scm/slib/hash.scm
-lib/scm/slib/hashtab.scm
-lib/scm/slib/html4each.scm
-lib/scm/slib/htmlform.scm
-lib/scm/slib/http-cgi.scm
-lib/scm/slib/iso8601.scm
-lib/scm/slib/limit.scm
-lib/scm/slib/lineio.scm
-lib/scm/slib/linterp.scm
-lib/scm/slib/logical.scm
-lib/scm/slib/macrotst.scm
-lib/scm/slib/macwork.scm
-lib/scm/slib/manifest.scm
-lib/scm/slib/matfile.scm
-lib/scm/slib/math-integer.scm
-lib/scm/slib/math-real.scm
-lib/scm/slib/mbe.scm
-lib/scm/slib/minimize.scm
-lib/scm/slib/mkclrnam.scm
-lib/scm/slib/mklibcat.scm
-lib/scm/slib/mkpltcat.scm
-lib/scm/slib/modular.scm
-lib/scm/slib/mulapply.scm
-lib/scm/slib/mularg.scm
-lib/scm/slib/mwdenote.scm
-lib/scm/slib/mwexpand.scm
-lib/scm/slib/mwsynrul.scm
-lib/scm/slib/ncbi-dna.scm
-lib/scm/slib/null.scm
-lib/scm/slib/obj2str.scm
-lib/scm/slib/object.scm
-lib/scm/slib/paramlst.scm
-lib/scm/slib/peanosfc.scm
-lib/scm/slib/phil-spc.scm
-lib/scm/slib/pnm.scm
-lib/scm/slib/pp.scm
-lib/scm/slib/ppfile.scm
-lib/scm/slib/prec.scm
-lib/scm/slib/printf.scm
-lib/scm/slib/priorque.scm
-lib/scm/slib/process.scm
-lib/scm/slib/promise.scm
+lib/scm/socket.so
+lib/scm/unix.so
 lib/scm/slib/psd/instrum.scm
 lib/scm/slib/psd/pexpr.scm
 lib/scm/slib/psd/primitives.scm
@@ -135,74 +42,6 @@ lib/scm/slib/psd/psd-slib.scm
 lib/scm/slib/psd/read.scm
 lib/scm/slib/psd/runtime.scm
 lib/scm/slib/psd/version.scm
-lib/scm/slib/psxtime.scm
-lib/scm/slib/qp.scm
-lib/scm/slib/queue.scm
-lib/scm/slib/r4rsyn.scm
-lib/scm/slib/randinex.scm
-lib/scm/slib/random.scm
-lib/scm/slib/ratize.scm
-lib/scm/slib/rdms.scm
-lib/scm/slib/recobj.scm
-lib/scm/slib/record.scm
-lib/scm/slib/repl.scm
-lib/scm/slib/require.scm
-lib/scm/slib/root.scm
-lib/scm/slib/sc2.scm
-lib/scm/slib/sc4opt.scm
-lib/scm/slib/sc4sc3.scm
-lib/scm/slib/scaexpp.scm
-lib/scm/slib/scaglob.scm
-lib/scm/slib/scainit.scm
-lib/scm/slib/scamacr.scm
-lib/scm/slib/scanf.scm
-lib/scm/slib/scaoutp.scm
-lib/scm/slib/schmooz.scm
-lib/scm/slib/scmacro.scm
-lib/scm/slib/selfset.scm
-lib/scm/slib/sierpinski.scm
-lib/scm/slib/simetrix.scm
-lib/scm/slib/solid.scm
-lib/scm/slib/sort.scm
-lib/scm/slib/soundex.scm
-lib/scm/slib/srfi-1.scm
-lib/scm/slib/srfi-11.scm
-lib/scm/slib/srfi-2.scm
-lib/scm/slib/srfi-23.scm
-lib/scm/slib/srfi-39.scm
-lib/scm/slib/srfi-61.scm
-lib/scm/slib/srfi-8.scm
-lib/scm/slib/srfi-9.scm
-lib/scm/slib/srfi.scm
-lib/scm/slib/stdio.scm
-lib/scm/slib/strcase.scm
-lib/scm/slib/strport.scm
-lib/scm/slib/strsrch.scm
-lib/scm/slib/structure.scm
-lib/scm/slib/subarray.scm
-lib/scm/slib/synchk.scm
-lib/scm/slib/synclo.scm
-lib/scm/slib/synrul.scm
-lib/scm/slib/timecore.scm
-lib/scm/slib/timezone.scm
-lib/scm/slib/top-refs.scm
-lib/scm/slib/trace.scm
-lib/scm/slib/transact.scm
-lib/scm/slib/tree.scm
-lib/scm/slib/trnscrpt.scm
-lib/scm/slib/tsort.scm
-lib/scm/slib/tzfile.scm
-lib/scm/slib/uri.scm
-lib/scm/slib/values.scm
-lib/scm/slib/vet.scm
-lib/scm/slib/withfile.scm
-lib/scm/slib/wttree-test.scm
-lib/scm/slib/wttree.scm
-lib/scm/slib/xml-parse.scm
-lib/scm/slib/yasyn.scm
-@comment lib/scm/slibcat
-lib/scm/socket.so
-lib/scm/unix.so
 %%X11%%lib/scm/x.so
 %%X11%%lib/scm/x11.scm
 %%X11%%lib/scm/xatoms.scm