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:33:54 UTC 2026 Modified Files: pkgsrc/devel/guile-slib: Makefile PLIST pkgsrc/devel/guile22-slib: Makefile pkgsrc/devel/guile30-slib: Makefile.common Log Message: guile-slib: Convert to Makefile.common Override PKGNAME to be guile-slib, instead of the guile20-slib that it ought to be, to avoid dealing with changing it for now. Works as well as the old package does, which is: To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 pkgsrc/devel/guile-slib/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/guile-slib/PLIST cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/guile22-slib/Makefile cvs rdiff -u -r1.3 -r1.4 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, 4.2 KB)
Modified files:
Index: pkgsrc/devel/guile-slib/Makefile
diff -u pkgsrc/devel/guile-slib/Makefile:1.59 pkgsrc/devel/guile-slib/Makefile:1.60
--- pkgsrc/devel/guile-slib/Makefile:1.59 Fri Aug 14 15:22:13 2026
+++ pkgsrc/devel/guile-slib/Makefile Fri Aug 14 15:33:54 2026
@@ -1,48 +1,12 @@
-# $NetBSD: Makefile,v 1.59 2026/08/14 15:22:13 gdt Exp $
+# $NetBSD: Makefile,v 1.60 2026/08/14 15:33:54 gdt Exp $
-SLIBVERSION= 3.3.1
-DISTNAME= guile-slib-${SLIBVERSION}
-CATEGORIES= devel
-MASTER_SITES= # empty
-DISTFILES= # empty
+GUILE_MAJOR= 2
+GUILE_MINOR= 0
-MAINTAINER= [email protected]
-HOMEPAGE= https://people.csail.mit.edu/jaffer/SLIB
-COMMENT= SLIB glue files for guile
+# For now, this package uses the irregular name guile-slib, instead of
+# guile20-slib.
+PKGNAME= ${DISTNAME}
-GUILE_VERSION= guile20
-GUILE_DIR= 2.0
-PLIST_SUBST+= GUILE_DIR=${GUILE_DIR}
+.include "../../devel/guile30-slib/Makefile.common"
-DEPENDS+= slib>=${SLIBVERSION}:../../devel/slib
-
-NO_BUILD= yes
-WRKSRC= ${WRKDIR}
-
-
-# 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
-# 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
-# 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"
Index: pkgsrc/devel/guile-slib/PLIST
diff -u pkgsrc/devel/guile-slib/PLIST:1.17 pkgsrc/devel/guile-slib/PLIST:1.18
--- pkgsrc/devel/guile-slib/PLIST:1.17 Thu Mar 10 16:32:25 2022
+++ pkgsrc/devel/guile-slib/PLIST Fri Aug 14 15:33:54 2026
@@ -1,3 +1,3 @@
-@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
+@comment $NetBSD: PLIST,v 1.18 2026/08/14 15:33:54 gdt Exp $
+${SITE_DIR}/slib
+${SITE_DIR}/slibcat
Index: pkgsrc/devel/guile22-slib/Makefile
diff -u pkgsrc/devel/guile22-slib/Makefile:1.12 pkgsrc/devel/guile22-slib/Makefile:1.13
--- pkgsrc/devel/guile22-slib/Makefile:1.12 Fri Aug 14 15:22:13 2026
+++ pkgsrc/devel/guile22-slib/Makefile Fri Aug 14 15:33:54 2026
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2026/08/14 15:22:13 gdt Exp $
-
-# $NetBSD: Makefile,v 1.12 2026/08/14 15:22:13 gdt Exp $
+# $NetBSD: Makefile,v 1.13 2026/08/14 15:33:54 gdt Exp $
GUILE_MAJOR= 2
GUILE_MINOR= 2
Index: pkgsrc/devel/guile30-slib/Makefile.common
diff -u pkgsrc/devel/guile30-slib/Makefile.common:1.3 pkgsrc/devel/guile30-slib/Makefile.common:1.4
--- pkgsrc/devel/guile30-slib/Makefile.common:1.3 Fri Aug 14 15:22:13 2026
+++ pkgsrc/devel/guile30-slib/Makefile.common Fri Aug 14 15:33:54 2026
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.common,v 1.3 2026/08/14 15:22:13 gdt Exp $
+# $NetBSD: Makefile.common,v 1.4 2026/08/14 15:33:54 gdt Exp $
+# used by devel/guile-slib/Makefile
# used by devel/guile22-slib/Makefile
# This file exists to centralize maintainer documentation as much as logic.
@@ -14,7 +15,7 @@ GUILE_DIR= ${GUILE_MAJOR}.${GUILE_MINOR}
SLIBVERSION= 3.3.1
DISTNAME= guile-slib-${SLIBVERSION}
-PKGNAME= ${DISTNAME:S/guile/${GUILE_VERSION}/}
+PKGNAME?= ${DISTNAME:S/guile/${GUILE_VERSION}/}
CATEGORIES= devel
MASTER_SITES= # empty
DISTFILES= # empty