From 86010984da313e477655654700f507c89a53a561 Mon Sep 17 00:00:00 2001
From: Sergey Skvortsov <skv@FreeBSD.org>
Date: Thu, 30 Nov 2006 13:32:15 +0000
Subject: [PATCH] Update to 1.2.0

Changes:	http://code.sixapart.com/svn/memcached/tags/1.2.0/ChangeLog
PR:		ports/103523
Submitted by:	skv
Approved by:	maintainer timeout (68 days)
---
 databases/memcached/Makefile                |  6 ++++--
 databases/memcached/distinfo                |  6 +++---
 databases/memcached/files/patch-memcached.c | 22 ++++++++++-----------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 20e69d0598fd..fb8525c0aff4 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	memcached
-PORTVERSION=	1.1.12
-PORTREVISION=	3
+PORTVERSION=	1.2.0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.danga.com/memcached/dist/ \
 		${MASTER_SITE_GENTOO}
@@ -42,4 +41,7 @@ post-install:
 .endfor
 .endif
 
+test:
+	${MAKE} -C ${WRKSRC} test
+
 .include <bsd.port.mk>
diff --git a/databases/memcached/distinfo b/databases/memcached/distinfo
index a7955ee7ef39..244b89d905e5 100644
--- a/databases/memcached/distinfo
+++ b/databases/memcached/distinfo
@@ -1,3 +1,3 @@
-MD5 (memcached-1.1.12.tar.gz) = a1236dad33e9ac6c36d53faa8da61780
-SHA256 (memcached-1.1.12.tar.gz) = 6a8e63b02d8576a937dc154232357dbb9c236890be53e9ce0d44e2dba21ca79a
-SIZE (memcached-1.1.12.tar.gz) = 114103
+MD5 (memcached-1.2.0.tar.gz) = 6555a7b13b2c4ffa231b6043d13cc5ef
+SHA256 (memcached-1.2.0.tar.gz) = cadb9fb565c8d5695fcec7381094d47215c8c9956a677d5af0b259e0284e5aa7
+SIZE (memcached-1.2.0.tar.gz) = 143082
diff --git a/databases/memcached/files/patch-memcached.c b/databases/memcached/files/patch-memcached.c
index 92e71ec748ac..04683b54adbd 100644
--- a/databases/memcached/files/patch-memcached.c
+++ b/databases/memcached/files/patch-memcached.c
@@ -1,12 +1,12 @@
---- memcached.c.orig	Mon Jul  3 13:04:31 2006
-+++ memcached.c	Mon Jul  3 13:04:40 2006
-@@ -1146,9 +1146,7 @@
-     setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
-     setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, &flags, sizeof(flags));
-     setsockopt(sfd, SOL_SOCKET, SO_LINGER, &ling, sizeof(ling));
--#if !defined(TCP_NOPUSH)
-     setsockopt(sfd, IPPROTO_TCP, TCP_NODELAY, &flags, sizeof(flags));
--#endif
+--- memcached.c.orig	Sat Sep  9 21:10:21 2006
++++ memcached.c	Sat Sep 23 21:33:25 2006
+@@ -1706,7 +1706,9 @@
+     } else {
+         setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, &flags, sizeof(flags));
+         setsockopt(sfd, SOL_SOCKET, SO_LINGER, &ling, sizeof(ling));
++#if !defined(TCP_NOPUSH)
+         setsockopt(sfd, IPPROTO_TCP, TCP_NODELAY, &flags, sizeof(flags));
++#endif
+     }
  
-     /* 
-      * the memset call clears nonstandard fields in some impementations
+     /*