update to 1.1, ok pedro@

This commit is contained in:
jolan 2005-07-08 17:57:27 +00:00
parent 4ed1a36e3d
commit f76367a619
6 changed files with 47 additions and 46 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.1.1.1 2005/05/15 00:42:52 jolan Exp $
# $OpenBSD: Makefile,v 1.2 2005/07/08 17:57:27 jolan Exp $
SHARED_ONLY= Yes
COMMENT= "file system library for the lua language"
DISTNAME= luafilesystem-1.0
PKGNAME= luafs-1.0
DISTNAME= luafilesystem-1.1
PKGNAME= luafs-1.1
CATEGORIES= devel
MASTER_SITES= http://luaforge.net/frs/download.php/430/
MASTER_SITES= http://luaforge.net/frs/download.php/831/
HOMEPAGE= http://www.keplerproject.org/luafilesystem/
@ -28,11 +28,11 @@ post-extract:
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lua/luafs
${INSTALL_DATA} ${WRKSRC}/*.so ${PREFIX}/lib/luafs.so
${INSTALL_DATA} ${WRKBUILD}/src/*.so ${PREFIX}/lib/luafs.so
${INSTALL_DATA} ${WRKSRC}/init.lua ${PREFIX}/lua/luafs
${INSTALL_DATA} ${FILESDIR}/lfs.lua ${PREFIX}/lua/luafs
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/luafs
${INSTALL_DATA} ${WRKSRC}/*.html ${WRKSRC}/*.png \
${INSTALL_DATA} ${WRKSRC}/doc/us/*.html ${WRKSRC}/doc/us/*.png \
${PREFIX}/share/doc/luafs
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (luafilesystem-1.0.tar.gz) = 35eb7c97a4ca21719ea345bb81c005fc
RMD160 (luafilesystem-1.0.tar.gz) = 7144967b6eb3c7d6f1372e68a6783e292dff41a5
SHA1 (luafilesystem-1.0.tar.gz) = e21e9d88b5509dd16cdefd7a8edf9ba8c0556cb8
SIZE (luafilesystem-1.0.tar.gz) = 17619
MD5 (luafilesystem-1.1.tar.gz) = 77d9bba27367d18b6b044f99d98be111
RMD160 (luafilesystem-1.1.tar.gz) = 3c6fe9455e49723b43747e3c3f3d217538b1d843
SHA1 (luafilesystem-1.1.tar.gz) = 623411cc1934c11a12e9574ee2b44dac5b83e022
SIZE (luafilesystem-1.1.tar.gz) = 21078

View File

@ -1,18 +1,27 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2005/05/15 00:42:52 jolan Exp $
--- Makefile.orig Wed Jan 19 15:20:04 2005
+++ Makefile Sat May 14 21:11:36 2005
@@ -8,11 +8,12 @@ V= 1.0
$OpenBSD: patch-Makefile,v 1.2 2005/07/08 17:57:27 jolan Exp $
--- Makefile.orig Mon May 30 12:54:49 2005
+++ Makefile Thu Jul 7 23:41:21 2005
@@ -8,17 +8,21 @@ V= 1.1
DIST_DIR= luafilesystem-$V
TAR_FILE= $(DIST_DIR).tar.gz
ZIP_FILE= $(DIST_DIR).zip
-LIBNAME= lib$T.$V$(LIB_EXT)
+LIBNAME= luafs.so
-LIBNAME= lib$T.$V.so
+LIBNAME= libfs.so
SRCS= $T.c
-OBJS= $T.o compat-5.1.o
+OBJS= $T.o
COMPAT_O= $(COMPAT_DIR)/compat-5.1.o
SRCS= src/$T.c
-OBJS= src/$T.o $(COMPAT_O)
+OBJS= src/$T.o
+all: lib
lib: $(LIBNAME)
lib: src/$(LIBNAME)
src/$(LIBNAME): $(OBJS)
$(CC) $(CFLAGS) $(LIBS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS)
+
+$(OBJS): $(SRCS)
+ $(CC) -c $(CFLAGS) -o $@ src/lfs.c
$(COMPAT_O): $(COMPAT_DIR)/compat-5.1.c
$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c

View File

@ -1,41 +1,31 @@
$OpenBSD: patch-config,v 1.1.1.1 2005/05/15 00:42:52 jolan Exp $
--- config.orig Wed Jan 19 15:20:04 2005
+++ config Sat May 14 21:06:43 2005
@@ -1,25 +1,22 @@
$OpenBSD: patch-config,v 1.2 2005/07/08 17:57:27 jolan Exp $
--- config.orig Wed May 25 07:55:32 2005
+++ config Thu Jul 7 23:27:58 2005
@@ -1,22 +1,17 @@
# Installation directories
# System's libraries directory (where binary libraries are installed)
-LUA_LIBDIR= /usr/local/lib/lua/5.0
+LUA_LIBDIR= $(LOCALBASE)/lib
# System's lua directory (where Lua libraries are installed)
-LUA_DIR= /usr/local/share/lua/5.0
+#LUA_DIR= /usr/local/share/lua/5.0
# Lua includes directory
-LUA_INC= /usr/local/include/lua5
+LUA_INC= $(LOCALBASE)/include
# OS dependent
-LIB_EXT= .dylib
-#LIB_EXT= .so
-LIB_OPTION= -dynamiclib #for MacOS X
-#LIB_OPTION= -shared #for Linux
+#LIB_EXT= .dylib
+LIB_EXT= .so
+#LIB_OPTION= -dynamiclib #for MacOS X
+LIB_OPTION= -shared #for Linux
#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
LIB_OPTION= -shared #for Linux
-COMPAT_DIR= .
-COMPAT_DIR= ../compat/src
-
# Compilation directives
# On FreeBSD systems, the following line should be commented
-DLLIB= -ldl
+#DLLIB= -ldl
#LUA_LIBS= -llua50 -lm
-WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
-INCS= -I$(LUA_INC) -I$(COMPAT_DIR)
+#DLLIB= -ldl
+#WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
+INCS= -I$(LUA_INC)
LIBS= -L$(LUA_LIBDIR) -llua -llualib -lm $(DLLIB)
LIBS= $(LUA_LIBS) $(DLLIB)
-CFLAGS= $(WARN) $(INCS)
-CC= gcc
-
+CFLAGS+= $(WARN) $(INCS) -fPIC
+#CC= gcc

View File

@ -1,12 +1,13 @@
$OpenBSD: patch-lfs_c,v 1.1.1.1 2005/05/15 00:42:52 jolan Exp $
--- lfs.c.orig Wed Jan 19 15:20:04 2005
+++ lfs.c Wed May 11 08:31:54 2005
@@ -26,13 +26,12 @@
$OpenBSD: patch-src_lfs_c,v 1.1 2005/07/08 17:57:27 jolan Exp $
--- src/lfs.c.orig Fri May 20 13:32:19 2005
+++ src/lfs.c Thu Jul 7 23:29:53 2005
@@ -28,14 +28,13 @@
#include <unistd.h>
#include <dirent.h>
#include <fcntl.h>
-#include <sys/types.h>
+#include <sys/param.h>
#include <utime.h>
#endif
#include "lua.h"
@ -16,7 +17,7 @@ $OpenBSD: patch-lfs_c,v 1.1.1.1 2005/05/15 00:42:52 jolan Exp $
#include "lfs.h"
@@ -81,8 +80,8 @@ static int change_dir (lua_State *L) {
@@ -84,8 +83,8 @@ static int change_dir (lua_State *L) {
** and a string describing the error
*/
static int get_dir (lua_State *L) {

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2005/05/15 00:42:52 jolan Exp $
@comment $OpenBSD: PLIST,v 1.2 2005/07/08 17:57:27 jolan Exp $
@unexec lua ${SYSCONFDIR}/lua/luapkg.lua del luafs
%%SHARED%%
lua/luafs/
@ -6,6 +6,7 @@ lua/luafs/init.lua
lua/luafs/lfs.lua
@exec lua ${SYSCONFDIR}/lua/luapkg.lua add luafs ${PREFIX}/lua/luafs/init.lua
share/doc/luafs/
share/doc/luafs/examples.html
share/doc/luafs/index.html
share/doc/luafs/license.html
share/doc/luafs/luafilesystem.png