pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/lua-filesystem lua-filesystem: update to 1.7.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/819075afb198
branches: trunk
changeset: 334474:819075afb198
user: maya <maya%pkgsrc.org@localhost>
date: Tue May 28 20:43:04 2019 +0000
description:
lua-filesystem: update to 1.7.0
Update provided by Jonathan Buschmann in PR pkg/53787.
I added some pkgconfig invocations, because otherwise it was linking
to lua without the RPATH to liblua.
Added a test target.
Version 1.7.0 [15/Sep/2017]
symlinkattributes function now provides 'target' field, containing name of the file that the symlink points to.
attributes, symlinkattributes, touch, mkdir, and rmdir functions now return system-dependent error code as the third value on error.
Fixed detection of closed files for Lua 5.2+ in setmode, lock, and unlock functions.
Fixed various compiler warnings.
s: ----------------------------------------------------------------------
diffstat:
devel/lua-filesystem/Makefile | 15 ++++++---
devel/lua-filesystem/distinfo | 13 ++++----
devel/lua-filesystem/patches/patch-Makefile | 16 +++++++++++
devel/lua-filesystem/patches/patch-aa | 27 ------------------
devel/lua-filesystem/patches/patch-config | 42 +++++++++++++++++++++++++++++
5 files changed, 75 insertions(+), 38 deletions(-)
diffs (151 lines):
diff -r 5e155ed320b2 -r 819075afb198 devel/lua-filesystem/Makefile
--- a/devel/lua-filesystem/Makefile Tue May 28 19:34:38 2019 +0000
+++ b/devel/lua-filesystem/Makefile Tue May 28 20:43:04 2019 +0000
@@ -1,22 +1,27 @@
-# $NetBSD: Makefile,v 1.10 2018/12/15 21:12:21 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/05/28 20:43:04 maya Exp $
#
-DISTNAME= luafilesystem-1.6.3
+DISTNAME= luafilesystem-1.7.0
PKGNAME= ${DISTNAME:S/lua/${LUA_PKGPREFIX}-/}
CATEGORIES= devel
-MASTER_SITES= -http://github.com/keplerproject/luafilesystem/archive/v_1_6_3.tar.gz
+MASTER_SITES= ${MASTER_SITE_GITHUB:=keplerproject/}
+GITHUB_PROJECT= luafilesystem
+GITHUB_TAG= v${PKGVERSION_NOREV:S/./_/g}_2
MAINTAINER= fhajny%NetBSD.org@localhost
HOMEPAGE= http://keplerproject.github.com/luafilesystem/
COMMENT= File system related library for Lua
LICENSE= mit
-WRKSRC= ${WRKDIR}/luafilesystem-v_${PKGVERSION_NOREV:S/./_/g}
+WRKSRC= ${WRKDIR}/luafilesystem-${PKGVERSION_NOREV:S/./_/g}_2
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
BUILD_TARGET= lib
+TEST_TARGET= test
+
MAKE_ENV+= LUA_CDIR=${LUA_CDIR}
+MAKE_ENV+= LUA_VERS=${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
.include "../../lang/lua/module.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5e155ed320b2 -r 819075afb198 devel/lua-filesystem/distinfo
--- a/devel/lua-filesystem/distinfo Tue May 28 19:34:38 2019 +0000
+++ b/devel/lua-filesystem/distinfo Tue May 28 20:43:04 2019 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 03:27:47 agc Exp $
+$NetBSD: distinfo,v 1.6 2019/05/28 20:43:04 maya Exp $
-SHA1 (luafilesystem-1.6.3.tar.gz) = 72bc1415e7eefb339742538505675c59bd69e6bb
-RMD160 (luafilesystem-1.6.3.tar.gz) = cb949e36d9d09061be5eed9c67332cb3178250b5
-SHA512 (luafilesystem-1.6.3.tar.gz) = abfa1b3ac22ed80189560a1a025a7ea21a954defe14e5b539e08f266d180962a691262efc7eb2ddacc2d4aae14d6e356b1a276165b5bed46a13e4d6c61ab99f1
-Size (luafilesystem-1.6.3.tar.gz) = 30379 bytes
-SHA1 (patch-aa) = c287a1203f4a85e616ef3d31276aabfb0a1ed83d
+SHA1 (luafilesystem-1.7.0.tar.gz) = 910de0959ff72703b284c26783979b663c4dc0d2
+RMD160 (luafilesystem-1.7.0.tar.gz) = 6770d25f1d0928c347560425d7c5758788038fd9
+SHA512 (luafilesystem-1.7.0.tar.gz) = a1d4d077776e57cd878dbcd21656da141ea3686c587b5420a2b039aeaf086b7e7d05d531ee1cc2bbd7d06660d1315b09593e52143f6711f033ce8eecdc550511
+Size (luafilesystem-1.7.0.tar.gz) = 30877 bytes
+SHA1 (patch-Makefile) = 1fd838ba0f5a716ed1f8f7b7ed4fda816e702806
+SHA1 (patch-config) = 5d459797960118aa387f1f5cfb8bc6d7923965c8
diff -r 5e155ed320b2 -r 819075afb198 devel/lua-filesystem/patches/patch-Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/lua-filesystem/patches/patch-Makefile Tue May 28 20:43:04 2019 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile,v 1.1 2019/05/28 20:43:04 maya Exp $
+
+ - Remove MACOSX_DEPLOYMENT_TARGET as it will give problem on newer macOS
+ and also targeting/building for current macOS version is enough
+
+--- Makefile.orig 2017-09-15 23:07:33.000000000 +0000
++++ Makefile
+@@ -12,7 +12,7 @@ OBJS= src/$T.o
+ lib: src/lfs.so
+
+ src/lfs.so: $(OBJS)
+- MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(LIB_OPTION) -o src/lfs.so $(OBJS)
++ $(CC) $(LIB_OPTION) -o src/lfs.so $(OBJS)
+
+ test: lib
+ LUA_CPATH=./src/?.so lua tests/test.lua
diff -r 5e155ed320b2 -r 819075afb198 devel/lua-filesystem/patches/patch-aa
--- a/devel/lua-filesystem/patches/patch-aa Tue May 28 19:34:38 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2013/09/13 12:09:37 fhajny Exp $
-
-Fix default directory locations
---- config.orig 2012-10-04 14:25:54.000000000 +0000
-+++ config
-@@ -1,10 +1,10 @@
- # Installation directories
-
- # Default installation prefix
--PREFIX=/usr/local
-+PREFIX?=/usr/local
-
- # System's libraries directory (where binary libraries are installed)
--LUA_LIBDIR= $(PREFIX)/lib/lua/5.1
-+LUA_LIBDIR= $(DESTDIR)$(PREFIX)/$(LUA_CDIR)
-
- # Lua includes directory
- LUA_INC= $(PREFIX)/include
-@@ -16,7 +16,7 @@ LIB_OPTION= -shared #for Linux
- LIBNAME= $T.so.$V
-
- # Compilation directives
--WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
-+WARN= -O2 -fPIC
- INCS= -I$(LUA_INC)
- CFLAGS= $(WARN) $(INCS)
- CC= gcc
diff -r 5e155ed320b2 -r 819075afb198 devel/lua-filesystem/patches/patch-config
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/lua-filesystem/patches/patch-config Tue May 28 20:43:04 2019 +0000
@@ -0,0 +1,42 @@
+$NetBSD: patch-config,v 1.1 2019/05/28 20:43:04 maya Exp $
+
+Fix default directory locations
+Try to find lua libs from pkgconfig, so we get RPATH specified.
+(This eliminates the need to separately add -lm)
+
+--- config.orig 2017-09-15 23:07:33.000000000 +0000
++++ config
+@@ -1,22 +1,28 @@
+ # Installation directories
+
+ # Default installation prefix
+-PREFIX=/usr/local
++PREFIX?=/usr/local
+
+ # System's libraries directory (where binary libraries are installed)
+-LUA_LIBDIR= $(PREFIX)/lib/lua/5.1
++LUA_LIBS= $(pkg-config --libs lua-$(LUA_VERS))
++LUA_LIBDIR= $(DESTDIR)$(PREFIX)/$(LUA_CDIR)
+
+ # Lua includes directory
+ LUA_INC= $(PREFIX)/include
+
+ # OS dependent
+-LIB_OPTION= -shared #for Linux
+-#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
++ifeq ($(shell uname -s 2>/dev/null), Darwin)
++# for macOS
++LIB_OPTION+= -L$(PREFIX)/lib $(LUA_LIBS) -shared -install_name $(PREFIX)/$(LUA_CDIR)/$(notdir $@)
++else
++# for Linux & other unix
++LIB_OPTION+= -L$(PREFIX)/lib $(LUA_LIBS) -shared
++endif
+
+ LIBNAME= $T.so.$V
+
+ # Compilation directives
+-WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
++WARN= -O2 -fPIC
+ INCS= -I$(LUA_INC)
+ CFLAGS= $(WARN) $(INCS)
+ CC= gcc
Home |
Main Index |
Thread Index |
Old Index