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)

5 files changed, 15 insertions, 80 deletions

diff --git a/devel/lua-lgi/Makefile b/devel/lua-lgi/Makefile
index 966ab73eb850..d8e5253ab417 100644
--- a/devel/lua-lgi/Makefile
+++ b/devel/lua-lgi/Makefile
@@ -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}
 
-CPPFLAGS+=	-I${LOCALBASE}/include/${LUA_SUBDIR}
+post-patch:
+	@${REINPLACE_CMD} -e 's/51/${LUA_VER_STR}/g' \
+		${WRKSRC}/lgi/core.c \
+		${WRKSRC}/lgi/core.lua
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/lua-lgi/distinfo b/devel/lua-lgi/distinfo
index 8bb208b81130..712f8073fe30 100644
--- a/devel/lua-lgi/distinfo
+++ b/devel/lua-lgi/distinfo
@@ -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
diff --git a/devel/lua-lgi/files/patch-lgi-override-Gdk.lua b/devel/lua-lgi/files/patch-lgi-override-Gdk.lua
deleted file mode 100644
index 934111f5a098..000000000000
--- a/devel/lua-lgi/files/patch-lgi-override-Gdk.lua
+++ /dev/null
@@ -1,31 +0,0 @@
---- lgi/override/Gdk.lua.orig	2013-06-25 14:33:15.000000000 +0300
-+++ lgi/override/Gdk.lua	2013-06-25 14:34:28.000000000 +0300
-@@ -54,16 +54,18 @@
- } do Gdk._constant[name] = Gdk.Atom(val) end
- 
- -- Easier-to-use Gdk.RGBA.parse() override.
--local parse = Gdk.RGBA.parse
--function Gdk.RGBA._method.parse(arg1, arg2)
--   if Gdk.RGBA:is_type_of(arg1) then
--      -- Standard member method.
--      return parse(arg1, arg2)
--   else
--      -- Static constructor variant.
--      local rgba = Gdk.RGBA()
--      return parse(rgba, arg1) and rgba or nil
--   end
-+if Gdk.RGBA then
-+    local parse = Gdk.RGBA.parse
-+    function Gdk.RGBA._method.parse(arg1, arg2)
-+       if Gdk.RGBA:is_type_of(arg1) then
-+          -- Standard member method.
-+          return parse(arg1, arg2)
-+       else
-+          -- Static constructor variant.
-+          local rgba = Gdk.RGBA()
-+          return parse(rgba, arg1) and rgba or nil
-+       end
-+    end
- end
- 
- -- Gdk.Window.destroy() actually consumes 'self'.  Prepare workaround
diff --git a/devel/lua-lgi/files/patch-lgi_Makefile b/devel/lua-lgi/files/patch-lgi_Makefile
deleted file mode 100644
index 0ed85647047e..000000000000
--- a/devel/lua-lgi/files/patch-lgi_Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./lgi/Makefile.orig	2013-03-04 22:10:19.000000000 +0100
-+++ ./lgi/Makefile	2013-03-26 23:07:31.000000000 +0100
-@@ -5,10 +5,13 @@
- # License: MIT
- #
- 
--PREFIX = /usr/local
-+PREFIX ?= /usr/local
- LUA_VERSION=5.1
--LUA_LIBDIR = $(PREFIX)/lib/lua/$(LUA_VERSION)
--LUA_SHAREDIR = $(PREFIX)/share/lua/$(LUA_VERSION)
-+LUA_LIBDIR ?= $(PREFIX)/lib/lua/$(LUA_VERSION)
-+LUA_SHAREDIR ?= $(PREFIX)/share/lua/$(LUA_VERSION)
-+LUA_CFLAGS ?= -I$(LUA_INCDIR) $(CPPFLAGS)
-+LUA_LIBDIR ?= $(LUA_MODLIBDIR)
-+LUA_SHAREDIR ?= $(LUA_MODSHAREDIR)
- 
- GINAME = gobject-introspection-1.0
- PKGS = $(GINAME) gmodule-2.0 libffi
-@@ -74,11 +77,11 @@
- CORESOURCES = $(wildcard *.lua)
- 
- install : $(CORE) $(VERSION_FILE)
--	mkdir -p $(DESTDIR)$(LUA_LIBDIR)/lgi
--	cp $(CORE) $(DESTDIR)$(LUA_LIBDIR)/lgi
--	mkdir -p $(DESTDIR)$(LUA_SHAREDIR)
--	cp ../lgi.lua $(DESTDIR)$(LUA_SHAREDIR)
--	mkdir -p $(DESTDIR)$(LUA_SHAREDIR)/lgi
--	cp $(CORESOURCES) $(VERSION_FILE) $(DESTDIR)$(LUA_SHAREDIR)/lgi
--	mkdir -p $(DESTDIR)$(LUA_SHAREDIR)/lgi/override
--	cp $(OVERRIDES) $(DESTDIR)$(LUA_SHAREDIR)/lgi/override
-+	mkdir -p $(DESTDIR)$(LUA_MODLIBDIR)/lgi
-+	cp $(CORE) $(DESTDIR)$(LUA_MODLIBDIR)/lgi
-+	mkdir -p $(DESTDIR)$(LUA_MODSHAREDIR)
-+	cp ../lgi.lua $(DESTDIR)$(LUA_MODSHAREDIR)
-+	mkdir -p $(DESTDIR)$(LUA_MODSHAREDIR)/lgi
-+	cp $(CORESOURCES) $(VERSION_FILE) $(DESTDIR)$(LUA_MODSHAREDIR)/lgi
-+	mkdir -p $(DESTDIR)$(LUA_MODSHAREDIR)/lgi/override
-+	cp $(OVERRIDES) $(DESTDIR)$(LUA_MODSHAREDIR)/lgi/override
diff --git a/devel/lua-lgi/pkg-plist b/devel/lua-lgi/pkg-plist
index 69225a237e15..cf024cc3fc9e 100644
--- a/devel/lua-lgi/pkg-plist
+++ b/devel/lua-lgi/pkg-plist
@@ -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