diff --git a/devel/lua-lgi/Makefile b/devel/lua-lgi/Makefile
index 8f1b5ef76e24..b8889d36201a 100644
--- a/devel/lua-lgi/Makefile
+++ b/devel/lua-lgi/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	lgi
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
diff --git a/devel/lua-lgi/files/patch-lgi_Makefile b/devel/lua-lgi/files/patch-lgi_Makefile
index a26e6bd1139d..68947ac714ed 100644
--- a/devel/lua-lgi/files/patch-lgi_Makefile
+++ b/devel/lua-lgi/files/patch-lgi_Makefile
@@ -1,16 +1,33 @@
---- lgi/Makefile.orig  2012-12-15 21:18:35.000000000 +0400
-+++ lgi/Makefile       2012-12-15 21:20:31.000000000 +0400
-@@ -6,8 +6,11 @@
+--- lgi/Makefile.orig	2013-03-11 08:48:54.000000000 -0300
++++ lgi/Makefile	2013-03-11 08:50:03.000000000 -0300
+@@ -5,9 +5,7 @@
+ # License: MIT
  #
-
- PREFIX = /usr/local
+ 
+-PREFIX = /usr/local
 -LUA_LIBDIR = $(PREFIX)/lib/lua/5.1
 -LUA_SHAREDIR = $(PREFIX)/share/lua/5.1
-+LUA_LIBDIR ?= $(PREFIX)/lib/lua/5.1
-+LUA_SHAREDIR ?= $(PREFIX)/share/lua/5.1
-+LUA_CFLAGS ?= -I$(LUA_INCDIR)
-+LUA_LIBDIR ?= $(LUA_MODLIBDIR)
-+LUA_SHAREDIR ?= $(LUA_MODSHAREDIR)
-
++PREFIX ?= /usr/local
+ 
  GINAME = gobject-introspection-1.0
  PKGS = $(GINAME) gmodule-2.0 libffi
+@@ -60,11 +58,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 4daedc370d53..6a2f127d2233 100644
--- a/devel/lua-lgi/pkg-plist
+++ b/devel/lua-lgi/pkg-plist
@@ -1,29 +1,29 @@
-lib/lua51/lgi/corelgilua51.so
-share/lua/5.1/lgi.lua
-share/lua/5.1/lgi/class.lua
-share/lua/5.1/lgi/component.lua
-share/lua/5.1/lgi/core.lua
-share/lua/5.1/lgi/enum.lua
-share/lua/5.1/lgi/ffi.lua
-share/lua/5.1/lgi/init.lua
-share/lua/5.1/lgi/log.lua
-share/lua/5.1/lgi/namespace.lua
-share/lua/5.1/lgi/override/Clutter.lua
-share/lua/5.1/lgi/override/GLib-Variant.lua
-share/lua/5.1/lgi/override/GLib.lua
-share/lua/5.1/lgi/override/GObject-Closure.lua
-share/lua/5.1/lgi/override/GObject-Object.lua
-share/lua/5.1/lgi/override/GObject-Type.lua
-share/lua/5.1/lgi/override/GObject-Value.lua
-share/lua/5.1/lgi/override/Gdk.lua
-share/lua/5.1/lgi/override/Gio.lua
-share/lua/5.1/lgi/override/Gst.lua
-share/lua/5.1/lgi/override/Gtk.lua
-share/lua/5.1/lgi/override/Pango.lua
-share/lua/5.1/lgi/override/PangoCairo.lua
-share/lua/5.1/lgi/override/cairo.lua
-share/lua/5.1/lgi/record.lua
-share/lua/5.1/lgi/version.lua
-@dirrm share/lua/5.1/lgi/override
-@dirrm share/lua/5.1/lgi
-@dirrm lib/lua51/lgi
+%%LUA_MODLIBDIR%%/lgi/corelgilua51.so
+%%LUA_MODSHAREDIR%%/lgi.lua
+%%LUA_MODSHAREDIR%%/lgi/class.lua
+%%LUA_MODSHAREDIR%%/lgi/component.lua
+%%LUA_MODSHAREDIR%%/lgi/core.lua
+%%LUA_MODSHAREDIR%%/lgi/enum.lua
+%%LUA_MODSHAREDIR%%/lgi/ffi.lua
+%%LUA_MODSHAREDIR%%/lgi/init.lua
+%%LUA_MODSHAREDIR%%/lgi/log.lua
+%%LUA_MODSHAREDIR%%/lgi/namespace.lua
+%%LUA_MODSHAREDIR%%/lgi/override/Clutter.lua
+%%LUA_MODSHAREDIR%%/lgi/override/GLib-Variant.lua
+%%LUA_MODSHAREDIR%%/lgi/override/GLib.lua
+%%LUA_MODSHAREDIR%%/lgi/override/GObject-Closure.lua
+%%LUA_MODSHAREDIR%%/lgi/override/GObject-Object.lua
+%%LUA_MODSHAREDIR%%/lgi/override/GObject-Type.lua
+%%LUA_MODSHAREDIR%%/lgi/override/GObject-Value.lua
+%%LUA_MODSHAREDIR%%/lgi/override/Gdk.lua
+%%LUA_MODSHAREDIR%%/lgi/override/Gio.lua
+%%LUA_MODSHAREDIR%%/lgi/override/Gst.lua
+%%LUA_MODSHAREDIR%%/lgi/override/Gtk.lua
+%%LUA_MODSHAREDIR%%/lgi/override/Pango.lua
+%%LUA_MODSHAREDIR%%/lgi/override/PangoCairo.lua
+%%LUA_MODSHAREDIR%%/lgi/override/cairo.lua
+%%LUA_MODSHAREDIR%%/lgi/record.lua
+%%LUA_MODSHAREDIR%%/lgi/version.lua
+@dirrm %%LUA_MODSHAREDIR%%/lgi/override
+@dirrm %%LUA_MODSHAREDIR%%/lgi
+@dirrm %%LUA_MODLIBDIR%%/lgi