CVS commit: pkgsrc/devel
"Greg Troxel" <[email protected]>
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module Name: pkgsrc Committed By: gdt Date: Fri Aug 14 15:22:13 UTC 2026 Modified Files: pkgsrc/devel/guile-slib: Makefile pkgsrc/devel/guile22-slib: Makefile PLIST pkgsrc/devel/guile30-slib: Makefile.common Log Message: devel/guile22-slib: Convert to Makefile.common Replace the guile22-slib Makefile with an include of Makefile.common. guile30-slib: Restore load path env variable, but point it to destdir, so that the catalog can find slib when the symlink exists in the being-built destdir but does not exist in the system, because the package is not yet installed. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 pkgsrc/devel/guile-slib/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/guile22-slib/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/guile22-slib/PLIST cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/guile30-slib/Makefile.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
(unnamed)
(text/x-diff, 5 KB)
Modified files:
Index: pkgsrc/devel/guile-slib/Makefile
diff -u pkgsrc/devel/guile-slib/Makefile:1.58 pkgsrc/devel/guile-slib/Makefile:1.59
--- pkgsrc/devel/guile-slib/Makefile:1.58 Sat Dec 27 08:09:34 2025
+++ pkgsrc/devel/guile-slib/Makefile Fri Aug 14 15:22:13 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2025/12/27 08:09:34 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2026/08/14 15:22:13 gdt Exp $
SLIBVERSION= 3.3.1
DISTNAME= guile-slib-${SLIBVERSION}
@@ -19,12 +19,6 @@ DEPENDS+= slib>=${SLIBVERSION}:../../dev
NO_BUILD= yes
WRKSRC= ${WRKDIR}
-# 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.
# There is a residual problem where after slib is used (and scheme
# code is compiled), building the package again can result in "Unbound
Index: pkgsrc/devel/guile22-slib/Makefile
diff -u pkgsrc/devel/guile22-slib/Makefile:1.11 pkgsrc/devel/guile22-slib/Makefile:1.12
--- pkgsrc/devel/guile22-slib/Makefile:1.11 Sat Dec 27 08:10:12 2025
+++ pkgsrc/devel/guile22-slib/Makefile Fri Aug 14 15:22:13 2026
@@ -1,39 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2025/12/27 08:10:12 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2026/08/14 15:22:13 gdt Exp $
-SLIBVERSION= 3.3.1
-DISTNAME= guile-slib-${SLIBVERSION}
-PKGNAME= ${DISTNAME:S/guile/guile22/}
-CATEGORIES= devel
-MASTER_SITES= # empty
-DISTFILES= # empty
+# $NetBSD: Makefile,v 1.12 2026/08/14 15:22:13 gdt Exp $
-MAINTAINER= [email protected]
-HOMEPAGE= https://people.csail.mit.edu/jaffer/SLIB
-COMMENT= SLIB glue files for guile
+GUILE_MAJOR= 2
+GUILE_MINOR= 2
+.include "../../devel/guile30-slib/Makefile.common"
-GUILE_VERSION= guile22
-GUILE_DIR= 2.2
-PLIST_SUBST+= GUILE_DIR=${GUILE_DIR}
-
-DEPENDS+= slib>=${SLIBVERSION}:../../devel/slib
-
-NO_BUILD= yes
-WRKSRC= ${WRKDIR}
-
-# 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/${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"
Index: pkgsrc/devel/guile22-slib/PLIST
diff -u pkgsrc/devel/guile22-slib/PLIST:1.3 pkgsrc/devel/guile22-slib/PLIST:1.4
--- pkgsrc/devel/guile22-slib/PLIST:1.3 Thu Mar 10 16:32:25 2022
+++ pkgsrc/devel/guile22-slib/PLIST Fri Aug 14 15:22:13 2026
@@ -1,3 +1,3 @@
-@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
+@comment $NetBSD: PLIST,v 1.4 2026/08/14 15:22:13 gdt Exp $
+${SITE_DIR}/slib
+${SITE_DIR}/slibcat
Index: pkgsrc/devel/guile30-slib/Makefile.common
diff -u pkgsrc/devel/guile30-slib/Makefile.common:1.2 pkgsrc/devel/guile30-slib/Makefile.common:1.3
--- pkgsrc/devel/guile30-slib/Makefile.common:1.2 Fri Aug 14 15:15:16 2026
+++ pkgsrc/devel/guile30-slib/Makefile.common Fri Aug 14 15:22:13 2026
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.common,v 1.2 2026/08/14 15:15:16 gdt Exp $
+# $NetBSD: Makefile.common,v 1.3 2026/08/14 15:22:13 gdt Exp $
+# used by devel/guile22-slib/Makefile
# This file exists to centralize maintainer documentation as much as logic.
@@ -65,7 +66,7 @@ WRKSRC= ${WRKDIR}
# symlink slib:
# ln -s /usr/local/lib/slib /usr/local/share/guile/3.0/slib
# (which of course should be ${PREFIX} instead of /usr/local).
-#
+#
# SCHEME_LIBARY_PATH is used by slib. Both slib and guile imply that
# the value of SCHEME_LIBRARY_PATH should be the pathname where slib
# is installed, with a trailing /, e.g. `/usr/local/lib/slib/`. If
@@ -87,6 +88,8 @@ PLIST_SUBST+= SITE_DIR=${SITE_DIR}
# Create symlink to slib from SITE_DIR, and build the catalog.
# The RM commands are superfluous in the normal case, but needed if
# install fails and one re-runs it.
+# The GUILE_LOAD_PATH setting is necessary so that guile will find
+# slib in the destdir before it is installed.
# The GUILE_IMPLEMENTATION_PATH setting is necessary so that slib
# writes the catalog file in the DESTDIR.
do-install:
@@ -95,6 +98,7 @@ do-install:
${DESTDIR}${PREFIX}/${SITE_DIR}/slib
${RM} -f ${DESTDIR}${PREFIX}/${SITE_DIR}/slibcat
cd ${DESTDIR}${PREFIX}/${SITE_DIR}/slib && \
+ GUILE_LOAD_PATH=${DESTDIR}${PREFIX}/${SITE_DIR} \
GUILE_IMPLEMENTATION_PATH=${DESTDIR}${PREFIX}/${SITE_DIR} \
${PREFIX}/guile/${GUILE_DIR}/bin/guile -c "(begin (use-modules (ice-9 slib)) (require 'new-catalog))"