svn commit: r325175 - in head/databases/redis-devel: . files

[Sergey A. Osokin]

Author: osa
Date: Thu Aug 22 04:40:27 2013
New Revision: 325175
URL: http://svnweb.freebsd.org/changeset/ports/325175

Log:
  Add support for lang/lua, disabled by default.
  Do not bump PORTREVISION.

Added:
  head/databases/redis-devel/files/extra-patch-src-Makefile.lua
     - copied, changed from r324677, head/databases/redis-devel/files/extra-patch-src-Makefile
  head/databases/redis-devel/files/extra-patch-src-Makefile.luajit
     - copied unchanged from r324677, head/databases/redis-devel/files/extra-patch-src-Makefile
Deleted:
  head/databases/redis-devel/files/extra-patch-src-Makefile
Modified:
  head/databases/redis-devel/Makefile

Modified: head/databases/redis-devel/Makefile
==============================================================================
--- head/databases/redis-devel/Makefile	Thu Aug 22 02:37:47 2013	(r325174)
+++ head/databases/redis-devel/Makefile	Thu Aug 22 04:40:27 2013	(r325175)
@@ -14,15 +14,25 @@ LICENSE=	BSD
 
 LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
 
-OPTIONS_DEFINE=	LUAJIT TESTS
+OPTIONS_DEFINE=	TESTS
+OPTIONS_RADIO=	EXTLUA
+OPTIONS_RADIO_EXTLUA=	LUA LUAJIT
+LUA_DESC=	Use lang/lua instead of builtin lua
 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:MLUA}
+USE_LUA?=	5.1
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.lua
+CFLAGS+=	-fPIC
+LDFLAGS+=	-Wl,-E
+.endif
+
 .if ${PORT_OPTIONS:MLUAJIT}
 LIB_DEPENDS+=	luajit-5.1:${PORTSDIR}/lang/luajit
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.luajit
 CFLAGS+=	-fPIC
 LDFLAGS+=	-Wl,-E
 .endif
@@ -64,7 +74,7 @@ PLIST_SUB+=	REDIS_USER=${USERS} \
 	REDIS_DBDIR=${REDIS_DBDIR} \
 	REDIS_RUNDIR=${REDIS_RUNDIR}
 
-.if ${PORT_OPTIONS:MLUAJIT}
+.if ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUA}
 post-patch:
 	@cd ${WRKSRC}/deps/lua/src && ${CP} lua_* strbuf.* ${WRKSRC}/src/
 .endif

Copied and modified: head/databases/redis-devel/files/extra-patch-src-Makefile.lua (from r324677, head/databases/redis-devel/files/extra-patch-src-Makefile)
==============================================================================
--- head/databases/redis-devel/files/extra-patch-src-Makefile	Tue Aug 13 17:39:57 2013	(r324677, copy source)
+++ head/databases/redis-devel/files/extra-patch-src-Makefile.lua	Thu Aug 22 04:40:27 2013	(r325175)
@@ -22,8 +22,8 @@
  	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
++FINAL_CFLAGS+= -I${PREFIX}/include/lua51
++FINAL_LIBS+= -L${PREFIX}/lib -llua-5.1
 +
  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
  REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)

Copied: head/databases/redis-devel/files/extra-patch-src-Makefile.luajit (from r324677, head/databases/redis-devel/files/extra-patch-src-Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis-devel/files/extra-patch-src-Makefile.luajit	Thu Aug 22 04:40:27 2013	(r325175, copy of r324677, head/databases/redis-devel/files/extra-patch-src-Makefile)
@@ -0,0 +1,47 @@
+--- src/Makefile.orig	2013-08-13 15:52:22.000000000 +0400
++++ src/Makefile	2013-08-13 15:54:55.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
+@@ -49,7 +49,7 @@
+ # Override default settings if possible
+ -include .make-settings
+ 
+-FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
++FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
+ FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
+ FINAL_LIBS=-lm
+ DEBUG=-g -ggdb
+@@ -85,6 +85,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)
+@@ -105,6 +108,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 notify.o setproctitle.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 crc64.o
+ REDIS_BENCHMARK_NAME=redis-benchmark
+@@ -159,7 +163,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)