Date: Mon, 11 Mar 2013 05:25:18 GMT From: Green Dog <fiziologus@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/176834: [Fix] devel/lua-lgi Message-ID: <201303110525.r2B5PInN019993@red.freebsd.org> Resent-Message-ID: <201303110530.r2B5U04v024204@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 176834 >Category: ports >Synopsis: [Fix] devel/lua-lgi >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Mar 11 05:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Green Dog >Release: >Organization: >Environment: >Description: [devel/lua-lgi] fix lua path (install *.so in LUA_MODLIBDIR) PS: lua-lgi in RUN_DEPEND for x11-wm/awesome (missing) >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN lua-lgi.orig/files/patch-lgi-Makefile lua-lgi/files/patch-lgi-Makefile --- lua-lgi.orig/files/patch-lgi-Makefile 1970-01-01 03:00:00.000000000 +0300 +++ lua-lgi/files/patch-lgi-Makefile 2013-03-11 09:23:48.000000000 +0400 @@ -0,0 +1,35 @@ +--- lgi/Makefile.orig 2012-06-25 12:22:57.000000000 +0400 ++++ lgi/Makefile 2013-03-11 08:22:29.000000000 +0400 +@@ -5,9 +5,9 @@ + # License: MIT + # + +-PREFIX = /usr/local +-LUA_LIBDIR = $(PREFIX)/lib/lua/5.1 +-LUA_SHAREDIR = $(PREFIX)/share/lua/5.1 ++PREFIX ?= /usr/local ++MY_LUA_LIBDIR = $(LUA_MODLIBDIR) ++MY_LUA_SHAREDIR = $(LUA_MODSHAREDIR) + + GINAME = gobject-introspection-1.0 + PKGS = $(GINAME) gmodule-2.0 libffi +@@ -60,11 +60,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)$(MY_LUA_LIBDIR)/lgi ++ cp $(CORE) $(DESTDIR)$(MY_LUA_LIBDIR)/lgi ++ mkdir -p $(DESTDIR)$(MY_LUA_SHAREDIR) ++ cp ../lgi.lua $(DESTDIR)$(MY_LUA_SHAREDIR) ++ mkdir -p $(DESTDIR)$(MY_LUA_SHAREDIR)/lgi ++ cp $(CORESOURCES) $(VERSION_FILE) $(DESTDIR)$(MY_LUA_SHAREDIR)/lgi ++ mkdir -p $(DESTDIR)$(MY_LUA_SHAREDIR)/lgi/override ++ cp $(OVERRIDES) $(DESTDIR)$(MY_LUA_SHAREDIR)/lgi/override diff -ruN lua-lgi.orig/files/patch-lgi_Makefile lua-lgi/files/patch-lgi_Makefile --- lua-lgi.orig/files/patch-lgi_Makefile 2012-12-22 17:40:50.000000000 +0400 +++ lua-lgi/files/patch-lgi_Makefile 1970-01-01 03:00:00.000000000 +0300 @@ -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 diff -ruN lua-lgi.orig/pkg-plist lua-lgi/pkg-plist --- lua-lgi.orig/pkg-plist 2012-12-22 17:40:50.000000000 +0400 +++ lua-lgi/pkg-plist 2013-03-11 09:23:48.000000000 +0400 @@ -1,4 +1,4 @@ -lib/lua51/lgi/corelgilua51.so +lib/lua/5.1/lgi/corelgilua51.so share/lua/5.1/lgi.lua share/lua/5.1/lgi/class.lua share/lua/5.1/lgi/component.lua @@ -26,4 +26,4 @@ share/lua/5.1/lgi/version.lua @dirrm share/lua/5.1/lgi/override @dirrm share/lua/5.1/lgi -@dirrm lib/lua51/lgi +@dirrm lib/lua/5.1/lgi >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303110525.r2B5PInN019993>