3 files changed, 64 insertions, 4 deletions

diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index d7057f0503d4..1f6191633009 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	redis
-DISTVERSION=	2.6.7
+DISTVERSION=	2.6.8
 CATEGORIES=	databases
 MASTER_SITES=	GOOGLE_CODE
 
@@ -13,11 +13,19 @@ LICENSE=	BSD
 
 LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
 
-OPTIONS_DEFINE=	TESTS
+OPTIONS_DEFINE=	LUAJIT TESTS
+LUAJIT_DESC=	Use lang/luajit instead of builtin lua
 TESTS_DESC=	Install lang/tcl for redis unit tests
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MLUAJIT}
+LIB_DEPENDS+=	luajit-5.1:${PORTSDIR}/lang/luajit
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile
+CFLAGS+=	-fPIC
+LDFLAGS+=	-Wl,-E
+.endif
+
 .if ${PORT_OPTIONS:MTESTS}
 USE_TCL_BUILD=	yes
 .endif
@@ -55,6 +63,11 @@ PLIST_SUB+=	REDIS_USER=${USERS} \
 	REDIS_DBDIR=${REDIS_DBDIR} \
 	REDIS_RUNDIR=${REDIS_RUNDIR}
 
+.if ${PORT_OPTIONS:MLUAJIT}
+post-patch:
+	@cd ${WRKSRC}/deps/lua/src && ${CP} lua_* strbuf.* ${WRKSRC}/src/
+.endif
+
 post-build:
 	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf
diff --git a/databases/redis/distinfo b/databases/redis/distinfo
index 111db8ce301a..a4bc4cdd707c 100644
--- a/databases/redis/distinfo
+++ b/databases/redis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redis-2.6.7.tar.gz) = e1a05b02665dbbd3ae2fed10906888310d5e82e28b868b32085c30659f3bdcd0
-SIZE (redis-2.6.7.tar.gz) = 987306
+SHA256 (redis-2.6.8.tar.gz) = b04083127f5e11e82045314c4ff9ad92e33f89772cc435ef8bccd75572eec9bd
+SIZE (redis-2.6.8.tar.gz) = 987578
diff --git a/databases/redis/files/extra-patch-src-Makefile b/databases/redis/files/extra-patch-src-Makefile
new file mode 100644
index 000000000000..b0d026db6754
--- /dev/null
+++ b/databases/redis/files/extra-patch-src-Makefile
@@ -0,0 +1,47 @@
+--- src/Makefile.orig	2012-12-25 23:11:28.000000000 +0400
++++ src/Makefile	2012-12-25 23:13:53.000000000 +0400
+@@ -15,7 +15,7 @@
+ release_hdr := $(shell sh -c './mkreleasehdr.sh')
+ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+ OPTIMIZATION?=-O2
+-DEPENDENCY_TARGETS=hiredis linenoise lua
++DEPENDENCY_TARGETS=hiredis linenoise
+ 
+ # Default settings
+ STD= -std=c99 -pedantic
+@@ -61,7 +61,7 @@
+ endif
+ 
+ # Include paths to dependencies
+-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
+ 
+ ifeq ($(MALLOC),tcmalloc)
+   FINAL_CFLAGS+= -DUSE_TCMALLOC
+@@ -79,6 +79,9 @@
+   FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
+ endif
+ 
++FINAL_CFLAGS+= -I${PREFIX}/include/luajit-2.0
++FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
++
+ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
+ REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
+ REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
+@@ -103,6 +106,7 @@
+ REDIS_SERVER_NAME= redis-server
+ REDIS_SENTINEL_NAME= redis-sentinel
+ REDIS_SERVER_OBJ= adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o migrate.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o
++REDIS_SERVER_OBJ+= lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
+ REDIS_CLI_NAME= redis-cli
+ REDIS_CLI_OBJ= anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o
+ REDIS_BENCHMARK_NAME= redis-benchmark
+@@ -157,7 +161,7 @@
+ 
+ # redis-server
+ $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
+-	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
++	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
+ 
+ # redis-sentinel
+ $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)