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

Sergey A. Osokin osa at FreeBSD.org
Tue Jul 17 18:23:26 UTC 2012 

Author: osa
Date: Tue Jul 17 18:23:25 2012
New Revision: 301021
URL: http://svn.freebsd.org/changeset/ports/301021

Log:
  Readding the removed port redis-devel.
  Update to the latest development version 2.6.0-rc5.

Added:
  head/databases/redis-devel/
     - copied from r261448, head/databases/redis-devel/
  head/databases/redis-devel/files/patch-deps::Makefile   (contents, props changed)
  head/databases/redis-devel/files/patch-deps::hiredis::Makefile   (contents, props changed)
  head/databases/redis-devel/files/patch-src::Makefile   (contents, props changed)
  head/databases/redis-devel/files/patch-src::config.h   (contents, props changed)
  head/databases/redis-devel/files/patch-src::mkreleasehdr.sh   (contents, props changed)
  head/databases/redis-devel/files/redis.in   (contents, props changed)
     - copied, changed from r261448, head/databases/redis-devel/files/redis.sh.in
Deleted:
  head/databases/redis-devel/files/redis.sh.in
Modified:
  head/databases/redis-devel/Makefile   (contents, props changed)
  head/databases/redis-devel/distinfo   (contents, props changed)
  head/databases/redis-devel/pkg-descr   (contents, props changed)
  head/databases/redis-devel/pkg-plist   (contents, props changed)
Directory Properties:
  head/databases/redis-devel/files/patch-redis.conf   (props changed)
  head/databases/redis-devel/files/pkg-install.in   (props changed)
  head/databases/redis-devel/files/pkg-message.in   (props changed)

Modified: head/databases/redis-devel/Makefile
==============================================================================
--- head/databases/redis-devel/Makefile	Sun Sep 19 17:57:32 2010	(r261448)
+++ head/databases/redis-devel/Makefile	Tue Jul 17 18:23:25 2012	(r301021)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	redis
-DISTVERSION=	2.0.1
+DISTVERSION=	2.6.0-rc5
 CATEGORIES=	databases
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMESUFFIX=	-devel
@@ -18,52 +18,47 @@ LIB_DEPENDS=	execinfo.1:${PORTSDIR}/deve
 
 CFLAGS+=	-I${LOCALBASE}/include
 
-CONFLICTS?=	redis-1.*
+CONFLICTS?=	redis-2.4.* redis-scripting-2.*
 
 USE_GMAKE=	yes
-USE_RC_SUBR=	redis.sh
+MAKE_ENV=	"V=yo"
+USE_RC_SUBR=	redis
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-dump \
 		redis-cli redis-server
 
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-install
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-REDIS_USER?=	redis
-REDIS_UID?=	535
-REDIS_GROUP?=	redis
-REDIS_GID?=	535
+USERS=	redis
+GROUPS=	redis
 
 REDIS_DBDIR?=	/var/db/redis
 REDIS_RUNDIR?=	/var/run/redis
 REDIS_LOGDIR?=	/var/log/redis
 
-SUB_FILES=	pkg-message pkg-install
+SUB_FILES=	pkg-message
 SUB_LIST+=	PORTNAME="${PORTNAME}" \
-	REDIS_USER="${REDIS_USER}" \
-	REDIS_UID="${REDIS_UID}" \
-	REDIS_GROUP="${REDIS_GROUP}" \
-	REDIS_GID="${REDIS_GID}" \
-	REDIS_LOGDIR="${REDIS_LOGDIR}" \
-	REDIS_DBDIR="${REDIS_DBDIR}" \
-	REDIS_RUNDIR="${REDIS_RUNDIR}"
-
-PATTERN=	'16d;119d;15s|$$$$(ARCH) ||'
-.if !defined(WITH_DEBUG)
-PATTERN:=	${PATTERN:S/'$/;5s|^|\#|'/}
-.endif
-
-post-patch:
-	${REINPLACE_CMD} ${PATTERN} ${WRKSRC}/Makefile
+	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}
 
 post-build:
 	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf
 
 do-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/!} ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKDIR}/redis.conf ${PREFIX}/etc/redis.conf.sample
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+post-install:
+.for d in ${REDIS_LOGDIR} ${REDIS_RUNDIR} ${REDIS_DBDIR}
+	[ -d ${d} ] || ${MKDIR} ${d} && ${CHOWN} ${USERS}:${GROUPS} ${d}
+.endfor
 
 .include <bsd.port.mk>

Modified: head/databases/redis-devel/distinfo
==============================================================================
--- head/databases/redis-devel/distinfo	Sun Sep 19 17:57:32 2010	(r261448)
+++ head/databases/redis-devel/distinfo	Tue Jul 17 18:23:25 2012	(r301021)
@@ -1,3 +1,2 @@
-MD5 (redis-2.0.1.tar.gz) = 7c0fd3521bbee3ba777b195dedeac5c4
-SHA256 (redis-2.0.1.tar.gz) = 4a20e667fe4267e1eb743d9b929a3662f7d5e211ef036c8dd4a7280f51a3b169
-SIZE (redis-2.0.1.tar.gz) = 347301
+SHA256 (redis-2.6.0-rc5.tar.gz) = f6252f13d1e0542a7f3797ff9da517c0dea6855b74490ddc625ca288c8473e9f
+SIZE (redis-2.6.0-rc5.tar.gz) = 965683

Added: head/databases/redis-devel/files/patch-deps::Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis-devel/files/patch-deps::Makefile	Tue Jul 17 18:23:25 2012	(r301021)
@@ -0,0 +1,17 @@
+--- 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
+ endif
+ 
+-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS)
++LUA_CFLAGS+= -Wall -DLUA_ANSI $(CFLAGS)
+ LUA_LDFLAGS+= $(LDFLAGS)
+ 
+ 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)"
+ 
+ .PHONY: lua
+ 

Added: head/databases/redis-devel/files/patch-deps::hiredis::Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis-devel/files/patch-deps::hiredis::Makefile	Tue Jul 17 18:23:25 2012	(r301021)
@@ -0,0 +1,41 @@
+--- deps/hiredis/Makefile.orig	2012-02-22 17:23:43.000000000 +0400
++++ deps/hiredis/Makefile	2012-02-24 16:46:44.000000000 +0400
+@@ -12,10 +12,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
+@@ -34,6 +34,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)
+@@ -104,7 +113,7 @@
+ 	$(CC) -MM *.c
+ 
+ # Installation related variables and target
+-PREFIX?=/usr/local
++PREFIX?=${PREFIX}
+ INCLUDE_PATH?=include/hiredis
+ LIBRARY_PATH?=lib
+ INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH)

Added: head/databases/redis-devel/files/patch-src::Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis-devel/files/patch-src::Makefile	Tue Jul 17 18:23:25 2012	(r301021)
@@ -0,0 +1,31 @@
+--- src/Makefile.orig	2012-06-15 15:44:17.000000000 +0400
++++ src/Makefile	2012-07-02 04:11: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 lua
+ 
+ # Default settings
+ STD= -std=c99 -pedantic
+@@ -50,6 +50,10 @@
+   FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -ggdb
+   FINAL_LIBS= -ldl -lnsl -lsocket -lm -lpthread
+   DEBUG= -g -ggdb
++else ifeq ($(uname_S),FreeBSD)
++  FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
++  FINAL_LDFLAGS= -pthread -L$(PREFIX)/lib
++  FINAL_LIBS= -lm -lexecinfo
+ else
+   FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
+   FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -rdynamic -ggdb
+@@ -79,7 +83,7 @@
+ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
+ REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
+ 
+-PREFIX?=/usr/local
++PREFIX:=${PREFIX}
+ INSTALL_BIN= $(PREFIX)/bin
+ INSTALL= cp -pf
+ 

Added: head/databases/redis-devel/files/patch-src::config.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis-devel/files/patch-src::config.h	Tue Jul 17 18:23:25 2012	(r301021)
@@ -0,0 +1,11 @@
+--- src/config.h.orig	2012-02-24 16:56:36.000000000 +0400
++++ src/config.h	2012-02-24 16:57:01.000000000 +0400
+@@ -25,7 +25,7 @@
+ #endif
+ 
+ /* Test for backtrace() */
+-#if defined(__APPLE__) || defined(__linux__) || defined(__sun)
++#if defined(__APPLE__) || defined(__linux__) || defined(__sun) || defined(__FreeBSD__)
+ #define HAVE_BACKTRACE 1
+ #endif
+ 

Added: head/databases/redis-devel/files/patch-src::mkreleasehdr.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis-devel/files/patch-src::mkreleasehdr.sh	Tue Jul 17 18:23:25 2012	(r301021)
@@ -0,0 +1,11 @@
+--- src/mkreleasehdr.sh.orig	2010-12-24 09:37:11.000000000 +0300
++++ src/mkreleasehdr.sh	2010-12-24 09:37:16.000000000 +0300
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
+-GIT_DIRTY=`git diff 2> /dev/null | wc -l`
++GIT_SHA1="00000000"
++GIT_DIRTY="0"
+ test -f release.h || touch release.h
+ (cat release.h | grep SHA1 | grep $GIT_SHA1) && \
+ (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already uptodate

Copied and modified: head/databases/redis-devel/files/redis.in (from r261448, head/databases/redis-devel/files/redis.sh.in)
==============================================================================
--- head/databases/redis-devel/files/redis.sh.in	Sun Sep 19 17:57:32 2010	(r261448, copy source)
+++ head/databases/redis-devel/files/redis.in	Tue Jul 17 18:23:25 2012	(r301021)
@@ -30,6 +30,5 @@ required_files="${config_file}"
 load_rc_config "$name"
 : ${redis_enable="NO"}
 : ${redis_user="%%REDIS_USER%%"}
-: ${redis_flags=""}
 
 run_rc_command "$1"

Modified: head/databases/redis-devel/pkg-descr
==============================================================================
--- head/databases/redis-devel/pkg-descr	Sun Sep 19 17:57:32 2010	(r261448)
+++ head/databases/redis-devel/pkg-descr	Tue Jul 17 18:23:25 2012	(r301021)
@@ -1,14 +1,19 @@
-Redis is a key-value database.  It is similar to memcached but the
-dataset is not volatile, and values can be strings, exactly like in
-memcached, but also lists and sets with atomic operations to push/pop
-elements.
+Redis is an open source, advanced key-value store.  It is often referred
+to as a data structure server since keys can contain strings, hashes,
+lists, sets and sorted sets.
 
-In order to be very fast but at the same time persistent the whole
-dataset is taken in memory and from time to time and/or when a number of
-changes to the dataset are performed it is written asynchronously on
-disk.  You may lost the last few queries that is acceptable in many
-applications but it is as fast as an in memory DB (Redis supports
-non-blocking master-slave replication in order to solve this problem by
-redundancy).
+You can run atomic operations on these types, like appending to a string;
+incrementing the value in a hash; pushing to a list; computing set
+intersection, union and difference; or getting the member with highest
+ranking in a sorted set.
 
-WWW: http://code.google.com/p/redis/
+In order to achieve its outstanding performance, Redis works with an
+in-memory dataset.  Depending on your use case, you can persist it either
+by dumping the dataset to disk every once in a while, or by appending each
+command to a log.
+
+Redis also supports trivial-to-setup master-slave replication, with very
+fast non-blocking first synchronization, auto-reconnection on net split
+and so forth.
+
+WWW: http://redis.io/

Modified: head/databases/redis-devel/pkg-plist
==============================================================================
--- head/databases/redis-devel/pkg-plist	Sun Sep 19 17:57:32 2010	(r261448)
+++ head/databases/redis-devel/pkg-plist	Tue Jul 17 18:23:25 2012	(r301021)
@@ -6,3 +6,12 @@ bin/redis-server
 @unexec (cmp -s %D/etc/redis.conf %D/etc/redis.conf.sample && rm -f %D/etc/redis.conf) || true
 etc/redis.conf.sample
 @exec [ -f %B/redis.conf ] || cp %B/%f %B/redis.conf
+ at exec [ -d %%REDIS_DBDIR%% ] || mkdir -p %%REDIS_DBDIR%%
+ at exec chown %%REDIS_USER%%:%%REDIS_GROUP%% %%REDIS_DBDIR%%
+ at unexec if [ -z ${UPGRADE_PORT} ] ; then rmdir %%REDIS_DBDIR%% 2>/dev/null; fi
+ at exec [ -d %%REDIS_LOGDIR%% ] || mkdir -p %%REDIS_LOGDIR%%
+ at exec chown %%REDIS_USER%%:%%REDIS_GROUP%% %%REDIS_LOGDIR%%
+ at unexec if [ -z ${UPGRADE_PORT} ] ; then rmdir %%REDIS_LOGDIR%% 2>/dev/null; fi
+ at exec [ -d %%REDIS_RUNDIR%% ] || mkdir -p %%REDIS_RUNDIR%%
+ at exec chown %%REDIS_USER%%:%%REDIS_GROUP%% %%REDIS_RUNDIR%%
+ at unexec if [ -z ${UPGRADE_PORT} ] ; then rmdir %%REDIS_RUNDIR%% 2>/dev/null; fi

More information about the svn-ports-head mailing list