CVS commit: pkgsrc/devel/guile-slib

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Mar 10 14:29:04 UTC 2022

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

Log Message:
guile-slib: Rationalize install paths and document

This package is a maze of twisty include paths in guile interacting
with DESTDIR.  Add many comments to explain the plan, after reading
sources.  Switch to site/2.0 as the scheme subdir, following upstream
slib's default.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/guile-slib/Makefile
cvs rdiff -u -r1.15 -r1.16 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.53 pkgsrc/devel/guile-slib/Makefile:1.54
--- pkgsrc/devel/guile-slib/Makefile:1.53       Thu Mar 10 13:43:59 2022
+++ pkgsrc/devel/guile-slib/Makefile    Thu Mar 10 14:29:04 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2022/03/10 13:43:59 gdt Exp $
+# $NetBSD: Makefile,v 1.54 2022/03/10 14:29:04 gdt Exp $
 
 SLIBVERSION=   3.2.6
 DISTNAME=      guile-slib-${SLIBVERSION}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -20,23 +20,29 @@ DEPENDS+=   slib>=${SLIBVERSION}:../../dev
 NO_BUILD=      yes
 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
+#   https://www.gnu.org/software/guile/docs/docs-2.0/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.
-
+#   ln -s /usr/local/lib/slib /usr/local/share/guile/2.0/slib
+# However, slib's default catalog location is guile/site/2.0, so we
+# use that.
+
+INSTALLATION_DIRS=     guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}
+
+# GUILE_LOAD_PATH enables (ice-9 slib) to find slib, needed because
+# the symlink is in the DESTDIR but not yet in the installed system.
+# GUILE_IMPLEMENTATION_PATH is an override to the slib catalog build
+# procedure to write the catalog at that particular path instead of
+# the default value of (%site-dir), which is
+# /usr/pkg/guile/2.0/share/guile/site/2.0
 do-install:
        ${LN} -sf ${PREFIX}/share/slib \
-               ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/slib
-       cd ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/slib && \
+               ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}/slib
+       cd ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}/slib && \
                GUILE_LOAD_PATH=${PREFIX}/share \
+               GUILE_IMPLEMENTATION_PATH=${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/${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"

Index: pkgsrc/devel/guile-slib/PLIST
diff -u pkgsrc/devel/guile-slib/PLIST:1.15 pkgsrc/devel/guile-slib/PLIST:1.16
--- pkgsrc/devel/guile-slib/PLIST:1.15  Wed Mar  9 23:29:51 2022
+++ pkgsrc/devel/guile-slib/PLIST       Thu Mar 10 14:29:04 2022
@@ -1,3 +1,3 @@
-@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
+@comment $NetBSD: PLIST,v 1.16 2022/03/10 14:29:04 gdt Exp $
+guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}/slibcat
+guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}/slib