CVS commit: pkgsrc/devel/guile-slib

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Mar 10 13:43:59 UTC 2022

Modified Files:
        pkgsrc/devel/guile-slib: DESCR Makefile

Log Message:
devel/guile-slib: Align to guile22-slib


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/guile-slib/DESCR
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/guile-slib/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/guile-slib/DESCR
diff -u pkgsrc/devel/guile-slib/DESCR:1.5 pkgsrc/devel/guile-slib/DESCR:1.6
--- pkgsrc/devel/guile-slib/DESCR:1.5   Sat Mar  5 18:32:31 2022
+++ pkgsrc/devel/guile-slib/DESCR       Thu Mar 10 13:43:59 2022
@@ -1 +1 @@
-SLIB glue files for guile
+SLIB glue files for guile 2.0.

Index: pkgsrc/devel/guile-slib/Makefile
diff -u pkgsrc/devel/guile-slib/Makefile:1.52 pkgsrc/devel/guile-slib/Makefile:1.53
--- pkgsrc/devel/guile-slib/Makefile:1.52       Thu Mar 10 13:32:36 2022
+++ pkgsrc/devel/guile-slib/Makefile    Thu Mar 10 13:43:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2022/03/10 13:32:36 gdt Exp $
+# $NetBSD: Makefile,v 1.53 2022/03/10 13:43:59 gdt Exp $
 
 SLIBVERSION=   3.2.6
 DISTNAME=      guile-slib-${SLIBVERSION}
@@ -29,11 +29,10 @@ INSTALLATION_DIRS=  guile/${GUILE_DIR}/sh
 # We were using site instead of 2.2 in previous guile-slib packages.
 
 do-install:
-       ${MKDIR} ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/${GUILE_DIR}
        ${LN} -sf ${PREFIX}/share/slib \
-               ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/${GUILE_DIR}/slib
-       cd ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/${GUILE_DIR} && \
-               GUILE_LOAD_PATH=${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/${GUILE_DIR} \
+               ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/slib
+       cd ${DESTDIR}${PREFIX}/guile/${GUILE_DIR}/share/guile/site/slib && \
+               GUILE_LOAD_PATH=${PREFIX}/share \
                ${PREFIX}/guile/${GUILE_DIR}/bin/guile -q -c "(begin (use-modules (ice-9 slib)) (require 'new-catalog))"
 
 # historical - does not seem to be used in 2.2