CVS commit: pkgsrc/devel/slib

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Sep 15 14:02:08 UTC 2016

Modified Files:
        pkgsrc/devel/slib: Makefile PLIST

Log Message:
Install a symlink from ${PREFIX}/share/slib/slib to ${PREFIX}/share/slib.

Needed by guile-slib with guile20-2.0.12.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/slib/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/slib/PLIST

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

Modified files:

Index: pkgsrc/devel/slib/Makefile
diff -u pkgsrc/devel/slib/Makefile:1.36 pkgsrc/devel/slib/Makefile:1.37
--- pkgsrc/devel/slib/Makefile:1.36     Thu Sep 15 00:08:12 2016
+++ pkgsrc/devel/slib/Makefile  Thu Sep 15 14:02:08 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2016/09/15 00:08:12 gdt Exp $
+# $NetBSD: Makefile,v 1.37 2016/09/15 14:02:08 wiz Exp $
 
 DISTNAME=      slib-3b5
 #
@@ -9,6 +9,7 @@ DISTNAME=       slib-3b5
 # Also update guile-slib
 #
 PKGNAME=       slib-3.2.5
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  http://swissnet.ai.mit.edu/ftpdir/scm/
 
@@ -25,7 +26,7 @@ SLIBDIR=      ${PREFIX}/share/slib
 DOCDIR=                ${PREFIX}/share/doc/slib
 INFO_FILES=    yes
 
-INSTALLATION_DIRS=     ${PKGINFODIR}
+INSTALLATION_DIRS=     ${PKGINFODIR} share/slib share/doc/slib
 
 SUBST_CLASSES+=                scmpath
 SUBST_STAGE.scmpath=   post-patch
@@ -33,9 +34,10 @@ SUBST_FILES.scmpath= guile.init
 SUBST_SED.scmpath=     -e "s|/usr/share/slib|${PREFIX}/share/slib|"
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${SLIBDIR}
+       # symlink is a workaround for guile-slib with guile20-2.0.12
+       # remove when not needed any longer
+       cd ${DESTDIR}${SLIBDIR} && ${LN} -s . slib
        cd ${WRKSRC}; ${INSTALL_DATA} *.scm *.init ${DESTDIR}${SLIBDIR}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
        cd ${WRKSRC}; ${INSTALL_DATA} README FAQ ${DESTDIR}${DOCDIR}
        cd ${WRKSRC}; for f in slib.info slib.info-[0-9]*; do           \
                ${TEST} ! -f "$$f" ||                                   \

Index: pkgsrc/devel/slib/PLIST
diff -u pkgsrc/devel/slib/PLIST:1.16 pkgsrc/devel/slib/PLIST:1.17
--- pkgsrc/devel/slib/PLIST:1.16        Thu Sep 15 00:08:12 2016
+++ pkgsrc/devel/slib/PLIST     Thu Sep 15 14:02:08 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2016/09/15 00:08:12 gdt Exp $
+@comment $NetBSD: PLIST,v 1.17 2016/09/15 14:02:08 wiz Exp $
 info/slib.info
 share/doc/slib/FAQ
 share/doc/slib/README
@@ -143,6 +143,7 @@ share/slib/selfset.scm
 share/slib/sierpinski.scm
 share/slib/simetrix.scm
 share/slib/sisc.init
+share/slib/slib
 share/slib/solid.scm
 share/slib/sort.scm
 share/slib/soundex.scm