Wed Mar 9 23:29:51 2022 UTC ()
devel/guile-slib: Adapt to new guile paths and switch back to 2.0

This package now expects guile always be namespaced.  (Arguably the
paths should come from the bl3.)

With guile20, this builds and works, and thus it is that way.  (With
guile22, there's an error that I don't understand.)


(gdt)
diff -r1.50 -r1.51 pkgsrc/devel/guile-slib/Makefile
diff -r1.14 -r1.15 pkgsrc/devel/guile-slib/PLIST
cvs diff -r1.50 -r1.51 pkgsrc/devel/guile-slib/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/guile-slib/Makefile 2022/03/09 20:35:39 1.50
+++ pkgsrc/devel/guile-slib/Makefile 2022/03/09 23:29:51 1.51
@@ -1,34 +1,36 @@ @@ -1,34 +1,36 @@
1# $NetBSD: Makefile,v 1.50 2022/03/09 20:35:39 gdt Exp $ 1# $NetBSD: Makefile,v 1.51 2022/03/09 23:29:51 gdt Exp $
2 2
3SLIBVERSION= 3.2.6 3SLIBVERSION= 3.2.6
4DISTNAME= guile-slib-${SLIBVERSION} 4DISTNAME= guile-slib-${SLIBVERSION}
5PKGREVISION= 4 5PKGREVISION= 5
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= # empty 7MASTER_SITES= # empty
8DISTFILES= # empty 8DISTFILES= # empty
9 9
10MAINTAINER= gdt@NetBSD.org 10MAINTAINER= gdt@NetBSD.org
11HOMEPAGE= http://people.csail.mit.edu/jaffer/SLIB 11HOMEPAGE= http://people.csail.mit.edu/jaffer/SLIB
12COMMENT= SLIB glue files for guile 12COMMENT= SLIB glue files for guile
13 13
14# This package is currently linked to guile22. 14GUILE_VERSION= guile20
 15GUILE_DIR= 2.0
 16PLIST_SUBST+= GUILE_DIR=${GUILE_DIR}
15 17
16DEPENDS+= slib>=${SLIBVERSION}:../../devel/slib 18DEPENDS+= slib>=${SLIBVERSION}:../../devel/slib
17 19
18NO_BUILD= yes 20NO_BUILD= yes
19WRKSRC= ${WRKDIR} 21WRKSRC= ${WRKDIR}
20 22
21INSTALLATION_DIRS= guile/2.2/share/guile guile/2.2/share/guile/site 23INSTALLATION_DIRS= guile/${GUILE_DIR}/share/guile guile/${GUILE_DIR}/share/guile/site
22 24
23do-install: 25do-install:
24 ${RM} -f ${DESTDIR}${PREFIX}/guile/2.2/share/guile/site/slib 26 ${RM} -f ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/slib
25 ${LN} -sf ${PREFIX}/share/slib \ 27 ${LN} -sf ${PREFIX}/share/slib \
26 ${DESTDIR}${PREFIX}/guile/2.2/share/guile/site/slib 28 ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/slib
27 ${RM} -f ${DESTDIR}${PREFIX}/guile/2.2/share/guile/slibcat 29 ${RM} -f ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/slibcat
28 cd ${DESTDIR}${PREFIX}/guile/2.2/share/guile/site/slib && \ 30 cd ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/slib && \
29 GUILE_LOAD_PATH=${PREFIX}/share \ 31 GUILE_LOAD_PATH=${PREFIX}/share \
30 GUILE_IMPLEMENTATION_PATH=${DESTDIR}${PREFIX}/guile/2.2/share/guile \ 32 GUILE_IMPLEMENTATION_PATH=${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site \
31 guile -q -c "(begin (use-modules (ice-9 slib)) (require 'new-catalog))" 33 ${PREFIX}/guile/${GUILE_DIR}/bin/guile -q -c "(begin (use-modules (ice-9 slib)) (require 'new-catalog))"
32 34
33.include "../../lang/guile22/buildlink3.mk" 35.include "../../lang/${GUILE_VERSION}/buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/devel/guile-slib/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/guile-slib/PLIST 2022/03/09 20:35:39 1.14
+++ pkgsrc/devel/guile-slib/PLIST 2022/03/09 23:29:51 1.15
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1@comment $NetBSD: PLIST,v 1.14 2022/03/09 20:35:39 gdt Exp $ 1@comment $NetBSD: PLIST,v 1.15 2022/03/09 23:29:51 gdt Exp $
2guile/2.2/share/guile/slibcat 2guile/${GUILE_DIR}/share/guile/site/slibcat
3guile/2.2/share/guile/site/slib 3guile/${GUILE_DIR}/share/guile/site/slib