summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/redis-devel/Makefile2
-rw-r--r--databases/redis-devel/distinfo4
-rw-r--r--databases/redis-devel/files/patch-src-mkreleasehdr.sh8
-rw-r--r--databases/redis/Makefile2
-rw-r--r--databases/redis/distinfo4
-rw-r--r--databases/redis/files/patch-src-mkreleasehdr.sh8
6 files changed, 14 insertions, 14 deletions
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 94057dd75bad..78ad26b2a7a5 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= redis
-DISTVERSION= 2.6.10
+DISTVERSION= 2.6.11
CATEGORIES= databases
MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -devel
diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo
index c561a824c1d3..4ab458675470 100644
--- a/databases/redis-devel/distinfo
+++ b/databases/redis-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redis-2.6.10.tar.gz) = 0b930976830afaad40274107a36f9aae0d8a8fbbdea4e566d20765ee502c2a22
-SIZE (redis-2.6.10.tar.gz) = 991437
+SHA256 (redis-2.6.11.tar.gz) = b0644669849a130659cf8dd48965cf116e4fe64a5bb86a239ea078d7464b6968
+SIZE (redis-2.6.11.tar.gz) = 993744
diff --git a/databases/redis-devel/files/patch-src-mkreleasehdr.sh b/databases/redis-devel/files/patch-src-mkreleasehdr.sh
index 2d818f69198b..41eac24ceca2 100644
--- a/databases/redis-devel/files/patch-src-mkreleasehdr.sh
+++ b/databases/redis-devel/files/patch-src-mkreleasehdr.sh
@@ -1,11 +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
+--- src/mkreleasehdr.sh.orig 2013-03-12 22:27:27.000000000 +0400
++++ src/mkreleasehdr.sh 2013-03-12 22:27:37.000000000 +0400
@@ -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_DIRTY=`git diff --no-ext-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
+ (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already up-to-date
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index bbf6f84e82e6..1727d7f6391b 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= redis
-DISTVERSION= 2.6.10
+DISTVERSION= 2.6.11
CATEGORIES= databases
MASTER_SITES= GOOGLE_CODE
diff --git a/databases/redis/distinfo b/databases/redis/distinfo
index c561a824c1d3..4ab458675470 100644
--- a/databases/redis/distinfo
+++ b/databases/redis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redis-2.6.10.tar.gz) = 0b930976830afaad40274107a36f9aae0d8a8fbbdea4e566d20765ee502c2a22
-SIZE (redis-2.6.10.tar.gz) = 991437
+SHA256 (redis-2.6.11.tar.gz) = b0644669849a130659cf8dd48965cf116e4fe64a5bb86a239ea078d7464b6968
+SIZE (redis-2.6.11.tar.gz) = 993744
diff --git a/databases/redis/files/patch-src-mkreleasehdr.sh b/databases/redis/files/patch-src-mkreleasehdr.sh
index 2d818f69198b..41eac24ceca2 100644
--- a/databases/redis/files/patch-src-mkreleasehdr.sh
+++ b/databases/redis/files/patch-src-mkreleasehdr.sh
@@ -1,11 +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
+--- src/mkreleasehdr.sh.orig 2013-03-12 22:27:27.000000000 +0400
++++ src/mkreleasehdr.sh 2013-03-12 22:27:37.000000000 +0400
@@ -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_DIRTY=`git diff --no-ext-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
+ (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already up-to-date