Date: Mon, 11 Mar 2013 08:35:14 -0300 From: Renato Botelho <garga@FreeBSD.org> To: Green Dog <fiziologus@gmail.com> Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/176834: [Fix] devel/lua-lgi Message-ID: <20130311113514.GA23747@tp.localdomain>
next in thread | raw e-mail | index | archive | help
I would like to propose the following patch that fixes pkg-plist for
other lua versions.
Regards
Index: Makefile
===================================================================
--- Makefile (revision 313650)
+++ Makefile (working copy)
@@ -2,6 +2,7 @@
PORTNAME= lgi
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
@@ -22,4 +23,12 @@
CPPFLAGS+= -I${LOCALBASE}/include/${LUA_SUBDIR}
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-patch:
+ @${REINPLACE_CMD} -e '/^LUA_LIBDIR/d; /^LUA_SHAREDIR/d' \
+ -e "s,LUA_LIBDIR,LUA_MODLIBDIR,g" \
+ -e "s,LUA_SHAREDIR,LUA_MODSHAREDIR,g" \
+ ${WRKSRC}/lgi/Makefile
+
+.include <bsd.port.post.mk>
Index: files/patch-lgi_Makefile
===================================================================
--- files/patch-lgi_Makefile (revision 313650)
+++ files/patch-lgi_Makefile (working copy)
@@ -1,16 +0,0 @@
---- 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 @@
- #
-
- 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)
-
- GINAME = gobject-introspection-1.0
- PKGS = $(GINAME) gmodule-2.0 libffi
Index: pkg-plist
===================================================================
--- pkg-plist (revision 313650)
+++ pkg-plist (working copy)
@@ -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
--
Renato Botelho <garga @ FreeBSD.org>
<garga.bsd @ gmail.com>
GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130311113514.GA23747>