CVS commit: pkgsrc/devel/guile-slib

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Mar  9 23:29:51 UTC 2022

Modified Files:
        pkgsrc/devel/guile-slib: Makefile PLIST

Log Message:
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.)


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/guile-slib/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/guile-slib/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/guile-slib/Makefile
diff -u pkgsrc/devel/guile-slib/Makefile:1.50 pkgsrc/devel/guile-slib/Makefile:1.51
--- pkgsrc/devel/guile-slib/Makefile:1.50       Wed Mar  9 20:35:39 2022
+++ pkgsrc/devel/guile-slib/Makefile    Wed Mar  9 23:29:51 2022
@@ -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 @@ MAINTAINER= gdt%NetBSD.org@localhost
 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"

Index: pkgsrc/devel/guile-slib/PLIST
diff -u pkgsrc/devel/guile-slib/PLIST:1.14 pkgsrc/devel/guile-slib/PLIST:1.15
--- pkgsrc/devel/guile-slib/PLIST:1.14  Wed Mar  9 20:35:39 2022
+++ pkgsrc/devel/guile-slib/PLIST       Wed Mar  9 23:29:51 2022
@@ -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