svn commit: r372229 - head/x11/xbindkeys

[Pietro Cerutti]

Author: gahr
Date: Thu Nov  6 18:33:54 2014
New Revision: 372229
URL: https://svnweb.freebsd.org/changeset/ports/372229
QAT: https://qat.redports.org/buildarchive/r372229/

Log:
  - Do not require a particular version of Tk - any will do [1]
  - While at it, modernize OPTIONS
  
  PR:		194868
  Submitted by:	wbparsons at alum.mit.edu

Modified:
  head/x11/xbindkeys/Makefile

Modified: head/x11/xbindkeys/Makefile
==============================================================================
--- head/x11/xbindkeys/Makefile	Thu Nov  6 16:30:27 2014	(r372228)
+++ head/x11/xbindkeys/Makefile	Thu Nov  6 18:33:54 2014	(r372229)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xbindkeys
 PORTVERSION=	1.8.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.nongnu.org/xbindkeys/
 
@@ -20,24 +20,12 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/xbindkeys %%EXAMPLESDIR%%/xbindkeysrc man/man1/xbindkeys.1.gz
-PLIST_DIRS=	%%EXAMPLESDIR%%
 
-WISH=		${LOCALBASE}/bin/wish8.4
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGUILE}
-LIB_DEPENDS+=	libguile.so:${PORTSDIR}/lang/guile
-.else
-CONFIGURE_ARGS+=	--disable-guile
-.endif
-
-.if ${PORT_OPTIONS:MTCL}
-RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
-PLIST_FILES+=	bin/xbindkeys_show man/man1/xbindkeys_show.1.gz
-.else
-CONFIGURE_ARGS+=	--disable-tk
-.endif
+TCL_USES=		tk
+TCL_CONFIGURE_OFF=	--disable-tk
+TCL_PLIST_FILES=	bin/xbindkeys_show man/man1/xbindkeys_show.1.gz
+GUILE_LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+GUILE_CONFIGURE_OFF=	--disable-guile
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| wish | ${WISH} |g' ${WRKSRC}/xbindkeys_show