[pkgsrc/trunk]: pkgsrc/devel/guile-slib devel/guile-slib: Adapt to new guile ...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6488dece1eb2
branches:  trunk
changeset: 375214:6488dece1eb2
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Wed Mar 09 23:29:51 2022 +0000

description:
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.)

diffstat:

 devel/guile-slib/Makefile |  24 +++++++++++++-----------
 devel/guile-slib/PLIST    |   6 +++---
 2 files changed, 16 insertions(+), 14 deletions(-)

diffs (60 lines):

diff -r e968230af2dd -r 6488dece1eb2 devel/guile-slib/Makefile
--- a/devel/guile-slib/Makefile Wed Mar 09 20:35:39 2022 +0000
+++ b/devel/guile-slib/Makefile Wed Mar 09 23:29:51 2022 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2022/03/09 20:35:39 gdt Exp $
+# $NetBSD: Makefile,v 1.51 2022/03/09 23:29:51 gdt Exp $
 
 SLIBVERSION=   3.2.6
 DISTNAME=      guile-slib-${SLIBVERSION}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -11,24 +11,26 @@
 HOMEPAGE=      http://people.csail.mit.edu/jaffer/SLIB
 COMMENT=       SLIB glue files for guile
 
-# This package is currently linked to guile22.
+GUILE_VERSION= guile20
+GUILE_DIR=     2.0
+PLIST_SUBST+=  GUILE_DIR=${GUILE_DIR}
 
 DEPENDS+=      slib>=${SLIBVERSION}:../../devel/slib
 
 NO_BUILD=      yes
 WRKSRC=                ${WRKDIR}
 
-INSTALLATION_DIRS=     guile/2.2/share/guile guile/2.2/share/guile/site
+INSTALLATION_DIRS=     guile/${GUILE_DIR}/share/guile guile/${GUILE_DIR}/share/guile/site
 
 do-install:
-       ${RM} -f ${DESTDIR}${PREFIX}/guile/2.2/share/guile/site/slib
+       ${RM} -f ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/slib
        ${LN} -sf ${PREFIX}/share/slib \
-               ${DESTDIR}${PREFIX}/guile/2.2/share/guile/site/slib
-       ${RM} -f ${DESTDIR}${PREFIX}/guile/2.2/share/guile/slibcat
-       cd ${DESTDIR}${PREFIX}/guile/2.2/share/guile/site/slib && \
+               ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/slib
+       ${RM} -f ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/slibcat
+       cd ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/slib && \
                GUILE_LOAD_PATH=${PREFIX}/share \
-               GUILE_IMPLEMENTATION_PATH=${DESTDIR}${PREFIX}/guile/2.2/share/guile \
-               guile -q -c "(begin (use-modules (ice-9 slib)) (require 'new-catalog))"
+               GUILE_IMPLEMENTATION_PATH=${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site \
+               ${PREFIX}/guile/${GUILE_DIR}/bin/guile -q -c "(begin (use-modules (ice-9 slib)) (require 'new-catalog))"
 
-.include "../../lang/guile22/buildlink3.mk"
+.include "../../lang/${GUILE_VERSION}/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e968230af2dd -r 6488dece1eb2 devel/guile-slib/PLIST
--- a/devel/guile-slib/PLIST    Wed Mar 09 20:35:39 2022 +0000
+++ b/devel/guile-slib/PLIST    Wed Mar 09 23:29:51 2022 +0000
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.14 2022/03/09 20:35:39 gdt Exp $
-guile/2.2/share/guile/slibcat
-guile/2.2/share/guile/site/slib
+@comment $NetBSD: PLIST,v 1.15 2022/03/09 23:29:51 gdt Exp $
+guile/${GUILE_DIR}/share/guile/site/slibcat
+guile/${GUILE_DIR}/share/guile/site/slib