From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Feb 25 05:00:03 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06C8E16A408 for ; Mon, 25 Feb 2008 05:00:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D16BB13C45E for ; Mon, 25 Feb 2008 05:00:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m1P5020S000469 for ; Mon, 25 Feb 2008 05:00:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m1P5023h000468; Mon, 25 Feb 2008 05:00:02 GMT (envelope-from gnats) Resent-Date: Mon, 25 Feb 2008 05:00:02 GMT Resent-Message-Id: <200802250500.m1P5023h000468@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, David Barksdale Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2439516A406 for ; Mon, 25 Feb 2008 04:55:58 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 0EAC013C4CC for ; Mon, 25 Feb 2008 04:55:58 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m1P4rGOw075014 for ; Mon, 25 Feb 2008 04:53:16 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m1P4rFLW075013; Mon, 25 Feb 2008 04:53:15 GMT (envelope-from nobody) Message-Id: <200802250453.m1P4rFLW075013@www.freebsd.org> Date: Mon, 25 Feb 2008 04:53:15 GMT From: David Barksdale To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/121070: [PATCH] lang/slib-guile parameterize guile version X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2008 05:00:03 -0000 >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 + +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 +.include 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 @@ -@exec ln -shf %D/share/slib %D/share/guile/1.6/slib +@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)" -@unexec rm -f %D/share/guile/1.6/slib -@unexec rm -f %D/share/guile/1.6/slibcat +@unexec rm -f %D/share/guile/%%GUILE_VER%%/slib +@unexec rm -f %D/share/guile/%%GUILE_VER%%/slibcat >Release-Note: >Audit-Trail: >Unformatted: