Index: head/databases/redis-devel/Makefile =================================================================== --- head/databases/redis-devel/Makefile (revision 370601) +++ head/databases/redis-devel/Makefile (revision 370602) @@ -1,100 +1,100 @@ # Created by: Sergey Skvortsov # $FreeBSD$ PORTNAME= redis -DISTVERSION= 3.0.0-beta8 +DISTVERSION= 3.0.0-rc1 CATEGORIES= databases MASTER_SITES= https://github.com/antirez/redis/archive/ PKGNAMESUFFIX= -devel DISTNAME= ${DISTVERSION} DIST_SUBDIR= ${PORTNAME} 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 FETCH_ARGS= -Fpr WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} .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 ${PTHREAD_LIBS} -lm -lexecinfo CONFLICTS?= redis-2.* 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} 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 regression-test: build @cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl .include Index: head/databases/redis-devel/distinfo =================================================================== --- head/databases/redis-devel/distinfo (revision 370601) +++ head/databases/redis-devel/distinfo (revision 370602) @@ -1,2 +1,2 @@ -SHA256 (redis/3.0.0-beta8.tar.gz) = b84d1624873c4f20ed7504932233b2b91584b6a0c4383c25034e8710c5ea16cd -SIZE (redis/3.0.0-beta8.tar.gz) = 1327483 +SHA256 (redis/3.0.0-rc1.tar.gz) = c64c31527d93175e2a83010d69e0b83dc86c8b75b7cf8aa8b497213921418db4 +SIZE (redis/3.0.0-rc1.tar.gz) = 1335857 Index: head/databases/redis-devel/files/patch-deps-Makefile =================================================================== --- head/databases/redis-devel/files/patch-deps-Makefile (revision 370601) +++ head/databases/redis-devel/files/patch-deps-Makefile (revision 370602) @@ -1,17 +1,20 @@ ---- deps/Makefile.orig 2012-07-02 04:18:07.000000000 +0400 -+++ deps/Makefile 2012-07-02 04:18:56.000000000 +0400 -@@ -58,12 +58,12 @@ - LUA_CFLAGS= -D__C99FEATURES__=1 +--- deps/Makefile.orig 2014-10-11 01:02:23.000000000 +0400 ++++ deps/Makefile 2014-10-11 01:03:37.000000000 +0400 +@@ -58,7 +58,7 @@ + LUA_CFLAGS= -D__C99FEATURES__=1 endif -LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS) +LUA_CFLAGS+= -Wall -DLUA_ANSI $(CFLAGS) LUA_LDFLAGS+= $(LDFLAGS) + # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more + # challenging to cross-compile lua (and redis). These defines make it easier +@@ -68,7 +68,7 @@ lua: .make-prerequisites @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) -- cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" -+ cd lua/src && $(MAKE) all CC="$(CC)" CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" +- cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)" ++ cd lua/src && $(MAKE) all CC="$(CC)" CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)" .PHONY: lua Index: head/databases/redis-devel/files/patch-src-Makefile =================================================================== --- head/databases/redis-devel/files/patch-src-Makefile (revision 370601) +++ head/databases/redis-devel/files/patch-src-Makefile (revision 370602) @@ -1,31 +1,39 @@ ---- src/Makefile.orig 2014-01-14 14:17:43.000000000 +0400 -+++ src/Makefile 2014-01-14 14:19:31.000000000 +0400 +--- src/Makefile.orig 2014-10-11 01:09:55.000000000 +0400 ++++ src/Makefile 2014-10-11 01:12:53.000000000 +0400 @@ -22,7 +22,7 @@ - WARN=-Wall + 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 -@@ -63,6 +63,7 @@ --ifeq ($(uname_S),Darwin) -- # Darwin (nothing to do) --else +@@ -63,6 +62,11 @@ + ifeq ($(uname_S),Darwin) + # Darwin (nothing to do) + else +ifeq ($(uname_S),FreeBSD) -+ FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include -+ FINAL_LDFLAGS= $(LDFLAGS) ++ # FreeBSD ++ FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include ++ FINAL_LDFLAGS= $(LDFLAGS) +else - # All the other OSes (notably Linux) - FINAL_LDFLAGS+= -rdynamic - FINAL_LIBS+= -pthread + 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 +