svn commit: r307662 - in head/databases: redis-devel/files redis/files

Sergey A. Osokin osa at FreeBSD.org
Thu Nov 22 18:21:13 UTC 2012 

Author: osa
Date: Thu Nov 22 18:21:12 2012
New Revision: 307662
URL: http://svnweb.freebsd.org/changeset/ports/307662

Log:
  Use more canonical names for patches.
  No functionaly changes.
  Don't bump PORTREVISION.
  
  Feature safe: yes

Added:
  head/databases/redis-devel/files/patch-deps-Makefile
     - copied unchanged from r306336, head/databases/redis-devel/files/patch-deps::Makefile
  head/databases/redis-devel/files/patch-deps-hiredis-Makefile
     - copied unchanged from r306336, head/databases/redis-devel/files/patch-deps::hiredis::Makefile
  head/databases/redis-devel/files/patch-src-Makefile
     - copied unchanged from r306336, head/databases/redis-devel/files/patch-src::Makefile
  head/databases/redis-devel/files/patch-src-config.h
     - copied unchanged from r306336, head/databases/redis-devel/files/patch-src::config.h
  head/databases/redis-devel/files/patch-src-mkreleasehdr.sh
     - copied unchanged from r306336, head/databases/redis-devel/files/patch-src::mkreleasehdr.sh
  head/databases/redis/files/patch-deps-Makefile
     - copied unchanged from r306540, head/databases/redis/files/patch-deps::Makefile
  head/databases/redis/files/patch-deps-hiredis-Makefile
     - copied unchanged from r306540, head/databases/redis/files/patch-deps::hiredis::Makefile
  head/databases/redis/files/patch-src-Makefile
     - copied unchanged from r306540, head/databases/redis/files/patch-src::Makefile
  head/databases/redis/files/patch-src-config.h
     - copied unchanged from r306336, head/databases/redis/files/patch-src::config.h
  head/databases/redis/files/patch-src-mkreleasehdr.sh
     - copied unchanged from r306336, head/databases/redis/files/patch-src::mkreleasehdr.sh
Deleted:
  head/databases/redis-devel/files/patch-deps::Makefile
  head/databases/redis-devel/files/patch-deps::hiredis::Makefile
  head/databases/redis-devel/files/patch-src::Makefile
  head/databases/redis-devel/files/patch-src::config.h
  head/databases/redis-devel/files/patch-src::mkreleasehdr.sh
  head/databases/redis/files/patch-deps::Makefile
  head/databases/redis/files/patch-deps::hiredis::Makefile
  head/databases/redis/files/patch-src::Makefile
  head/databases/redis/files/patch-src::config.h
  head/databases/redis/files/patch-src::mkreleasehdr.sh

Copied: head/databases/redis-devel/files/patch-deps-Makefile (from r306336, 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	Thu Nov 22 18:21:12 2012	(r307662, copy of r306336, head/databases/redis-devel/files/patch-deps::Makefile)
@@ -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
+ 

Copied: head/databases/redis-devel/files/patch-deps-hiredis-Makefile (from r306336, 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	Thu Nov 22 18:21:12 2012	(r307662, copy of r306336, head/databases/redis-devel/files/patch-deps::hiredis::Makefile)
@@ -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)

Copied: head/databases/redis-devel/files/patch-src-Makefile (from r306336, 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	Thu Nov 22 18:21:12 2012	(r307662, copy of r306336, head/databases/redis-devel/files/patch-src::Makefile)
@@ -0,0 +1,21 @@
+--- src/Makefile.orig	2012-08-01 14:06:03.000000000 +0400
++++ src/Makefile	2012-08-02 22:24:01.000000000 +0400
+@@ -50,6 +50,9 @@
+   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= $(LDFLAGS)
+ else
+   FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
+   FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -rdynamic -ggdb
+@@ -79,7 +82,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
+ 

Copied: head/databases/redis-devel/files/patch-src-config.h (from r306336, 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	Thu Nov 22 18:21:12 2012	(r307662, copy of r306336, head/databases/redis-devel/files/patch-src::config.h)
@@ -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
+ 

Copied: head/databases/redis-devel/files/patch-src-mkreleasehdr.sh (from r306336, 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	Thu Nov 22 18:21:12 2012	(r307662, copy of r306336, head/databases/redis-devel/files/patch-src::mkreleasehdr.sh)
@@ -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: head/databases/redis/files/patch-deps-Makefile (from r306540, head/databases/redis/files/patch-deps::Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis/files/patch-deps-Makefile	Thu Nov 22 18:21:12 2012	(r307662, copy of r306540, head/databases/redis/files/patch-deps::Makefile)
@@ -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
+ 

Copied: head/databases/redis/files/patch-deps-hiredis-Makefile (from r306540, head/databases/redis/files/patch-deps::hiredis::Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis/files/patch-deps-hiredis-Makefile	Thu Nov 22 18:21:12 2012	(r307662, copy of r306540, head/databases/redis/files/patch-deps::hiredis::Makefile)
@@ -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)

Copied: head/databases/redis/files/patch-src-Makefile (from r306540, head/databases/redis/files/patch-src::Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis/files/patch-src-Makefile	Thu Nov 22 18:21:12 2012	(r307662, copy of r306540, head/databases/redis/files/patch-src::Makefile)
@@ -0,0 +1,21 @@
+--- src/Makefile.orig	2012-08-01 14:06:03.000000000 +0400
++++ src/Makefile	2012-08-02 22:24:01.000000000 +0400
+@@ -50,6 +50,9 @@
+   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= $(LDFLAGS)
+ else
+   FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
+   FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -rdynamic -ggdb
+@@ -79,7 +82,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
+ 

Copied: head/databases/redis/files/patch-src-config.h (from r306336, head/databases/redis/files/patch-src::config.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis/files/patch-src-config.h	Thu Nov 22 18:21:12 2012	(r307662, copy of r306336, head/databases/redis/files/patch-src::config.h)
@@ -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
+ 

Copied: head/databases/redis/files/patch-src-mkreleasehdr.sh (from r306336, head/databases/redis/files/patch-src::mkreleasehdr.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/redis/files/patch-src-mkreleasehdr.sh	Thu Nov 22 18:21:12 2012	(r307662, copy of r306336, head/databases/redis/files/patch-src::mkreleasehdr.sh)
@@ -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

More information about the svn-ports-head mailing list