Date: Fri, 15 Dec 2017 17:19:56 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456410 - in head: . finance/gnucash Message-ID: <201712151719.vBFHJuAZ090604@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Fri Dec 15 17:19:56 2017 New Revision: 456410 URL: https://svnweb.freebsd.org/changeset/ports/456410 Log: - Convert GUILE1 and GUILE2 options to flavors in the gnucash port - Make the guile2 flavor the new default. Users requiring guile1 can use that flavor - Add note in UPDATING, since the default is changing Reviewed by: mat Approved by: portmgr (mat) Differential Revision: https://reviews.freebsd.org/D13478 Modified: head/UPDATING head/finance/gnucash/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Fri Dec 15 17:08:56 2017 (r456409) +++ head/UPDATING Fri Dec 15 17:19:56 2017 (r456410) @@ -5,6 +5,21 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20171215: + AFFECTS: users of finance/gnucash + AUTHOR: madpilot@FreeBSD.org + + The gnucash port has been converted too use flavors, the GUILE1 + and GUILE2 options have been converted to flavors so that two + separate packages can be provided. + + Since the next major release of gnucash will drop guile1 support, + the default flavor package is compiled against guile2, switching + the previous default. + + Users who intend to stay on the guile1 version should deinstall + the default gnucash package and install the gnucash-guile1 package. + 20171214: AFFECTS: all ports users AUTHOR: adamw@FreeBSD.org Modified: head/finance/gnucash/Makefile ============================================================================== --- head/finance/gnucash/Makefile Fri Dec 15 17:08:56 2017 (r456409) +++ head/finance/gnucash/Makefile Fri Dec 15 17:19:56 2017 (r456410) @@ -4,6 +4,7 @@ PORTNAME= gnucash PORTVERSION= 2.6.18 DISTVERSIONSUFFIX=-1 +PORTREVISION= 1 CATEGORIES= finance gnome MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION} @@ -24,18 +25,25 @@ RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \ p5-Date-Manip>=0:devel/p5-Date-Manip \ p5-Finance-Quote>=0:finance/p5-Finance-Quote +FLAVORS= guile2 guile1 + +guile1_PKGNAMESUFFIX= -guile1 +guile1_LIB_DEPENDS= libguile.so:lang/guile +guile1_BUILD_DEPENDS= slib-guile>0:lang/slib-guile +guile1_RUN_DEPENDS= slib-guile>0:lang/slib-guile +guile1_CONFLICTS_INSTALL= gnucash-[0-9]* +guile2_LIB_DEPENDS= libguile-2.0.so:lang/guile2 +guile2_BUILD_DEPENDS= slib-guile2>0:lang/slib-guile2 +guile2_RUN_DEPENDS= slib-guile2>0:lang/slib-guile2 +guile2_CONFLICTS_INSTALL= gnucash-guile1-[0-9]* + 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 @@ -57,12 +65,6 @@ PYTHON_USES= python:2.7 GTKMM_USE= GNOME=gtkmm24 GTKMM_CONFIGURE_ON= --enable-gtkmm GTKMM_CONFIGURE_OFF= --disable-gtkmm -GUILE1_LIB_DEPENDS= libguile.so:lang/guile -GUILE1_BUILD_DEPENDS= slib-guile>0:lang/slib-guile -GUILE1_RUN_DEPENDS= slib-guile>0:lang/slib-guile -GUILE2_LIB_DEPENDS= libguile-2.0.so:lang/guile2 -GUILE2_BUILD_DEPENDS= slib-guile2>0:lang/slib-guile2 -GUILE2_RUN_DEPENDS= slib-guile2>0:lang/slib-guile2 USES= compiler:c++11-lib desktop-file-utils gettext gmake libtool localbase \ perl5 pkgconfig shebangfix tar:bzip2 @@ -93,6 +95,14 @@ GLIB_SCHEMAS= org.gnucash.dialogs.business.gschema.xml org.gnucash.warnings.gschema.xml \ org.gnucash.window.pages.account.tree.gschema.xml \ org.gnucash.window.pages.gschema.xml + +.if ${FLAVOR:U} == guile1 +CONFIGURE_ARGS+= --with-guile=1.8 +PLIST_SUB+= GUILE2="@comment " +.elif ${FLAVOR:U} == guile2 +CONFIGURE_ARGS+= --with-guile=2.0 +PLIST_SUB+= GUILE2="" +.endif .include <bsd.port.pre.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712151719.vBFHJuAZ090604>