Update to memcached 1.1.10 from the duplicate net/memcached port.

9 files changed, 20 insertions, 143 deletions

diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 1c3c9ccac47b..55de2f58934f 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	memcached
-PORTVERSION=	1.1.8
+PORTVERSION=	1.1.10
 CATEGORIES=	databases
 MASTER_SITES=	http://www.danga.com/memcached/dist/
 
@@ -15,11 +15,22 @@ COMMENT=	High-performance distributed memory object cache system
 
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
 
-PLIST_FILES=	bin/memcached
 USE_AUTOMAKE=	YES
 WANT_AUTOCONF_VER=	253
 GNU_CONFIGURE=	YES
 
-CONFIGURE_ARGS+=	--with-libevent=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-libevent=${LOCALBASE} --program-prefix=
+
+MAN1=		memcached.1
+
+DOCS_LIST=	memory_management.txt protocol.txt
+
+post-install:
+	${INSTALL_MAN} ${MAN1:S!^!${WRKSRC}/doc/!} ${MAN1PREFIX}/man/man1
+.ifndef(NOPORTDOCS)
+	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
+	${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${DOCS_LIST:S!^!${WRKSRC}/doc/!} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/databases/memcached/distinfo b/databases/memcached/distinfo
index eb72067f61c4..2136ac847f18 100644
--- a/databases/memcached/distinfo
+++ b/databases/memcached/distinfo
@@ -1 +1,2 @@
-MD5 (memcached-1.1.8.tar.gz) = ee7302df1b634beedccae3a97e5d207b
+MD5 (memcached-1.1.10.tar.gz) = 44dff278da83225a092a3ff70602bcbc
+SIZE (memcached-1.1.10.tar.gz) = 98153
diff --git a/databases/memcached/files/patch-Makefile.am b/databases/memcached/files/patch-Makefile.am
deleted file mode 100644
index e582cacda005..000000000000
--- a/databases/memcached/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	Mon Jul 21 23:04:08 2003
-+++ Makefile.am	Mon Jul 21 23:04:18 2003
-@@ -5,6 +5,7 @@
- DIST_SUBDIRS = website api
- EXTRA_DIST = website api
- 
--CFLAGS=-g -O2 -static -DNDEBUG
-+CFLAGS=-g -O2 -static -DNDEBUG @LIBEVENT_CFLAGS@
-+LDFLAGS=@LIBEVENT_LDFLAGS@
- 
- 
diff --git a/databases/memcached/files/patch-assoc.c b/databases/memcached/files/patch-assoc.c
deleted file mode 100644
index f5af4c8c788f..000000000000
--- a/databases/memcached/files/patch-assoc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- assoc.c.orig	Mon Jul 21 22:58:06 2003
-+++ assoc.c	Mon Jul 21 22:58:11 2003
-@@ -28,7 +28,6 @@
- #include <netinet/in.h>
- #include <errno.h>
- #include <event.h>
--#include <malloc.h>
- #include <assert.h>
- 
- #include "memcached.h"
diff --git a/databases/memcached/files/patch-configure.ac b/databases/memcached/files/patch-configure.ac
deleted file mode 100644
index c6e5a7304332..000000000000
--- a/databases/memcached/files/patch-configure.ac
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.ac.orig	Mon Jul 21 23:03:01 2003
-+++ configure.ac	Mon Jul 21 23:03:38 2003
-@@ -20,9 +20,20 @@
- 	AC_MSG_RESULT(yes)
- fi
- 
-+AC_ARG_WITH(libevent,[  --with-libevent=PREFIX  Prefix where libevent is installed], libevent_prefix="$withval", libevent_prefix="")
-+LIBEVENT_LDFLAGS="-L$libevent_prefix/lib"
-+LIBEVENT_CFLAGS="-I$libevent_prefix/include"
-+
-+LDFLAGS="$LIBEVENT_LDFLAGS"
-+CFLAGS="$LIBEVENT_CFLAGS"
-+LDADD="$LIBEVENT_LDFLAGS"
-+
- LIBEVENT_URL=http://www.monkey.org/~provos/libevent/
- AC_CHECK_LIB(event, event_set, ,
- 	[AC_MSG_ERROR(libevent is required.  You can get it from $LIBEVENT_URL)])
-+
-+AC_SUBST(LIBEVENT_LDFLAGS)
-+AC_SUBST(LIBEVENT_CFLAGS)
- 
- AC_CONFIG_FILES(Makefile)
- AC_OUTPUT
diff --git a/databases/memcached/files/patch-items.c b/databases/memcached/files/patch-items.c
deleted file mode 100644
index dda854c3a145..000000000000
--- a/databases/memcached/files/patch-items.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- items.c.orig	Thu Aug 21 11:05:52 2003
-+++ items.c	Thu Aug 21 11:05:56 2003
-@@ -17,7 +17,6 @@
- #include <errno.h>
- #include <time.h>
- #include <event.h>
--#include <malloc.h>
- #include <assert.h>
- 
- #include "memcached.h"
diff --git a/databases/memcached/files/patch-memcached.c b/databases/memcached/files/patch-memcached.c
deleted file mode 100644
index 8dae062a879c..000000000000
--- a/databases/memcached/files/patch-memcached.c
+++ /dev/null
@@ -1,75 +0,0 @@
---- memcached.c.orig	Tue Jul 29 22:43:57 2003
-+++ memcached.c	Thu Aug 21 11:18:45 2003
-@@ -34,7 +34,6 @@
- #include <errno.h>
- #include <time.h>
- #include <event.h>
--#include <malloc.h>
- #include <assert.h>
- 
- #include "memcached.h"
-@@ -314,26 +313,6 @@
-         return;
-     }
- 
--    if (strcmp(command, "stats malloc") == 0) {
--        char temp[512];
--        struct mallinfo info;
--        char *pos = temp;
--
--        info = mallinfo();
--        pos += sprintf(pos, "STAT arena_size %d\r\n", info.arena);
--        pos += sprintf(pos, "STAT free_chunks %d\r\n", info.ordblks);
--        pos += sprintf(pos, "STAT fastbin_blocks %d\r\n", info.smblks);
--        pos += sprintf(pos, "STAT mmapped_regions %d\r\n", info.hblks);
--        pos += sprintf(pos, "STAT mmapped_space %d\r\n", info.hblkhd);
--        pos += sprintf(pos, "STAT max_total_alloc %d\r\n", info.usmblks);
--        pos += sprintf(pos, "STAT fastbin_space %d\r\n", info.fsmblks);
--        pos += sprintf(pos, "STAT total_alloc %d\r\n", info.uordblks);
--        pos += sprintf(pos, "STAT total_free %d\r\n", info.fordblks);
--        pos += sprintf(pos, "STAT releasable_space %d\r\nEND", info.keepcost);
--        out_string(c, temp);
--        return;
--    }
--
-     if (strcmp(command, "stats maps") == 0) {
-         char *wbuf;
-         int wsize = 8192; /* should be enough */
-@@ -1114,7 +1093,6 @@
-     printf("-d            run as a daemon\n");
-     printf("-m <num>      max memory to use for items in megabytes, default is 64 MB\n");
-     printf("-c <num>      max simultaneous connections, default is 1024\n");
--    printf("-k            lock down all paged memory\n");
-     printf("-v            verbose (print errors/warnings while in event loop)\n");
-     printf("-h            print this help and exit\n");
-     printf("-i            print memcached and libevent license\n");
-@@ -1198,7 +1176,6 @@
-     int c;
-     conn *l_conn;
-     struct in_addr addr;
--    int lock_memory = 0;
-     int daemonize = 0;
- 
-     /* init settings */
-@@ -1222,9 +1199,6 @@
-         case 'i':
-             usage_license();
-             exit(0);
--        case 'k':
--            lock_memory = 1;
--            break;
-         case 'v':
-             settings.verbose = 1;
-             break;
-@@ -1261,11 +1235,6 @@
-             fprintf(stderr, "failed to daemon() in order to daemonize\n");
-             return 1;
-         }
--    }
--
--    /* lock paged memory if needed */
--    if (lock_memory) {
--        mlockall(MCL_CURRENT | MCL_FUTURE);
-     }
- 
-     /* create the listening socket and bind it */
diff --git a/databases/memcached/files/patch-slabs.c b/databases/memcached/files/patch-slabs.c
deleted file mode 100644
index 3b6f6bf15c64..000000000000
--- a/databases/memcached/files/patch-slabs.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- slabs.c.orig	Mon Jul 21 23:08:11 2003
-+++ slabs.c	Mon Jul 21 23:08:18 2003
-@@ -20,7 +20,6 @@
- #include <netinet/in.h>
- #include <errno.h>
- #include <event.h>
--#include <malloc.h>
- #include <assert.h>
- 
- #include "memcached.h"
diff --git a/databases/memcached/pkg-plist b/databases/memcached/pkg-plist
new file mode 100644
index 000000000000..bd06b67299d6
--- /dev/null
+++ b/databases/memcached/pkg-plist
@@ -0,0 +1,4 @@
+bin/memcached
+%%PORTDOCS%%%%DOCSDIR%%/memory_management.txt
+%%PORTDOCS%%%%DOCSDIR%%/protocol.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%