svn commit: r339364 - in head: devel/lua-lgi devel/lua-lgi/files x11-wm/awesome

[Baptiste Daroussin]

Author: bapt
Date: Fri Jan 10 16:09:10 2014
New Revision: 339364
URL: http://svnweb.freebsd.org/changeset/ports/339364

Log:
  Update lua-lgi to 0.7.2
  Port to lua 5.2
  Port awesome to lua 5.2 (use pkgconfig to properly figure out how to build with lua 5.2)

Deleted:
  head/devel/lua-lgi/files/patch-lgi-override-Gdk.lua
  head/devel/lua-lgi/files/patch-lgi_Makefile
Modified:
  head/devel/lua-lgi/Makefile
  head/devel/lua-lgi/distinfo
  head/devel/lua-lgi/pkg-plist
  head/x11-wm/awesome/Makefile

Modified: head/devel/lua-lgi/Makefile
==============================================================================
--- head/devel/lua-lgi/Makefile	Fri Jan 10 15:37:00 2014	(r339363)
+++ head/devel/lua-lgi/Makefile	Fri Jan 10 16:09:10 2014	(r339364)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	lgi
-PORTVERSION=	0.7.1
+PORTVERSION=	0.7.2
 PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
@@ -14,13 +14,18 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pavouk
-GH_COMMIT=	1bbf1bc
+GH_COMMIT=	efa920a
+GH_TAGNAME=	0.7.2
 
-USES=		pkgconfig
-USE_LUA=	5.1+
-USE_GMAKE=	yes
+USES=		gmake lua pkgconfig
+MAKE_ARGS+=	PREFIX=${PREFIX} LUA_LIBDIR=${LUA_MODLIBDIR} \
+		LUA_INCDIR=${LUA_INCDIR} LUA_VERSION=${LUA_VER} \
+		CORE=corelgilua${LUA_VER_STR}.so
+MAKE_ENV+=	LUA_CFLAGS=-I${LUA_INCDIR}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's/51/${LUA_VER_STR}/g' \
+		${WRKSRC}/lgi/core.c \
+		${WRKSRC}/lgi/core.lua
 
-CPPFLAGS+=	-I${LOCALBASE}/include/${LUA_SUBDIR}
-
-NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/devel/lua-lgi/distinfo
==============================================================================
--- head/devel/lua-lgi/distinfo	Fri Jan 10 15:37:00 2014	(r339363)
+++ head/devel/lua-lgi/distinfo	Fri Jan 10 16:09:10 2014	(r339364)
@@ -1,2 +1,2 @@
-SHA256 (lgi-0.7.1.tar.gz) = 31f273e056959cea5a4e929b0e81b21e89c852d8a0e874bc6f78017c93d3a5a0
-SIZE (lgi-0.7.1.tar.gz) = 268357
+SHA256 (lgi-0.7.2.tar.gz) = ddcae1c6e0e91dc7f68d809633d4f4ad64fbe1f62e27fc60d75d1c7e887429d2
+SIZE (lgi-0.7.2.tar.gz) = 270800

Modified: head/devel/lua-lgi/pkg-plist
==============================================================================
--- head/devel/lua-lgi/pkg-plist	Fri Jan 10 15:37:00 2014	(r339363)
+++ head/devel/lua-lgi/pkg-plist	Fri Jan 10 16:09:10 2014	(r339364)
@@ -1,4 +1,4 @@
-%%LUA_MODLIBDIR%%/lgi/corelgilua51.so
+%%LUA_MODLIBDIR%%/lgi/corelgilua%%LUA_VER_STR%%.so
 %%LUA_MODSHAREDIR%%/lgi.lua
 %%LUA_MODSHAREDIR%%/lgi/class.lua
 %%LUA_MODSHAREDIR%%/lgi/component.lua

Modified: head/x11-wm/awesome/Makefile
==============================================================================
--- head/x11-wm/awesome/Makefile	Fri Jan 10 15:37:00 2014	(r339363)
+++ head/x11-wm/awesome/Makefile	Fri Jan 10 16:09:10 2014	(r339364)
@@ -3,7 +3,7 @@
 
 PORTNAME=	awesome
 PORTVERSION=	3.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
@@ -19,9 +19,9 @@ BUILD_DEPENDS=	asciidoc:${PORTSDIR}/text
 		xmlto:${PORTSDIR}/textproc/xmlto \
 		xcb-util>=0.3.8:${PORTSDIR}/x11/xcb-util \
 		xproto>=7.0.11:${PORTSDIR}/x11/xproto \
-		${LUA_MODLIBDIR}/lgi/corelgilua51.so:${PORTSDIR}/devel/lua-lgi \
+		${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:${PORTSDIR}/devel/lua-lgi \
 		${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml-450
-RUN_DEPENDS=	${LUA_MODLIBDIR}/lgi/corelgilua51.so:${PORTSDIR}/devel/lua-lgi
+RUN_DEPENDS=	${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:${PORTSDIR}/devel/lua-lgi
 LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
 		libev.so:${PORTSDIR}/devel/libev \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
@@ -34,11 +34,10 @@ LIB_DEPENDS=	libcairo.so:${PORTSDIR}/gra
 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 
 USE_XZ=		yes
-USES=		cmake iconv pkgconfig
+USES=		cmake iconv pkgconfig lua
 CMAKE_ARGS+=	-DSYSCONFDIR=${PREFIX}/etc
 USE_EFL=	imlib2
 USE_GNOME=	glib20 pango gdkpixbuf2
-USE_LUA=	5.1+
 USE_XORG=	pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \
 		xproto
 LDFLAGS+=	${ICONV_LIB}
@@ -60,7 +59,10 @@ IGNORE=	cannot find dependency: The cair
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e "/LUA_EXECUTABLE lua/ s,lua,lua-${LUA_VER}," \
+	@${REINPLACE_CMD} -e "/LUA_EXECUTABLE lua/ s,lua,lua${LUA_VER_STR}," \
+		-e '/Lua51/d' \
+		-e 's/glib-2.0/lua-${LUA_VER} glib-2.0/g' \
+		-e '/LUA51_FOUND/,+2d' \
 		${WRKSRC}/awesomeConfig.cmake
 	@${REINPLACE_CMD} -e "s,^lua ,${LUA_CMD} ," \
 		${WRKSRC}/build-utils/lgi-check.sh