From owner-svn-ports-head@FreeBSD.ORG  Thu Nov  6 18:33:55 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0FC3E29B;
 Thu,  6 Nov 2014 18:33:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id F01396E7;
 Thu,  6 Nov 2014 18:33:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA6IXsJD098808;
 Thu, 6 Nov 2014 18:33:54 GMT (envelope-from gahr@FreeBSD.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA6IXscK098807;
 Thu, 6 Nov 2014 18:33:54 GMT (envelope-from gahr@FreeBSD.org)
Message-Id: <201411061833.sA6IXscK098807@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gahr set sender to gahr@FreeBSD.org
 using -f
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Thu, 6 Nov 2014 18:33:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r372229 - head/x11/xbindkeys
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Nov 2014 18:33:55 -0000

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@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