pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/53787: Update devel/lua-filesytem to 1.7.0_2



>Number:         53787
>Category:       pkg
>Synopsis:       Update devel/lua-filesytem to 1.7.0_2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Dec 15 10:20:00 +0000 2018
>Originator:     Jonathan Buschmann
>Release:        latest branch
>Organization:
>Environment:
>Description:
I tried to contact the maintainer 'filip' but this mailbox doesn't exist anymore.

See this diff to update to latest (only tested on macOS)

----

diff --git c/devel/lua-filesystem/Makefile i/devel/lua-filesystem/Makefile
index 2f34b1b95f8..4010617c29d 100644
--- c/devel/lua-filesystem/Makefile
+++ i/devel/lua-filesystem/Makefile
@@ -1,22 +1,25 @@
 # $NetBSD: Makefile,v 1.9 2015/03/24 13:35:49 fhajny 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=		filip%joyent.com@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
 
 MAKE_ENV+=		LUA_CDIR=${LUA_CDIR}
+MAKE_ENV+=		LUA_LINKVERSION=${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
 
 .include "../../lang/lua/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git c/devel/lua-filesystem/distinfo i/devel/lua-filesystem/distinfo
index 7d2fcf383ea..6d7c6202add 100644
--- c/devel/lua-filesystem/distinfo
+++ i/devel/lua-filesystem/distinfo
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.5 2015/11/03 03:27:47 agc 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) = 6356dbf1c4ba7d8ed1b775c3ddddde40570677df
+SHA1 (patch-config) = 1ea446296ea2d5f08753c127e99984fead120cac
diff --git c/devel/lua-filesystem/patches/patch-Makefile i/devel/lua-filesystem/patches/patch-Makefile
new file mode 100644
index 00000000000..e14b79d24da
--- /dev/null
+++ i/devel/lua-filesystem/patches/patch-Makefile
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Makefile.orig	2018-12-15 04:00:31.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 --git c/devel/lua-filesystem/patches/patch-aa i/devel/lua-filesystem/patches/patch-config
similarity index 66%
rename from devel/lua-filesystem/patches/patch-aa
rename to devel/lua-filesystem/patches/patch-config
index 9dc3373d6f8..bb0a27b5440 100644
--- c/devel/lua-filesystem/patches/patch-aa
+++ i/devel/lua-filesystem/patches/patch-config
@@ -1,9 +1,9 @@
 $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.orig	2017-09-15 23:07:33.000000000 +0000
 +++ config
-@@ -1,10 +1,10 @@
+@@ -1,22 +1,22 @@
  # Installation directories
  
  # Default installation prefix
@@ -16,7 +16,13 @@ Fix default directory locations
  
  # Lua includes directory
  LUA_INC= $(PREFIX)/include
-@@ -16,7 +16,7 @@ LIB_OPTION= -shared #for Linux
+ 
+ # OS dependent
+-LIB_OPTION= -shared #for Linux
+-#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
++LIB_OPTION+= $(shell pkg-config --libs lua-${LUA_LINKVERSION}) -shared #for Linux
++#LIB_OPTION+= -bundle -undefined dynamic_lookup #for MacOS X
+ 
  LIBNAME= $T.so.$V
  
  # Compilation directives

>How-To-Repeat:

>Fix:
diff --git c/devel/lua-filesystem/Makefile i/devel/lua-filesystem/Makefile
index 2f34b1b95f8..4010617c29d 100644
--- c/devel/lua-filesystem/Makefile
+++ i/devel/lua-filesystem/Makefile
@@ -1,22 +1,25 @@
 # $NetBSD: Makefile,v 1.9 2015/03/24 13:35:49 fhajny 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=		filip%joyent.com@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
 
 MAKE_ENV+=		LUA_CDIR=${LUA_CDIR}
+MAKE_ENV+=		LUA_LINKVERSION=${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
 
 .include "../../lang/lua/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git c/devel/lua-filesystem/distinfo i/devel/lua-filesystem/distinfo
index 7d2fcf383ea..6d7c6202add 100644
--- c/devel/lua-filesystem/distinfo
+++ i/devel/lua-filesystem/distinfo
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.5 2015/11/03 03:27:47 agc 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) = 6356dbf1c4ba7d8ed1b775c3ddddde40570677df
+SHA1 (patch-config) = 1ea446296ea2d5f08753c127e99984fead120cac
diff --git c/devel/lua-filesystem/patches/patch-Makefile i/devel/lua-filesystem/patches/patch-Makefile
new file mode 100644
index 00000000000..e14b79d24da
--- /dev/null
+++ i/devel/lua-filesystem/patches/patch-Makefile
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Makefile.orig	2018-12-15 04:00:31.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 --git c/devel/lua-filesystem/patches/patch-aa i/devel/lua-filesystem/patches/patch-config
similarity index 66%
rename from devel/lua-filesystem/patches/patch-aa
rename to devel/lua-filesystem/patches/patch-config
index 9dc3373d6f8..bb0a27b5440 100644
--- c/devel/lua-filesystem/patches/patch-aa
+++ i/devel/lua-filesystem/patches/patch-config
@@ -1,9 +1,9 @@
 $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.orig	2017-09-15 23:07:33.000000000 +0000
 +++ config
-@@ -1,10 +1,10 @@
+@@ -1,22 +1,22 @@
  # Installation directories
  
  # Default installation prefix
@@ -16,7 +16,13 @@ Fix default directory locations
  
  # Lua includes directory
  LUA_INC= $(PREFIX)/include
-@@ -16,7 +16,7 @@ LIB_OPTION= -shared #for Linux
+ 
+ # OS dependent
+-LIB_OPTION= -shared #for Linux
+-#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
++LIB_OPTION+= $(shell pkg-config --libs lua-${LUA_LINKVERSION}) -shared #for Linux
++#LIB_OPTION+= -bundle -undefined dynamic_lookup #for MacOS X
+ 
  LIBNAME= $T.so.$V
  
  # Compilation directives


Home | Main Index | Thread Index | Old Index