ports/121070: [PATCH] lang/slib-guile parameterize guile version

[David Barksdale]

>Number:         121070
>Category:       ports
>Synopsis:       [PATCH] lang/slib-guile parameterize guile version
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 25 05:00:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     David Barksdale
>Release:        
>Organization:
>Environment:
>Description:
This patch allows lang/slib-guile to build against guile versions 1.6 and 1.8 in preparation for updating to guile 1.8.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN /usr/ports/lang/slib-guile/Makefile lang/slib-guile/Makefile
--- /usr/ports/lang/slib-guile/Makefile	2007-01-24 10:19:21.000000000 -0600
+++ lang/slib-guile/Makefile	2008-02-24 21:15:29.469452251 -0600
@@ -7,6 +7,7 @@
 
 PORTNAME=	slib
 PORTVERSION=	3a4 # Keep this in sync with lang/slib
+PORTREVISION=	1
 CATEGORIES=	lang scheme
 MASTER_SITES=	# empty
 PKGNAMESUFFIX=	-guile
@@ -21,10 +22,15 @@
 
 NO_BUILD=	yes
 
+.include <bsd.port.pre.mk>
+
+GUILE_VER!=	${LOCALBASE}/bin/guile-config info guileversion | ${CUT} -f 1-2 -d .
+PLIST_SUB=	GUILE_VER=${GUILE_VER}
+
 do-install:
-	${LN} -shf ${PREFIX}/share/slib ${LOCALBASE}/share/guile/1.6/slib
-	cd ${PREFIX}/share/guile/1.6/slib && \
+	${LN} -shf ${PREFIX}/share/slib ${LOCALBASE}/share/guile/${GUILE_VER}/slib
+	cd ${PREFIX}/share/guile/${GUILE_VER}/slib && \
 		${LOCALBASE}/bin/guile -q -l guile.init -c \
 		"(require 'new-catalog)"
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN /usr/ports/lang/slib-guile/pkg-plist lang/slib-guile/pkg-plist
--- /usr/ports/lang/slib-guile/pkg-plist	2006-10-14 03:35:41.000000000 -0500
+++ lang/slib-guile/pkg-plist	2008-02-24 20:50:39.147358801 -0600
@@ -1,4 +1,4 @@
- at exec ln -shf %D/share/slib %D/share/guile/1.6/slib
+ at exec ln -shf %D/share/slib %D/share/guile/%%GUILE_VER%%/slib
 @exec %D/bin/guile -q -l %%LOCALBASE%%/share/slib/guile.init -c "(require 'new-catalog)"
- at unexec rm -f %D/share/guile/1.6/slib
- at unexec rm -f %D/share/guile/1.6/slibcat
+ at unexec rm -f %D/share/guile/%%GUILE_VER%%/slib
+ at unexec rm -f %D/share/guile/%%GUILE_VER%%/slibcat


>Release-Note:
>Audit-Trail:
>Unformatted: