Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -5,6 +5,21 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20171213:
+  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.
+
 20171205:
   AFFECTS: users of dns/powerdns
   AUTHOR: krion@FreeBSD.org
Index: finance/gnucash/Makefile
===================================================================
--- finance/gnucash/Makefile
+++ finance/gnucash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	2.6.18
+PORTREVISION=	1
 DISTVERSIONSUFFIX=-1
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
@@ -25,9 +26,6 @@
 		p5-Finance-Quote>=0: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
@@ -34,8 +32,6 @@
 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,13 +53,19 @@
 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
 
+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]*
+
 USES=		compiler:c++11-lib desktop-file-utils gettext gmake libtool localbase \
 		perl5 pkgconfig shebangfix tar:bzip2
 USE_XORG=	x11
@@ -94,6 +96,14 @@
 		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>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc