From owner-svn-ports-all@FreeBSD.ORG Sun Oct 5 13:32:38 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D961B523; Sun, 5 Oct 2014 13:32:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C55C3889; Sun, 5 Oct 2014 13:32:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s95DWcjF095378; Sun, 5 Oct 2014 13:32:38 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s95DWc0F095371; Sun, 5 Oct 2014 13:32:38 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201410051332.s95DWc0F095371@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sun, 5 Oct 2014 13:32:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370067 - in head: . finance/gnucash finance/gnucash/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Oct 2014 13:32:39 -0000 Author: madpilot Date: Sun Oct 5 13:32:37 2014 New Revision: 370067 URL: https://svnweb.freebsd.org/changeset/ports/370067 QAT: https://qat.redports.org/buildarchive/r370067/ Log: - Fix gnucash configure script to accept guile 1.8 - Add options to gnucash port to choose which guile version to use - Remove superceded UPDATING entry Approved by: kwm (gnome, implicit) Added: head/finance/gnucash/files/patch-configure (contents, props changed) Modified: head/UPDATING head/finance/gnucash/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Oct 5 13:29:40 2014 (r370066) +++ head/UPDATING Sun Oct 5 13:32:37 2014 (r370067) @@ -50,18 +50,6 @@ you update your ports collection, before Please check your configuration. -20140930: - AFFECTS: users of finance/gnucash - AUTHOR: madpilot@FreeBSD.org - - The new version of gnucsh requires guile 2.0. If the update fails - because the old guile 1.8 library is still present you will need - to manally remove gnucash, guile and, if installed, boehm-gc: - - # pkg delete gnucash guile boehm-gc - - and then install gnucash again the usual way. - 20140929: AFFECTS: users of comms/usbmuxd AUTHOR: avilla@FreeBSD.org Modified: head/finance/gnucash/Makefile ============================================================================== --- head/finance/gnucash/Makefile Sun Oct 5 13:29:40 2014 (r370066) +++ head/finance/gnucash/Makefile Sun Oct 5 13:32:37 2014 (r370067) @@ -3,6 +3,7 @@ PORTNAME= gnucash PORTVERSION= 2.6.4 +PORTREVISION= 1 CATEGORIES= finance gnome MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION} @@ -12,22 +13,25 @@ COMMENT= Quicken-like money and finance LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -BUILD_DEPENDS= guile:${PORTSDIR}/lang/guile2 LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \ libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 \ libgoffice-0.8.so:${PORTSDIR}/devel/goffice -RUN_DEPENDS= guile:${PORTSDIR}/lang/guile2 \ - p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ +RUN_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \ p5-Finance-Quote>=0:${PORTSDIR}/finance/p5-Finance-Quote OPTIONS_DEFINE= AQBANKING OFX DATABASE LOCALE_TAX PYTHON GTKMM DOCS +OPTIONS_SINGLE= GV +OPTIONS_SINGLE_GV= GUILE1 GUILE2 +OPTIONS_DEFAULT= GUILE1 AQBANKING_DESC= AqBanking support (HBCI/OpenHBCI) OFX_DESC= OFX support DATABASE_DESC= Enable SQL database backends LOCALE_TAX_DESC= Enable localized tax categories GTKMM_DESC= Enable GTKMM based UI +GUILE1_DESC= Use lang/guile +GUILE2_DESC= Use lang/guile2 OPTIONS_SUB= yes AQBANKING_CONFIGURE_ENABLE=aqbanking @@ -47,6 +51,12 @@ PYTHON_USE= PYTHON=yes GTKMM_USE= GNOME=gtkmm24 GTKMM_CONFIGURE_ON= --enable-gtkmm GTKMM_CONFIGURE_OFF= --disable-gtkmm +GUILE1_LIB_DEPENDS= libguile.so:${PORTSDIR}/lang/guile +GUILE1_BUILD_DEPENDS= ${LOCALBASE}/share/guile/1.8/slibcat:${PORTSDIR}/lang/slib-guile +GUILE1_RUN_DEPENDS= ${LOCALBASE}/share/guile/1.8/slibcat:${PORTSDIR}/lang/slib-guile +GUILE2_LIB_DEPENDS= libguile-2.0.so:${PORTSDIR}/lang/guile2 +GUILE2_BUILD_DEPENDS= ${LOCALBASE}/share/guile/2.0/slibcat:${PORTSDIR}/lang/slib-guile2 +GUILE2_RUN_DEPENDS= ${LOCALBASE}/share/guile/2.0/slibcat:${PORTSDIR}/lang/slib-guile2 USE_XORG= x11 USES= desktop-file-utils gettext gmake libtool perl5 pkgconfig shebangfix tar:bzip2 Added: head/finance/gnucash/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/finance/gnucash/files/patch-configure Sun Oct 5 13:32:37 2014 (r370067) @@ -0,0 +1,10 @@ +--- configure.orig 2014-09-28 02:56:29.000000000 +0200 ++++ configure 2014-10-05 01:43:56.028480737 +0200 +@@ -20513,6 +20513,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + succeeded=yes ++ GUILE_EFFECTIVE_VERSION=1.8 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GUILE_CFLAGS" >&5 + $as_echo_n "checking GUILE_CFLAGS... " >&6; }