Date: Sat, 12 Jan 2013 15:48:48 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310279 - in head/databases: redis redis-devel redis-devel/files redis/files Message-ID: <201301121548.r0CFmmvd078339@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Sat Jan 12 15:48:47 2013 New Revision: 310279 URL: http://svnweb.freebsd.org/changeset/ports/310279 Log: Update from 2.6.7 to 2.6.8. Add experimental support for lang/luajit, disabled by default. <ChangeLog> UPGRADE URGENCY: MODERATE if you use Lua scripting. Otherwise LOW. * [BUGFIX] Multiple fixes for EVAL (issue #872). * [BUGFIX] Fix overflow in mstime() in redis-cli and benchmark. * [BUGFIX] Fix Linux / PPC64 behavior by correcting endianess detection. * [BUGFIX] Fix NetBSD build by defining _XOPEN_SOURCE appropriately. * [BUGFIX] Added missing license and copyright in a few places. * [BUGFIX] Better error reporting when fd event creation fails. </ChangeLog> Added: head/databases/redis-devel/files/extra-patch-src-Makefile (contents, props changed) head/databases/redis/files/extra-patch-src-Makefile (contents, props changed) Modified: head/databases/redis-devel/Makefile head/databases/redis-devel/distinfo head/databases/redis/Makefile head/databases/redis/distinfo Modified: head/databases/redis-devel/Makefile ============================================================================== --- head/databases/redis-devel/Makefile Sat Jan 12 15:41:25 2013 (r310278) +++ head/databases/redis-devel/Makefile Sat Jan 12 15:48:47 2013 (r310279) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= redis -DISTVERSION= 2.6.7 +DISTVERSION= 2.6.8 CATEGORIES= databases MASTER_SITES= GOOGLE_CODE PKGNAMESUFFIX= -devel @@ -14,11 +14,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 @@ -56,6 +64,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 Modified: head/databases/redis-devel/distinfo ============================================================================== --- head/databases/redis-devel/distinfo Sat Jan 12 15:41:25 2013 (r310278) +++ head/databases/redis-devel/distinfo Sat Jan 12 15:48:47 2013 (r310279) @@ -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 Added: 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 Sat Jan 12 15:48:47 2013 (r310279) @@ -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) Modified: head/databases/redis/Makefile ============================================================================== --- head/databases/redis/Makefile Sat Jan 12 15:41:25 2013 (r310278) +++ head/databases/redis/Makefile Sat Jan 12 15:48:47 2013 (r310279) @@ -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 Modified: head/databases/redis/distinfo ============================================================================== --- head/databases/redis/distinfo Sat Jan 12 15:41:25 2013 (r310278) +++ head/databases/redis/distinfo Sat Jan 12 15:48:47 2013 (r310279) @@ -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 Added: head/databases/redis/files/extra-patch-src-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/redis/files/extra-patch-src-Makefile Sat Jan 12 15:48:47 2013 (r310279) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301121548.r0CFmmvd078339>