cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to Lua 5.1, okay jolan@

Browse Source
This commit is contained in:
pedro 2006-07-30 04:33:18 +00:00
parent 3dd204b3c5
commit 55815b6716
19 changed files with 65 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devel/luaalarm/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.2 2006/07/13 12:35:54 steven Exp $
# $OpenBSD: Makefile,v 1.3 2006/07/30 04:36:01 pedro Exp $
COMMENT= "alarm library for the lua language"
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
DISTNAME= lalarm
DATE= 20030709
PKGNAME= luaalarm-${DATE}
PKGNAME= luaalarm-${DATE}p0
DIST_SUBDIR= luaalarm-${DATE}
WRKDIST= ${WRKDIR}/alarm
CATEGORIES= devel
@ -25,14 +25,8 @@ NO_REGRESS= Yes
BUILD_DEPENDS= ::lang/lua
RUN_DEPENDS= ${BUILD_DEPENDS}
post-extract:
@sed -e "s:@alarmpath@:${PREFIX}/lua/luaalarm/?.lua:g" \
${FILESDIR}/init.lua > ${WRKSRC}/init.lua
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lua/luaalarm
${INSTALL_DATA} ${WRKSRC}/luaalarm.so ${PREFIX}/lib
${INSTALL_DATA} ${FILESDIR}/alarm.lua ${PREFIX}/lua/luaalarm
${INSTALL_DATA} ${WRKSRC}/init.lua ${PREFIX}/lua/luaalarm
${INSTALL_DATA_DIR} ${PREFIX}/lib/lua/5.1
${INSTALL_DATA} ${WRKSRC}/luaalarm.so ${PREFIX}/lib/lua/5.1/alarm.so
.include <bsd.port.mk>

2
devel/luaalarm/files/alarm.lua
View File

@ -1,2 +0,0 @@
-- $OpenBSD: alarm.lua,v 1.1.1.1 2006/01/25 23:32:13 jolan Exp $
assert(loadlib("luaalarm.so","luaopen_alarm"))()

3
devel/luaalarm/files/init.lua
View File

@ -1,3 +0,0 @@
-- $OpenBSD: init.lua,v 1.1.1.1 2006/01/25 23:32:13 jolan Exp $
-- luaalarm's initialization steps
lua_addpath("@alarmpath@")

4
devel/luaalarm/pkg/PFRAG.shared
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/01/25 23:32:13 jolan Exp $
lib/luaalarm.so
@comment $OpenBSD: PFRAG.shared,v 1.2 2006/07/30 04:36:01 pedro Exp $
lib/lua/5.1/alarm.so

8
devel/luaalarm/pkg/PLIST
View File

@ -1,8 +1,2 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/01/25 23:32:13 jolan Exp $
@unexec lua ${SYSCONFDIR}/lua/luapkg.lua del luaalarm
@comment $OpenBSD: PLIST,v 1.2 2006/07/30 04:36:01 pedro Exp $
%%SHARED%%
lua/
lua/luaalarm/
lua/luaalarm/alarm.lua
lua/luaalarm/init.lua
@exec lua ${SYSCONFDIR}/lua/luapkg.lua add luaalarm ${PREFIX}/lua/luaalarm/init.lua

18
devel/luafs/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2006/03/26 04:56:01 pedro Exp $
# $OpenBSD: Makefile,v 1.4 2006/07/30 04:38:39 pedro Exp $
SHARED_ONLY= Yes
COMMENT= "file system library for the lua language"
DISTNAME= luafilesystem-1.2
PKGNAME= luafs-1.2
PKGNAME= luafs-1.2p0
CATEGORIES= devel
MASTER_SITES= http://luaforge.net/frs/download.php/1487/
@ -18,25 +18,17 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
NO_REGRESS= Yes
BUILD_DEPENDS= ::lang/lua ::devel/luacompat
BUILD_DEPENDS= ::lang/lua
RUN_DEPENDS= ${BUILD_DEPENDS}
post-extract:
@sed -e "s:@fspath@:${PREFIX}/lua/luafs/?.lua:g" \
-e "s:@fscpath@:${PREFIX}/lua/luafs/?.so:g" \
${FILESDIR}/init.lua > ${WRKSRC}/init.lua
@perl -pi -e 's/\r\n/\n/' ${WRKSRC}/Makefile ${WRKSRC}/config
LUAFSDIR= ${PREFIX}/lua/luafs
do-install:
${INSTALL_DATA_DIR} ${LUAFSDIR}
${INSTALL_DATA_DIR} ${LUAFSDIR}/fs
${INSTALL_DATA_DIR} ${PREFIX}/lib/lua/5.1
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/luafs
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/luafs
${INSTALL_DATA} ${FILESDIR}/lfs.lua ${LUAFSDIR}
${INSTALL_DATA} ${WRKSRC}/core.so ${LUAFSDIR}/fs
${INSTALL_DATA} ${WRKSRC}/init.lua ${LUAFSDIR}
${INSTALL_DATA} ${WRKSRC}/lfs.so ${PREFIX}/lib/lua/5.1
${INSTALL_DATA} ${WRKSRC}/doc/us/*.html ${WRKSRC}/doc/us/*.png \
${PREFIX}/share/doc/luafs
${INSTALL_DATA} ${WRKSRC}/tests/*.lua ${PREFIX}/share/examples/luafs

4
devel/luafs/files/init.lua
View File

@ -1,4 +0,0 @@
-- $OpenBSD: init.lua,v 1.2 2006/03/26 04:56:02 pedro Exp $
-- luafs' initialization steps
lua_addpath("@fspath@")
lua_addcpath("@fscpath@")

2
devel/luafs/files/lfs.lua
View File

@ -1,2 +0,0 @@
-- $OpenBSD: lfs.lua,v 1.2 2006/03/26 04:56:02 pedro Exp $
require("fs.core")

10
devel/luafs/patches/patch-config
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-config,v 1.3 2006/03/26 04:56:02 pedro Exp $
--- config.orig Sat Mar 25 23:55:30 2006
+++ config Sat Mar 25 23:56:30 2006
$OpenBSD: patch-config,v 1.4 2006/07/30 04:38:39 pedro Exp $
--- config.orig Thu Jul 27 16:38:52 2006
+++ config Thu Jul 27 16:39:09 2006
@@ -1,20 +1,20 @@
# Installation directories
# System's libraries directory (where binary libraries are installed)
@ -15,7 +15,7 @@ $OpenBSD: patch-config,v 1.3 2006/03/26 04:56:02 pedro Exp $
#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
-LIBNAME= $T.so.$V
+LIBNAME= core.so
+LIBNAME= lfs.so
COMPAT_DIR= ../compat/src
# Compilation directives
@ -27,4 +27,4 @@ $OpenBSD: patch-config,v 1.3 2006/03/26 04:56:02 pedro Exp $
+CFLAGS+= -fPIC
+CC= cc
# $Id: patch-config,v 1.3 2006/03/26 04:56:02 pedro Exp $
# $Id: patch-config,v 1.4 2006/07/30 04:38:39 pedro Exp $

13
devel/luafs/patches/patch-src_lfs_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_lfs_c,v 1.2 2006/03/26 04:56:02 pedro Exp $
$OpenBSD: patch-src_lfs_c,v 1.3 2006/07/30 04:38:39 pedro Exp $
--- src/lfs.c.orig Tue Mar 14 13:18:30 2006
+++ src/lfs.c Sun Mar 26 00:15:08 2006
+++ src/lfs.c Thu Jul 27 16:40:51 2006
@@ -32,14 +32,13 @@
#include <unistd.h>
#include <dirent.h>
@ -28,12 +28,3 @@ $OpenBSD: patch-src_lfs_c,v 1.2 2006/03/26 04:56:02 pedro Exp $
lua_pushnil(L);
lua_pushstring(L, getcwd_error);
return 2;
@@ -580,7 +579,7 @@ static const struct luaL_reg fslib[] = {
{NULL, NULL},
};
-int luaopen_lfs (lua_State *L) {
+int luaopen_fs_core (lua_State *L) {
dir_create_meta (L);
luaL_openlib (L, "lfs", fslib, 0);
set_info (L);

9
devel/luafs/patches/patch-src_lfs_h
View File

@ -1,9 +0,0 @@
$OpenBSD: patch-src_lfs_h,v 1.1 2006/03/26 04:56:02 pedro Exp $
--- src/lfs.h.orig Fri Mar 10 20:37:32 2006
+++ src/lfs.h Sun Mar 26 00:15:04 2006
@@ -13,4 +13,4 @@
#define chdir_error strerror(errno)
#endif
-int luaopen_lfs (lua_State *L);
+int luaopen_fs_core (lua_State *L);

4
devel/luafs/pkg/PFRAG.shared
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2006/03/26 04:56:02 pedro Exp $
lua/luafs/fs/core.so
@comment $OpenBSD: PFRAG.shared,v 1.3 2006/07/30 04:38:39 pedro Exp $
lib/lua/5.1/lfs.so

8
devel/luafs/pkg/PLIST
View File

@ -1,11 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2006/03/26 04:56:02 pedro Exp $
@unexec lua ${SYSCONFDIR}/lua/luapkg.lua del luafs
@comment $OpenBSD: PLIST,v 1.4 2006/07/30 04:38:39 pedro Exp $
%%SHARED%%
lua/luafs/
lua/luafs/fs/
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

10
games/enigma/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.9 2005/02/14 00:35:53 pvalchev Exp $
# $OpenBSD: Makefile,v 1.10 2006/07/30 04:33:18 pedro Exp $
COMMENT= "Oxyd/Rock'n'Roll clone"
DISTNAME= enigma-0.81
PKGNAME= ${DISTNAME}p0
CATEGORIES= games x11
HOMEPAGE= http://www.nongnu.org/enigma/
@ -16,10 +17,9 @@ WANTLIB= SDL X11 Xext c m pthread stdc++ usbhid z
MASTER_SITES= http://savannah.nongnu.org/download/enigma/
LIB_DEPENDS= SDL_image.1::devel/sdl-image \
SDL_mixer.2::devel/sdl-mixer \
lua.5,lualib.5::lang/lua
BUILD_DEPENDS= :lua->=5.1:lang/lua
LIB_DEPENDS= SDL_image.1::devel/sdl-image SDL_mixer.2::devel/sdl-mixer
USE_GMAKE= Yes
USE_X11= Yes
CONFIGURE_STYLE=gnu

43
net/luasocket/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.8 2006/04/12 18:41:36 pedro Exp $
# $OpenBSD: Makefile,v 1.9 2006/07/30 04:42:52 pedro Exp $
SHARED_ONLY= Yes
COMMENT= "network support for the lua language"
DISTNAME= luasocket-2.0
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= net
MASTER_SITES= http://luaforge.net/frs/download.php/1097/
@ -22,35 +22,28 @@ NO_REGRESS= Yes
WANTLIB= m
LIB_DEPENDS= lua,lualib::lang/lua \
luacompat::devel/luacompat
BUILD_DEPENDS= :lua->=5.1:lang/lua
RUN_DEPENDS= ${BUILD_DEPENDS}
MAKE_FILE= makefile
post-extract:
@sed -e "s:@socketpath@:${PREFIX}/lua/luasocket/?.lua:g" \
-e "s:@socketcpath@:${PREFIX}/lua/luasocket/?.so:g" \
${FILESDIR}/init.lua > ${WRKSRC}/init.lua
LUASOCKETDIR= ${PREFIX}/lua/luasocket
SHAREDIR= ${PREFIX}/share/lua/5.1
LIBDIR= ${PREFIX}/lib/lua/5.1
do-install:
${INSTALL_DATA_DIR} ${LUASOCKETDIR}
${INSTALL_DATA_DIR} ${LUASOCKETDIR}/socket
${INSTALL_DATA_DIR} ${LUASOCKETDIR}/mime
${INSTALL_DATA_DIR} ${SHAREDIR}/socket ${SHAREDIR}/mime
${INSTALL_DATA_DIR} ${LIBDIR}/socket ${LIBDIR}/mime
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/luasocket
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/luasocket
${INSTALL_DATA} ${WRKSRC}/src/socket.so ${LUASOCKETDIR}/socket/core.so
${INSTALL_DATA} ${WRKSRC}/src/mime.so ${LUASOCKETDIR}/mime/core.so
${INSTALL_DATA} ${WRKSRC}/init.lua ${LUASOCKETDIR}
${INSTALL_DATA} ${WRKSRC}/src/socket.lua ${LUASOCKETDIR}
${INSTALL_DATA} ${WRKSRC}/src/ltn12.lua ${LUASOCKETDIR}
${INSTALL_DATA} ${WRKSRC}/src/mime.lua ${LUASOCKETDIR}
${INSTALL_DATA} ${WRKSRC}/src/ftp.lua ${LUASOCKETDIR}/socket
${INSTALL_DATA} ${WRKSRC}/src/http.lua ${LUASOCKETDIR}/socket
${INSTALL_DATA} ${WRKSRC}/src/smtp.lua ${LUASOCKETDIR}/socket
${INSTALL_DATA} ${WRKSRC}/src/tp.lua ${LUASOCKETDIR}/socket
${INSTALL_DATA} ${WRKSRC}/src/url.lua ${LUASOCKETDIR}/socket
${INSTALL_DATA} ${WRKSRC}/src/socket.so ${LIBDIR}/socket/core.so
${INSTALL_DATA} ${WRKSRC}/src/mime.so ${LIBDIR}/mime/core.so
${INSTALL_DATA} ${WRKSRC}/src/socket.lua ${SHAREDIR}
${INSTALL_DATA} ${WRKSRC}/src/ltn12.lua ${SHAREDIR}
${INSTALL_DATA} ${WRKSRC}/src/mime.lua ${SHAREDIR}
${INSTALL_DATA} ${WRKSRC}/src/ftp.lua ${SHAREDIR}/socket
${INSTALL_DATA} ${WRKSRC}/src/http.lua ${SHAREDIR}/socket
${INSTALL_DATA} ${WRKSRC}/src/smtp.lua ${SHAREDIR}/socket
${INSTALL_DATA} ${WRKSRC}/src/tp.lua ${SHAREDIR}/socket
${INSTALL_DATA} ${WRKSRC}/src/url.lua ${SHAREDIR}/socket
${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/luasocket
${INSTALL_DATA} ${WRKSRC}/samples/* ${PREFIX}/share/examples/luasocket

4
net/luasocket/files/init.lua
View File

@ -1,4 +0,0 @@
-- $OpenBSD: init.lua,v 1.3 2005/04/19 15:14:38 pedro Exp $
-- luasocket's initialization steps
lua_addpath("@socketpath@")
lua_addcpath("@socketcpath@")

8
net/luasocket/patches/patch-config
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-config,v 1.1 2005/11/25 15:09:44 pedro Exp $
--- config.orig Tue Nov 22 19:19:38 2005
+++ config Thu Nov 24 15:08:17 2005
$OpenBSD: patch-config,v 1.2 2006/07/30 04:42:52 pedro Exp $
--- config.orig Thu Nov 24 18:29:38 2005
+++ config Fri May 19 14:27:00 2006
@@ -6,22 +6,22 @@
# Output file names
#
@ -57,7 +57,7 @@ $OpenBSD: patch-config,v 1.1 2005/11/25 15:09:44 pedro Exp $
+# for Unix
+CC=cc
+CFLAGS+= $(LUAINC) -fPIC -DPIC
+LDFLAGS+= -O -shared $(LUALIB) -lluacompat -llualib -llua -lm
+LDFLAGS+= -O -shared $(LUALIB) -llua -lm
+LD=cc
#------

8
net/luasocket/pkg/PFRAG.shared
View File

@ -1,3 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/11/25 15:09:44 pedro Exp $
lua/luasocket/mime/core.so
lua/luasocket/socket/core.so
@comment $OpenBSD: PFRAG.shared,v 1.4 2006/07/30 04:42:52 pedro Exp $
lib/lua/5.1/mime/
lib/lua/5.1/mime/core.so
lib/lua/5.1/socket/
lib/lua/5.1/socket/core.so

26
net/luasocket/pkg/PLIST
View File

@ -1,17 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2005/11/25 15:09:44 pedro Exp $
@unexec lua ${SYSCONFDIR}/lua/luapkg.lua del luasocket
lua/luasocket/
lua/luasocket/init.lua
lua/luasocket/ltn12.lua
lua/luasocket/mime/
lua/luasocket/mime.lua
lua/luasocket/socket/
lua/luasocket/socket.lua
lua/luasocket/socket/ftp.lua
lua/luasocket/socket/http.lua
lua/luasocket/socket/smtp.lua
lua/luasocket/socket/tp.lua
lua/luasocket/socket/url.lua
@comment $OpenBSD: PLIST,v 1.4 2006/07/30 04:42:52 pedro Exp $
share/doc/luasocket/
share/doc/luasocket/dns.html
share/doc/luasocket/ftp.html
@ -39,5 +26,14 @@ share/examples/luasocket/listener.lua
share/examples/luasocket/lpr.lua
share/examples/luasocket/talker.lua
share/examples/luasocket/tinyirc.lua
@exec lua ${SYSCONFDIR}/lua/luapkg.lua add luasocket ${PREFIX}/lua/luasocket/init.lua
%%SHARED%%
share/lua/5.1/ltn12.lua
share/lua/5.1/mime/
share/lua/5.1/mime.lua
share/lua/5.1/socket/
share/lua/5.1/socket.lua
share/lua/5.1/socket/ftp.lua
share/lua/5.1/socket/http.lua
share/lua/5.1/socket/smtp.lua
share/lua/5.1/socket/tp.lua
share/lua/5.1/socket/url.lua