From owner-svn-ports-head@FreeBSD.ORG  Tue Jan 28 19:38:46 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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 517997C8;
 Tue, 28 Jan 2014 19:38:46 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3D5FD11FD;
 Tue, 28 Jan 2014 19:38:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0SJckHi038436;
 Tue, 28 Jan 2014 19:38:46 GMT
 (envelope-from olivierd@svn.freebsd.org)
Received: (from olivierd@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0SJckes038435;
 Tue, 28 Jan 2014 19:38:46 GMT
 (envelope-from olivierd@svn.freebsd.org)
Message-Id: <201401281938.s0SJckes038435@svn.freebsd.org>
From: Olivier Duchateau <olivierd@FreeBSD.org>
Date: Tue, 28 Jan 2014 19:38:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r341648 - head/x11/keybinder
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.17
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: Tue, 28 Jan 2014 19:38:46 -0000

Author: olivierd
Date: Tue Jan 28 19:38:45 2014
New Revision: 341648
URL: http://svnweb.freebsd.org/changeset/ports/341648
QAT: https://qat.redports.org/buildarchive/r341648/

Log:
  - Fix Python and Lua versions
  - Disable g-ir-scanner cache [1]
  
  PR:		185910
  Submitted by:	amdmi3@ [1]

Modified:
  head/x11/keybinder/Makefile

Modified: head/x11/keybinder/Makefile
==============================================================================
--- head/x11/keybinder/Makefile	Tue Jan 28 19:15:44 2014	(r341647)
+++ head/x11/keybinder/Makefile	Tue Jan 28 19:38:45 2014	(r341648)
@@ -9,15 +9,14 @@ MASTER_SITES=	GENTOO/distfiles
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Library for registering keyboard shortcuts
 
-BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 introspection
 USE_XORG=	x11 xext xrender
 USES=		gmake pkgconfig pathfix
 USE_LDCONFIG=	yes
+MAKE_ENV=	GI_SCANNER_DISABLE_CACHE=yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES PYTHON LUA
 OPTIONS_DEFAULT=	PYTHON
@@ -28,7 +27,7 @@ LUA_DESC=	Lua bindings
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
+USE_PYTHON=	2
 USE_GNOME+=	pygtk2
 PLIST_SUB+=	PYTHON=""
 .else
@@ -37,7 +36,7 @@ PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLUA}
-USE_LUA=	5.1+
+USE_LUA=	5.1
 CONFIGURE_ARGS+=	--with-lua-includes=${LUA_INCDIR}
 PLIST_SUB+=	LUA=""
 .else
@@ -58,7 +57,7 @@ PLIST_SUB+=	DOCS="@comment "
 
 post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${REINPLACE_CMD} -i '' -e 's|lua5.1|lua-5.1|g' ${WRKSRC}/examples/Makefile
+	@${REINPLACE_CMD} -i '' -e 's|lua5.1|lua-${LUA_VER}|g' ${WRKSRC}/examples/Makefile
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 .endif