[pkgsrc/trunk]: pkgsrc/devel/guile-slib guile-slib: Rationalize install paths...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7807a7f853be
branches:  trunk
changeset: 375236:7807a7f853be
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Thu Mar 10 14:29:04 2022 +0000

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

diffstat:

 devel/guile-slib/Makefile |  30 ++++++++++++++++++------------
 devel/guile-slib/PLIST    |   6 +++---
 2 files changed, 21 insertions(+), 15 deletions(-)

diffs (64 lines):

diff -r 323f0270676b -r 7807a7f853be devel/guile-slib/Makefile
--- a/devel/guile-slib/Makefile Thu Mar 10 14:20:16 2022 +0000
+++ b/devel/guile-slib/Makefile Thu Mar 10 14:29:04 2022 +0000
@@ -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 @@
 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.0/guile-ref/SLIB-installation.html
+# say
+#   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.
 
-# 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.
+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"
diff -r 323f0270676b -r 7807a7f853be devel/guile-slib/PLIST
--- a/devel/guile-slib/PLIST    Thu Mar 10 14:20:16 2022 +0000
+++ b/devel/guile-slib/PLIST    Thu Mar 10 14:29:04 2022 +0000
@@ -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