120 lines
3.8 KiB
Diff
120 lines
3.8 KiB
Diff
Hi,
|
|
I've attached an update for devel/luafs to 1.8.0, all tests are passing.
|
|
|
|
diff --git a/devel/luafs/Makefile b/devel/luafs/Makefile
|
|
index cd6a2a2559c..adebaaff7ef 100644
|
|
--- a/devel/luafs/Makefile
|
|
+++ b/devel/luafs/Makefile
|
|
@@ -2,9 +2,8 @@ COMMENT = file system library for the lua language
|
|
|
|
GH_ACCOUNT = keplerproject
|
|
GH_PROJECT = luafilesystem
|
|
-GH_TAGNAME = v_1_6_3
|
|
-PKGNAME = luafs-1.6.3
|
|
-REVISION = 1
|
|
+GH_TAGNAME = v1_8_0
|
|
+PKGNAME = luafs-1.8.0
|
|
|
|
CATEGORIES = devel
|
|
|
|
@@ -18,7 +17,8 @@ MODULES = lang/lua
|
|
FLAVORS = lua52 lua53
|
|
FLAVOR ?=
|
|
|
|
-MAKE_ENV += LUA_LIBDIR=${MODLUA_LIBDIR} LUA_INC=${MODLUA_INCL_DIR}
|
|
+CFLAGS += -I${MODLUA_INCL_DIR} -I${LOCALBASE}/include
|
|
+LDFLAGS += -L${MODLUA_LIBDIR} -L${LOCALBASE}/lib
|
|
|
|
ALL_TARGET = lib
|
|
|
|
diff --git a/devel/luafs/distinfo b/devel/luafs/distinfo
|
|
index f7f578c05f9..a933c9bb8d5 100644
|
|
--- a/devel/luafs/distinfo
|
|
+++ b/devel/luafs/distinfo
|
|
@@ -1,2 +1,2 @@
|
|
-SHA256 (luafilesystem-1_6_3.tar.gz) = VSXSuOx3dIZWKaainC+Uyw9+Z4eYe/VM034BG/tkIGg=
|
|
-SIZE (luafilesystem-1_6_3.tar.gz) = 30379
|
|
+SHA256 (luafilesystem-1_8_0.tar.gz) = FtF8eIuAk/IEcyU0P16bdMzLHqlgAeRZFKWLuuiTJJU=
|
|
+SIZE (luafilesystem-1_8_0.tar.gz) = 30374
|
|
diff --git a/devel/luafs/patches/patch-Makefile b/devel/luafs/patches/patch-Makefile
|
|
index c4fb73ee739..33a6481036d 100644
|
|
--- a/devel/luafs/patches/patch-Makefile
|
|
+++ b/devel/luafs/patches/patch-Makefile
|
|
@@ -1,14 +1,14 @@
|
|
---- Makefile.orig Thu Jan 15 19:58:20 2015
|
|
-+++ Makefile Tue Feb 10 21:14:38 2015
|
|
-@@ -12,7 +12,10 @@ OBJS= src/$T.o
|
|
+Index: Makefile
|
|
+--- Makefile.orig
|
|
++++ Makefile
|
|
+@@ -11,8 +11,8 @@ OBJS= src/$T.o
|
|
+
|
|
lib: src/lfs.so
|
|
|
|
- src/lfs.so: $(OBJS)
|
|
-- MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/lfs.so $(OBJS)
|
|
-+ MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(CFLAGS) $(LIB_OPTION) lfs.o -o $(LIBNAME)
|
|
-+
|
|
-+$(OBJS): $(SRCS)
|
|
-+ $(CC) $(CFLAGS) $(INCS) -c src/lfs.c
|
|
+-src/lfs.so: $(OBJS)
|
|
+- MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET); export MACOSX_DEPLOYMENT_TARGET; $(CC) $(LIB_OPTION) -o src/lfs.so $(OBJS)
|
|
++src/lfs.so: $(SRCS)
|
|
++ MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET); export MACOSX_DEPLOYMENT_TARGET; $(CC) -fPIC -shared $(CFLAGS) -o lfs.so src/lfs.c $(LDFLAGS)
|
|
|
|
test: lib
|
|
LUA_CPATH=./src/?.so lua tests/test.lua
|
|
diff --git a/devel/luafs/patches/patch-config b/devel/luafs/patches/patch-config
|
|
index 2ecdf6cad02..d61a89f71e6 100644
|
|
--- a/devel/luafs/patches/patch-config
|
|
+++ b/devel/luafs/patches/patch-config
|
|
@@ -1,29 +1,14 @@
|
|
---- config.orig Thu Jan 15 19:58:20 2015
|
|
-+++ config Tue Feb 10 21:14:38 2015
|
|
-@@ -3,9 +3,9 @@
|
|
- # 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?= $(LOCALBASE)/lib/lua/5.1
|
|
-
|
|
- # Lua includes directory
|
|
--LUA_INC= $(PREFIX)/include
|
|
-+LUA_INC?= $(LOCALBASE)/include
|
|
-
|
|
-@@ -15,9 +15,9 @@
|
|
-
|
|
--LIBNAME= $T.so.$V
|
|
-+LIBNAME= $T.so
|
|
-
|
|
+Index: config
|
|
+--- config.orig
|
|
++++ config
|
|
+@@ -20,7 +20,7 @@ LIB_OPTION= -shared #for Linux
|
|
+ MACOSX_DEPLOYMENT_TARGET= 10.5
|
|
+
|
|
# Compilation directives
|
|
-WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
|
|
+#WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
|
|
- INCS= -I$(LUA_INC)
|
|
+ INCS= $(LUA_INC)
|
|
-CFLAGS= $(WARN) $(INCS)
|
|
-CC= gcc
|
|
-+CFLAGS+= -fPIC $(INCS)
|
|
++#CFLAGS+= -fPIC $(INCS)
|
|
+#CC= gcc
|
|
-
|
|
diff --git a/devel/luafs/pkg/PLIST b/devel/luafs/pkg/PLIST
|
|
index 3239f999e45..46185a8816e 100644
|
|
--- a/devel/luafs/pkg/PLIST
|
|
+++ b/devel/luafs/pkg/PLIST
|
|
@@ -1,4 +1,4 @@
|
|
-lib/lua/${MODLUA_VERSION}/lfs.so
|
|
+@so lib/lua/${MODLUA_VERSION}/lfs.so
|
|
share/doc/${FULLPKGNAME}/
|
|
share/doc/${FULLPKGNAME}/examples.html
|
|
share/doc/${FULLPKGNAME}/index.html
|
|
|