svn commit: r370069 - head/deskutils/gnotime

[Guido Falsi]

Author: madpilot
Date: Sun Oct  5 13:46:11 2014
New Revision: 370069
URL: https://svnweb.freebsd.org/changeset/ports/370069
QAT: https://qat.redports.org/buildarchive/r370069/

Log:
  - Add options to choose which guile version to use
  - While here remove dirrms

Modified:
  head/deskutils/gnotime/Makefile
  head/deskutils/gnotime/pkg-plist

Modified: head/deskutils/gnotime/Makefile
==============================================================================
--- head/deskutils/gnotime/Makefile	Sun Oct  5 13:45:58 2014	(r370068)
+++ head/deskutils/gnotime/Makefile	Sun Oct  5 13:46:11 2014	(r370069)
@@ -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||' \

Modified: head/deskutils/gnotime/pkg-plist
==============================================================================
--- head/deskutils/gnotime/pkg-plist	Sun Oct  5 13:45:58 2014	(r370068)
+++ head/deskutils/gnotime/pkg-plist	Sun Oct  5 13:46:11 2014	(r370069)
@@ -102,11 +102,3 @@ share/locale/wa/LC_MESSAGES/gnotime-2.0.
 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
- at dirrm share/omf/gnotime
- at dirrm %%DATADIR%%/glade
- at dirrm %%DATADIR%%/ghtml/C
- at dirrm %%DATADIR%%/ghtml
- at dirrm %%DATADIR%%
- at dirrm share/gnome/help/gnotime/C/figures
- at dirrm share/gnome/help/gnotime/C
- at dirrm share/gnome/help/gnotime