svn commit: r394667 - in head/www/lighttpd: . files
Philip M. Gollucci
pgollucci at FreeBSD.org
Wed Aug 19 01:26:41 UTC 2015
Author: pgollucci
Date: Wed Aug 19 01:26:39 2015
New Revision: 394667
URL: https://svnweb.freebsd.org/changeset/ports/394667
Log:
www/lighttpd: modernize, support lua 5.2+
- Use USE OPTIONs helpers
- add support for lua 5.2+
PR: 202302
Submitted by: pkubaj at riseup.net (maintainer)
Added:
head/www/lighttpd/files/patch-src_mod__cml__lua.c (contents, props changed)
head/www/lighttpd/files/patch-src_mod__magnet.c (contents, props changed)
Modified:
head/www/lighttpd/Makefile
Modified: head/www/lighttpd/Makefile
==============================================================================
--- head/www/lighttpd/Makefile Wed Aug 19 01:00:55 2015 (r394666)
+++ head/www/lighttpd/Makefile Wed Aug 19 01:26:39 2015 (r394667)
@@ -49,9 +49,24 @@ SPAWNFCGI_DESC= Depend on spawn-fcgi uti
VALGRIND_DESC= valgrind support
WEBDAV_DESC= WebDAV support
-FAM_USES= fam
-FAM_CONFIGURE_ON= --with-fam
-FAM_CONFIGURE_ENV= FAM_CFLAGS="-I${LOCALBASE}/include" FAM_LIBS="-L${LOCALBASE}/lib"
+BZIP2_CONFIGURE_WITH= bzip2
+FAM_USES= fam
+FAM_CONFIGURE_ON= --with-fam
+FAM_CONFIGURE_ENV= FAM_CFLAGS="-I${LOCALBASE}/include" FAM_LIBS="-L${LOCALBASE}/lib"
+GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_CONFIGURE_WITH= gdbm
+IPV6_CONFIGURE_OFF= --disable-ipv6
+LIBEV_CONFIGURE_WITH= libev=${LOCALBASE}
+LIBEV_LIB_DEPENDS= libev.so:${PORTSDIR}/devel/libev
+LUA_USES= lua:51+
+LUA_CONFIGURE_WITH= lua
+LUA_CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
+MEMCACHE_LIB_DEPENDS= libmemcache.so:${PORTSDIR}/databases/libmemcache
+MEMCACHE_CONFIGURE_WITH=memcache
+SPAWNFCGI_RUN_DEPENDS= spawn-fcgi:${PORTSDIR}/www/spawn-fcgi
+VALGRIND_BUILD_DEPENDS= valgrind:${PORTSDIR}/devel/valgrind
+VALGRIND_RUN_DEPENDS= valgrind:${PORTSDIR}/devel/valgrind
+VALGRIND_CONFIGURE_WITH=valgrind
LIGHTTPD_CONF_FILES= lighttpd.conf modules.conf
@@ -95,35 +110,6 @@ CONFIGURE_ARGS+= --with-openssl \
--with-openssl-libs=${OPENSSLLIB}
.endif
-.if ${PORT_OPTIONS:MBZIP2}
-CONFIGURE_ARGS+= --with-bzip2
-.endif
-
-.if ${PORT_OPTIONS:MGDBM}
-LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+= --with-gdbm
-.endif
-
-.if empty(PORT_OPTIONS:MIPV6)
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-.if ${PORT_OPTIONS:MLIBEV}
-CONFIGURE_ARGS+= --with-libev=${LOCALBASE}
-LIB_DEPENDS+= libev.so:${PORTSDIR}/devel/libev
-.endif
-
-.if ${PORT_OPTIONS:MLUA}
-USES+= lua:51
-CONFIGURE_ARGS+= --with-lua
-CONFIGURE_ENV+= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
-.endif
-
-.if ${PORT_OPTIONS:MMEMCACHE}
-LIB_DEPENDS+= libmemcache.so:${PORTSDIR}/databases/libmemcache
-CONFIGURE_ARGS+= --with-memcache
-.endif
-
.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
CONFIGURE_ARGS+= --with-mysql
@@ -149,16 +135,6 @@ CONFIGURE_ARGS+= --with-ldap
_REQUIRE+= slapd
.endif
-.if ${PORT_OPTIONS:MSPAWNFCGI}
-RUN_DEPENDS+= spawn-fcgi:${PORTSDIR}/www/spawn-fcgi
-.endif
-
-.if ${PORT_OPTIONS:MVALGRIND}
-BUILD_DEPENDS+= valgrind:${PORTSDIR}/devel/valgrind
-RUN_DEPENDS+= valgrind:${PORTSDIR}/devel/valgrind
-CONFIGURE_ARGS+= --with-valgrind
-.endif
-
.if ${PORT_OPTIONS:MWEBDAV}
USE_GNOME+= libxml2
LIB_DEPENDS+= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
Added: head/www/lighttpd/files/patch-src_mod__cml__lua.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/lighttpd/files/patch-src_mod__cml__lua.c Wed Aug 19 01:26:39 2015 (r394667)
@@ -0,0 +1,25 @@
+--- src/mod_cml_lua.c.orig 2015-07-26 10:36:36 UTC
++++ src/mod_cml_lua.c
+@@ -28,6 +28,10 @@ typedef char HASHHEX[HASHHEXLEN+1];
+ #include <lualib.h>
+ #include <lauxlib.h>
+
++#if LUA_VERSION_NUM >= 502
++#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX
++#endif
++
+ typedef struct {
+ stream st;
+ int done;
+@@ -291,7 +295,11 @@ int cache_parse_lua(server *srv, connect
+ lua_settable(L, LUA_GLOBALSINDEX);
+
+ /* load lua program */
++#if LUA_VERSION_NUM >= 502
++ if (lua_load(L, load_file, &rm, fn->ptr, NULL) || lua_pcall(L,0,1,0)) {
++#else
+ if (lua_load(L, load_file, &rm, fn->ptr) || lua_pcall(L,0,1,0)) {
++#endif
+ log_error_write(srv, __FILE__, __LINE__, "s",
+ lua_tostring(L,-1));
+
Added: head/www/lighttpd/files/patch-src_mod__magnet.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/lighttpd/files/patch-src_mod__magnet.c Wed Aug 19 01:26:39 2015 (r394667)
@@ -0,0 +1,13 @@
+--- src/mod_magnet.c.orig 2015-07-26 10:36:36 UTC
++++ src/mod_magnet.c
+@@ -24,6 +24,10 @@
+ #define MAGNET_CONFIG_PHYSICAL_PATH "magnet.attract-physical-path-to"
+ #define MAGNET_RESTART_REQUEST 99
+
++#if LUA_VERSION_NUM >= 502
++#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX
++#endif
++
+ /* plugin config for all request/connections */
+
+ static jmp_buf exceptionjmp;
More information about the svn-ports-head
mailing list