svn commit: r301868 - in head/databases/redis-devel: . files
Sergey A. Osokin
osa at FreeBSD.org
Thu Aug 2 19:07:28 UTC 2012
Author: osa
Date: Thu Aug 2 19:07:27 2012
New Revision: 301868
URL: http://svn.freebsd.org/changeset/ports/301868
Log:
Update from 2.6.0-rc5 to 2.6.0-rc6.
Modified:
head/databases/redis-devel/Makefile
head/databases/redis-devel/distinfo
head/databases/redis-devel/files/patch-src::Makefile
Modified: head/databases/redis-devel/Makefile
==============================================================================
--- head/databases/redis-devel/Makefile Thu Aug 2 18:20:11 2012 (r301867)
+++ head/databases/redis-devel/Makefile Thu Aug 2 19:07:27 2012 (r301868)
@@ -6,7 +6,7 @@
#
PORTNAME= redis
-DISTVERSION= 2.6.0-rc5
+DISTVERSION= 2.6.0-rc6
CATEGORIES= databases
MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -devel
@@ -14,9 +14,10 @@ PKGNAMESUFFIX= -devel
MAINTAINER= osa at FreeBSD.org
COMMENT= A persistent key-value database with built-in net interface
-LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo
CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lm -lexecinfo
CONFLICTS?= redis-2.4.*
Modified: head/databases/redis-devel/distinfo
==============================================================================
--- head/databases/redis-devel/distinfo Thu Aug 2 18:20:11 2012 (r301867)
+++ head/databases/redis-devel/distinfo Thu Aug 2 19:07:27 2012 (r301868)
@@ -1,2 +1,2 @@
-SHA256 (redis-2.6.0-rc5.tar.gz) = f6252f13d1e0542a7f3797ff9da517c0dea6855b74490ddc625ca288c8473e9f
-SIZE (redis-2.6.0-rc5.tar.gz) = 965683
+SHA256 (redis-2.6.0-rc6.tar.gz) = 0bc49799cc644bd849ca2a85d073fda6fd5e29a469969213a912e1e227000961
+SIZE (redis-2.6.0-rc6.tar.gz) = 967845
Modified: head/databases/redis-devel/files/patch-src::Makefile
==============================================================================
--- head/databases/redis-devel/files/patch-src::Makefile Thu Aug 2 18:20:11 2012 (r301867)
+++ head/databases/redis-devel/files/patch-src::Makefile Thu Aug 2 19:07:27 2012 (r301868)
@@ -1,26 +1,16 @@
---- 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 @@
+--- 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= -pthread -L$(PREFIX)/lib
-+ FINAL_LIBS= -lm -lexecinfo
++ FINAL_LDFLAGS= $(LDFLAGS)
else
FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -rdynamic -ggdb
-@@ -79,7 +83,7 @@
+@@ -79,7 +82,7 @@
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
More information about the svn-ports-all
mailing list