diff options
| author | gdt <gdt@pkgsrc.org> | 2022-03-09 23:29:51 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2022-03-09 23:29:51 +0000 |
| commit | e7f8d490b106a30e185f9bd0978dd04e358abb13 (patch) | |
| tree | 1da315797ad4cce54e56918b59291e49592986c5 /devel | |
| parent | 42e1fa90461e6e53eba5539b1330398bea7d7ff9 (diff) | |
| download | pkgsrc-e7f8d490b106a30e185f9bd0978dd04e358abb13.tar.gz | |
devel/guile-slib: Adapt to new guile paths and switch back to 2.0
This package now expects guile always be namespaced. (Arguably the
paths should come from the bl3.)
With guile20, this builds and works, and thus it is that way. (With
guile22, there's an error that I don't understand.)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/guile-slib/Makefile | 24 | ||||
| -rw-r--r-- | devel/guile-slib/PLIST | 6 |
2 files changed, 16 insertions, 14 deletions
diff --git a/devel/guile-slib/Makefile b/devel/guile-slib/Makefile index 7e98ff66d70..f09b82e1ea0 100644 --- a/devel/guile-slib/Makefile +++ b/devel/guile-slib/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.50 2022/03/09 20:35:39 gdt Exp $ +# $NetBSD: Makefile,v 1.51 2022/03/09 23:29:51 gdt Exp $ SLIBVERSION= 3.2.6 DISTNAME= guile-slib-${SLIBVERSION} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= devel MASTER_SITES= # empty DISTFILES= # empty @@ -11,24 +11,26 @@ MAINTAINER= gdt@NetBSD.org HOMEPAGE= http://people.csail.mit.edu/jaffer/SLIB COMMENT= SLIB glue files for guile -# This package is currently linked to guile22. +GUILE_VERSION= guile20 +GUILE_DIR= 2.0 +PLIST_SUBST+= GUILE_DIR=${GUILE_DIR} DEPENDS+= slib>=${SLIBVERSION}:../../devel/slib NO_BUILD= yes WRKSRC= ${WRKDIR} -INSTALLATION_DIRS= guile/2.2/share/guile guile/2.2/share/guile/site +INSTALLATION_DIRS= guile/${GUILE_DIR}/share/guile guile/${GUILE_DIR}/share/guile/site do-install: - ${RM} -f ${DESTDIR}${PREFIX}/guile/2.2/share/guile/site/slib + ${RM} -f ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/slib ${LN} -sf ${PREFIX}/share/slib \ - ${DESTDIR}${PREFIX}/guile/2.2/share/guile/site/slib - ${RM} -f ${DESTDIR}${PREFIX}/guile/2.2/share/guile/slibcat - cd ${DESTDIR}${PREFIX}/guile/2.2/share/guile/site/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 && \ GUILE_LOAD_PATH=${PREFIX}/share \ - GUILE_IMPLEMENTATION_PATH=${DESTDIR}${PREFIX}/guile/2.2/share/guile \ - guile -q -c "(begin (use-modules (ice-9 slib)) (require 'new-catalog))" + GUILE_IMPLEMENTATION_PATH=${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site \ + ${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 --git a/devel/guile-slib/PLIST b/devel/guile-slib/PLIST index f770de90cc6..7195541651d 100644 --- a/devel/guile-slib/PLIST +++ b/devel/guile-slib/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.14 2022/03/09 20:35:39 gdt Exp $ -guile/2.2/share/guile/slibcat -guile/2.2/share/guile/site/slib +@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 |