- Upgrade to 0.3.1.

- My patches were merged into upstream.
- Fix build on 6.4 by using GCC 4.2+.

6 files changed, 19 insertions, 77 deletions

diff --git a/databases/kumofs/Makefile b/databases/kumofs/Makefile
index 177634703eec..a90dfd33015b 100644
--- a/databases/kumofs/Makefile
+++ b/databases/kumofs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kumofs
-PORTVERSION=	0.3.0
+PORTVERSION=	0.3.1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kuriyama
@@ -23,13 +23,17 @@ WRKSRC=		${WRKDIR}/etolabo-kumofs-${GIT_REVISION}
 USE_AUTOTOOLS=	libtool:22 autoheader:262 autoconf:262 automake:110 aclocal:110
 ACLOCAL_ARGS=	# empty
 AUTOMAKE_ARGS=	--add-missing --copy
-CONFIGURE_ARGS=	--with-msgpack=${LOCALBASE}
+CONFIGURE_ARGS=	--with-msgpack=${LOCALBASE} --with-tokyocabinet=${LOCALBASE}
+USE_GCC=	4.2+
 USE_GMAKE=	yes
 USE_RUBY=	yes
 
-GIT_REVISION=	2a0c402
+GIT_REVISION=	03cb7f8
 
-MAN1=	kumoctl.1 \
+MAN1=	kumo-gateway.1 \
+	kumo-manager.1 \
+	kumo-server.1 \
+	kumoctl.1 \
 	kumohash.1 \
 	kumolog.1 \
 	kumomergedb.1 \
@@ -40,4 +44,10 @@ pre-configure:
 	cd ${WRKSRC}; ${TOUCH} README
 	cd ${WRKSRC}; ${LIBTOOLIZE} --force --copy
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+CONFIGURE_ARGS+=CFLAGS="${CFLAGS} -march=i686" CXXFLAGS="${CXXFLAGS} -march=i686"
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/kumofs/distinfo b/databases/kumofs/distinfo
index bb918c3152f2..3d961fd6772a 100644
--- a/databases/kumofs/distinfo
+++ b/databases/kumofs/distinfo
@@ -1,3 +1,3 @@
-MD5 (kumofs-2a0c402.tar.gz) = 1c28fc033edb95bff48fa7b4b865561a
-SHA256 (kumofs-2a0c402.tar.gz) = dd453c6eb6d0e1b794df368308c588af772960db7c1f450ffae9c27c2e848b21
-SIZE (kumofs-2a0c402.tar.gz) = 158931
+MD5 (kumofs-03cb7f8.tar.gz) = 3bde4ac432a363602501024c2cb901bd
+SHA256 (kumofs-03cb7f8.tar.gz) = 893a5d218ba2dceb06ca2dee2a8531066887c0f7fc16ca2810747ca4332f31bc
+SIZE (kumofs-03cb7f8.tar.gz) = 154913
diff --git a/databases/kumofs/files/patch-framework.cc b/databases/kumofs/files/patch-framework.cc
deleted file mode 100644
index ae6e5fa5722a..000000000000
--- a/databases/kumofs/files/patch-framework.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/logic/manager/framework.cc.orig	2010-01-19 12:35:26.982220174 +0900
-+++ src/logic/manager/framework.cc	2010-01-19 12:35:39.546813770 +0900
-@@ -66,7 +66,7 @@
- 
- void framework::new_node(address addr, role_type id, shared_node n)
- {
--	LOG_WARN("new node ",id," ",addr);
-+	LOG_WARN("new node ",(uint16_t)id," ",addr);
- 	if(id == ROLE_MANAGER) {
- 		if(addr != share->partner()) {
- 			TLOGPACK("eP",3,
diff --git a/databases/kumofs/files/patch-kazuhiki.cc b/databases/kumofs/files/patch-kazuhiki.cc
deleted file mode 100644
index d08ab1844f75..000000000000
--- a/databases/kumofs/files/patch-kazuhiki.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/kazuhiki/kazuhiki.cc.orig	2010-01-18 06:06:16.000000000 +0900
-+++ src/kazuhiki/kazuhiki.cc	2010-01-19 11:56:44.907400335 +0900
-@@ -330,12 +330,16 @@
- 		memset(&hints, 0, sizeof(hints));
- 		hints.ai_family = UseIPv6 ? AF_UNSPEC : AF_INET;
- 		hints.ai_socktype = SOCK_STREAM;  // FIXME
-+#ifdef __FreeBSD__
-+		hints.ai_flags = AI_ADDRCONFIG;
-+#else
- 		hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
-+#endif
- 
- 		addrinfo *res = NULL;
- 		int err;
- 		if( (err=getaddrinfo(host, NULL, &hints, &res)) != 0 ) {
--			parser::raise("can't resolve host name: %s", host);
-+			parser::raise("can't resolve host name (%s): %s", gai_strerror(err), host);
- 		}
- 
- 		for(addrinfo* rp=res; rp; rp = rp->ai_next) {
-@@ -349,7 +353,7 @@
- 			}
- 		}
- 
--		parser::raise("can't resolve host name: %s", host);
-+		parser::raise("can't resolve host name (no suitable family): %s", host);
- 	}
- 
- 	void addr_any(unsigned short port, bool dummy)
diff --git a/databases/kumofs/files/patch-mod_replace_stream.cc b/databases/kumofs/files/patch-mod_replace_stream.cc
deleted file mode 100644
index 6da66956eaa8..000000000000
--- a/databases/kumofs/files/patch-mod_replace_stream.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/logic/server/mod_replace_stream.cc.orig	2010-01-18 23:49:40.347505120 +0900
-+++ src/logic/server/mod_replace_stream.cc	2010-01-18 23:49:59.399149969 +0900
-@@ -277,6 +277,17 @@
- 		size -= rl;
- 	}
- #else
-+#ifdef __FreeBSD__
-+	size_t sent = 0;
-+	while(sent < size) {
-+		size_t len = size - sent;
-+		off_t sbytes = 0;
-+		if(::sendfile(m_fd.get(), sock, sent, len, NULL, &sbytes, 0) < 0) {
-+			throw mp::system_error(errno, "offer send error");
-+		}
-+		sent += sbytes;
-+	}
-+#else
- 	off_t sent = 0;
- 	while(sent < size) {
- 		off_t len = size - sent;
-@@ -286,6 +297,7 @@
- 		sent += len;
- 	}
- #endif
-+#endif
- }
- 
- 
diff --git a/databases/kumofs/pkg-descr b/databases/kumofs/pkg-descr
index dc689a035939..56438832192b 100644
--- a/databases/kumofs/pkg-descr
+++ b/databases/kumofs/pkg-descr
@@ -1,3 +1,3 @@
-kumofs is a scalabe and highly available distributed key-value store.
+kumofs is a scalable and highly available distributed key-value store.
 
 WWW: http://github.com/etolabo/kumofs