[pkgsrc/trunk]: pkgsrc/devel/lua-gi Don't hardcode lua '5.2' everywhere, use ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3a683a75f3fa
branches:  trunk
changeset: 629524:3a683a75f3fa
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Jan 22 16:16:21 2014 +0000

description:
Don't hardcode lua '5.2' everywhere, use the appropriate variables.

Fixes build with lua 5.1.  Bump PKGREVISION.

diffstat:

 devel/lua-gi/Makefile               |   8 ++++-
 devel/lua-gi/PLIST                  |  58 ++++++++++++++++++------------------
 devel/lua-gi/distinfo               |   4 +-
 devel/lua-gi/patches/patch-Makefile |   4 +-
 4 files changed, 40 insertions(+), 34 deletions(-)

diffs (119 lines):

diff -r b48ee20773c9 -r 3a683a75f3fa devel/lua-gi/Makefile
--- a/devel/lua-gi/Makefile     Wed Jan 22 15:21:23 2014 +0000
+++ b/devel/lua-gi/Makefile     Wed Jan 22 16:16:21 2014 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2013/10/30 06:03:37 dholland Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/22 16:16:21 jperkin Exp $
 #
 
 DISTNAME=      lgi-${VERSION}
 PKGNAME=       ${LUA_PKGPREFIX}-gi-${VERSION}
 VERSION=       0.7.1
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  -https://codeload.github.com/pavouk/lgi/tar.gz/${VERSION}
 
@@ -17,6 +18,11 @@
 FETCH_USING=   curl
 WRKSRC=                ${WRKDIR}/pavouk-lgi-1bbf1bc
 
+SUBST_CLASSES+=        v
+SUBST_STAGE.v= pre-build
+SUBST_FILES.v= lgi/Makefile
+SUBST_VARS.v=  _LUA_DOT_VERSION
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
diff -r b48ee20773c9 -r 3a683a75f3fa devel/lua-gi/PLIST
--- a/devel/lua-gi/PLIST        Wed Jan 22 15:21:23 2014 +0000
+++ b/devel/lua-gi/PLIST        Wed Jan 22 16:16:21 2014 +0000
@@ -1,29 +1,29 @@
-@comment $NetBSD: PLIST,v 1.1 2013/07/22 19:38:07 degroote Exp $
-lib/lua/5.2/lgi/corelgilua51.so
-share/lua/5.2/lgi.lua
-share/lua/5.2/lgi/class.lua
-share/lua/5.2/lgi/component.lua
-share/lua/5.2/lgi/core.lua
-share/lua/5.2/lgi/enum.lua
-share/lua/5.2/lgi/ffi.lua
-share/lua/5.2/lgi/init.lua
-share/lua/5.2/lgi/log.lua
-share/lua/5.2/lgi/namespace.lua
-share/lua/5.2/lgi/override/Clutter.lua
-share/lua/5.2/lgi/override/GLib-Timer.lua
-share/lua/5.2/lgi/override/GLib-Variant.lua
-share/lua/5.2/lgi/override/GLib.lua
-share/lua/5.2/lgi/override/GObject-Closure.lua
-share/lua/5.2/lgi/override/GObject-Object.lua
-share/lua/5.2/lgi/override/GObject-Type.lua
-share/lua/5.2/lgi/override/GObject-Value.lua
-share/lua/5.2/lgi/override/Gdk.lua
-share/lua/5.2/lgi/override/Gio.lua
-share/lua/5.2/lgi/override/Gst.lua
-share/lua/5.2/lgi/override/Gtk.lua
-share/lua/5.2/lgi/override/Pango.lua
-share/lua/5.2/lgi/override/PangoCairo.lua
-share/lua/5.2/lgi/override/cairo.lua
-share/lua/5.2/lgi/package.lua
-share/lua/5.2/lgi/record.lua
-share/lua/5.2/lgi/version.lua
+@comment $NetBSD: PLIST,v 1.2 2014/01/22 16:16:21 jperkin Exp $
+${LUA_CDIR}/lgi/corelgilua51.so
+${LUA_LDIR}/lgi.lua
+${LUA_LDIR}/lgi/class.lua
+${LUA_LDIR}/lgi/component.lua
+${LUA_LDIR}/lgi/core.lua
+${LUA_LDIR}/lgi/enum.lua
+${LUA_LDIR}/lgi/ffi.lua
+${LUA_LDIR}/lgi/init.lua
+${LUA_LDIR}/lgi/log.lua
+${LUA_LDIR}/lgi/namespace.lua
+${LUA_LDIR}/lgi/override/Clutter.lua
+${LUA_LDIR}/lgi/override/GLib-Timer.lua
+${LUA_LDIR}/lgi/override/GLib-Variant.lua
+${LUA_LDIR}/lgi/override/GLib.lua
+${LUA_LDIR}/lgi/override/GObject-Closure.lua
+${LUA_LDIR}/lgi/override/GObject-Object.lua
+${LUA_LDIR}/lgi/override/GObject-Type.lua
+${LUA_LDIR}/lgi/override/GObject-Value.lua
+${LUA_LDIR}/lgi/override/Gdk.lua
+${LUA_LDIR}/lgi/override/Gio.lua
+${LUA_LDIR}/lgi/override/Gst.lua
+${LUA_LDIR}/lgi/override/Gtk.lua
+${LUA_LDIR}/lgi/override/Pango.lua
+${LUA_LDIR}/lgi/override/PangoCairo.lua
+${LUA_LDIR}/lgi/override/cairo.lua
+${LUA_LDIR}/lgi/package.lua
+${LUA_LDIR}/lgi/record.lua
+${LUA_LDIR}/lgi/version.lua
diff -r b48ee20773c9 -r 3a683a75f3fa devel/lua-gi/distinfo
--- a/devel/lua-gi/distinfo     Wed Jan 22 15:21:23 2014 +0000
+++ b/devel/lua-gi/distinfo     Wed Jan 22 16:16:21 2014 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2013/07/25 13:05:18 degroote Exp $
+$NetBSD: distinfo,v 1.3 2014/01/22 16:16:21 jperkin Exp $
 
 SHA1 (lgi-0.7.1.tar.gz) = 53affb0a82bb1537d7ecef4d6f2a65bdd4d9e3bc
 RMD160 (lgi-0.7.1.tar.gz) = af49608d6af76c468fef0ab67f2a065ed8730152
 Size (lgi-0.7.1.tar.gz) = 268357 bytes
-SHA1 (patch-Makefile) = ecba51fb9bc78c08e89bebfc981206a2587e63f4
+SHA1 (patch-Makefile) = 0ff1b55df7e7c6c236a4ca7f3109439b69f85e4a
diff -r b48ee20773c9 -r 3a683a75f3fa devel/lua-gi/patches/patch-Makefile
--- a/devel/lua-gi/patches/patch-Makefile       Wed Jan 22 15:21:23 2014 +0000
+++ b/devel/lua-gi/patches/patch-Makefile       Wed Jan 22 16:16:21 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.1 2013/07/22 19:38:07 degroote Exp $
+$NetBSD: patch-Makefile,v 1.2 2014/01/22 16:16:21 jperkin Exp $
 
 Don't hardcode PREFIX
 Fix the LUA version to match the one installed by pkgsrc
@@ -12,7 +12,7 @@
  
 -PREFIX = /usr/local
 -LUA_VERSION=5.1
-+LUA_VERSION=5.2
++LUA_VERSION=@_LUA_DOT_VERSION@
  LUA_LIBDIR = $(PREFIX)/lib/lua/$(LUA_VERSION)
  LUA_SHAREDIR = $(PREFIX)/share/lua/$(LUA_VERSION)