Update databases/redis to 2.2.12, plus the Makefile cleanup I wanted to do since a long time...
testsuite ok on both amd64 and sparc64 OK / Comments ?? ciao, david Index: Makefile =================================================================== RCS file: /cvs/ports/databases/redis/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile 27 Jun 2011 13:11:32 -0000 1.12 +++ Makefile 27 Jul 2011 08:06:59 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.12 2011/06/27 13:11:32 dcoppa Exp $ COMMENT = persistent key-value database -DISTNAME = redis-2.2.11 +DISTNAME = redis-2.2.12 CATEGORIES = databases HOMEPAGE = http://redis.io/ @@ -21,8 +21,11 @@ USE_GMAKE = Yes FAKE_FLAGS = INSTALL_TOP=${WRKINST}${PREFIX} -# Replace cp by install -MAKE_FLAGS = INSTALL="${INSTALL_PROGRAM}" +# Replace cp/mkdir with our install commands +# Enable verbose compilation +MAKE_FLAGS = INSTALL="${INSTALL_PROGRAM}" \ + INSTALL_DIR="${INSTALL_DATA_DIR}" \ + V=1 WANTLIB += c m pthread Index: distinfo =================================================================== RCS file: /cvs/ports/databases/redis/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo 27 Jun 2011 13:11:32 -0000 1.10 +++ distinfo 27 Jul 2011 08:06:59 -0000 @@ -1,5 +1,5 @@ -MD5 (redis-2.2.11.tar.gz) = VQHJDKAq5+qTw08Gez4GGQ== -RMD160 (redis-2.2.11.tar.gz) = tcGAI5Wgw3Xl6cBwLnCGuDmJ0O0= -SHA1 (redis-2.2.11.tar.gz) = uktRPFv3oosuULvRylG7eWLlaFw= -SHA256 (redis-2.2.11.tar.gz) = qUwd0lc+GfGr0zVQfV6igHU7CS3fFtAU3NMhL1pbwOs= -SIZE (redis-2.2.11.tar.gz) = 450839 +MD5 (redis-2.2.12.tar.gz) = YbKHhgyrPonEk5C49f+2lw== +RMD160 (redis-2.2.12.tar.gz) = i/EnX9HSrRU2znCBvfNSLV6SqNM= +SHA1 (redis-2.2.12.tar.gz) = ZtRHVuDzNx2eN7Uh9cwX4S4e+6M= +SHA256 (redis-2.2.12.tar.gz) = nipBM7kg/E7tcxyc06nQtg5wEXnqmLKUSrQ057HQ2wM= +SIZE (redis-2.2.12.tar.gz) = 455240 Index: patches/patch-deps_hiredis_Makefile =================================================================== RCS file: patches/patch-deps_hiredis_Makefile diff -N patches/patch-deps_hiredis_Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-deps_hiredis_Makefile 27 Jul 2011 08:06:59 -0000 @@ -0,0 +1,40 @@ +$OpenBSD$ +--- deps/hiredis/Makefile.orig Fri Jul 22 12:22:26 2011 ++++ deps/hiredis/Makefile Wed Jul 27 09:40:00 2011 +@@ -6,7 +6,7 @@ OBJ = net.o hiredis.o sds.o async.o + BINS = hiredis-example hiredis-test + + uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') +-OPTIMIZATION?=-O3 ++# OPTIMIZATION?=-O3 + ifeq ($(uname_S),SunOS) + CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -D__EXTENSIONS__ -D_XPG6 $(ARCH) $(PROF) + CCLINK?=-ldl -lnsl -lsocket -lm -lpthread +@@ -37,13 +37,17 @@ endif + endif + + CCOPT= $(CFLAGS) $(CCLINK) +-DEBUG?= -g -ggdb ++# DEBUG?= -g -ggdb + + PREFIX?= /usr/local + INSTALL_INC= $(PREFIX)/include/hiredis + INSTALL_LIB= $(PREFIX)/lib + INSTALL= cp -a + ++ifndef INSTALL_DIR ++ INSTALL_DIR= mkdir -p ++endif ++ + all: ${DYLIBNAME} ${BINS} + + # Deps (use make dep to generate this) +@@ -95,7 +99,7 @@ dep: + $(CC) -MM *.c + + install: ${DYLIBNAME} ${STLIBNAME} +- mkdir -p $(INSTALL_INC) $(INSTALL_LIB) ++ $(INSTALL_DIR) $(INSTALL_INC) $(INSTALL_LIB) + $(INSTALL) hiredis.h async.h adapters $(INSTALL_INC) + $(INSTALL) ${DYLIBNAME} ${STLIBNAME} $(INSTALL_LIB) + Index: patches/patch-deps_linenoise_Makefile =================================================================== RCS file: /cvs/ports/databases/redis/patches/patch-deps_linenoise_Makefile,v retrieving revision 1.1 diff -u -p -r1.1 patch-deps_linenoise_Makefile --- patches/patch-deps_linenoise_Makefile 11 Apr 2011 07:54:49 -0000 1.1 +++ patches/patch-deps_linenoise_Makefile 27 Jul 2011 08:06:59 -0000 @@ -1,16 +1,16 @@ $OpenBSD: patch-deps_linenoise_Makefile,v 1.1 2011/04/11 07:54:49 dcoppa Exp $ ---- deps/linenoise/Makefile.orig Fri Apr 8 13:47:34 2011 -+++ deps/linenoise/Makefile Fri Apr 8 13:48:59 2011 +--- deps/linenoise/Makefile.orig Fri Jul 22 12:22:26 2011 ++++ deps/linenoise/Makefile Wed Jul 27 09:22:55 2011 @@ -1,10 +1,10 @@ linenoise_example: linenoise.h linenoise.c linenoise_example: linenoise.o example.o - $(CC) $(ARCH) -Wall -W -Os -g -o linenoise_example linenoise.o example.o -+ $(CC) $(CFLAGS) $(ARCH) -g -o linenoise_example linenoise.o example.o ++ $(CC) $(CFLAGS) $(ARCH) -o linenoise_example linenoise.o example.o .c.o: - $(CC) $(ARCH) -c -Wall -W -Os -g $< -+ $(CC) $(CFLAGS) $(ARCH) -c -g $< ++ $(CC) $(CFLAGS) $(ARCH) -c $< clean: rm -f linenoise_example *.o Index: patches/patch-src_Makefile =================================================================== RCS file: /cvs/ports/databases/redis/patches/patch-src_Makefile,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_Makefile --- patches/patch-src_Makefile 21 Mar 2011 19:58:28 -0000 1.1 +++ patches/patch-src_Makefile 27 Jul 2011 08:06:59 -0000 @@ -1,7 +1,25 @@ $OpenBSD: patch-src_Makefile,v 1.1 2011/03/21 19:58:28 simon Exp $ ---- src/Makefile.orig Fri Mar 4 16:31:20 2011 -+++ src/Makefile Sun Mar 20 18:05:46 2011 -@@ -21,7 +21,7 @@ ifeq ($(USE_TCMALLOC),yes) +--- src/Makefile.orig Fri Jul 22 12:22:26 2011 ++++ src/Makefile Wed Jul 27 09:41:11 2011 +@@ -4,7 +4,7 @@ + + release_hdr := $(shell sh -c './mkreleasehdr.sh') + uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') +-OPTIMIZATION?=-O2 ++# OPTIMIZATION?=-O2 + + CCCOLOR="\033[34m" + LINKCOLOR="\033[34;1m" +@@ -25,7 +25,7 @@ ifeq ($(uname_S),SunOS) + else + CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF) + CCLINK?= -lm -pthread +- DEBUG?= -g -rdynamic -ggdb ++# DEBUG?= -g -rdynamic -ggdb + endif + + ifeq ($(USE_TCMALLOC),yes) +@@ -34,10 +34,14 @@ ifeq ($(USE_TCMALLOC),yes) endif CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF) @@ -10,8 +28,32 @@ $OpenBSD: patch-src_Makefile,v 1.1 2011/ INSTALL_BIN= $(PREFIX)/bin INSTALL= cp -p -@@ -142,7 +142,7 @@ dep: - $(CC) -MM *.c ++ifndef INSTALL_DIR ++ INSTALL_DIR= mkdir -p ++endif ++ + 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 vm.o pubsub.o multi.o debug.o sort.o intset.o syncio.o slowlog.o + BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o + CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o +@@ -124,16 +128,13 @@ zipmap.o: zipmap.c zmalloc.h + zmalloc.o: zmalloc.c config.h zmalloc.h + + dependencies: +- @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)hiredis$(ENDCOLOR) + cd ../deps/hiredis && $(MAKE) static ARCH="$(ARCH)" +- @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)linenoise$(ENDCOLOR) + cd ../deps/linenoise && $(MAKE) ARCH="$(ARCH)" + + redis-server: $(OBJ) + $(QUIET_LINK)$(CC) -o $(PRGNAME) $(CCOPT) $(DEBUG) $(OBJ) + + redis-benchmark: dependencies $(BENCHOBJ) +- @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)hiredis$(ENDCOLOR) + cd ../deps/hiredis && $(MAKE) static ARCH="$(ARCH)" + $(QUIET_LINK)$(CC) -o $(BENCHPRGNAME) $(CCOPT) $(DEBUG) $(BENCHOBJ) ../deps/hiredis/libhiredis.a + +@@ -162,7 +163,7 @@ dep: + $(CC) -MM *.c -I ../deps/hiredis -I ../deps/linenoise test: redis-server - (cd ..; tclsh8.5 tests/test_helper.tcl --tags "${TAGS}" --file "${FILE}") @@ -19,3 +61,12 @@ $OpenBSD: patch-src_Makefile,v 1.1 2011/ bench: ./redis-benchmark +@@ -189,7 +190,7 @@ noopt: + $(MAKE) PROF="-pg" ARCH="-arch i386" + + install: all +- mkdir -p $(INSTALL_BIN) ++ $(INSTALL_DIR) $(INSTALL_BIN) + $(INSTALL) $(PRGNAME) $(INSTALL_BIN) + $(INSTALL) $(BENCHPRGNAME) $(INSTALL_BIN) + $(INSTALL) $(CLIPRGNAME) $(INSTALL_BIN) Index: patches/patch-src_mkreleasehdr_sh =================================================================== RCS file: patches/patch-src_mkreleasehdr_sh diff -N patches/patch-src_mkreleasehdr_sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_mkreleasehdr_sh 27 Jul 2011 08:06:59 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/mkreleasehdr.sh.orig Wed Jul 27 09:33:10 2011 ++++ src/mkreleasehdr.sh Wed Jul 27 09:34:31 2011 +@@ -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 Index: patches/patch-src_redis_c =================================================================== RCS file: /cvs/ports/databases/redis/patches/patch-src_redis_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_redis_c --- patches/patch-src_redis_c 21 Mar 2011 19:58:28 -0000 1.1 +++ patches/patch-src_redis_c 27 Jul 2011 08:06:59 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_redis_c,v 1.1 2011/03/21 19:58:28 simon Exp $ ---- src/redis.c.orig Thu Mar 10 20:32:37 2011 -+++ src/redis.c Thu Mar 10 20:32:47 2011 -@@ -41,6 +41,7 @@ +--- src/redis.c.orig Fri Jul 22 12:22:26 2011 ++++ src/redis.c Wed Jul 27 08:49:12 2011 +@@ -42,6 +42,7 @@ #include <assert.h> #include <ctype.h> #include <stdarg.h>
