Updated to release 1.4.4.

Release notes:

http://code.google.com/p/memcached/wiki/ReleaseNotes144

Reviewed by <joerg>

8 files changed, 143 insertions, 79 deletions

diff --git a/devel/memcached/Makefile b/devel/memcached/Makefile
index 427404718b6..d661810cdcd 100644
--- a/devel/memcached/Makefile
+++ b/devel/memcached/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.21 2009/08/16 15:35:43 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/02/27 20:40:52 morr Exp $
 #
 
-DISTNAME=	memcached-1.2.8
-# PKGREVISION=	4
-PKGREVISION=	1
+DISTNAME=	memcached-1.4.4
 CATEGORIES=	devel
-MASTER_SITES=	http://www.danga.com/memcached/dist/
+MASTER_SITES=	http://memcached.googlecode.com/files/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.danga.com/memcached/
+HOMEPAGE=	http://www.memcached.org/
 COMMENT=	High-performance distributed memory object caching system
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -16,17 +14,24 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_TOOLS+=	perl
 GNU_CONFIGURE=	yes
 
-REPLACE_PERL=	scripts/memcached-tool
+REPLACE_PERL=		scripts/memcached-tool
 
 CONFIGURE_ARGS+=	--with-libevent=${BUILDLINK_PREFIX.libevent}
 
-INSTALLATION_DIRS=	bin share/doc/${PKGBASE} ${PKGMANDIR}/man1 sbin
+RCD_SCRIPTS=		memcached
+INSTALLATION_DIRS=	share/doc/${PKGBASE} share/examples/rc.d
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/memcached ${DESTDIR}${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/doc/memcached.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+MEMCACHED_USER?=	memcached
+MEMCACHED_GROUP?=	memcached
+PKG_GROUPS=		${MEMCACHED_GROUP}
+PKG_USERS=		${MEMCACHED_USER}:${MEMCACHED_GROUP}
+PKG_GROUPS_VARS+=	MEMCACHED_GROUP
+PKG_USERS_VARS+=	MEMCACHED_USER
+FILES_SUBST+=		MEMCACHED_USER=${MEMCACHED_USER:Q}
+
+post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${DESTDIR}${PREFIX}/bin
 
 .include "../../devel/libevent/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=1.0
diff --git a/devel/memcached/PLIST b/devel/memcached/PLIST
index beed871483d..c4736d0c5e5 100644
--- a/devel/memcached/PLIST
+++ b/devel/memcached/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:48:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/02/27 20:40:52 morr Exp $
+bin/memcached
+bin/memcached-tool
+include/memcached/protocol_binary.h
 man/man1/memcached.1
-sbin/memcached
-sbin/memcached-tool
-share/doc/memcached/binary-protocol-plan.txt
-share/doc/memcached/memory_management.txt
 share/doc/memcached/protocol.txt
+share/doc/memcached/readme.txt
 share/doc/memcached/threads.txt
+share/examples/rc.d/memcached
diff --git a/devel/memcached/distinfo b/devel/memcached/distinfo
index 93a65e817b0..a21dec50cb6 100644
--- a/devel/memcached/distinfo
+++ b/devel/memcached/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.8 2009/04/15 09:07:15 mjl Exp $
+$NetBSD: distinfo,v 1.9 2010/02/27 20:40:52 morr Exp $
 
-SHA1 (memcached-1.2.8.tar.gz) = 6f99414f37cc5b1a6866d9b3ec9254c2ebda237a
-RMD160 (memcached-1.2.8.tar.gz) = 8866865f57b6914fca98f3cf5ae0942f7e94ba00
-Size (memcached-1.2.8.tar.gz) = 221285 bytes
-SHA1 (patch-aa) = 70b649a987f48a1811014ad92c7cc61299d7d6fe
-SHA1 (patch-ac) = c2a057b617f23ed2fc681dcd7b9072e62a5ae039
-SHA1 (patch-ad) = d9cf95fda0d81c95e797b37c4e9211adc6d5a15d
+SHA1 (memcached-1.4.4.tar.gz) = 32a4f2cee9e1c0f4d7a247844714756e3affe96a
+RMD160 (memcached-1.4.4.tar.gz) = 9d10ce383684bf94f4c169471e1ca49d271653ad
+Size (memcached-1.4.4.tar.gz) = 297920 bytes
+SHA1 (patch-aa) = 33959beb6857a4c0117a6a428d950c4888a197e5
+SHA1 (patch-ab) = de936862c0de76712a577896399f6ab588232890
diff --git a/devel/memcached/files/memcached.sh b/devel/memcached/files/memcached.sh
new file mode 100644
index 00000000000..de0cf163ea8
--- /dev/null
+++ b/devel/memcached/files/memcached.sh
@@ -0,0 +1,17 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: memcached.sh,v 1.1 2010/02/27 20:40:52 morr Exp $
+#
+
+# PROVIDE: memcached
+# REQUIRE: DAEMON
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="memcached"
+rcvar=$name
+command="@PREFIX@/bin/${name}"
+command_args="-d -u @MEMCACHED_USER@"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/devel/memcached/patches/patch-aa b/devel/memcached/patches/patch-aa
index 0e5ae4fdbb2..49b0e49b624 100644
--- a/devel/memcached/patches/patch-aa
+++ b/devel/memcached/patches/patch-aa
@@ -1,12 +1,53 @@
-$NetBSD: patch-aa,v 1.3 2007/08/20 17:02:41 abs Exp $
+$NetBSD: patch-aa,v 1.4 2010/02/27 20:40:52 morr Exp $
 
---- memcached.c.orig	2007-08-20 16:54:17.000000000 +0100
-+++ memcached.c
-@@ -45,6 +45,7 @@ std *
- #include <time.h>
- #include <assert.h>
- #include <limits.h>
-+#include <signal.h>
+Make it compile on NetBSD and Solaris. Patch taken from memcached git.
+
+--- util.c.orig	2009-10-23 20:38:01.000000000 +0000
++++ util.c
+@@ -8,6 +8,10 @@
+ 
+ #include "memcached.h"
+ 
++/* Avoid warnings on solaris, where isspace() is an index into an array,
++ * and gcc uses signed chars */
++#define xisspace(c) isspace((unsigned char)c)
++
+ bool safe_strtoull(const char *str, uint64_t *out) {
+     assert(out != NULL);
+     errno = 0;
+@@ -16,7 +20,7 @@ bool safe_strtoull(const char *str, uint
+     unsigned long long ull = strtoull(str, &endptr, 10);
+     if (errno == ERANGE)
+         return false;
+-    if (isspace(*endptr) || (*endptr == '\0' && endptr != str)) {
++    if (xisspace(*endptr) || (*endptr == '\0' && endptr != str)) {
+         if ((long long) ull < 0) {
+             /* only check for negative signs in the uncommon case when
+              * the unsigned number is so big that it's negative as a
+@@ -39,7 +43,7 @@ bool safe_strtoll(const char *str, int64
+     long long ll = strtoll(str, &endptr, 10);
+     if (errno == ERANGE)
+         return false;
+-    if (isspace(*endptr) || (*endptr == '\0' && endptr != str)) {
++    if (xisspace(*endptr) || (*endptr == '\0' && endptr != str)) {
+         *out = ll;
+         return true;
+     }
+@@ -59,7 +63,7 @@ bool safe_strtoul(const char *str, uint3
+         return false;
+     }
  
- #ifdef HAVE_MALLOC_H
- /* OpenBSD has a malloc.h, but warns to use stdlib.h instead */
+-    if (isspace(*endptr) || (*endptr == '\0' && endptr != str)) {
++    if (xisspace(*endptr) || (*endptr == '\0' && endptr != str)) {
+         if ((long) l < 0) {
+             /* only check for negative signs in the uncommon case when
+              * the unsigned number is so big that it's negative as a
+@@ -83,7 +87,7 @@ bool safe_strtol(const char *str, int32_
+     long l = strtol(str, &endptr, 10);
+     if (errno == ERANGE)
+         return false;
+-    if (isspace(*endptr) || (*endptr == '\0' && endptr != str)) {
++    if (xisspace(*endptr) || (*endptr == '\0' && endptr != str)) {
+         *out = l;
+         return true;
+     }
diff --git a/devel/memcached/patches/patch-ab b/devel/memcached/patches/patch-ab
new file mode 100644
index 00000000000..7107de7f5aa
--- /dev/null
+++ b/devel/memcached/patches/patch-ab
@@ -0,0 +1,46 @@
+$NetBSD: patch-ab,v 1.6 2010/02/27 20:40:52 morr Exp $
+
+time_t changes
+
+--- items.c.orig	2009-10-23 20:38:01.000000000 +0000
++++ items.c
+@@ -366,9 +366,9 @@ char *do_item_cachedump(const unsigned i
+         /* Copy the key since it may not be null-terminated in the struct */
+         strncpy(key_temp, ITEM_key(it), it->nkey);
+         key_temp[it->nkey] = 0x00; /* terminate */
+-        len = snprintf(temp, sizeof(temp), "ITEM %s [%d b; %lu s]\r\n",
++        len = snprintf(temp, sizeof(temp), "ITEM %s [%d b; %jd s]\r\n",
+                        key_temp, it->nbytes - 2,
+-                       (unsigned long)it->exptime + process_started);
++                       (intmax_t)it->exptime + process_started);
+         if (bufcurr + len + 6 > memlimit)  /* 6 is END\r\n\0 */
+             break;
+         memcpy(buffer + bufcurr, temp, len);
+@@ -394,13 +394,13 @@ void do_item_stats(ADD_STAT add_stats, v
+             int klen = 0, vlen = 0;
+ 
+             APPEND_NUM_FMT_STAT(fmt, i, "number", "%u", sizes[i]);
+-            APPEND_NUM_FMT_STAT(fmt, i, "age", "%u", tails[i]->time);
++            APPEND_NUM_FMT_STAT(fmt, i, "age", "%jd", tails[i]->time);
+             APPEND_NUM_FMT_STAT(fmt, i, "evicted",
+                                 "%u", itemstats[i].evicted);
+             APPEND_NUM_FMT_STAT(fmt, i, "evicted_nonzero",
+                                 "%u", itemstats[i].evicted_nonzero);
+             APPEND_NUM_FMT_STAT(fmt, i, "evicted_time",
+-                                "%u", itemstats[i].evicted_time);
++                                "%jd", itemstats[i].evicted_time);
+             APPEND_NUM_FMT_STAT(fmt, i, "outofmemory",
+                                 "%u", itemstats[i].outofmemory);
+             APPEND_NUM_FMT_STAT(fmt, i, "tailrepairs",
+
+--- memcached.h.orig	2009-11-26 00:37:49.000000000 +0000
++++ memcached.h
+@@ -191,7 +191,7 @@ enum delta_result_type {
+ };
+ 
+ /** Time relative to server start. Smaller than time_t on 64-bit systems. */
+-typedef unsigned int rel_time_t;
++typedef intmax_t rel_time_t;
+ 
+ /** Stats stored per slab (and per thread). */
+ struct slab_stats {
diff --git a/devel/memcached/patches/patch-ac b/devel/memcached/patches/patch-ac
deleted file mode 100644
index 9de1108f8e3..00000000000
--- a/devel/memcached/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/04/15 09:07:15 mjl Exp $
-
---- configure.orig	2009-04-15 10:39:37.000000000 +0200
-+++ configure	2009-04-15 10:39:59.000000000 +0200
-@@ -3807,7 +3807,7 @@
-   enableval=$enable_dtrace;
- fi
- 
--if test "x$enable_dtrace" == "xyes"; then
-+if test "x$enable_dtrace" = "xyes"; then
-   # Extract the first word of "dtrace", so it can be a program name with args.
- set dummy dtrace; ac_word=$2
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -3880,7 +3880,7 @@
-   enableval=$enable_64bit;
- fi
- 
--if test "x$enable_64bit" == "xyes"
-+if test "x$enable_64bit" = "xyes"
- then
-     org_cflags=$CFLAGS
-     CFLAGS=-m64
-@@ -5842,7 +5842,7 @@
-   enableval=$enable_threads;
- fi
- 
--if test "x$enable_threads" == "xyes"; then
-+if test "x$enable_threads" = "xyes"; then
-   { $as_echo "$as_me:$LINENO: checking for library containing pthread_create" >&5
- $as_echo_n "checking for library containing pthread_create... " >&6; }
- if test "${ac_cv_search_pthread_create+set}" = set; then
diff --git a/devel/memcached/patches/patch-ad b/devel/memcached/patches/patch-ad
deleted file mode 100644
index a79bd1b5e1b..00000000000
--- a/devel/memcached/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/04/15 09:07:15 mjl Exp $
-
-Note: Patch from FreeBSD memcached port
-
---- thread.c.orig	2009-01-27 00:34:19.000000000 -0200
-+++ thread.c	2009-01-27 00:34:04.000000000 -0200
-@@ -644,6 +644,7 @@
-         perror("Can't allocate thread descriptors");
-         exit(1);
-     }
-+    memset(threads, 0, sizeof(LIBEVENT_THREAD) * nthreads);
- 
-     threads[0].base = main_base;
-     threads[0].thread_id = pthread_self();