From 3058d14e68d66c6392800587e9e57aa591079b0a Mon Sep 17 00:00:00 2001
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Sun, 5 Oct 2014 13:46:11 +0000
Subject: [PATCH] - Add options to choose which guile version to use - While
 here remove dirrms

---
 deskutils/gnotime/Makefile  | 14 ++++++++++++--
 deskutils/gnotime/pkg-plist |  8 --------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index c9bed69c4e76..08d3a733ad93 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Time tracker for gnome2
 LICENSE=	GPLv2 # (or later)
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile \
-		libqof.so:${PORTSDIR}/databases/qof
+LIB_DEPENDS=	libqof.so:${PORTSDIR}/databases/qof
 
 USES=		gettext gmake libtool pathfix pkgconfig
 USE_XORG=	xscrnsaver
@@ -32,6 +31,17 @@ LIBS+=		-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gnotime.schemas
 
+OPTIONS_SINGLE= GV
+OPTIONS_SINGLE_GV=	GUILE1 GUILE2
+OPTIONS_DEFAULT=	GUILE1
+
+GUILE1_DESC=	Use lang/guile
+GUILE2_DESC=	Use lang/guile2
+
+GUILE1_LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+GUILE2_LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
+GUILE2_LDFLAGS=		-lm
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^install-data-am/s|install-data-local||' \
diff --git a/deskutils/gnotime/pkg-plist b/deskutils/gnotime/pkg-plist
index 4c413a8c50e9..672048fbd30d 100644
--- a/deskutils/gnotime/pkg-plist
+++ b/deskutils/gnotime/pkg-plist
@@ -102,11 +102,3 @@ share/locale/wa/LC_MESSAGES/gnotime-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnotime-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnotime-2.0.mo
 share/omf/gnotime/gnotime-C.omf
-@dirrm share/omf/gnotime
-@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%/ghtml/C
-@dirrm %%DATADIR%%/ghtml
-@dirrm %%DATADIR%%
-@dirrm share/gnome/help/gnotime/C/figures
-@dirrm share/gnome/help/gnotime/C
-@dirrm share/gnome/help/gnotime