SF.net SVN: gar:[22700] csw/mgar/pkg/redis/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22700
          http://sourceforge.net/p/gar/code/22700
Author:   dmichelsen
Date:     2013-12-16 13:10:12 +0000 (Mon, 16 Dec 2013)
Log Message:
-----------
redis/trunk: Update to 2.8.3

Modified Paths:
--------------
    csw/mgar/pkg/redis/trunk/Makefile
    csw/mgar/pkg/redis/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch

Modified: csw/mgar/pkg/redis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/redis/trunk/Makefile	2013-12-16 11:41:04 UTC (rev 22699)
+++ csw/mgar/pkg/redis/trunk/Makefile	2013-12-16 13:10:12 UTC (rev 22700)
@@ -2,23 +2,25 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = redis
-VERSION = 2.6.14
+VERSION = 2.8.3
 
 DESCRIPTION = An advanced key-value store
 
-MASTER_SITES = $(GOOGLE_MIRROR)
-DISTFILES  = $(DISTNAME).tar.gz
+MASTER_SITES = http://download.redis.io/releases/
+DISTFILES += $(DISTNAME).tar.gz
 
 PACKAGES += CSWredis
 SPKG_DESC_CSWredis = An advanced key-value store
 
-#BUILD64 = 1
-#ISAEXEC = 1
+BUILD64 = 1
+ISAEXEC = 1
 
 GARCOMPILER = GNU
 
 PATCHFILES += 0001-Fix-tclsh-finding.patch
 
+PATCHFILES += 0001-Solaris-needs-lrt-for-nanosleep.patch
+
 # These are set in the Makefile and are not inherited when we force our CFLAGS in
 EXTRA_CFLAGS += -std=c99 -pedantic -Wall -W -D__EXTENSIONS__ -D_XPG6
 
@@ -29,13 +31,13 @@
 
 TEST_TARGET = test
 
-# There are three tests failing which are harmless because strings are not compared in the actual program:
-#   Expected 'Infinity' to be equal to 'inf'
-#   https://groups.google.com/forum/#!msg/redis-db/gNtfZ3J-FAU/Ul-P_huFcdMJ
-SKIPTEST ?= 1
+# Some tests fail
+# SKIPTEST ?= 1
 
 INSTALL_OVERRIDE_VARS += PREFIX
 INSTALL_OVERRIDE_VAR_PREFIX = $(DESTDIR)$(prefix)
+INSTALL_OVERRIDE_VARS += INSTALL_BIN
+INSTALL_OVERRIDE_VAR_INSTALL_BIN = $(DESTDIR)$(bindir)
 
 # This is for tail taking -n namely gtail for us
 TEST_ENV_PATH = $(prefix)/gnu:$(PATH)

Modified: csw/mgar/pkg/redis/trunk/checksums
===================================================================
--- csw/mgar/pkg/redis/trunk/checksums	2013-12-16 11:41:04 UTC (rev 22699)
+++ csw/mgar/pkg/redis/trunk/checksums	2013-12-16 13:10:12 UTC (rev 22700)
@@ -1 +1 @@
-02e0c06e953413017ff64862953e2756  redis-2.6.14.tar.gz
+6327e6786130b556b048beef0edbdfa7  redis-2.8.3.tar.gz

Added: csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch
===================================================================
--- csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch	                        (rev 0)
+++ csw/mgar/pkg/redis/trunk/files/0001-Solaris-needs-lrt-for-nanosleep.patch	2013-12-16 13:10:12 UTC (rev 22700)
@@ -0,0 +1,25 @@
+From 754f0d38b843f84f01d3617257f8ec1fe82cf1c7 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 16 Dec 2013 09:37:56 +0100
+Subject: [PATCH] Solaris needs -lrt for nanosleep
+
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index c37549d..eadd6b7 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -57,7 +57,7 @@ DEBUG=-g -ggdb
+ ifeq ($(uname_S),SunOS)
+ 	INSTALL=cp -pf
+ 	FINAL_CFLAGS+= -D__EXTENSIONS__ -D_XPG6
+-	FINAL_LIBS+= -ldl -lnsl -lsocket -lpthread
++	FINAL_LIBS+= -ldl -lnsl -lsocket -lpthread -lrt
+ else ifeq ($(uname_S),Darwin)
+ 	
+ else
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.