From 187d60d6fd06e5b9607e368ebd958fa6db9fc3a9 Mon Sep 17 00:00:00 2001 From: alnsn Date: Sat, 3 May 2014 13:01:24 +0000 Subject: Adapt to Lua multiversion support. --- textproc/lua-slnunicode/Makefile | 8 +++----- textproc/lua-slnunicode/PLIST | 4 ++-- textproc/lua-slnunicode/distinfo | 4 ++-- textproc/lua-slnunicode/patches/patch-Makefile | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) (limited to 'textproc') diff --git a/textproc/lua-slnunicode/Makefile b/textproc/lua-slnunicode/Makefile index c74bfca5615..8118f633c04 100644 --- a/textproc/lua-slnunicode/Makefile +++ b/textproc/lua-slnunicode/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2013/10/30 06:24:57 dholland Exp $ +# $NetBSD: Makefile,v 1.5 2014/05/03 13:01:24 alnsn Exp $ DISTNAME= slnunicode-1.1apl1 PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -12,10 +13,7 @@ COMMENT= Unicode library for Lua BUILD_TARGET= unicode.so LUA_VERSIONS_INCOMPATIBLE= 51 -FIND_PREFIX:= LUADIR=lua -.include "../../mk/find-prefix.mk" - -MAKE_ENV+= LUADIR=${LUADIR} +MAKE_ENV+= LUA_EXECUTABLE=${LUA_INTERPRETER} INSTALLATION_DIRS= ${LUA_CDIR} diff --git a/textproc/lua-slnunicode/PLIST b/textproc/lua-slnunicode/PLIST index e6db5e9c4cf..49279914868 100644 --- a/textproc/lua-slnunicode/PLIST +++ b/textproc/lua-slnunicode/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1 2013/09/03 16:18:41 ryoon Exp $ -lib/lua/5.2/unicode.so +@comment $NetBSD: PLIST,v 1.2 2014/05/03 13:01:24 alnsn Exp $ +${LUA_CDIR}/unicode.so diff --git a/textproc/lua-slnunicode/distinfo b/textproc/lua-slnunicode/distinfo index 0dbbc2096ca..4f191ae0876 100644 --- a/textproc/lua-slnunicode/distinfo +++ b/textproc/lua-slnunicode/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1 2013/09/03 16:18:41 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2014/05/03 13:01:24 alnsn Exp $ SHA1 (slnunicode-1.1apl1.tar.gz) = 635cfd874afc88765358206172ecb28308dc9e50 RMD160 (slnunicode-1.1apl1.tar.gz) = 0802483382f375036fdbbf1b00592dd2c309aa1b Size (slnunicode-1.1apl1.tar.gz) = 31369 bytes -SHA1 (patch-Makefile) = 8f3fd40102ba6a7fd5dc81ec7ced0e68469b077f +SHA1 (patch-Makefile) = ab5f6c7c971dc682883ac636f46c09065d64030a diff --git a/textproc/lua-slnunicode/patches/patch-Makefile b/textproc/lua-slnunicode/patches/patch-Makefile index 727a42976a4..5144ffa8d34 100644 --- a/textproc/lua-slnunicode/patches/patch-Makefile +++ b/textproc/lua-slnunicode/patches/patch-Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-Makefile,v 1.1 2013/09/03 16:18:41 ryoon Exp $ +$NetBSD: patch-Makefile,v 1.2 2014/05/03 13:01:24 alnsn Exp $ * for pkgsrc. @@ -14,7 +14,7 @@ $NetBSD: patch-Makefile,v 1.1 2013/09/03 16:18:41 ryoon Exp $ - lua-5.1.4/src/lua slnunicode-1.1a/unitest +unicode.so: slnunico.c slnudata.c + gcc -I. ${CFLAGS} -shared -Wall -Os -fpic -o unicode.so slnunico.c -+ ${LUADIR}/bin/lua unitest ++ ${LUA_EXECUTABLE} unitest clean: rm unicode.so -- cgit v1.2.3