Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 6FD9E7A16D for ; Wed, 28 Sep 2016 09:04:43 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id D72A885E4A; Wed, 28 Sep 2016 09:04:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 66F4185E00 for ; Wed, 28 Sep 2016 09:04:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id qgQhV7JhaRK2 for ; Wed, 28 Sep 2016 09:04:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id EBA3984CBD for ; Wed, 28 Sep 2016 09:04:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E714CFBD2; Wed, 28 Sep 2016 09:04:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1475053481107680" MIME-Version: 1.0 Date: Wed, 28 Sep 2016 09:04:41 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/lang/guile20 To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20160928090441.E714CFBD2@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1475053481107680 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Wed Sep 28 09:04:41 UTC 2016 Modified Files: pkgsrc/lang/guile20: Makefile PLIST Log Message: Handle PLIST difference on Darwin. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/guile20/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/guile20/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1475053481107680 Content-Disposition: inline Content-Length: 1694 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/guile20/Makefile diff -u pkgsrc/lang/guile20/Makefile:1.6 pkgsrc/lang/guile20/Makefile:1.7 --- pkgsrc/lang/guile20/Makefile:1.6 Mon Sep 19 11:21:11 2016 +++ pkgsrc/lang/guile20/Makefile Wed Sep 28 09:04:41 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2016/09/19 11:21:11 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2016/09/28 09:04:41 jperkin Exp $ DISTNAME= guile-2.0.12 PKGNAME= ${DISTNAME:S/guile/guile20/} @@ -48,6 +48,13 @@ SUBST_MESSAGE.tools= Fixing path to pkg- # XXX: less tests would fail if we made libunistring use GNU iconv too #USE_GNU_ICONV= yes +OPSYSVARS+= GUILE_LIBNAME +GUILE_LIBNAME.Darwin= a +GUILE_LIBNAME.*= so.22.8.0 + +PLIST_SUBST+= GUILE_LIBNAME=${GUILE_LIBNAME} +PRINT_PLIST_AWK+= {gsub(/${GUILE_LIBNAME}/, "$${GUILE_LIBNAME}");} + # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24002 post-configure: ${ECHO} '#define FLEXIBLE_ARRAY_MEMBER /**/' >> ${WRKSRC}/config.h Index: pkgsrc/lang/guile20/PLIST diff -u pkgsrc/lang/guile20/PLIST:1.5 pkgsrc/lang/guile20/PLIST:1.6 --- pkgsrc/lang/guile20/PLIST:1.5 Fri Sep 16 06:26:13 2016 +++ pkgsrc/lang/guile20/PLIST Wed Sep 28 09:04:41 2016 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2016/09/16 06:26:13 wiz Exp $ +@comment $NetBSD: PLIST,v 1.6 2016/09/28 09:04:41 jperkin Exp $ bin/guild bin/guile bin/guile-config @@ -391,8 +391,8 @@ lib/guile/2.0/ccache/web/response.go lib/guile/2.0/ccache/web/server.go lib/guile/2.0/ccache/web/server/http.go lib/guile/2.0/ccache/web/uri.go +lib/libguile-2.0.${GUILE_LIBNAME}-gdb.scm lib/libguile-2.0.la -lib/libguile-2.0.so.22.8.0-gdb.scm lib/libguilereadline-v-18.la lib/pkgconfig/guile-2.0.pc ${PKGMANDIR}/man1/guile.1 --_----------=_1475053481107680--