CVS commit: pkgsrc/devel/guile-slib

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Mar 10 13:32:36 UTC 2022

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

Log Message:
devel/guile22-slib: Use variable for guile dep

This does not change the build, but reduces diffs to ../guile-slib


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

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.51 pkgsrc/devel/guile-slib/Makefile:1.52
--- pkgsrc/devel/guile-slib/Makefile:1.51       Wed Mar  9 23:29:51 2022
+++ pkgsrc/devel/guile-slib/Makefile    Thu Mar 10 13:32:36 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2022/03/09 23:29:51 gdt Exp $
+# $NetBSD: Makefile,v 1.52 2022/03/10 13:32:36 gdt Exp $
 
 SLIBVERSION=   3.2.6
 DISTNAME=      guile-slib-${SLIBVERSION}
@@ -22,15 +22,22 @@ WRKSRC=             ${WRKDIR}
 
 INSTALLATION_DIRS=     guile/${GUILE_DIR}/share/guile guile/${GUILE_DIR}/share/guile/site
 
+# Instructions at
+#   https://www.gnu.org/software/guile/docs/docs-2.2/guile-ref/SLIB-installation.html
+# say
+#   ln -s /usr/local/lib/slib /usr/local/share/guile/2.2/slib
+# We were using site instead of 2.2 in previous guile-slib packages.
+
 do-install:
-       ${RM} -f ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/slib
+       ${MKDIR} ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/${GUILE_DIR}
        ${LN} -sf ${PREFIX}/share/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/${GUILE_DIR}/share/guile/site \
+               ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/${GUILE_DIR}/slib
+       cd ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/${GUILE_DIR} && \
+               GUILE_LOAD_PATH=${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/${GUILE_DIR} \
                ${PREFIX}/guile/${GUILE_DIR}/bin/guile -q -c "(begin (use-modules (ice-9 slib)) (require 'new-catalog))"
 
+# historical - does not seem to be used in 2.2
+#              GUILE_IMPLEMENTATION_PATH=${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share \
+
 .include "../../lang/${GUILE_VERSION}/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"