Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Jan 2014 19:38:46 +0000 (UTC)
From:      Olivier Duchateau <olivierd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341648 - head/x11/keybinder
Message-ID:  <201401281938.s0SJckes038435@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401281938.s0SJckes038435>