Index: head/databases/redis/Makefile =================================================================== --- head/databases/redis/Makefile (revision 383545) +++ head/databases/redis/Makefile (revision 383546) @@ -1,97 +1,97 @@ # Created by: Sergey Skvortsov # $FreeBSD$ PORTNAME= redis -DISTVERSION= 2.8.19 +DISTVERSION= 3.0.0 CATEGORIES= databases MASTER_SITES= http://download.redis.io/releases/ MAINTAINER= osa@FreeBSD.org COMMENT= Persistent key-value database with built-in net interface LICENSE= BSD3CLAUSE USES= execinfo 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 .if ${PORT_OPTIONS:MLUA} USES+= lua:51 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.lua .endif .if ${PORT_OPTIONS:MLUAJIT} LIB_DEPENDS+= libluajit-5.1.so:${PORTSDIR}/lang/luajit EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.luajit .endif .if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} CFLAGS+= -fPIC LDFLAGS+= -Wl,-E .endif .if ${PORT_OPTIONS:MTESTS} USES+= tcl:build .endif CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lpthread -lm -lexecinfo -CONFLICTS?= redis-devel-2.* +CONFLICTS?= redis-devel-3.* USES+= gmake MAKE_ENV= "V=yo" USE_RC_SUBR= redis BIN_FILES= redis-benchmark redis-check-aof redis-check-dump \ redis-cli redis-sentinel redis-server PKGMESSAGE= ${WRKDIR}/pkg-message USERS= redis GROUPS= redis REDIS_DBDIR?= /var/db/redis REDIS_RUNDIR?= /var/run/redis REDIS_LOGDIR?= /var/log/redis SUB_FILES= pkg-message SUB_LIST+= PORTNAME=${PORTNAME} \ REDIS_USER=${USERS} \ REDIS_DBDIR=${REDIS_DBDIR} \ REDIS_LOGDIR=${REDIS_LOGDIR} \ REDIS_RUNDIR=${REDIS_RUNDIR} PLIST_SUB+= REDIS_USER=${USERS} \ REDIS_GROUP=${GROUPS} \ REDIS_LOGDIR=${REDIS_LOGDIR} \ REDIS_DBDIR=${REDIS_DBDIR} \ REDIS_RUNDIR=${REDIS_RUNDIR} .if ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUA} post-patch: @cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/ .endif post-build: ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf do-install: ${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample ${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample ${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \ ${STAGEDIR}${REDIS_DBDIR} \ ${STAGEDIR}${REDIS_RUNDIR} regression-test: build @cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl .include Index: head/databases/redis/distinfo =================================================================== --- head/databases/redis/distinfo (revision 383545) +++ head/databases/redis/distinfo (revision 383546) @@ -1,2 +1,2 @@ -SHA256 (redis-2.8.19.tar.gz) = 29bb08abfc3d392b2f0c3e7f48ec46dd09ab1023f9a5575fc2a93546f4ca5145 -SIZE (redis-2.8.19.tar.gz) = 1254857 +SHA256 (redis-3.0.0.tar.gz) = 654c95c6236692dcb916fccba9a34d0877cc91338c8b6a372511e6eb080e34bf +SIZE (redis-3.0.0.tar.gz) = 1358081 Index: head/databases/redis/files/extra-patch-src-Makefile.lua =================================================================== --- head/databases/redis/files/extra-patch-src-Makefile.lua (revision 383545) +++ head/databases/redis/files/extra-patch-src-Makefile.lua (revision 383546) @@ -1,47 +1,47 @@ ---- src/Makefile.orig 2014-09-10 02:02:41.000000000 +0400 -+++ src/Makefile 2014-09-10 02:05:34.000000000 +0400 +--- src/Makefile.orig 2014-05-26 20:06:48.000000000 +0400 ++++ src/Makefile 2014-06-02 00:19:36.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 -@@ -98,6 +98,9 @@ + DEBUG=-g -ggdb +@@ -88,6 +88,9 @@ FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl endif +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) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -118,6 +121,7 @@ +@@ -108,6 +111,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 hyperloglog.o latency.o sparkline.o -+REDIS_SERVER_OBJ+= lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o fpconv.o + 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 cluster.o crc16.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 blocked.o hyperloglog.o latency.o sparkline.o ++REDIS_SERVER_OBJ+=fpconv.o lua_bit.o 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 -@@ -172,7 +176,7 @@ +@@ -162,7 +166,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) Index: head/databases/redis/files/extra-patch-src-Makefile.luajit =================================================================== --- head/databases/redis/files/extra-patch-src-Makefile.luajit (revision 383545) +++ head/databases/redis/files/extra-patch-src-Makefile.luajit (revision 383546) @@ -1,47 +1,47 @@ ---- src/Makefile.orig 2014-09-10 02:02:41.000000000 +0400 -+++ src/Makefile 2014-09-10 02:05:34.000000000 +0400 +--- src/Makefile.orig 2014-07-29 12:17:48.000000000 +0400 ++++ src/Makefile 2014-09-10 02:30:38.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 -@@ -98,6 +98,9 @@ + DEBUG=-g -ggdb +@@ -88,6 +88,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) -@@ -118,6 +121,7 @@ +@@ -108,6 +111,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 hyperloglog.o latency.o sparkline.o -+REDIS_SERVER_OBJ+= lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o fpconv.o + 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 cluster.o crc16.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 blocked.o hyperloglog.o latency.o sparkline.o ++REDIS_SERVER_OBJ+=fpconv.o lua_bit.o 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 -@@ -172,7 +176,7 @@ +@@ -162,7 +166,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) Index: head/databases/redis/files/patch-deps-hiredis-Makefile =================================================================== --- head/databases/redis/files/patch-deps-hiredis-Makefile (revision 383545) +++ head/databases/redis/files/patch-deps-hiredis-Makefile (revision 383546) @@ -1,41 +1,41 @@ ---- deps/hiredis/Makefile.orig 2014-06-27 05:00:12.000000000 +0400 -+++ deps/hiredis/Makefile 2014-06-27 05:02:00.000000000 +0400 +--- deps/hiredis/Makefile.orig 2014-07-29 12:17:48.000000000 +0400 ++++ deps/hiredis/Makefile 2014-09-10 02:32:25.000000000 +0400 @@ -25,10 +25,10 @@ # Fallback to gcc when $CC is not in $PATH. CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') -OPTIMIZATION?=-O3 +#OPTIMIZATION?=-O3 WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -DEBUG?= -g -ggdb -REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH) +#DEBUG?= -g -ggdb +REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) REAL_LDFLAGS=$(LDFLAGS) $(ARCH) DYLIBSUFFIX=so @@ -47,6 +47,15 @@ DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS) INSTALL= cp -r endif +ifeq ($(uname_S),FreeBSD) + CFLAGS?=$(CFLAGS) + CCLINK?=-pthread + LDFLAGS?=-L. -Wl,-rpath,. + DYLIBNAME?=libhiredis.so + DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ} + STLIBNAME?=libhiredis.a + STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ} +endif ifeq ($(uname_S),Darwin) DYLIBSUFFIX=dylib DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(DYLIBSUFFIX) @@ -124,7 +133,7 @@ $(CC) -MM *.c # Installation related variables and target -PREFIX?=/usr/local +PREFIX?=${PREFIX} INSTALL_INCLUDE_PATH= $(PREFIX)/include/hiredis INSTALL_LIBRARY_PATH= $(PREFIX)/lib Index: head/databases/redis/files/patch-deps-linenoise-Makefile =================================================================== --- head/databases/redis/files/patch-deps-linenoise-Makefile (revision 383545) +++ head/databases/redis/files/patch-deps-linenoise-Makefile (revision 383546) @@ -1,15 +1,15 @@ ---- deps/linenoise/Makefile.orig 2014-12-12 07:06:18.000000000 +0300 -+++ deps/linenoise/Makefile 2014-12-12 07:06:36.000000000 +0300 +--- deps/linenoise/Makefile.orig 2015-01-17 22:13:25.000000000 +0300 ++++ deps/linenoise/Makefile 2015-01-17 22:13:45.000000000 +0300 @@ -1,10 +1,10 @@ STD= WARN= -Wall -OPT= -Os +#OPT= -Os R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) R_LDFLAGS= $(LDFLAGS) -DEBUG= -g +#DEBUG= -g R_CC=$(CC) $(R_CFLAGS) R_LD=$(CC) $(R_LDFLAGS) Index: head/databases/redis/files/patch-src-Makefile =================================================================== --- head/databases/redis/files/patch-src-Makefile (revision 383545) +++ head/databases/redis/files/patch-src-Makefile (revision 383546) @@ -1,40 +1,39 @@ ---- src/Makefile.orig 2014-09-01 19:00:38.000000000 +0400 -+++ src/Makefile 2014-09-09 05:45:32.000000000 +0400 +--- src/Makefile.orig 2015-04-01 17:01:44.000000000 +0300 ++++ src/Makefile 2015-04-07 21:30:22.464962000 +0300 @@ -22,7 +22,7 @@ WARN=-Wall -W OPT=$(OPTIMIZATION) -PREFIX?=/usr/local +PREFIX:=$(PREFIX) INSTALL_BIN=$(PREFIX)/bin INSTALL=install -@@ -52,7 +52,7 @@ +@@ -52,7 +52,6 @@ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) FINAL_LIBS=-lm -DEBUG=-g -ggdb -+#DEBUG=-g -ggdb ifeq ($(uname_S),SunOS) # SunOS -@@ -67,7 +67,10 @@ - # AIX - FINAL_LDFLAGS+= -Wl,-bexpall - FINAL_LIBS+= -pthread -lcrypt -lbsd -- -+else +@@ -63,6 +62,11 @@ + ifeq ($(uname_S),Darwin) + # Darwin (nothing to do) + else +ifeq ($(uname_S),FreeBSD) ++ # FreeBSD + FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include -+ FINAL_LDFLAGS= $(LDFLAGS) - else - # All the other OSes (notably Linux) - FINAL_LDFLAGS+= -rdynamic -@@ -75,6 +78,7 @@ ++ FINAL_LDFLAGS= $(LDFLAGS) -pthread ++else + ifeq ($(uname_S),AIX) + # AIX + FINAL_LDFLAGS+= -Wl,-bexpall +@@ -75,6 +79,7 @@ endif endif endif +endif # Include paths to dependencies FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src Index: head/databases/redis/files/patch-src-config.h =================================================================== --- head/databases/redis/files/patch-src-config.h (revision 383545) +++ head/databases/redis/files/patch-src-config.h (revision 383546) @@ -1,11 +1,11 @@ ---- src/config.h.orig 2013-02-11 21:47:44.000000000 +0400 -+++ src/config.h 2013-02-11 21:50:10.000000000 +0400 -@@ -54,7 +54,7 @@ +--- src/config.h.orig 2015-04-07 21:24:36.634829000 +0300 ++++ src/config.h 2015-04-07 21:24:53.388849000 +0300 +@@ -62,7 +62,7 @@ #endif /* Test for backtrace() */ --#if defined(__APPLE__) || defined(__linux__) -+#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) +-#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) ++#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) || defined(__FreeBSD__) #define HAVE_BACKTRACE 1 #endif Index: head/databases/redis/files/redis.in =================================================================== --- head/databases/redis/files/redis.in (revision 383545) +++ head/databases/redis/files/redis.in (revision 383546) @@ -1,35 +1,34 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: redis # REQUIRE: LOGIN # BEFORE: securelevel # KEYWORD: shutdown # Add the following line to /etc/rc.conf to enable `redis': # #redis_enable="YES" # . /etc/rc.subr name="redis" -rcvar=redis_enable +rcvar="${name}_enable" extra_commands="reload" command="%%PREFIX%%/bin/redis-server" +config_file="%%PREFIX%%/etc/$name.conf" +command_args="${config_file}" pidfile="%%REDIS_RUNDIR%%/$name.pid" +required_files="${config_file}" # read configuration and set defaults load_rc_config "$name" : ${redis_enable="NO"} : ${redis_user="%%REDIS_USER%%"} -: ${redis_config="%%PREFIX%%/etc/$name.conf"} - -command_args="${redis_config}" -required_files="${redis_config}" run_rc_command "$1"