diff options
Diffstat (limited to 'devel/memcached')
-rw-r--r-- | devel/memcached/Makefile | 5 | ||||
-rw-r--r-- | devel/memcached/PLIST | 5 | ||||
-rw-r--r-- | devel/memcached/distinfo | 12 | ||||
-rw-r--r-- | devel/memcached/patches/patch-aa | 8 | ||||
-rw-r--r-- | devel/memcached/patches/patch-ab | 18 |
5 files changed, 20 insertions, 28 deletions
diff --git a/devel/memcached/Makefile b/devel/memcached/Makefile index e8c525e285b..8be9459d416 100644 --- a/devel/memcached/Makefile +++ b/devel/memcached/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2007/08/16 09:27:04 tnn Exp $ +# $NetBSD: Makefile,v 1.12 2007/08/20 17:02:40 abs Exp $ # -DISTNAME= memcached-1.2.1 -PKGREVISION= 2 +DISTNAME= memcached-1.2.2 CATEGORIES= devel MASTER_SITES= http://www.danga.com/memcached/dist/ diff --git a/devel/memcached/PLIST b/devel/memcached/PLIST index 65f633256a7..93190e8ddb0 100644 --- a/devel/memcached/PLIST +++ b/devel/memcached/PLIST @@ -1,8 +1,7 @@ -@comment $NetBSD: PLIST,v 1.2 2007/02/27 11:30:49 grant Exp $ +@comment $NetBSD: PLIST,v 1.3 2007/08/20 17:02:40 abs Exp $ man/man1/memcached.1 sbin/memcached -share/doc/memcached/CONTRIBUTORS.txt -share/doc/memcached/OSX.txt share/doc/memcached/memory_management.txt share/doc/memcached/protocol.txt +share/doc/memcached/threads.txt @dirrm share/doc/memcached diff --git a/devel/memcached/distinfo b/devel/memcached/distinfo index 40b45b674b9..ba7f5bf4b98 100644 --- a/devel/memcached/distinfo +++ b/devel/memcached/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2007/03/02 11:20:09 grant Exp $ +$NetBSD: distinfo,v 1.6 2007/08/20 17:02:40 abs Exp $ -SHA1 (memcached-1.2.1.tar.gz) = 07ce5441874c052d28484070438822eedd7cc8ec -RMD160 (memcached-1.2.1.tar.gz) = 0b275591af74440f3de22946fb7ccc658f6578af -Size (memcached-1.2.1.tar.gz) = 148755 bytes -SHA1 (patch-aa) = 0420acd9ba1a90cd32896f3864b53c31528191cf -SHA1 (patch-ab) = 35db483c34debc3a468b7009ddb093c4cf5532d7 +SHA1 (memcached-1.2.2.tar.gz) = b2160f63ffe6e50681b3dd13a192153130897366 +RMD160 (memcached-1.2.2.tar.gz) = 78dd094efb9b17a5e80a631690b929b3a4427854 +Size (memcached-1.2.2.tar.gz) = 166201 bytes +SHA1 (patch-aa) = 70b649a987f48a1811014ad92c7cc61299d7d6fe +SHA1 (patch-ab) = 0b899c6b261f8a9943b65e8190daab1b14be8e8a diff --git a/devel/memcached/patches/patch-aa b/devel/memcached/patches/patch-aa index c0c8c0f0332..0e5ae4fdbb2 100644 --- a/devel/memcached/patches/patch-aa +++ b/devel/memcached/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.2 2007/02/27 11:29:19 grant Exp $ +$NetBSD: patch-aa,v 1.3 2007/08/20 17:02:41 abs Exp $ ---- memcached.c.orig 2006-12-05 20:34:10.000000000 +1100 +--- memcached.c.orig 2007-08-20 16:54:17.000000000 +0100 +++ memcached.c -@@ -49,6 +49,7 @@ - #include <event.h> +@@ -45,6 +45,7 @@ std * + #include <time.h> #include <assert.h> #include <limits.h> +#include <signal.h> diff --git a/devel/memcached/patches/patch-ab b/devel/memcached/patches/patch-ab index 96447f6193c..5d7f48290ff 100644 --- a/devel/memcached/patches/patch-ab +++ b/devel/memcached/patches/patch-ab @@ -1,19 +1,13 @@ -$NetBSD: patch-ab,v 1.2 2007/03/02 11:20:10 grant Exp $ +$NetBSD: patch-ab,v 1.3 2007/08/20 17:02:41 abs Exp $ ---- memcached.h.orig 2006-12-05 20:34:10.000000000 +1100 +--- memcached.h.orig 2007-08-20 16:55:11.000000000 +0100 +++ memcached.h -@@ -76,7 +76,7 @@ typedef struct _stritem { - unsigned char it_flags; /* ITEM_* above */ - unsigned char slabs_clsid;/* which slab class we're in */ - unsigned char nkey; /* key length, w/terminating null and padding */ +@@ -102,7 +102,7 @@ typedef struct _stritem { + uint8_t it_flags; /* ITEM_* above */ + uint8_t slabs_clsid;/* which slab class we're in */ + uint8_t nkey; /* key length, w/terminating null and padding */ - void * end[0]; + void * end[]; /* then null-terminated key */ /* then " flags length\r\n" (no terminating null) */ /* then data with terminating \r\n (no terminating null; it's binary!) */ -@@ -282,3 +282,5 @@ void item_flush_expired(void); - void set_current_time (); /* update the global variable holding - global 32-bit seconds-since-start time - (to avoid 64 bit time_t) */ -+ -+extern int daemon(int, int); |