From 60ab123f2cd3a72d1233d71a17c2d1ff68cd7d74 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 25 Feb 2019 22:14:39 -0300 Subject: [PATCH] lua-lualdap: update to 1.2.5. --- .../files/001-makefile-generic.patch | 13 ---------- .../files/002-lua52-lua53-fix.patch | 22 ---------------- srcpkgs/lua-lualdap/files/COPYING | 20 --------------- srcpkgs/lua-lualdap/template | 25 +++++++++---------- srcpkgs/lua-lualdap/update | 2 -- 5 files changed, 12 insertions(+), 70 deletions(-) delete mode 100644 srcpkgs/lua-lualdap/files/001-makefile-generic.patch delete mode 100644 srcpkgs/lua-lualdap/files/002-lua52-lua53-fix.patch delete mode 100644 srcpkgs/lua-lualdap/files/COPYING delete mode 100644 srcpkgs/lua-lualdap/update diff --git a/srcpkgs/lua-lualdap/files/001-makefile-generic.patch b/srcpkgs/lua-lualdap/files/001-makefile-generic.patch deleted file mode 100644 index 10d203008bd..00000000000 --- a/srcpkgs/lua-lualdap/files/001-makefile-generic.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git Makefile Makefile -index 3ff7bc1..f05d15b 100644 ---- Makefile -+++ Makefile -@@ -1,8 +1,3 @@ --CFLAGS += $(shell pkg-config --cflags lua) --LDLIBS += $(shell pkg-config --libs lua) -lldap -- --LUA_MODULES := $(shell pkg-config --variable=INSTALL_CMOD lua) -- - all: lualdap.so - - lualdap.so: lualdap.c diff --git a/srcpkgs/lua-lualdap/files/002-lua52-lua53-fix.patch b/srcpkgs/lua-lualdap/files/002-lua52-lua53-fix.patch deleted file mode 100644 index ca0b0be5738..00000000000 --- a/srcpkgs/lua-lualdap/files/002-lua52-lua53-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git lualdap.c lualdap.c -index a3f42a9..026e369 100644 ---- lualdap.c -+++ lualdap.c -@@ -876,7 +876,7 @@ static int lualdap_search_tostring(lua_State *L) - */ - static int lualdap_createmeta(lua_State *L) - { -- const luaL_reg methods[] = { -+ const luaL_Reg methods[] = { - {"close", lualdap_close}, - {"add", lualdap_add}, - {"compare", lualdap_compare}, -@@ -1043,7 +1043,7 @@ static void set_info(lua_State *L) - */ - int luaopen_lualdap(lua_State *L) - { -- struct luaL_reg lualdap[] = { -+ struct luaL_Reg lualdap[] = { - {"open_simple", lualdap_open_simple}, - {NULL, NULL}, - }; diff --git a/srcpkgs/lua-lualdap/files/COPYING b/srcpkgs/lua-lualdap/files/COPYING deleted file mode 100644 index af8815c5f2a..00000000000 --- a/srcpkgs/lua-lualdap/files/COPYING +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2003-2007 The Kepler Project. -Copyright (c) 2015 Jason A. Donenfeld . - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. diff --git a/srcpkgs/lua-lualdap/template b/srcpkgs/lua-lualdap/template index f38f4cf7d70..0fb91565b5b 100644 --- a/srcpkgs/lua-lualdap/template +++ b/srcpkgs/lua-lualdap/template @@ -1,25 +1,22 @@ # Template file for 'lua-lualdap' pkgname=lua-lualdap -version=1.2.0 +version=1.2.5 revision=1 +wrksrc="lualdap-${version}" build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="lua51-devel lua52-devel lua-devel libldap-devel" short_desc="LDAP bindings for Lua" maintainer="John Regan " license="MIT" -homepage="http://git.zx2cf.com/lualdap" -distfiles="http://git.zx2c4.com/lualdap/snapshot/lualdap-${version}.tar.xz" -checksum=126c50f013ebf329c1771ab4d489f5e6eb7b11d2a64412414f1c6bc6e8a69ed8 -wrksrc="lualdap-${version}" +homepage="https://github.com/lualdap/lualdap" +distfiles="https://github.com/lualdap/lualdap/archive/v${version}.tar.gz" +checksum=3e028faa6a5798cf2f3d50b9853b9b3fb6eb562b62010747bd5b6f50b57bb1cc post_extract() { cd ${wrksrc} - for p in ${FILESDIR}/*.patch; do - patch -p0 -i "${p}" - done mkdir -p lua51 - mv * lua51 || true + mv * lua51 || : cp -a lua51 lua52 cp -a lua51 lua53 } @@ -27,6 +24,7 @@ post_extract() { do_build() { for luaver in 5.1 5.2 5.3; do cd ${wrksrc}/lua${luaver//.} + vsed -i "s|^LUA_VERSION.*|LUA_VERSION = ${luaver}|g" config make \ CC=$CC \ LD=$CC \ @@ -39,6 +37,7 @@ do_build() { do_install() { for luaver in 5.1 5.2 5.3; do + vmkdir usr/lib/lua/$luaver cd ${wrksrc}/lua${luaver//.} make \ CC=$CC \ @@ -46,17 +45,17 @@ do_install() { CFLAGS="$(pkg-config --cflags lua${luaver})" \ LDLIBS="$(pkg-config --libs lua${luaver}) -lldap" \ LUA_MODULES="$(pkg-config --variable=INSTALL_CMOD lua${luaver})" \ - DESTDIR="${PKGDESTDIR}" \ + DESTDIR="${DESTDIR}" \ install done - vlicense "${FILESDIR}/COPYING" + vlicense ${wrksrc}/lua53/LICENSE.md } lua51-lualdap_package() { short_desc+=" - Lua 5.1" pkg_install() { vmove usr/lib/lua/5.1 - vlicense "${FILESDIR}/COPYING" + vlicense lua51/LICENSE.md } } @@ -64,6 +63,6 @@ lua52-lualdap_package() { short_desc+=" - Lua 5.2" pkg_install() { vmove usr/lib/lua/5.2 - vlicense "${FILESDIR}/COPYING" + vlicense lua52/LICENSE.md } } diff --git a/srcpkgs/lua-lualdap/update b/srcpkgs/lua-lualdap/update deleted file mode 100644 index 823526c2729..00000000000 --- a/srcpkgs/lua-lualdap/update +++ /dev/null @@ -1,2 +0,0 @@ -pkgname=lualdap -site="https://git.zx2c4.com/lualdap/refs/"