[pkgsrc/trunk]: pkgsrc/devel devel/guile*-slib: Finish alignment of guile*-sl...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7f922fda341f
branches:  trunk
changeset: 375245:7f922fda341f
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Thu Mar 10 16:32:25 2022 +0000

description:
devel/guile*-slib: Finish alignment of guile*-slib packages

guile-slib:

Add more comments explaining a residual problem.  Put back RM
statements because they help re-running failed builds, even if they
are pointless on a fresh build.  Sort PLIST.  No change in generated
package.

guile22-slib:

Use variables more.  Move to site/2.2 subdir, following guile-lib and
upstream defaults.  Point to guile-slib for comments.

Sorry for the churn; this was much harder to understand than I expected.

diffstat:

 devel/guile-slib/Makefile   |  11 +++++++++--
 devel/guile-slib/PLIST      |   4 ++--
 devel/guile22-slib/Makefile |  21 ++++++++++++---------
 devel/guile22-slib/PLIST    |   6 +++---
 4 files changed, 26 insertions(+), 16 deletions(-)

diffs (101 lines):

diff -r 99605c980434 -r 7f922fda341f devel/guile-slib/Makefile
--- a/devel/guile-slib/Makefile Thu Mar 10 16:29:46 2022 +0000
+++ b/devel/guile-slib/Makefile Thu Mar 10 16:32:25 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2022/03/10 14:29:04 gdt Exp $
+# $NetBSD: Makefile,v 1.55 2022/03/10 16:32:25 gdt Exp $
 
 SLIBVERSION=   3.2.6
 DISTNAME=      guile-slib-${SLIBVERSION}
@@ -27,6 +27,10 @@
 # However, slib's default catalog location is guile/site/2.0, so we
 # use that.
 
+# There is a residual problem where after slib is used (and scheme
+# code is compiled), building the package again can result in "Unbound
+# variable: module-export-all!".
+
 INSTALLATION_DIRS=     guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}
 
 # GUILE_LOAD_PATH enables (ice-9 slib) to find slib, needed because
@@ -35,14 +39,17 @@
 # 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
+# The RM commands are only needed if there is a failure in install and
+# install is re-run.
 do-install:
+       ${RM} -f ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}/slib
        ${LN} -sf ${PREFIX}/share/slib \
                ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}/slib
+       ${RM} -f ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}/slibcat
        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))"
 
-
 .include "../../lang/${GUILE_VERSION}/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 99605c980434 -r 7f922fda341f devel/guile-slib/PLIST
--- a/devel/guile-slib/PLIST    Thu Mar 10 16:29:46 2022 +0000
+++ b/devel/guile-slib/PLIST    Thu Mar 10 16:32:25 2022 +0000
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.16 2022/03/10 14:29:04 gdt Exp $
+@comment $NetBSD: PLIST,v 1.17 2022/03/10 16:32:25 gdt Exp $
+guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}/slib
 guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}/slibcat
-guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}/slib
diff -r 99605c980434 -r 7f922fda341f devel/guile22-slib/Makefile
--- a/devel/guile22-slib/Makefile       Thu Mar 10 16:29:46 2022 +0000
+++ b/devel/guile22-slib/Makefile       Thu Mar 10 16:32:25 2022 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2022/03/10 07:42:32 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/03/10 16:32:25 gdt Exp $
 
 SLIBVERSION=   3.2.6
 DISTNAME=      guile-slib-${SLIBVERSION}
 PKGNAME=       ${DISTNAME:S/guile/guile22/}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -21,17 +21,20 @@
 NO_BUILD=      yes
 WRKSRC=                ${WRKDIR}
 
-INSTALLATION_DIRS=     guile/${GUILE_DIR}/share/guile guile/${GUILE_DIR}/share/guile/site
+# See ../guile-slib for comments explaining the choice of paths and
+# how this works.
+
+INSTALLATION_DIRS=     guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}
 
 do-install:
-       ${RM} -f ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/slib
+       ${RM} -f ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}/slib
        ${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 && \
+               ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}/slib
+       ${RM} -f ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}/slibcat
+       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_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))"
 
-.include "../../lang/guile22/buildlink3.mk"
+.include "../../lang/${GUILE_VERSION}/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 99605c980434 -r 7f922fda341f devel/guile22-slib/PLIST
--- a/devel/guile22-slib/PLIST  Thu Mar 10 16:29:46 2022 +0000
+++ b/devel/guile22-slib/PLIST  Thu Mar 10 16:32:25 2022 +0000
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2022/03/10 07:42:32 wiz Exp $
-guile/2.2/share/guile/site/slib
-guile/2.2/share/guile/site/slibcat
+@comment $NetBSD: PLIST,v 1.3 2022/03/10 16:32:25 gdt Exp $
+guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}/slib
+guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}/slibcat