From 148a5509d0790926b43cf038767149f17656a89b Mon Sep 17 00:00:00 2001
From: Stephen Walker <stephendwalker@gmail.com>
Date: Thu, 19 Jan 2012 00:46:53 +0000
Subject: [PATCH] memcached: update to 1.4.11 (#10804), add missing libpthread
 dependency, use PKG_INSTALL, refresh patches

SVN-Revision: 29784
---
 net/memcached/Makefile                      | 20 +++++++++++---------
 net/memcached/patches/100-fix_iov_max.patch |  6 +++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/net/memcached/Makefile b/net/memcached/Makefile
index 5ba9223c1..93f111d94 100644
--- a/net/memcached/Makefile
+++ b/net/memcached/Makefile
@@ -1,6 +1,6 @@
 #
-# Copyright (C) 2009-2011 OpenWrt.org
-# Copyright (C) 2009-2010 Thomas Heil <heil@terminal-consulting.de>
+# Copyright (C) 2009-2012 OpenWrt.org
+# Copyright (C) 2009-2012 Thomas Heil <heil@terminal-consulting.de>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,19 +9,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=memcached
-PKG_VERSION:=1.4.7
+PKG_VERSION:=1.4.11
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://memcached.googlecode.com/files
-PKG_MD5SUM:=cf0becfa65753c3b5a1fc8f84861bb23
+PKG_MD5SUM:=50ee313639531d4d2f8eb9c688f58948
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/memcached
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libevent
+  DEPENDS:=+libevent +libpthread
   TITLE:=The high-performance, distributed memory object caching system
   MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
   URL:=http://memcached.org/
@@ -44,15 +46,15 @@ endif
 CONFIGURE_ARGS += \
 	--disable-docs \
 	--disable-dtrace \
-	--disable-coverage  \
+	--disable-coverage \
 	--disable-sasl
 
-TARGET_CFLAGS+= \
-    -std=gnu99
+TARGET_CFLAGS += \
+	-std=gnu99
 
 define Package/memcached/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/memcached $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/memcached $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) ./files/memcached.config $(1)/etc/config/memcached
 	$(INSTALL_DIR) $(1)/etc/init.d
diff --git a/net/memcached/patches/100-fix_iov_max.patch b/net/memcached/patches/100-fix_iov_max.patch
index 086096e2c..1a5da94b0 100644
--- a/net/memcached/patches/100-fix_iov_max.patch
+++ b/net/memcached/patches/100-fix_iov_max.patch
@@ -1,8 +1,8 @@
 --- a/memcached.c
 +++ b/memcached.c
-@@ -15,6 +15,10 @@
- std *
-  *  $Id$
+@@ -13,6 +13,10 @@
+  *      Anatoly Vorobey <mellon@pobox.com>
+  *      Brad Fitzpatrick <brad@danga.com>
   */
 +#ifndef __need_IOV_MAX
 +#define __need_IOV_MAX
-- 
2.30.2