Fri Sep 13 12:09:37 2013 UTC ()
Fix build for lua>5.1.


(fhajny)
diff -r1.4 -r1.5 pkgsrc/devel/lua-filesystem/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/lua-filesystem/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/devel/lua-filesystem/patches/patch-aa
cvs diff -r1.4 -r1.5 pkgsrc/devel/lua-filesystem/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/lua-filesystem/Makefile 2013/08/15 06:32:05 1.4
+++ pkgsrc/devel/lua-filesystem/Makefile 2013/09/13 12:09:37 1.5
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1# $NetBSD: Makefile,v 1.4 2013/08/15 06:32:05 obache Exp $ 1# $NetBSD: Makefile,v 1.5 2013/09/13 12:09:37 fhajny Exp $
2# 2#
3 3
4DISTNAME= luafilesystem-1.6.2 4DISTNAME= luafilesystem-1.6.2
5PKGNAME= ${DISTNAME:S/lua/lua-/} 5PKGNAME= ${DISTNAME:S/lua/lua-/}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= devel 7CATEGORIES= devel
8MASTER_SITES= http://github.com/downloads/keplerproject/luafilesystem/ 8MASTER_SITES= http://github.com/downloads/keplerproject/luafilesystem/
9 9
10MAINTAINER= filip@joyent.com 10MAINTAINER= filip@joyent.com
11HOMEPAGE= http://keplerproject.github.com/luafilesystem/ 11HOMEPAGE= http://keplerproject.github.com/luafilesystem/
12COMMENT= File system related library for Lua 12COMMENT= File system related library for Lua
13LICENSE= mit 13LICENSE= mit
14 14
15USE_TOOLS+= gmake 15USE_TOOLS+= gmake
16BUILD_TARGET= lib 16BUILD_TARGET= lib
17 17
 18MAKE_ENV+= LUA_CDIR=${LUA_CDIR}
 19
18.include "../../lang/lua/module.mk" 20.include "../../lang/lua/module.mk"
19.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/lua-filesystem/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/lua-filesystem/distinfo 2013/06/04 09:21:26 1.2
+++ pkgsrc/devel/lua-filesystem/distinfo 2013/09/13 12:09:37 1.3
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.2 2013/06/04 09:21:26 fhajny Exp $ 1$NetBSD: distinfo,v 1.3 2013/09/13 12:09:37 fhajny Exp $
2 2
3SHA1 (luafilesystem-1.6.2.tar.gz) = 13e9ff1a550218eacbad6aef052fd686c4592797 3SHA1 (luafilesystem-1.6.2.tar.gz) = 13e9ff1a550218eacbad6aef052fd686c4592797
4RMD160 (luafilesystem-1.6.2.tar.gz) = bc106c6207ac99e15158483af7abebd67d44a893 4RMD160 (luafilesystem-1.6.2.tar.gz) = bc106c6207ac99e15158483af7abebd67d44a893
5Size (luafilesystem-1.6.2.tar.gz) = 27886 bytes 5Size (luafilesystem-1.6.2.tar.gz) = 27886 bytes
6SHA1 (patch-aa) = 17a15dbf8ec314bdf643ff4aba103006af55064a 6SHA1 (patch-aa) = c287a1203f4a85e616ef3d31276aabfb0a1ed83d
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/lua-filesystem/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/lua-filesystem/patches/Attic/patch-aa 2010/09/21 09:30:41 1.1.1.1
+++ pkgsrc/devel/lua-filesystem/patches/Attic/patch-aa 2013/09/13 12:09:37 1.2
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-aa,v 1.1.1.1 2010/09/21 09:30:41 fhajny Exp $ 1$NetBSD: patch-aa,v 1.2 2013/09/13 12:09:37 fhajny Exp $
2 2
3Fix default directory locations 3Fix default directory locations
4--- config.orig 2009-10-20 20:54:35.000000000 +0000 4--- config.orig 2012-10-04 14:25:54.000000000 +0000
5+++ config 5+++ config
6@@ -1,10 +1,10 @@ 6@@ -1,10 +1,10 @@
7 # Installation directories 7 # Installation directories
8  8
9 # Default installation prefix 9 # Default installation prefix
10-PREFIX=/usr/local 10-PREFIX=/usr/local
11+PREFIX?=/usr/local 11+PREFIX?=/usr/local
12  12
13 # System's libraries directory (where binary libraries are installed) 13 # System's libraries directory (where binary libraries are installed)
14-LUA_LIBDIR= $(PREFIX)/lib/lua/5.1 14-LUA_LIBDIR= $(PREFIX)/lib/lua/5.1
15+LUA_LIBDIR= $(DESTDIR)$(PREFIX)/lib/lua/5.1 15+LUA_LIBDIR= $(DESTDIR)$(PREFIX)/$(LUA_CDIR)
16  16
17 # Lua includes directory 17 # Lua includes directory
18 LUA_INC= $(PREFIX)/include 18 LUA_INC= $(PREFIX)/include
19@@ -16,7 +16,7 @@ LIB_OPTION= -shared #for Linux 19@@ -16,7 +16,7 @@ LIB_OPTION= -shared #for Linux
20 LIBNAME= $T.so.$V 20 LIBNAME= $T.so.$V
21  21
22 # Compilation directives 22 # Compilation directives
23-WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic 23-WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
24+WARN= -O2 -fPIC  24+WARN= -O2 -fPIC
25 INCS= -I$(LUA_INC) 25 INCS= -I$(LUA_INC)
26 CFLAGS= $(WARN) $(INCS) 26 CFLAGS= $(WARN) $(INCS)
27 CC= gcc 27 CC= gcc