[pkgsrc/trunk]: pkgsrc/devel/guile22-slib guile22-slib: make it match guile-s...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/292207da9bd4
branches:  trunk
changeset: 375222:292207da9bd4
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Mar 10 07:42:32 2022 +0000

description:
guile22-slib: make it match guile-slib to fix installation

Bump PKGREVISION.

diffstat:

 devel/guile22-slib/Makefile |  22 +++++++++++++---------
 devel/guile22-slib/PLIST    |   6 +++---
 2 files changed, 16 insertions(+), 12 deletions(-)

diffs (59 lines):

diff -r e2eeb3103354 -r 292207da9bd4 devel/guile22-slib/Makefile
--- a/devel/guile22-slib/Makefile       Thu Mar 10 06:56:41 2022 +0000
+++ b/devel/guile22-slib/Makefile       Thu Mar 10 07:42:32 2022 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2022/03/05 18:35:58 gdt Exp $
+# $NetBSD: Makefile,v 1.7 2022/03/10 07:42:32 wiz Exp $
 
 SLIBVERSION=   3.2.6
 DISTNAME=      guile-slib-${SLIBVERSION}
 PKGNAME=       ${DISTNAME:S/guile/guile22/}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -12,22 +12,26 @@
 HOMEPAGE=      http://people.csail.mit.edu/jaffer/SLIB
 COMMENT=       SLIB glue files for guile
 
+GUILE_VERSION= guile22
+GUILE_DIR=     2.2
+PLIST_SUBST+=  GUILE_DIR=${GUILE_DIR}
+
 DEPENDS+=      slib>=${SLIBVERSION}:../../devel/slib
 
 NO_BUILD=      yes
 WRKSRC=                ${WRKDIR}
 
-INSTALLATION_DIRS=     share/guile share/guile/site
+INSTALLATION_DIRS=     guile/${GUILE_DIR}/share/guile guile/${GUILE_DIR}/share/guile/site
 
 do-install:
-       ${RM} -f ${DESTDIR}${PREFIX}/share/guile/site/slib
+       ${RM} -f ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/slib
        ${LN} -sf ${PREFIX}/share/slib \
-               ${DESTDIR}${PREFIX}/share/guile/site/slib
-       ${RM} -f ${DESTDIR}${PREFIX}/share/guile/slibcat
-       cd ${DESTDIR}${PREFIX}/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}/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 "../../mk/bsd.pkg.mk"
diff -r e2eeb3103354 -r 292207da9bd4 devel/guile22-slib/PLIST
--- a/devel/guile22-slib/PLIST  Thu Mar 10 06:56:41 2022 +0000
+++ b/devel/guile22-slib/PLIST  Thu Mar 10 07:42:32 2022 +0000
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2018/01/16 13:33:32 wiz Exp $
-share/guile/2.2/slibcat
-share/guile/site/slib
+@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