From 144e2930d72ad0446460f8eebfb4d22cf705d165 Mon Sep 17 00:00:00 2001 From: jasper Date: Tue, 10 Jul 2012 15:22:44 +0000 Subject: [PATCH] handle multiple lua versions, for now everything builds with the "old" 5.1 in the new location. use FLAVOR=lua52 to use lua 5.2 with these ports. --- archivers/luazlib/Makefile | 10 ++--- astro/celestia/Makefile | 8 ++-- audio/aqualung/Makefile | 10 +++-- .../patches/patch-src_ext_title_format_c | 19 +++++++++ databases/luasqlite3/Makefile | 8 ++-- devel/coxpcall/Makefile | 8 ++-- devel/lpeg/Makefile | 4 +- devel/lpeg/patches/patch-makefile | 6 +-- devel/lua-lgi/Makefile | 6 ++- devel/lua-lgi/patches/patch-lgi_Makefile | 14 +++++++ devel/luaalarm/Makefile | 9 ++-- devel/luaalarm/patches/patch-Makefile | 7 ++-- devel/luabitop/Makefile | 13 +++--- devel/luacopas/Makefile | 6 +-- devel/luadoc/Makefile | 9 ++-- devel/luaevent/Makefile | 19 +++++---- devel/luafs/Makefile | 8 ++-- devel/luafs/patches/patch-config | 12 +++--- devel/luapack/Makefile | 6 +-- devel/luaposix/Makefile | 6 +-- devel/luaprofiler/Makefile | 4 +- devel/luarexlib/Makefile | 16 ++++---- devel/luarings/Makefile | 14 +++---- devel/luastdlib/Makefile | 4 +- editors/texworks/Makefile | 6 ++- editors/texworks/patches/patch-TeXworks_pro | 15 +++++-- ...ch-plugins-src_TWLuaPlugin_TWLuaPlugin_pro | 6 +-- emulators/desmume/Makefile | 5 +-- games/boswars/Makefile | 7 ++-- games/boswars/patches/patch-SConstruct | 23 ++++------- games/freedroidrpg/Makefile | 4 +- games/love/Makefile | 5 ++- games/stone-soup/Makefile | 6 +-- games/xmoto/Makefile | 9 ++-- graphics/luagd/Makefile | 12 +++--- lang/datalog/Makefile | 4 +- mail/imapfilter/Makefile | 8 +++- mail/imapfilter/patches/patch-configure | 16 +++++--- mail/osbf-lua/Makefile | 7 ++-- net/luasocket/Makefile | 7 +++- net/luasocket/patches/patch-config | 8 ++-- net/nmap/Makefile | 6 +-- net/nmap/patches/patch-configure | 15 +++++-- net/nmap/patches/patch-nping_EchoServer_cc | 8 ++-- net/nmap/patches/patch-nse_nsock_cc | 8 ++-- net/prosody/Makefile | 7 ++-- net/quvi/libquvi/Makefile | 6 ++- net/quvi/scripts/Makefile | 4 +- net/weechat/Makefile | 3 +- net/yt/Makefile | 4 +- productivity/taskwarrior/Makefile | 5 ++- security/luacrypto/Makefile | 16 +++++--- security/luacrypto/patches/patch-config | 6 +-- security/luasec/Makefile | 8 ++-- sysutils/conky/Makefile | 9 ++-- sysutils/luastatgrab/Makefile | 6 +-- textproc/highlight/Makefile | 9 ++-- textproc/luaexpat/Makefile | 12 +++--- www/lighttpd/Makefile | 8 +++- x11/e17/e/Makefile | 4 +- x11/e17/edje/Makefile | 4 +- x11/ion/Makefile | 8 +++- x11/ion/patches/patch-etc_cfg_ioncore_lua | 12 +++--- x11/ion/patches/patch-system_mk | 41 +++++++++++++++---- 64 files changed, 357 insertions(+), 226 deletions(-) create mode 100644 audio/aqualung/patches/patch-src_ext_title_format_c create mode 100644 devel/lua-lgi/patches/patch-lgi_Makefile diff --git a/archivers/luazlib/Makefile b/archivers/luazlib/Makefile index 969917c3bbf..4bdf034d50e 100644 --- a/archivers/luazlib/Makefile +++ b/archivers/luazlib/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.7 2012/05/15 19:48:30 jasper Exp $ +# $OpenBSD: Makefile,v 1.8 2012/07/10 15:22:44 jasper Exp $ COMMENT= lua binding of zlib SHARED_ONLY= Yes DISTNAME= luazlib-20100731 -REVISION= 0 +REVISION= 1 CATEGORIES= archivers MASTER_SITES= http://distfiles.nl/ @@ -19,17 +19,17 @@ MODULES= lang/lua REGRESS_DEPENDS += ${BASE_PKGPATH} WANTLIB+= ${MODLUA_WANTLIB} m z -CFLAGS+= `pkg-config --cflags lua` +CFLAGS+= `pkg-config --cflags ${MODLUA_DEP}` LINK= ${CC} ${CFLAGS} -fPIC -shared -L${LOCALBASE}/lib -o do-build: - cd ${WRKDIST} && ${LINK} zlib.so lua_zlib.c -lz -llua -lm + cd ${WRKDIST} && ${LINK} zlib.so lua_zlib.c -lz ${MODLUA_LIB} -lm do-install: ${INSTALL_DATA_DIR} ${MODLUA_LIBDIR} ${INSTALL_DATA} ${WRKSRC}/zlib.so ${MODLUA_LIBDIR} do-regress: - cd ${WRKDIST} && lua test.lua + cd ${WRKDIST} && ${MODLUA_BIN} test.lua .include diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile index a5a0d0e61ec..948afa194ad 100644 --- a/astro/celestia/Makefile +++ b/astro/celestia/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.25 2012/05/15 18:03:59 jasper Exp $ +# $OpenBSD: Makefile,v 1.26 2012/07/10 15:22:44 jasper Exp $ COMMENT= free space simulator and planetarium DISTNAME= celestia-1.6.1 -REVISION= 1 +REVISION= 2 CATEGORIES= astro x11 @@ -41,7 +41,9 @@ USE_GMAKE= Yes CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include \ -I${LOCALBASE}/include/libpng" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lm -lGL" + LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lm -lGL" \ + LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \ + LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`" CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --with-gtk \ --with-lua \ diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile index 2bfa96d008c..c6780efb9db 100644 --- a/audio/aqualung/Makefile +++ b/audio/aqualung/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.31 2012/05/24 18:36:45 shadchin Exp $ +# $OpenBSD: Makefile,v 1.32 2012/07/10 15:22:44 jasper Exp $ COMMENT= advanced music player DISTNAME= aqualung-0.9beta11 -REVISION= 9 +REVISION= 10 EPOCH= 0 CATEGORIES= audio @@ -33,6 +33,8 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aqualung/} MODULES= devel/gettext \ lang/lua +MODLUA_SA= Yes + LIB_DEPENDS= audio/flac \ audio/jack \ audio/libcdio \ @@ -53,10 +55,10 @@ LIB_DEPENDS= audio/flac \ RUN_DEPENDS= devel/desktop-file-utils CONFIGURE_STYLE=gnu -CONFIGURE_ENV= LDFLAGS="-pthread -L${LOCALBASE}/lib -L${X11BASE}/lib" \ +CONFIGURE_ENV= LDFLAGS="-pthread -L${LOCALBASE}/lib -L${X11BASE}/lib " \ CFLAGS="${CFLAGS} -DOSS_DEVICE='\"/dev/audio\"' \ -DPTHREAD_MIN_PRIORITY=0 -DPTHREAD_MAX_PRIORITY=31 \ - -I${LOCALBASE}/include" + -I${LOCALBASE}/include -I${MODLUA_INCL_DIR}" # ifp (requires libifp) - no package CONFIGURE_ARGS= --with-cdda \ diff --git a/audio/aqualung/patches/patch-src_ext_title_format_c b/audio/aqualung/patches/patch-src_ext_title_format_c new file mode 100644 index 00000000000..b4992e44e66 --- /dev/null +++ b/audio/aqualung/patches/patch-src_ext_title_format_c @@ -0,0 +1,19 @@ +$OpenBSD: patch-src_ext_title_format_c,v 1.1 2012/07/10 15:22:44 jasper Exp $ +--- src/ext_title_format.c.orig Mon Jul 9 19:26:50 2012 ++++ src/ext_title_format.c Mon Jul 9 19:27:51 2012 +@@ -25,15 +25,9 @@ + #include + #include + #include +-#ifdef LUA_HEADER_lua5_1 +-#include +-#include +-#include +-#else + #include + #include + #include +-#endif /* LUA_HEADER_DIR */ + #include "metadata.h" + #include "decoder/file_decoder.h" + #include "options.h" diff --git a/databases/luasqlite3/Makefile b/databases/luasqlite3/Makefile index 794d2eff829..3bcc9b8d55c 100644 --- a/databases/luasqlite3/Makefile +++ b/databases/luasqlite3/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.14 2012/05/15 20:36:28 jasper Exp $ +# $OpenBSD: Makefile,v 1.15 2012/07/10 15:22:44 jasper Exp $ + SHARED_ONLY= Yes COMMENT= binding of sqlite3 for lua PKGNAME= luasqlite3-0.4.1 -REVISION= 5 +REVISION= 6 DISTNAME= lua-sqlite3-0.4.1 CATEGORIES= databases MASTER_SITES= ${HOMEPAGE} @@ -22,7 +23,8 @@ MODULES= lang/lua USE_GMAKE= Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS+=--with-lua-dir=${PREFIX} +CONFIGURE_ARGS+=--with-lua-dir=${PREFIX} \ + --with-lua-includedir=${MODLUA_INCL_DIR} CFLAGS+= -fPIC -DPIC REGRESS_DEPENDS=${BASE_PKGPATH} diff --git a/devel/coxpcall/Makefile b/devel/coxpcall/Makefile index 5533b1dc180..23b833e0586 100644 --- a/devel/coxpcall/Makefile +++ b/devel/coxpcall/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2012/05/11 20:55:00 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2012/07/10 15:22:44 jasper Exp $ COMMENT = encapsulate protected Lua calls with a coroutine based loop DISTNAME = coxpcall-1.13.0 -REVISION= 1 +REVISION= 2 CATEGORIES = devel HOMEPAGE = http://coxpcall.luaforge.net/ @@ -22,7 +22,7 @@ NO_BUILD = Yes NO_REGRESS = Yes do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/lua/5.1/ - ${INSTALL_DATA} ${WRKSRC}/src/coxpcall.lua ${PREFIX}/share/lua/5.1/ + ${INSTALL_DATA_DIR} ${MODLUA_DATADIR} + ${INSTALL_DATA} ${WRKSRC}/src/coxpcall.lua ${MODLUA_DATADIR} .include diff --git a/devel/lpeg/Makefile b/devel/lpeg/Makefile index 6512607bc33..dfc6977b3ea 100644 --- a/devel/lpeg/Makefile +++ b/devel/lpeg/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.9 2012/05/15 15:16:29 jasper Exp $ +# $OpenBSD: Makefile,v 1.10 2012/07/10 15:22:44 jasper Exp $ SHARED_ONLY= Yes COMMENT= parsing expression grammars library for lua DISTNAME= lpeg-0.10.2 -REVISION= 0 +REVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.inf.puc-rio.br/~roberto/lpeg/ diff --git a/devel/lpeg/patches/patch-makefile b/devel/lpeg/patches/patch-makefile index 876f39de9d9..c4d67572395 100644 --- a/devel/lpeg/patches/patch-makefile +++ b/devel/lpeg/patches/patch-makefile @@ -1,10 +1,10 @@ -$OpenBSD: patch-makefile,v 1.6 2011/08/25 19:14:58 naddy Exp $ +$OpenBSD: patch-makefile,v 1.7 2012/07/10 15:22:44 jasper Exp $ --- makefile.orig Wed Feb 16 16:03:25 2011 -+++ makefile Thu Aug 25 21:09:29 2011 ++++ makefile Sat Jul 7 15:02:14 2012 @@ -1,14 +1,13 @@ LIBNAME = lpeg -LUADIR = /usr/include/lua5.1/ -+LUADIR = ${LOCALBASE}/include/ ++LUADIR = ${MODLUA_INCL_DIR} -COPT = -O2 -DNDEBUG +COPT = -O2 -DNDEBUG -fPIC -shared diff --git a/devel/lua-lgi/Makefile b/devel/lua-lgi/Makefile index a395ac36f87..7177a37928f 100644 --- a/devel/lua-lgi/Makefile +++ b/devel/lua-lgi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2012/05/26 08:56:44 jasper Exp $ +# $OpenBSD: Makefile,v 1.8 2012/07/10 15:22:44 jasper Exp $ SHARED_ONLY= Yes @@ -6,6 +6,7 @@ COMMENT= lua bindings to libraries using GObject-Introspection DISTNAME= lgi-0.6 PKGNAME= lua-${DISTNAME} +REVISION= 0 CATEGORIES= devel HOMEPAGE= https://github.com/pavouk/lgi @@ -28,7 +29,8 @@ MASTER_SITES= https://github.com/downloads/pavouk/lgi/ \ http://distfiles.nl/ USE_GMAKE= Yes -MAKE_ENV= MAKE=${MAKE_PROGRAM} +MAKE_ENV= MAKE=${MAKE_PROGRAM} LUA_CFLAGS="-I${MODLUA_INCL_DIR}" \ + LUA_LIBDIR="${MODLUA_LIBDIR}" LUA_SHAREDIR="${MODLUA_DATADIR}" REGRESS_TARGET= check REGRESS_IS_INTERACTIVE=x11 diff --git a/devel/lua-lgi/patches/patch-lgi_Makefile b/devel/lua-lgi/patches/patch-lgi_Makefile new file mode 100644 index 00000000000..519b9f6e7f4 --- /dev/null +++ b/devel/lua-lgi/patches/patch-lgi_Makefile @@ -0,0 +1,14 @@ +$OpenBSD: patch-lgi_Makefile,v 1.1 2012/07/10 15:22:44 jasper Exp $ +--- lgi/Makefile.orig Sun Jul 8 19:33:05 2012 ++++ lgi/Makefile Sun Jul 8 19:33:12 2012 +@@ -6,8 +6,8 @@ + # + + PREFIX = /usr/local +-LUA_LIBDIR = $(PREFIX)/lib/lua/5.1 +-LUA_SHAREDIR = $(PREFIX)/share/lua/5.1 ++LUA_LIBDIR ?= $(PREFIX)/lib/lua/5.1 ++LUA_SHAREDIR ?= $(PREFIX)/share/lua/5.1 + + GINAME = gobject-introspection-1.0 + PKGS = $(GINAME) gmodule-2.0 libffi diff --git a/devel/luaalarm/Makefile b/devel/luaalarm/Makefile index 61698a0a63f..d0a6d7e6124 100644 --- a/devel/luaalarm/Makefile +++ b/devel/luaalarm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2010/11/15 19:46:00 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2012/07/10 15:22:44 jasper Exp $ COMMENT= alarm library for the lua language SHARED_ONLY= Yes @@ -6,7 +6,7 @@ SHARED_ONLY= Yes DISTNAME= lalarm DATE= 20061011 PKGNAME= luaalarm-${DATE} -REVISION = 2 +REVISION = 3 # don't use PKGNAME DIST_SUBDIR= luaalarm-${DATE} WRKDIST= ${WRKDIR}/alarm @@ -23,12 +23,15 @@ PERMIT_DISTFILES_FTP= Yes MODULES= lang/lua +pre-configure: + ${SUBST_CMD} ${WRKSRC}/Makefile + do-install: ${INSTALL_DATA_DIR} ${MODLUA_LIBDIR} ${INSTALL_DATA} ${WRKSRC}/alarm.so ${MODLUA_LIBDIR} do-regress: rm -f ${WRKDIST}/alarm.lua - cd ${WRKDIST} && ${LOCALBASE}/bin/lua test.lua + cd ${WRKDIST} && ${MODLUA_BIN} test.lua .include diff --git a/devel/luaalarm/patches/patch-Makefile b/devel/luaalarm/patches/patch-Makefile index d3fc6ac90d8..dfe25f1a9c9 100644 --- a/devel/luaalarm/patches/patch-Makefile +++ b/devel/luaalarm/patches/patch-Makefile @@ -1,13 +1,14 @@ -$OpenBSD: patch-Makefile,v 1.3 2007/06/04 19:39:59 pedro Exp $ +$OpenBSD: patch-Makefile,v 1.4 2012/07/10 15:22:44 jasper Exp $ --- Makefile.orig Wed Oct 11 16:13:03 2006 -+++ Makefile Mon Jun 4 21:01:57 2007 ++++ Makefile Sun Jul 8 19:12:08 2012 @@ -1,23 +1,23 @@ # makefile for alarm library for Lua # change these to reflect your Lua installation -LUA= /tmp/lhf/lua-5.0 +-LUAINC= $(LUA)/include +LUA= $(LOCALBASE) - LUAINC= $(LUA)/include ++LUAINC= ${MODLUA_INCL_DIR} LUALIB= $(LUA)/lib LUABIN= $(LUA)/bin diff --git a/devel/luabitop/Makefile b/devel/luabitop/Makefile index 8b372016afc..8c371de7616 100644 --- a/devel/luabitop/Makefile +++ b/devel/luabitop/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2012/06/06 11:52:42 jasper Exp $ +# $OpenBSD: Makefile,v 1.9 2012/07/10 15:22:44 jasper Exp $ SHARED_ONLY= Yes @@ -8,6 +8,7 @@ V= 1.0.2 DISTNAME= LuaBitOp-$V PKGNAME= luabitop-$V CATEGORIES= devel +REVISION= 0 MASTER_SITES= ${HOMEPAGE}/download/ HOMEPAGE= http://bitop.luajit.org/ @@ -21,7 +22,7 @@ PERMIT_PACKAGE_FTP= Yes USE_GMAKE= Yes MODULES= lang/lua REGRESS_DEPENDS+=${BASE_PKGPATH} -MAKE_ENV+= INCLUDES=-I${LOCALBASE}/include +MAKE_ENV+= INCLUDES=-I${MODLUA_INCL_DIR} do-install: ${INSTALL_DATA_DIR} ${MODLUA_LIBDIR} ${MODLUA_DOCDIR} @@ -32,9 +33,9 @@ do-install: find . ! -type d \ -exec ${INSTALL_DATA} -m 644 {} ${MODLUA_DOCDIR}/{} \; do-regress: - lua ${WRKSRC}/bittest.lua - lua ${WRKSRC}/md5test.lua - lua ${WRKSRC}/bitbench.lua - lua ${WRKSRC}/nsievebits.lua + ${MODLUA_BIN} ${WRKSRC}/bittest.lua + ${MODLUA_BIN} ${WRKSRC}/md5test.lua + ${MODLUA_BIN} ${WRKSRC}/bitbench.lua + ${MODLUA_BIN} ${WRKSRC}/nsievebits.lua .include diff --git a/devel/luacopas/Makefile b/devel/luacopas/Makefile index 83443cf7d1a..c1cca75ab8d 100644 --- a/devel/luacopas/Makefile +++ b/devel/luacopas/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.15 2012/05/15 15:16:29 jasper Exp $ +# $OpenBSD: Makefile,v 1.16 2012/07/10 15:22:44 jasper Exp $ COMMENT= coroutine oriented portable asynchronous services for lua DISTNAME= copas-1.1.6 PKGNAME= lua${DISTNAME} -REVISION= 0 +REVISION= 1 CATEGORIES= devel MASTER_SITES= http://github.com/downloads/keplerproject/copas/ @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes MODULES= lang/lua NO_BUILD= Yes NO_REGRESS= Yes -RUN_DEPENDS+= devel/coxpcall \ +MODLUA_RUN_DEPENDS+= devel/coxpcall \ net/luasocket do-install: diff --git a/devel/luadoc/Makefile b/devel/luadoc/Makefile index 870d0980dee..60962cecc15 100644 --- a/devel/luadoc/Makefile +++ b/devel/luadoc/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2012/05/16 12:04:19 jasper Exp $ +# $OpenBSD: Makefile,v 1.7 2012/07/10 15:22:44 jasper Exp $ COMMENT= documentation generation tool for Lua DISTNAME= luadoc-3.0.1 -REVISION= 2 +REVISION= 3 CATEGORIES= devel HOMEPAGE= http://luadoc.luaforge.net/ @@ -16,7 +16,7 @@ PERMIT_DISTFILES_FTP = Yes MODULES= lang/lua -RUN_DEPENDS= devel/luafs +MODLUA_RUN_DEPENDS= devel/luafs MASTER_SITES= http://luaforge.net/frs/download.php/3185/ @@ -29,6 +29,9 @@ TAGLET_DIR = ${MODLUA_DATADIR}/luadoc/taglet HTML_DIR = ${DOCLET_DIR}/html STANDARD_DIR = ${TAGLET_DIR}/standard +pre-configure: + perl -pi -e 's,/usr/bin/env lua,${MODLUA_BIN},g' ${WRKSRC}/src/luadoc.lua.in + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/src/luadoc.lua.in ${PREFIX}/bin/luadoc ${INSTALL_DATA_DIR} ${MODLUA_DOCDIR} diff --git a/devel/luaevent/Makefile b/devel/luaevent/Makefile index 77596ffe29a..9313b580902 100644 --- a/devel/luaevent/Makefile +++ b/devel/luaevent/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.10 2012/05/15 19:48:30 jasper Exp $ +# $OpenBSD: Makefile,v 1.11 2012/07/10 15:22:44 jasper Exp $ COMMENT = lua binding of libevent SHARED_ONLY = Yes DISTNAME = luaevent-prosody-0.1.1 PKGNAME= luaevent-0.2.1 -REVISION = 0 +REVISION = 1 CATEGORIES = devel HOMEPAGE = http://prosody.im/doc/libevent @@ -22,19 +22,20 @@ MASTER_SITES = http://matthewwild.co.uk/uploads/ MODULES = lang/lua -REGRESS_DEPENDS += devel/luaevent -RUN_DEPENDS += net/luasocket +MODLUA_REGRESS_DEPENDS += devel/luaevent +MODLUA_RUN_DEPENDS += net/luasocket -CFLAGS += -I${LOCALBASE}/include -I../include +CFLAGS += -I${MODLUA_INCL_DIR} -I../include LINK = ${CC} ${CFLAGS} -fPIC -shared -L${LOCALBASE}/lib -o do-build: - cd ${WRKDIST}/src && ${LINK} core.so luaevent.c buffer_event.c event_buffer.c event_callback.c utility.c -llua -levent + cd ${WRKDIST}/src && ${LINK} core.so luaevent.c buffer_event.c \ + event_buffer.c event_callback.c utility.c ${MODLUA_LIB} -levent do-regress: - cd ${WRKDIST}/test && lua basic.lua - cd ${WRKDIST}/test && lua event_buffer-tests.lua - cd ${WRKDIST}/test && lua timertest.lua + cd ${WRKDIST}/test && ${MODLUA_BIN} basic.lua + cd ${WRKDIST}/test && ${MODLUA_BIN} event_buffer-tests.lua + cd ${WRKDIST}/test && ${MODLUA_BIN} timertest.lua do-install: ${INSTALL_DATA_DIR} ${MODLUA_DATADIR} diff --git a/devel/luafs/Makefile b/devel/luafs/Makefile index 852f09def9a..f30ff7a7743 100644 --- a/devel/luafs/Makefile +++ b/devel/luafs/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.15 2012/05/15 20:45:12 jasper Exp $ +# $OpenBSD: Makefile,v 1.16 2012/07/10 15:22:44 jasper Exp $ SHARED_ONLY= Yes COMMENT= file system library for the lua language V= 1.5.0 DISTNAME= luafilesystem-${V} PKGNAME= luafs-${V} -REVISION= 1 +REVISION= 3 CATEGORIES= devel MASTER_SITES= http://github.com/downloads/keplerproject/luafilesystem/ @@ -20,6 +20,8 @@ PERMIT_DISTFILES_FTP= Yes MODULES= lang/lua ALL_TARGET= lib +MAKE_ENV+= LUA_LIBDIR=${MODLUA_LIBDIR} LUA_INC=${MODLUA_INCL_DIR} + do-install: ${INSTALL_DATA_DIR} ${MODLUA_LIBDIR} ${MODLUA_DOCDIR} ${MODLUA_EXAMPLEDIR} ${INSTALL_DATA} ${WRKSRC}/lfs.so ${MODLUA_LIBDIR} @@ -29,6 +31,6 @@ do-install: do-regress: cp ${WRKDIST}/*.so ${WRKDIST}/tests - cd ${WRKDIST}/tests && lua test.lua + cd ${WRKDIST}/tests && ${MODLUA_BIN} test.lua .include diff --git a/devel/luafs/patches/patch-config b/devel/luafs/patches/patch-config index 9391b03694f..4e183215cdd 100644 --- a/devel/luafs/patches/patch-config +++ b/devel/luafs/patches/patch-config @@ -1,6 +1,6 @@ -$OpenBSD: patch-config,v 1.7 2009/09/06 19:25:22 jolan Exp $ ---- config.orig Sun Sep 6 14:21:39 2009 -+++ config Sun Sep 6 14:22:00 2009 +$OpenBSD: patch-config,v 1.8 2012/07/10 15:22:44 jasper Exp $ +--- config.orig Tue Oct 20 22:54:35 2009 ++++ config Sun Jul 8 19:36:28 2012 @@ -1,24 +1,24 @@ # Installation directories @@ -10,11 +10,11 @@ $OpenBSD: patch-config,v 1.7 2009/09/06 19:25:22 jolan Exp $ # System's libraries directory (where binary libraries are installed) -LUA_LIBDIR= $(PREFIX)/lib/lua/5.1 -+LUA_LIBDIR= $(LOCALBASE)/lib/lua/5.1 ++LUA_LIBDIR?= $(LOCALBASE)/lib/lua/5.1 # Lua includes directory -LUA_INC= $(PREFIX)/include -+LUA_INC= $(LOCALBASE)/include ++LUA_INC?= $(LOCALBASE)/include # OS dependent LIB_OPTION= -shared #for Linux @@ -32,4 +32,4 @@ $OpenBSD: patch-config,v 1.7 2009/09/06 19:25:22 jolan Exp $ +CFLAGS+= -fPIC $(INCS) +#CC= gcc - # $Id: patch-config,v 1.7 2009/09/06 19:25:22 jolan Exp $ + # $Id: patch-config,v 1.8 2012/07/10 15:22:44 jasper Exp $ diff --git a/devel/luapack/Makefile b/devel/luapack/Makefile index 456b85ebf22..3fe251df493 100644 --- a/devel/luapack/Makefile +++ b/devel/luapack/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.11 2012/05/15 15:16:29 jasper Exp $ +# $OpenBSD: Makefile,v 1.12 2012/07/10 15:22:44 jasper Exp $ COMMENT= library for packing and unpacking binary data DISTNAME= luapack-20061124 -REVISION = 1 +REVISION = 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_BACKUP} @@ -19,7 +19,7 @@ SHARED_ONLY= Yes REGRESS_DEPENDS=${BUILD_PKGPATH} do-build: - ${CC} ${CFLAGS} -fPIC -I${LOCALBASE}/include -shared \ + ${CC} ${CFLAGS} -fPIC -I${MODLUA_INCL_DIR} -shared \ ${WRKSRC}/lpack.c -o ${WRKDIST}/pack.so do-install: diff --git a/devel/luaposix/Makefile b/devel/luaposix/Makefile index a6abf0cb74a..8c8be4119e0 100644 --- a/devel/luaposix/Makefile +++ b/devel/luaposix/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2011/08/01 02:13:45 jolan Exp $ +# $OpenBSD: Makefile,v 1.17 2012/07/10 15:22:44 jasper Exp $ SHARED_ONLY= Yes @@ -21,7 +21,7 @@ MODULES= lang/lua REGRESS_DEPENDS=${BUILD_PKGPATH} do-build: - ${CC} ${CFLAGS} -fPIC -I${LOCALBASE}/include -shared \ + ${CC} ${CFLAGS} -fPIC -I${MODLUA_INCL_DIR} -shared \ ${WRKDIST}/lposix.c -o ${WRKDIST}/posix.so do-install: @@ -29,6 +29,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/posix.so ${MODLUA_LIBDIR} do-regress: - cd ${WRKSRC} && ${LOCALBASE}/bin/lua *.lua + cd ${WRKSRC} && ${MODLUA_BIN} *.lua .include diff --git a/devel/luaprofiler/Makefile b/devel/luaprofiler/Makefile index a5df045a969..09c994d96bb 100644 --- a/devel/luaprofiler/Makefile +++ b/devel/luaprofiler/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2012/05/15 15:16:29 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2012/07/10 15:22:44 jasper Exp $ SHARED_ONLY= Yes @@ -27,7 +27,7 @@ NO_REGRESS= Yes # but references files from elsewhere (ie. src/clock.o). MAKE_FILE= ../Makefile.linux ALL_TARGET= # empty -CFLAGS += -I${LOCALBASE}/include -fPIC +CFLAGS += -I${MODLUA_INCL_DIR} -fPIC WRKSRC= ${WRKDIST}/src/ diff --git a/devel/luarexlib/Makefile b/devel/luarexlib/Makefile index e361ada7fbc..915ab6ffc21 100644 --- a/devel/luarexlib/Makefile +++ b/devel/luarexlib/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.14 2012/05/15 20:45:12 jasper Exp $ +# $OpenBSD: Makefile,v 1.15 2012/07/10 15:22:44 jasper Exp $ SHARED_ONLY= Yes COMMENT= lua binding of posix and pcre regex libraries DISTNAME= lrexlib-2.4.0 PKGNAME= luarexlib-2.4.0 -REVISION= 3 +REVISION= 4 CATEGORIES= devel MASTER_SITES= http://luaforge.net/frs/download.php/3599/ @@ -19,14 +19,14 @@ PERMIT_DISTFILES_FTP= Yes USE_GMAKE= Yes MAKE_ENV+= MAKE_PROGRAM=${MAKE_PROGRAM} \ - INC_LUA=-I${LOCALBASE}/include \ - LIB_LUA="-L${LOCALBASE}/lib -llua" + INC_LUA="-I${MODLUA_INCL_DIR} -I${LOCALBASE}/include" \ + LIB_LUA="-L${LOCALBASE}/lib ${MODLUA_LIB}" MODULES= lang/lua LIB_DEPENDS= devel/pcre \ ${MODLUA_LIB_DEPENDS} \ textproc/oniguruma WANTLIB = pcre>=1.0 ${MODLUA_WANTLIB} onig -REGRESS_DEPENDS+=devel/luarexlib +MODLUA_REGRESS_DEPENDS+=devel/luarexlib do-install: ${INSTALL_DATA_DIR} ${MODLUA_LIBDIR} ${MODLUA_DOCDIR} @@ -37,8 +37,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/doc/* ${MODLUA_DOCDIR} do-regress: - cd ${WRKDIST}/test && lua runtest.lua -v onig - cd ${WRKDIST}/test && lua runtest.lua -v pcre - cd ${WRKDIST}/test && lua runtest.lua -v posix + cd ${WRKDIST}/test && ${MODLUA_BIN} runtest.lua -v onig + cd ${WRKDIST}/test && ${MODLUA_BIN} runtest.lua -v pcre + cd ${WRKDIST}/test && ${MODLUA_BIN} runtest.lua -v posix .include diff --git a/devel/luarings/Makefile b/devel/luarings/Makefile index 121f306782e..dd68019d461 100644 --- a/devel/luarings/Makefile +++ b/devel/luarings/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.12 2012/05/15 15:16:29 jasper Exp $ +# $OpenBSD: Makefile,v 1.13 2012/07/10 15:22:45 jasper Exp $ COMMENT = multiple states library for the lua language SHARED_ONLY = Yes DISTNAME = rings-1.2.3 PKGNAME = lua${DISTNAME} -REVISION = 1 +REVISION = 2 CATEGORIES = devel HOMEPAGE = http://www.keplerproject.org/rings/ @@ -20,8 +20,8 @@ MASTER_SITES = http://github.com/downloads/keplerproject/rings/ MODULES = lang/lua -CFLAGS += -I${LOCALBASE}/include -COMPILE = ${CC} ${CFLAGS} -fPIC -I${LOCALBASE}/include -c +CFLAGS += -I${MODLUA_INCL_DIR} +COMPILE = ${CC} ${CFLAGS} -fPIC ${CFLAGS} -c LINK = ${CC} ${CFLAGS} -fPIC -shared -L${LOCALBASE}/lib -o do-build: @@ -37,8 +37,8 @@ do-install: do-regress: cp ${WRKDIST}/src/*.so ${WRKDIST}/tests cp ${WRKDIST}/src/*.lua ${WRKDIST}/tests - cd ${WRKDIST}/tests && lua sample.lua - cd ${WRKDIST}/tests && lua sample_state.lua - cd ${WRKDIST}/tests && lua test.lua + cd ${WRKDIST}/tests && ${MODLUA_BIN} sample.lua + cd ${WRKDIST}/tests && ${MODLUA_BIN} sample_state.lua + cd ${WRKDIST}/tests && ${MODLUA_BIN} test.lua .include diff --git a/devel/luastdlib/Makefile b/devel/luastdlib/Makefile index fb1f5105b28..939d25902e5 100644 --- a/devel/luastdlib/Makefile +++ b/devel/luastdlib/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.9 2012/05/15 15:16:29 jasper Exp $ +# $OpenBSD: Makefile,v 1.10 2012/07/10 15:22:45 jasper Exp $ COMMENT= lua library of common programming tasks DISTNAME= stdlib-20 PKGNAME= lua${DISTNAME} -REVISION= 0 +REVISION= 1 CATEGORIES= devel MASTER_SITES= http://luaforge.net/frs/download.php/4805/ diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile index 19e956b0800..7a9574fbf8b 100644 --- a/editors/texworks/Makefile +++ b/editors/texworks/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2012/06/14 09:39:34 espie Exp $ +# $OpenBSD: Makefile,v 1.17 2012/07/10 15:22:45 jasper Exp $ COMMENT-main = easy to use LaTeX and ConTeXt editor COMMENT-python = Python scripting for TeXworks @@ -12,6 +12,8 @@ PKGNAME-main = texworks-${V} PKGNAME-lua = texworks-lua-${V} PKGNAME-python = texworks-python-${V} +REVISION-lua = 0 + WRKDIST = ${WRKDIR}/texworks-${V} CATEGORIES = editors print @@ -61,6 +63,8 @@ RUN_DEPENDS-main = print/texlive/base \ RUN_DEPENDS-lua = editors/texworks,-main RUN_DEPENDS-python = editors/texworks,-main +MODLUA_SA = Yes + USE_GMAKE = Yes NO_REGRESS = Yes VMEM_WARNING = Yes diff --git a/editors/texworks/patches/patch-TeXworks_pro b/editors/texworks/patches/patch-TeXworks_pro index daa66b25128..75bd6960804 100644 --- a/editors/texworks/patches/patch-TeXworks_pro +++ b/editors/texworks/patches/patch-TeXworks_pro @@ -1,6 +1,6 @@ -$OpenBSD: patch-TeXworks_pro,v 1.4 2012/06/14 09:40:58 espie Exp $ ---- TeXworks.pro.orig Wed Jun 29 18:03:14 2011 -+++ TeXworks.pro Thu Apr 19 17:10:51 2012 +$OpenBSD: patch-TeXworks_pro,v 1.5 2012/07/10 15:22:45 jasper Exp $ +--- TeXworks.pro.orig Wed Jun 29 19:03:14 2011 ++++ TeXworks.pro Mon Jul 9 16:00:26 2012 @@ -47,11 +47,11 @@ QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas unix:!macx { @@ -15,6 +15,15 @@ $OpenBSD: patch-TeXworks_pro,v 1.4 2012/06/14 09:40:58 espie Exp $ } else { TARGET = TeXworks QMAKE_CXXFLAGS += -fexceptions +@@ -144,7 +144,7 @@ win32 { # paths here are specific to my setup + QMAKE_CXXFLAGS += -DSTATIC_SCRIPTING_PLUGINS + + LIBS += -Lplugins-src/TWLuaPlugin/release -lTWLuaPlugin +- LIBS += -llua ++ LIBS += ${MODLUA_LIB} + + LIBS += -Lplugins-src/TWPythonPlugin/release -lTWPythonPlugin + LIBS += -Lc:/Python26/libs -lpython26 @@ -243,7 +243,7 @@ unix:!macx { # installation on Unix-ish platforms isEmpty(BIN_DIR):BIN_DIR = $$INSTALL_PREFIX/bin isEmpty(DOCS_DIR):DOCS_DIR = $$DATA_DIR/doc/texworks diff --git a/editors/texworks/patches/patch-plugins-src_TWLuaPlugin_TWLuaPlugin_pro b/editors/texworks/patches/patch-plugins-src_TWLuaPlugin_TWLuaPlugin_pro index 0a7c9ec33a5..b4d99f7ea10 100644 --- a/editors/texworks/patches/patch-plugins-src_TWLuaPlugin_TWLuaPlugin_pro +++ b/editors/texworks/patches/patch-plugins-src_TWLuaPlugin_TWLuaPlugin_pro @@ -1,12 +1,12 @@ -$OpenBSD: patch-plugins-src_TWLuaPlugin_TWLuaPlugin_pro,v 1.3 2012/06/14 09:39:34 espie Exp $ +$OpenBSD: patch-plugins-src_TWLuaPlugin_TWLuaPlugin_pro,v 1.4 2012/07/10 15:22:45 jasper Exp $ --- plugins-src/TWLuaPlugin/TWLuaPlugin.pro.orig Wed Jun 29 19:03:14 2011 -+++ plugins-src/TWLuaPlugin/TWLuaPlugin.pro Wed Jun 13 11:22:30 2012 ++++ plugins-src/TWLuaPlugin/TWLuaPlugin.pro Mon Jul 9 16:08:24 2012 @@ -46,7 +46,7 @@ macx { unix:!macx { # on Unix-ish platforms we rely on pkgconfig CONFIG += link_pkgconfig - PKGCONFIG += lua5.1 -+ PKGCONFIG += lua ++ PKGCONFIG += ${MODLUA_DEP} isEmpty(INSTALL_PREFIX):INSTALL_PREFIX = /usr/local isEmpty(TW_PLUGINPATH):TW_PLUGINPATH = $$INSTALL_PREFIX/lib/texworks diff --git a/emulators/desmume/Makefile b/emulators/desmume/Makefile index 70176d0beee..d63f25d8382 100644 --- a/emulators/desmume/Makefile +++ b/emulators/desmume/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2011/12/11 13:11:49 jasper Exp $ +# $OpenBSD: Makefile,v 1.3 2012/07/10 15:22:45 jasper Exp $ COMMENT = Nintendo DS emulator DISTNAME = desmume-0.9.7 -REVISION = 0 +REVISION = 1 CATEGORIES = emulators @@ -40,7 +40,6 @@ CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" MODULES = devel/gettext \ - lang/lua \ textproc/intltool CONFIGURE_STYLE = gnu diff --git a/games/boswars/Makefile b/games/boswars/Makefile index 63b6698427f..46c3bf5ba22 100644 --- a/games/boswars/Makefile +++ b/games/boswars/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.13 2012/05/15 18:14:01 jasper Exp $ +# $OpenBSD: Makefile,v 1.14 2012/07/10 15:22:45 jasper Exp $ COMMENT= real-time strategy game V= 2.6.1 DISTNAME= boswars-${V}-src PKGNAME= boswars-${V} -REVISION= 0 +REVISION= 1 CATEGORIES= games x11 HOMEPAGE= http://www.boswars.org/ @@ -21,8 +21,7 @@ MASTER_SITES= http://www.boswars.org/dist/releases/ WANTLIB= GL X11 c m ogg pthread stdc++ z SDL>=7 ${MODLUA_WANTLIB} WANTLIB += theora>=2 vorbis>=5 png>=5 -MODULES= devel/scons \ - lang/lua +MODULES= devel/scons MODSCONS_FLAGS= CPPPATH="${CPPPATH} ${LOCALBASE}/include/libpng" \ LIBS="-lm" \ opengl=1 diff --git a/games/boswars/patches/patch-SConstruct b/games/boswars/patches/patch-SConstruct index aa1844d2fad..d33a3124092 100644 --- a/games/boswars/patches/patch-SConstruct +++ b/games/boswars/patches/patch-SConstruct @@ -1,16 +1,16 @@ -$OpenBSD: patch-SConstruct,v 1.5 2010/04/14 18:29:59 ajacoutot Exp $ ---- SConstruct.orig Sun Apr 11 14:13:04 2010 -+++ SConstruct Mon Apr 12 15:27:22 2010 +$OpenBSD: patch-SConstruct,v 1.6 2012/07/10 15:22:45 jasper Exp $ +--- SConstruct.orig Sun Apr 18 20:04:54 2010 ++++ SConstruct Mon Jul 9 19:37:51 2012 @@ -32,12 +32,12 @@ SConsignFile() def DefineOptions(filename, args): opts = Variables(filename, args) - opts.Add('CPPPATH', 'Additional preprocessor paths', ['/usr/local/include']) -+ opts.Add('CPPPATH', 'Additional preprocessor paths', ['${LOCALBASE}/include'], Split('')) ++ opts.Add('CPPPATH', 'Additional preprocessor paths', ['/usr/local/include'], Split('')) opts.Add('CPPFLAGS', 'Additional preprocessor flags') opts.Add('CPPDEFINES', 'defined constants', Split('')) - opts.Add('LIBPATH', 'Additional library paths', ['/usr/local/lib']) -+ opts.Add('LIBPATH', 'Additional library paths', ['${LOCALBASE}/lib'], Split('')) ++ opts.Add('LIBPATH', 'Additional library paths', ['/usr/local/lib'], Split('')) opts.Add('LIBS', 'Additional libraries') - opts.Add('CCFLAGS', 'C Compiler flags', Split(ccflags)) + opts.Add('CCFLAGS', 'C Compiler flags', Split(ccflags), Split('')) @@ -33,8 +33,8 @@ $OpenBSD: patch-SConstruct,v 1.5 2010/04/14 18:29:59 ajacoutot Exp $ 'CPPPATH': ['/usr/include']} + opengl['openbsd'] = { + 'LIBS': ['GL'], -+ 'LIBPATH': ['${X11BASE}/lib'], -+ 'CPPPATH': ['${X11BASE}/include']} ++ 'LIBPATH': ['/usr/X11R6/lib'], ++ 'CPPPATH': ['/usr/X11R6/include']} opengl['cygwin'] = { 'LIBS': ['opengl3']} opengl['darwin'] = { @@ -47,15 +47,6 @@ $OpenBSD: patch-SConstruct,v 1.5 2010/04/14 18:29:59 ajacoutot Exp $ glconfig = opengl.get(platform, {}) for key in glconfig: if key != 'LIBS': -@@ -170,7 +179,7 @@ def CheckOpenGL(env, conf): - def CheckLuaLib(env, conf): - if not 'USE_WIN32' in env['CPPDEFINES']: - if env.WhereIs('pkg-config'): -- for packagename in ['lua5.1', 'lua51', 'lua']: -+ for packagename in ['lua']: - exitcode,_ = ParseConfig(env, 'pkg-config --cflags --libs ' + packagename) - if exitcode == 0: - break @@ -178,7 +187,7 @@ def CheckLuaLib(env, conf): return 1 if conf.CheckLibWithHeader('lua5.1', 'lua.h', 'c'): diff --git a/games/freedroidrpg/Makefile b/games/freedroidrpg/Makefile index 05c45c5ba5e..608b5285276 100644 --- a/games/freedroidrpg/Makefile +++ b/games/freedroidrpg/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.18 2012/05/29 06:18:37 bentley Exp $ +# $OpenBSD: Makefile,v 1.19 2012/07/10 15:22:45 jasper Exp $ ONLY_FOR_ARCHS= ${GCC4_ARCHS} COMMENT= isometric RPG game DISTNAME = freedroidRPG-0.15.1 +REVISION = 0 PKGNAME = ${DISTNAME:L} CATEGORIES= games x11 @@ -26,6 +27,7 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=freedroid/} WRKDIST = ${WRKDIR}/${DISTNAME:L} MODULES= lang/lua +MODLUA_SA = Yes LIB_DEPENDS= devel/libexecinfo \ devel/sdl-gfx \ diff --git a/games/love/Makefile b/games/love/Makefile index e4945520860..20c12d32d65 100644 --- a/games/love/Makefile +++ b/games/love/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2012/05/15 18:21:12 jasper Exp $ +# $OpenBSD: Makefile,v 1.6 2012/07/10 15:22:45 jasper Exp $ COMMENT= 2D games framework for use with Lua @@ -44,7 +44,8 @@ USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL/ \ - -I${X11BASE}/include/ -I${X11BASE}/include/freetype2" \ + -I${X11BASE}/include/ -I${X11BASE}/include/freetype2 \ + `pkg-config --cflags ${MODLUA_DEP}`" \ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -pthread" WRKDIST= ${WRKDIR}/love-$V/ diff --git a/games/stone-soup/Makefile b/games/stone-soup/Makefile index c564db6e6ab..00982958441 100644 --- a/games/stone-soup/Makefile +++ b/games/stone-soup/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2012/07/09 12:59:33 jasper Exp $ +# $OpenBSD: Makefile,v 1.14 2012/07/10 15:22:45 jasper Exp $ COMMENT = dungeon crawl stone soup CATEGORIES = games @@ -9,7 +9,7 @@ VERSION = 0.9.1 DISTNAME= stone_soup-${VERSION}-nodeps EXTRACT_SUFX= .tar.bz2 PKGNAME= stone-soup-${VERSION} -REVISION = 1 +REVISION = 2 BROKEN-arm= tilegen.elf loops burning cpu @@ -18,7 +18,7 @@ WRKSRC = ${WRKDIST}/source MAKE_FILE = ${WRKSRC}/makefile USE_GMAKE = Yes MAKE_FLAGS = CC="${CC}" CXX="${CXX}" \ - LUA_INCLUDE_DIR=${LOCALBASE}/include \ + LUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \ LUA_LIB=-llua \ SQLITE_INCLUDE_DIR=/usr/include \ LDFLAGS=-L${LOCALBASE}/lib \ diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile index 8bd67be3831..699b49a2622 100644 --- a/games/xmoto/Makefile +++ b/games/xmoto/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.12 2012/05/15 18:21:12 jasper Exp $ +# $OpenBSD: Makefile,v 1.13 2012/07/10 15:22:45 jasper Exp $ COMMENT = challenging 2D motocross platform game V = 0.5.9 DISTNAME = xmoto-${V}-src PKGNAME = xmoto-${V} -REVISION= 1 +REVISION= 2 CATEGORIES = games MAINTAINER = Antti Harri @@ -24,6 +24,7 @@ WANTLIB += ${MODLUA_WANTLIB} m ode png pthread sqlite3 stdc++ xdg-basedir xml2 z MODULES= devel/gettext \ lang/lua +MODLUA_SA= Yes BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \ ${MODGNU_AUTOMAKE_DEPENDS} LIB_DEPENDS = archivers/bzip2 \ @@ -42,8 +43,8 @@ SEPARATE_BUILD = Yes USE_GROFF = Yes CONFIGURE_STYLE = gnu -CONFIGURE_ENV = CPPFLAGS="`pkg-config --cflags libpng sqlite3 sdl` -DSVN_REV='\"${V}\"'" \ - LDFLAGS="`pkg-config --libs libpng sdl` -lGL" +CONFIGURE_ENV = CPPFLAGS="`pkg-config --cflags libpng sqlite3 sdl ${MODLUA_DEP}` -DSVN_REV='\"${V}\"'" \ + LDFLAGS="`pkg-config --libs libpng sdl ${MODLUA_DEP}` -lGL" AUTOMAKE_VERSION = 1.11 AUTOCONF_VERSION = 2.68 diff --git a/graphics/luagd/Makefile b/graphics/luagd/Makefile index f7211f81b8e..1f45b7a2986 100644 --- a/graphics/luagd/Makefile +++ b/graphics/luagd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2012/05/15 20:36:28 jasper Exp $ +# $OpenBSD: Makefile,v 1.17 2012/07/10 15:22:45 jasper Exp $ SHARED_ONLY= Yes @@ -7,7 +7,7 @@ COMMENT= gd binding for the lua language V= 2.0.33r2 PKGNAME= luagd-$(V) DISTNAME= lua-gd-$(V) -REVISION= 7 +REVISION= 8 CATEGORIES= graphics HOMEPAGE= http://lua-gd.luaforge.net/ @@ -26,10 +26,10 @@ LIB_DEPENDS= graphics/jpeg graphics/png graphics/gd NO_REGRESS= Yes do-build: - $(CC) $(CFLAGS) -DGD_JPEG -DGD_FONTCONFIG -DGD_FREETYPE -DGD_PNG\ - -DGD_GIF -fPIC -I$(LOCALBASE)/include -shared -L$(LOCALBASE)/lib\ - -L$(X11BASE)/lib $(WRKDIST)/luagd.c -o ${WRKDIST}/core.so -ljpeg\ - -lfontconfig -lfreetype -lpng -lz -liconv -lgd + $(CC) $(CFLAGS) -DGD_JPEG -DGD_FONTCONFIG -DGD_FREETYPE -DGD_PNG \ + -DGD_GIF -fPIC -I$(LOCALBASE)/include -shared -I${MODLUA_INCL_DIR} \ + -L$(LOCALBASE)/lib -L$(X11BASE)/lib $(WRKDIST)/luagd.c \ + -o ${WRKDIST}/core.so -ljpeg -lfontconfig -lfreetype -lpng -lz -liconv -lgd do-install: ${INSTALL_DATA_DIR} ${MODLUA_DATADIR} ${MODLUA_LIBDIR}/gd diff --git a/lang/datalog/Makefile b/lang/datalog/Makefile index a9565e4a498..f5f26fdd0de 100644 --- a/lang/datalog/Makefile +++ b/lang/datalog/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.5 2012/05/11 21:36:48 jasper Exp $ +# $OpenBSD: Makefile,v 1.6 2012/07/10 15:22:45 jasper Exp $ COMMENT= deductive database system similar to Prolog DISTNAME= datalog-2.2 +REVISION= 0 SHARED_LIBS += datalog 0.0 # 0.0 CATEGORIES= lang @@ -23,6 +24,7 @@ MASTER_SITES= ${HOMEPAGE} \ USE_LIBTOOL= gnu MODULES= lang/lua +MODLUA_SA= Yes CONFIGURE_STYLE= gnu diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile index 693fc3c2cea..7e737af71b2 100644 --- a/mail/imapfilter/Makefile +++ b/mail/imapfilter/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.10 2012/05/15 18:28:36 jasper Exp $ +# $OpenBSD: Makefile,v 1.11 2012/07/10 15:22:45 jasper Exp $ COMMENT= remote IMAP filtering utility DISTNAME= imapfilter-2.2.3 -REVISION= 0 +REVISION= 1 CATEGORIES= mail HOMEPAGE= http://imapfilter.hellug.gr/ @@ -22,6 +22,7 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c crypto m ssl pcre ${MODLUA_WANTLIB} MODULES= lang/lua +MODLUA_SA= Yes LIB_DEPENDS= devel/pcre \ ${MODLUA_LIB_DEPENDS} @@ -37,6 +38,9 @@ USE_GROFF = Yes NO_REGRESS= Yes +pre-configure: + ${SUBST_CMD} ${WRKSRC}/configure + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/imapfilter ${INSTALL_DATA} ${WRKSRC}/samples/{config,extend}.lua \ diff --git a/mail/imapfilter/patches/patch-configure b/mail/imapfilter/patches/patch-configure index f415b18e9e9..3956b56da0c 100644 --- a/mail/imapfilter/patches/patch-configure +++ b/mail/imapfilter/patches/patch-configure @@ -1,12 +1,16 @@ -$OpenBSD: patch-configure,v 1.4 2011/07/09 12:53:52 dcoppa Exp $ ---- configure.orig Tue Jul 5 15:48:00 2011 -+++ configure Tue Jul 5 15:48:25 2011 -@@ -13,7 +13,7 @@ crammd5="yes" +$OpenBSD: patch-configure,v 1.5 2012/07/10 15:22:45 jasper Exp $ +--- configure.orig Sun Mar 6 13:46:56 2011 ++++ configure Sun Jul 8 20:59:51 2012 +@@ -13,10 +13,10 @@ crammd5="yes" incdirs="-I/usr/local/include" libdirs="-L/usr/local/lib" -mycflags="$CFLAGS -Wall -O" -+mycflags="$CFLAGS -Wall" ++mycflags="$CFLAGS -Wall -I${MODLUA_INCL_DIR}" myldflags="$LDFLAGS" - libs="-lm -llua -lpcre" +-libs="-lm -llua -lpcre" ++libs="-lm ${MODLUA_LIB} -lpcre" + libssl="-lssl" + libcrypto="-lcrypto" + diff --git a/mail/osbf-lua/Makefile b/mail/osbf-lua/Makefile index 6e8c23b95a3..ef91b676b0a 100644 --- a/mail/osbf-lua/Makefile +++ b/mail/osbf-lua/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.8 2012/05/15 15:16:05 jasper Exp $ +# $OpenBSD: Makefile,v 1.9 2012/07/10 15:22:45 jasper Exp $ COMMENT= lua text classification module and anti-spam solution DISTNAME= osbf-lua-2.0.4 -REVISION = 2 +REVISION = 3 CATEGORIES= mail MASTER_SITES= http://luaforge.net/frs/download.php/2094/ @@ -16,12 +16,13 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes MODULES= lang/lua +MODLUA_SA= Yes SHARED_ONLY= Yes NO_REGRESS= Yes do-build: .for f in losbflib osbf_bayes osbf_aux - ${CC} ${CFLAGS} -DLIB_VERSION=\"2.0.4\" -fPIC -I${LOCALBASE}/include\ + ${CC} ${CFLAGS} -DLIB_VERSION=\"2.0.4\" -fPIC -I${MODLUA_INCL_DIR} \ -c ${WRKDIST}/$f.c -o ${WRKDIST}/$f.o .endfor ${CC} ${CFLAGS} -shared ${WRKDIST}/losbflib.o ${WRKDIST}/osbf_bayes.o\ diff --git a/net/luasocket/Makefile b/net/luasocket/Makefile index 509794c3bd5..79d18a058b3 100644 --- a/net/luasocket/Makefile +++ b/net/luasocket/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.21 2012/05/15 20:36:28 jasper Exp $ +# $OpenBSD: Makefile,v 1.22 2012/07/10 15:22:45 jasper Exp $ SHARED_ONLY= Yes COMMENT= network support for the lua language DISTNAME= luasocket-2.0.2 -REVISION= 1 +REVISION= 2 CATEGORIES= net MASTER_SITES= http://luaforge.net/frs/download.php/2664/ @@ -21,6 +21,9 @@ NO_REGRESS= Yes MAKE_FILE= makefile +pre-configure: + ${SUBST_CMD} ${WRKSRC}/config + do-install: ${INSTALL_DATA_DIR} ${MODLUA_DATADIR}/socket ${MODLUA_DATADIR}/mime ${INSTALL_DATA_DIR} ${MODLUA_LIBDIR}/socket ${MODLUA_LIBDIR}/mime diff --git a/net/luasocket/patches/patch-config b/net/luasocket/patches/patch-config index a3840825c17..d62f93b399c 100644 --- a/net/luasocket/patches/patch-config +++ b/net/luasocket/patches/patch-config @@ -1,6 +1,6 @@ -$OpenBSD: patch-config,v 1.5 2009/09/06 13:46:58 jolan Exp $ ---- config.orig Sun Oct 14 23:21:05 2007 -+++ config Sun Sep 6 08:25:57 2009 +$OpenBSD: patch-config,v 1.6 2012/07/10 15:22:45 jasper Exp $ +--- config.orig Mon Oct 15 06:21:05 2007 ++++ config Sun Jul 8 20:27:56 2012 @@ -6,17 +6,17 @@ # Output file names # @@ -21,7 +21,7 @@ $OpenBSD: patch-config,v 1.5 2009/09/06 13:46:58 jolan Exp $ # #LUAINC=-I/usr/local/include/lua50 -#LUAINC=-I/usr/local/include/lua5.1 -+LUAINC=-I$(LOCALBASE)/include ++LUAINC=-I${MODLUA_INCL_DIR} #LUAINC=-Ilua-5.1.1/src #------ diff --git a/net/nmap/Makefile b/net/nmap/Makefile index 2bcdcc2227f..a4a5cbdb478 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.100 2012/05/15 18:28:36 jasper Exp $ +# $OpenBSD: Makefile,v 1.101 2012/07/10 15:22:45 jasper Exp $ COMMENT-main= scan ports and fingerprint stack of network hosts COMMENT-zenmap= graphical frontend for nmap @@ -7,8 +7,8 @@ MODPY_EGG_VERSION= 5.51 DISTNAME= nmap-${MODPY_EGG_VERSION} PKGNAME-main= ${DISTNAME} PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION} -REVISION-main= 3 -REVISION-zenmap= 2 +REVISION-main= 4 +REVISION-zenmap= 3 CATEGORIES= net security MASTER_SITES= http://nmap.org/dist/ diff --git a/net/nmap/patches/patch-configure b/net/nmap/patches/patch-configure index fdca02b2a39..177866d02dc 100644 --- a/net/nmap/patches/patch-configure +++ b/net/nmap/patches/patch-configure @@ -1,6 +1,6 @@ -$OpenBSD: patch-configure,v 1.13 2011/03/28 09:01:24 giovanni Exp $ ---- configure.orig Wed Feb 2 16:27:11 2011 -+++ configure Wed Feb 2 16:27:25 2011 +$OpenBSD: patch-configure,v 1.14 2012/07/10 15:22:45 jasper Exp $ +--- configure.orig Fri Jan 21 22:00:04 2011 ++++ configure Mon Jul 9 19:34:51 2012 @@ -6115,6 +6115,7 @@ else extern char pcap_version[]; int main() { @@ -9,3 +9,12 @@ $OpenBSD: patch-configure,v 1.13 2011/03/28 09:01:24 giovanni Exp $ sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2); if (major > 0) exit(0); +@@ -6455,7 +6456,7 @@ if test "${with_liblua+set}" = set; then : + no_lua="yes" + ;; + *) +- CPPFLAGS="-I$with_liblua/include $CPPFLAGS" ++ CPPFLAGS="-I$with_liblua/include/lua-5.1 $CPPFLAGS" + LDFLAGS="-L$with_liblua/lib $LDFLAGS" + ;; + esac diff --git a/net/nmap/patches/patch-nping_EchoServer_cc b/net/nmap/patches/patch-nping_EchoServer_cc index 48609dc3e4b..19aa099e06c 100644 --- a/net/nmap/patches/patch-nping_EchoServer_cc +++ b/net/nmap/patches/patch-nping_EchoServer_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-nping_EchoServer_cc,v 1.1 2011/03/28 09:01:24 giovanni Exp $ ---- nping/EchoServer.cc.orig Wed Feb 2 16:32:30 2011 -+++ nping/EchoServer.cc Wed Feb 2 16:33:20 2011 -@@ -836,7 +836,7 @@ int EchoServer::nep_capture_handler(nsock_pool nsp, ns +$OpenBSD: patch-nping_EchoServer_cc,v 1.2 2012/07/10 15:22:45 jasper Exp $ +--- nping/EchoServer.cc.orig Wed Feb 9 03:37:53 2011 ++++ nping/EchoServer.cc Mon Jul 9 19:32:14 2012 +@@ -837,7 +837,7 @@ int EchoServer::nep_capture_handler(nsock_pool nsp, ns const unsigned char *packet=NULL; const unsigned char *link=NULL; nsock_iod nsi = nse_iod(nse); diff --git a/net/nmap/patches/patch-nse_nsock_cc b/net/nmap/patches/patch-nse_nsock_cc index 2cf42cec654..b13e17cda50 100644 --- a/net/nmap/patches/patch-nse_nsock_cc +++ b/net/nmap/patches/patch-nse_nsock_cc @@ -1,7 +1,7 @@ -$OpenBSD: patch-nse_nsock_cc,v 1.1 2011/03/28 09:01:24 giovanni Exp $ ---- nse_nsock.cc.orig Wed Feb 2 16:30:50 2011 -+++ nse_nsock.cc Wed Feb 2 16:31:11 2011 -@@ -1010,7 +1010,7 @@ static void pcap_receive_handler (nsock_pool nsp, nsoc +$OpenBSD: patch-nse_nsock_cc,v 1.2 2012/07/10 15:22:45 jasper Exp $ +--- nse_nsock.cc.orig Wed Feb 9 03:37:53 2011 ++++ nse_nsock.cc Mon Jul 9 19:32:14 2012 +@@ -1012,7 +1012,7 @@ static void pcap_receive_handler (nsock_pool nsp, nsoc { const unsigned char *l2_data, *l3_data; size_t l2_len, l3_len, packet_len; diff --git a/net/prosody/Makefile b/net/prosody/Makefile index 97fc8746180..9fd941624a1 100644 --- a/net/prosody/Makefile +++ b/net/prosody/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2012/07/09 10:01:20 jasper Exp $ +# $OpenBSD: Makefile,v 1.20 2012/07/10 15:22:45 jasper Exp $ SHARED_ONLY= Yes @@ -6,7 +6,7 @@ COMMENT= communications server for Jabber/XMPP written in Lua DISTNAME= prosody-0.8.2 CATEGORIES= net MASTER_SITES= http://prosody.im/downloads/source/ -REVISION= 3 +REVISION= 4 HOMEPAGE= http://prosody.im/ @@ -34,10 +34,11 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --sysconfdir="${SYSCONFDIR}/prosody" \ --datadir="/var/prosody" \ --with-lua="${LOCALBASE}" \ + --with-lua-include="${MODLUA_INCL_DIR}" \ --c-compiler="${CC}" \ --linker="${CC}" \ --ldflags="-I/usr/include -I${LOCALBASE}/include -L/usr/lib -L${LOCALBASE}/lib -shared" \ - --cflags="${CFLAGS} -fPIC" + --cflags="${CFLAGS} -I${LOCALBASE}/include -fPIC" FAKE_FLAGS+= CONFIG=${DESTDIR}${PREFIX}/share/examples/prosody diff --git a/net/quvi/libquvi/Makefile b/net/quvi/libquvi/Makefile index 75e7a6506eb..7e8e7565e40 100644 --- a/net/quvi/libquvi/Makefile +++ b/net/quvi/libquvi/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2012/05/15 19:38:01 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2012/07/10 15:22:45 jasper Exp $ COMMENT= library to parse flash media stream URLs DISTNAME= libquvi-0.4.0 -REVISION= 1 +REVISION= 2 SHARED_LIBS += quvi 0.0 # 7.0 MODULES= devel/gettext \ @@ -18,6 +18,8 @@ LIB_DEPENDS= net/curl \ USE_LIBTOOL= Yes +MODLUA_SA= Yes + CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ --with-manual # only needed for tests we don't install diff --git a/net/quvi/scripts/Makefile b/net/quvi/scripts/Makefile index 68c9a11d819..0e16a4ca233 100644 --- a/net/quvi/scripts/Makefile +++ b/net/quvi/scripts/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2011/11/16 22:58:14 jasper Exp $ +# $OpenBSD: Makefile,v 1.3 2012/07/10 15:22:45 jasper Exp $ COMMENT= scripts libquvi uses for parsing the media details DISTNAME= libquvi-scripts-0.4.1 -REVISION= 0 +REVISION= 1 MODULES= lang/lua diff --git a/net/weechat/Makefile b/net/weechat/Makefile index 15e2796a607..289e68a491c 100644 --- a/net/weechat/Makefile +++ b/net/weechat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2012/06/28 08:42:01 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.4 2012/07/10 15:22:45 jasper Exp $ COMMENT-main= fast, light and extensible chat client COMMENT-lua= Lua bindings for weechat @@ -12,6 +12,7 @@ DISTNAME= weechat-${V} PKGNAME-main= weechat-${V} REVISION-main= 1 PKGNAME-lua= weechat-lua-${V} +REVISION-lua= 0 PKGNAME-python= weechat-python-${V} PKGNAME-ruby= weechat-ruby-${V} PKGNAME-tcl= weechat-tcl-${V} diff --git a/net/yt/Makefile b/net/yt/Makefile index 8135b98675d..10ac32c5222 100644 --- a/net/yt/Makefile +++ b/net/yt/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.43 2011/08/18 08:27:33 jsg Exp $ +# $OpenBSD: Makefile,v 1.44 2012/07/10 15:22:45 jasper Exp $ COMMENT= fetch YouTube and Google videos PKGNAME= yt-19 +REVISION= 0 CATEGORIES= net www DISTFILES= @@ -21,6 +22,7 @@ NO_REGRESS= Yes RUN_DEPENDS+= devel/luastdlib \ graphics/ffmpeg \ net/luasocket +MODLUA_SA= Yes do-install: ${INSTALL_SCRIPT} ${FILESDIR}/yt.lua ${PREFIX}/bin/yt diff --git a/productivity/taskwarrior/Makefile b/productivity/taskwarrior/Makefile index 0af1b878c65..65b6e51f5bb 100644 --- a/productivity/taskwarrior/Makefile +++ b/productivity/taskwarrior/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.4 2012/05/15 19:38:01 jasper Exp $ +# $OpenBSD: Makefile,v 1.5 2012/07/10 15:22:45 jasper Exp $ COMMENT = command line todo list manager VERSION = 2.0.0 DISTNAME = task-${VERSION} PKGNAME = taskwarrior-${VERSION} -REVISION = 0 +REVISION = 1 CATEGORIES = productivity HOMEPAGE = http://www.taskwarrior.org/ @@ -20,6 +20,7 @@ PERMIT_DISTFILES_FTP = Yes MODULES = devel/cmake \ lang/lua +MODLUA_SA = Yes WANTLIB = c e2fs-uuid m stdc++ ${MODLUA_WANTLIB} diff --git a/security/luacrypto/Makefile b/security/luacrypto/Makefile index 7f0bf48c057..698578f35fb 100644 --- a/security/luacrypto/Makefile +++ b/security/luacrypto/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.11 2012/05/15 15:19:37 jasper Exp $ +# $OpenBSD: Makefile,v 1.12 2012/07/10 15:22:45 jasper Exp $ COMMENT= Lua binding for the OpenSSL crypto libraries SHARED_ONLY= Yes DISTNAME= luacrypto-0.2.0 -REVISION= 1 +REVISION= 2 CATEGORIES= security MASTER_SITES= http://luaforge.net/frs/download.php/1722/ @@ -18,17 +18,21 @@ PERMIT_DISTFILES_FTP= Yes USE_GMAKE= Yes WANTLIB= crypto ssl -REGRESS_DEPENDS=security/luacrypto +MODLUA_REGRESS_DEPENDS=security/luacrypto CFLAGS+= -fPIC -DPIC MODULES= lang/lua -post-install: +pre-configure: + ${SUBST_CMD} ${WRKSRC}/config + +do-install: + ${INSTALL_DATA_DIR} ${MODLUA_LIBDIR} + ${INSTALL_DATA} ${WRKSRC}/src/crypto.so ${MODLUA_LIBDIR} ${INSTALL_DATA_DIR} ${MODLUA_DOCDIR} ${INSTALL_DATA} ${WRKSRC}/doc/us/{*.html,*.png} ${MODLUA_DOCDIR} do-regress: - cd ${WRKDIST}/tests && \ - ${LOCALBASE}/bin/lua test.lua message + cd ${WRKDIST}/tests && ${MODLUA_BIN} test.lua message .include diff --git a/security/luacrypto/patches/patch-config b/security/luacrypto/patches/patch-config index 5375efbfbf9..e7e2724865d 100644 --- a/security/luacrypto/patches/patch-config +++ b/security/luacrypto/patches/patch-config @@ -1,14 +1,14 @@ -$OpenBSD: patch-config,v 1.2 2011/04/18 18:12:47 jasper Exp $ +$OpenBSD: patch-config,v 1.3 2012/07/10 15:22:45 jasper Exp $ --- config.orig Mon Apr 18 20:10:20 2011 +++ config Mon Apr 18 20:11:05 2011 @@ -1,23 +1,23 @@ # Installation directories # System's libraries directory (where binary libraries are installed) -LUA_LIBDIR= /usr/local/lib/lua/5.0 -+LUA_LIBDIR= $(PREFIX)/lib/lua/5.1 ++LUA_LIBDIR= ${MODLUA_LIBDIR} # Lua includes directory -LUA_INC= /usr/local/include -+LUA_INC= $(PREFIX)/include ++LUA_INC= ${MODLUA_INCL_DIR} # OS dependent LIB_OPTION= -shared #for Linux diff --git a/security/luasec/Makefile b/security/luasec/Makefile index 8a2e741f307..b6e60f14110 100644 --- a/security/luasec/Makefile +++ b/security/luasec/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.8 2012/05/15 20:36:28 jasper Exp $ +# $OpenBSD: Makefile,v 1.9 2012/07/10 15:22:45 jasper Exp $ SHARED_ONLY= Yes COMMENT= lua binding to OpenSSL to provide TLS/SSL communication DISTNAME= luasec-0.4.1 -REVISION= 1 +REVISION= 2 CATEGORIES= security MASTER_SITES= ${HOMEPAGE}/download/ @@ -20,10 +20,10 @@ PERMIT_PACKAGE_FTP= Yes MODULES= lang/lua NO_REGRESS= Yes -RUN_DEPENDS+= net/luasocket +MODLUA_RUN_DEPENDS+= net/luasocket WANTLIB+= crypto ssl -MAKE_ENV+= INCDIR="-I${LOCALBASE}/include/" SAVECFLAGS="${CFLAGS}" +MAKE_ENV+= INCDIR="-I${MODLUA_INCL_DIR}" SAVECFLAGS="${CFLAGS}" ALL_TARGET= bsd do-install: diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 4dee76ab407..e33f75ae95a 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.31 2012/05/15 19:38:01 jasper Exp $ +# $OpenBSD: Makefile,v 1.32 2012/07/10 15:22:45 jasper Exp $ ONLY_FOR_ARCHS= ${APM_ARCHS} COMMENT= light-weight system monitor DISTNAME= conky-1.8.1 -REVISION= 9 +REVISION= 10 CATEGORIES= sysutils HOMEPAGE= http://conky.sourceforge.net/ @@ -24,6 +24,7 @@ WANTLIB= c crypto kvm idn m ncurses ossaudio pthread ssl z \ MODULES= devel/gettext \ lang/lua +MODLUA_SA= Yes LIB_DEPENDS= devel/glib2 \ devel/pcre \ @@ -81,7 +82,9 @@ CONFIGURE_ARGS+=--enable-mpd \ --enable-lua \ --enable-curl \ --with-libiconv-prefix="${LOCALBASE}" -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \ + LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \ + LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`" post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/conky diff --git a/sysutils/luastatgrab/Makefile b/sysutils/luastatgrab/Makefile index 1f38a997b76..cb66b59cf37 100644 --- a/sysutils/luastatgrab/Makefile +++ b/sysutils/luastatgrab/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2012/05/15 17:38:00 jasper Exp $ +# $OpenBSD: Makefile,v 1.7 2012/07/10 15:22:45 jasper Exp $ SHARED_ONLY= Yes @@ -6,7 +6,7 @@ COMMENT= libstatgrab bindings for Lua DISTNAME= lua-statgrab-0.3.0 PKGNAME= ${DISTNAME:S/-//} -REVISION= 1 +REVISION= 2 CATEGORIES= sysutils devel HOMEPAGE= http://luaforge.net/projects/lua-statgrab @@ -27,7 +27,7 @@ REGRESS_DEPENDS=${BUILD_PKGPATH} do-build: cd ${WRKDIR} && \ - ${CC} ${CFLAGS} -fPIC -I${LOCALBASE}/include -shared\ + ${CC} ${CFLAGS} -fPIC -I${MODLUA_INCL_DIR} -shared\ `pkg-config --cflags libstatgrab` \ `pkg-config --libs libstatgrab` \ ${WRKSRC}/libstatgrab.c -o ${WRKSRC}/libstatgrab.so diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile index a8ecd014618..1d164aaebfe 100644 --- a/textproc/highlight/Makefile +++ b/textproc/highlight/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.17 2012/05/15 19:38:01 jasper Exp $ +# $OpenBSD: Makefile,v 1.18 2012/07/10 15:22:45 jasper Exp $ COMMENT = convert source code to markup formats DISTNAME = highlight-3.9 -REVISION = 0 +REVISION = 1 CATEGORIES = textproc converters HOMEPAGE = http://www.andre-simon.de/ @@ -24,13 +24,16 @@ EXTRACT_SUFX = .tar.bz2 USE_GMAKE = Yes MODULES = lang/lua +MODLUA_SA = Yes BUILD_DEPENDS = devel/boost LIB_DEPENDS = ${MODLUA_LIB_DEPENDS} MAKE_FILE = makefile MAKE_FLAGS = CXX=${CXX} \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + CFLAGS+="`pkg-config --cflags ${MODLUA_DEP}`" \ + LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`" NO_REGRESS = Yes diff --git a/textproc/luaexpat/Makefile b/textproc/luaexpat/Makefile index 9d1dd039acc..addf49b9dee 100644 --- a/textproc/luaexpat/Makefile +++ b/textproc/luaexpat/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2012/05/15 15:15:19 jasper Exp $ +# $OpenBSD: Makefile,v 1.5 2012/07/10 15:22:45 jasper Exp $ SHARED_ONLY = Yes COMMENT = lua library for the expat XML parser DISTNAME = luaexpat-1.2.0 -REVISION = 0 +REVISION = 1 CATEGORIES = textproc HOMEPAGE = http://matthewwild.co.uk/projects/luaexpat/ @@ -20,14 +20,14 @@ WANTLIB = expat MASTER_SITES = ${HOMEPAGE} MODULES = lang/lua -REGRESS_DEPENDS = textproc/luaexpat +MODLUA_REGRESS_DEPENDS = textproc/luaexpat -MAKE_ENV+= LUA_INC="${LOCALBASE}/include" +MAKE_FLAGS+= LUA_INC="${MODLUA_INCL_DIR}" USE_GMAKE = Yes MAKE_FILE = makefile ALL_TARGET = lib -LUA = ${LOCALBASE}/bin/lua +LUA = ${MODLUA_BIN} do-install: ${INSTALL_DATA_DIR} ${MODLUA_LIBDIR} ${MODLUA_DATADIR}/lxp @@ -39,6 +39,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/doc/us/luaexpat.png ${MODLUA_DOCDIR} do-regress: - cd ${WRKSRC}/tests && ${LUA} test-lom.lua && ${LUA} test.lua + cd ${WRKSRC}/tests && ${MODLUA_BIN} test-lom.lua && ${MODLUA_BIN} test.lua .include diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index 227d376f10b..132b6d7f1bc 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.100 2012/06/01 08:20:50 sthen Exp $ +# $OpenBSD: Makefile,v 1.101 2012/07/10 15:22:45 jasper Exp $ SHARED_ONLY= Yes COMMENT= secure, fast, compliant, and very flexible web-server DISTNAME= lighttpd-1.4.31 +REVISION= 0 CATEGORIES= www net MASTER_SITES= http://download.lighttpd.net/lighttpd/releases-1.4.x/ @@ -20,6 +21,7 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c crypto ${MODLUA_WANTLIB} m pcre ssl z MODULES= lang/lua +MODLUA_SA= Yes LIB_DEPENDS+= devel/pcre \ ${MODLUA_LIB_DEPENDS} @@ -35,7 +37,9 @@ CONFIGURE_ARGS+= --libdir="${PREFIX}/lib/lighttpd" \ --without-bzip2 \ --without-libev CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \ + LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`" FLAVORS= ldap mysql FLAVOR?= diff --git a/x11/e17/e/Makefile b/x11/e17/e/Makefile index 8a719208e24..498a0a59d97 100644 --- a/x11/e17/e/Makefile +++ b/x11/e17/e/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2012/06/21 13:56:57 sthen Exp $ +# $OpenBSD: Makefile,v 1.35 2012/07/10 15:22:45 jasper Exp $ COMMENT = the enlightened window manager @@ -8,7 +8,7 @@ SHARED_ONLY = Yes DISTNAME = enlightenment-0.16.999.54504 EXTRACT_SUFX= .tar.bz2 -REVISION = 6 +REVISION = 7 EPOCH = 0 # BSD diff --git a/x11/e17/edje/Makefile b/x11/e17/edje/Makefile index 62d9fe60c16..bdb0c8c5163 100644 --- a/x11/e17/edje/Makefile +++ b/x11/e17/edje/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.21 2012/05/15 19:38:02 jasper Exp $ +# $OpenBSD: Makefile,v 1.22 2012/07/10 15:22:45 jasper Exp $ COMMENT = complex graphical design & layout library DISTNAME = edje-1.0.0 -REVISION = 1 +REVISION = 2 EPOCH = 2 # XXX stop lua module creating a no-arch package diff --git a/x11/ion/Makefile b/x11/ion/Makefile index 66af72bbccd..be755528e41 100644 --- a/x11/ion/Makefile +++ b/x11/ion/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.55 2012/05/15 19:38:01 jasper Exp $ +# $OpenBSD: Makefile,v 1.56 2012/07/10 15:22:45 jasper Exp $ COMMENT= light, keyboard friendly window manager V= 20070318 DISTNAME= ion-3ds-${V} PKGNAME= ion-${V} -REVISION= 3 +REVISION= 4 CATEGORIES= x11 HOMEPAGE= http://modeemi.cs.tut.fi/~tuomov/ion/ @@ -21,6 +21,7 @@ WANTLIB= ICE X11 m c SM Xext ${MODLUA_WANTLIB} MODULES= devel/gettext \ lang/lua +MODLUA_SA= Yes LIB_DEPENDS= ${MODLUA_LIB_DEPENDS} @@ -28,4 +29,7 @@ USE_GMAKE= Yes USE_GROFF = Yes NO_REGRESS= Yes +pre-configure: + ${SUBST_CMD} ${WRKSRC}/system.mk + .include diff --git a/x11/ion/patches/patch-etc_cfg_ioncore_lua b/x11/ion/patches/patch-etc_cfg_ioncore_lua index c24bb2c5084..127e814f1e4 100644 --- a/x11/ion/patches/patch-etc_cfg_ioncore_lua +++ b/x11/ion/patches/patch-etc_cfg_ioncore_lua @@ -1,7 +1,7 @@ -$OpenBSD: patch-etc_cfg_ioncore_lua,v 1.6 2007/03/28 19:33:04 pedro Exp $ ---- etc/cfg_ioncore.lua.orig Sun Dec 24 08:45:26 2006 -+++ etc/cfg_ioncore.lua Sun Dec 24 08:48:23 2006 -@@ -63,8 +63,8 @@ defbindings("WScreen", { +$OpenBSD: patch-etc_cfg_ioncore_lua,v 1.7 2012/07/10 15:22:45 jasper Exp $ +--- etc/cfg_ioncore.lua.orig Sun Mar 18 21:31:41 2007 ++++ etc/cfg_ioncore.lua Mon Jul 9 11:20:13 2012 +@@ -65,8 +65,8 @@ defbindings("WScreen", { kpress(META.."F9", "ioncore.create_ws(_)"), bdoc("Display the main menu."), @@ -12,7 +12,7 @@ $OpenBSD: patch-etc_cfg_ioncore_lua,v 1.6 2007/03/28 19:33:04 pedro Exp $ mpress("Button3", "mod_menu.pmenu(_, _sub, 'mainmenu')"), bdoc("Display the window list menu."), -@@ -139,10 +139,10 @@ defbindings("WMPlex.toplevel", { +@@ -147,10 +147,10 @@ defbindings("WMPlex.toplevel", { kpress(META.."T", "WRegion.set_tagged(_sub, 'toggle')", "_sub:non-nil"), bdoc("Query for manual page to be displayed."), @@ -25,7 +25,7 @@ $OpenBSD: patch-etc_cfg_ioncore_lua,v 1.6 2007/03/28 19:33:04 pedro Exp $ bdoc("Run a terminal emulator."), kpress(ALTMETA.."F2", "ioncore.exec_on(_, XTERM or 'xterm')"), -@@ -158,7 +158,7 @@ defbindings("WMPlex.toplevel", { +@@ -166,7 +166,7 @@ defbindings("WMPlex.toplevel", { bdoc("Query for file to edit."), kpress(ALTMETA.."F5", diff --git a/x11/ion/patches/patch-system_mk b/x11/ion/patches/patch-system_mk index 363406c5af2..ae0aebd5b94 100644 --- a/x11/ion/patches/patch-system_mk +++ b/x11/ion/patches/patch-system_mk @@ -1,6 +1,6 @@ -$OpenBSD: patch-system_mk,v 1.8 2007/03/28 19:33:04 pedro Exp $ ---- system.mk.orig Sat Dec 23 13:00:13 2006 -+++ system.mk Sun Dec 24 08:45:16 2006 +$OpenBSD: patch-system_mk,v 1.9 2012/07/10 15:22:45 jasper Exp $ +--- system.mk.orig Sun Mar 18 21:32:12 2007 ++++ system.mk Mon Jul 9 11:22:36 2012 @@ -7,7 +7,7 @@ ## Installation paths ## @@ -39,7 +39,32 @@ $OpenBSD: patch-system_mk,v 1.8 2007/03/28 19:33:04 pedro Exp $ ## -@@ -74,7 +75,7 @@ LUAC=$(LUA_DIR)/bin/luac +@@ -57,24 +58,24 @@ DL_LIBS=-ldl + # If you have installed Lua 5.1 from the official tarball without changing + # paths, this should do it. + LUA_DIR=/usr/local +-LUA_LIBS = -L$(LUA_DIR)/lib -llua +-LUA_INCLUDES = -I$(LUA_DIR)/include +-LUA=$(LUA_DIR)/bin/lua +-LUAC=$(LUA_DIR)/bin/luac ++#LUA_LIBS = -L$(LUA_DIR)/lib -llua ++#LUA_INCLUDES = -I$(LUA_DIR)/include ++#LUA=$(LUA_DIR)/bin/lua ++#LUAC=$(LUA_DIR)/bin/luac + + # If you are using the Debian packages, the following settings should be + # what you want. +-#LUA_LIBS=`pkg-config --libs lua5.1` +-#LUA_INCLUDES=`pkg-config --cflags lua5.1` +-#LUA=`which lua5.1` +-#LUAC=`which luac5.1` ++LUA_LIBS=`pkg-config --libs lua51` ++LUA_INCLUDES=`pkg-config --cflags lua51` ++LUA=`which lua51` ++LUAC=`which luac51` + + + ## ## X libraries, includes and options ## @@ -48,23 +73,23 @@ $OpenBSD: patch-system_mk,v 1.8 2007/03/28 19:33:04 pedro Exp $ # SunOS/Solaris #X11_PREFIX=/usr/openwin -@@ -110,7 +111,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR +@@ -104,7 +105,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND # asprintf and vasprintf in the c library. (gnu libc has.) # If HAS_SYSTEM_ASPRINTF is not defined, an implementation # in sprintf_2.2/ is used. -#HAS_SYSTEM_ASPRINTF=1 +HAS_SYSTEM_ASPRINTF=1 - # If you're on an archaic system (such as relatively recent *BSD releases) -@@ -119,24 +120,24 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR + # without even dummy multibyte/widechar and localisation support, you may +@@ -112,24 +113,24 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND #DEFINES += -DCF_NO_LOCALE # On some other systems you may something like this: -#EXTRA_LIBS += -lintl -#EXTRA_INCLUDES += +EXTRA_LIBS += -L$(LOCALBASE)/lib -lintl -liconv -+EXTRA_INCLUDES += -I$(LOCALBASE)/include ++EXTRA_INCLUDES += -I$(LOCALBASE)/include -I/usr/local/include/lua-5.1 ##