CVS commit: pkgsrc/devel/guile30-slib
"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 00:35:04 UTC 2026 Modified Files: pkgsrc/devel/guile30-slib: Makefile Added Files: pkgsrc/devel/guile30-slib: Makefile.common Log Message: devel/guile30-slib: Split most into Makefile.common As CSE across guile*-slib, not yet accomplished. Builds as well as it did before. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/guile30-slib/Makefile cvs rdiff -u -r0 -r1.1 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 KB)
Modified files:
Index: pkgsrc/devel/guile30-slib/Makefile
diff -u pkgsrc/devel/guile30-slib/Makefile:1.3 pkgsrc/devel/guile30-slib/Makefile:1.4
--- pkgsrc/devel/guile30-slib/Makefile:1.3 Thu Aug 13 19:20:32 2026
+++ pkgsrc/devel/guile30-slib/Makefile Fri Aug 14 00:35:04 2026
@@ -1,39 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2026/08/13 19:20:32 gdt Exp $
+# $NetBSD: Makefile,v 1.4 2026/08/14 00:35:04 gdt Exp $
-SLIBVERSION= 3.3.1
-DISTNAME= guile-slib-${SLIBVERSION}
-PKGNAME= ${DISTNAME:S/guile/guile30/}
-CATEGORIES= devel
-MASTER_SITES= # empty
-DISTFILES= # empty
+GUILE_MAJOR= 3
+GUILE_MINOR= 0
+.include "../../devel/guile30-slib/Makefile.common"
-MAINTAINER= [email protected]
-HOMEPAGE= https://people.csail.mit.edu/jaffer/SLIB
-COMMENT= SLIB glue files for guile
-
-GUILE_VERSION= guile30
-GUILE_DIR= 3.0
-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"
Added files:
Index: pkgsrc/devel/guile30-slib/Makefile.common
diff -u /dev/null pkgsrc/devel/guile30-slib/Makefile.common:1.1
--- /dev/null Fri Aug 14 00:35:04 2026
+++ pkgsrc/devel/guile30-slib/Makefile.common Fri Aug 14 00:35:04 2026
@@ -0,0 +1,54 @@
+# $NetBSD: Makefile.common,v 1.1 2026/08/14 00:35:04 gdt Exp $
+
+# This file exists to centralize maintainer documentation as much as logic.
+
+# Before including this file, set
+# GUILE_MAJOR
+# GUILE_MINOR
+
+# Construct needed variations on guile version numbers.
+GUILE_VERSION= guile${GUILE_MAJOR}${GUILE_MINOR}
+GUILE_DIR= ${GUILE_MAJOR}.${GUILE_MINOR}
+
+SLIBVERSION= 3.3.1
+
+DISTNAME= guile-slib-${SLIBVERSION}
+PKGNAME= ${DISTNAME:S/guile/${GUILE_VERSION}/}
+CATEGORIES= devel
+MASTER_SITES= # empty
+DISTFILES= # empty
+
+MAINTAINER= [email protected]
+HOMEPAGE= https://people.csail.mit.edu/jaffer/SLIB
+COMMENT= SLIB glue files for ${GUILE_VERSION}
+#LICENSE= [slib's license for the catalog]
+
+DEPENDS+= slib>=${SLIBVERSION}:../../devel/slib
+
+# Instead, we should construct the catalog at build time and copy it
+# to destdir at install time.
+NO_BUILD= yes
+WRKSRC= ${WRKDIR}
+
+# \todo Explain guile's placement rules.
+INSTALLATION_DIRS= guile/${GUILE_DIR}/share/guile/site/${GUILE_DIR}
+
+# See ../guile-slib for comments explaining the choice of paths and
+# how this works.
+
+# Create a symlink so guile can find slib, and build the catalog.
+# (The RM commands are superfluous in the normal case, but needed if
+# install fails and one re-runs it.)
+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))"
+
+PLIST_SUBST+= GUILE_DIR=${GUILE_DIR}
+
+.include "../../lang/${GUILE_VERSION}/buildlink3.mk"