Update to 0.6.3

8 files changed, 58 insertions, 20 deletions

diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index a3857bb3f701..419dd2ee594b 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gnunet
-PORTVERSION=	0.6.2b
+PORTVERSION=	0.6.3
 CATEGORIES=	net
 MASTER_SITES=	http://www.ovmj.org/GNUnet/download/ \
 		${MASTER_SITE_GNU}
@@ -78,7 +78,7 @@ MAN1=		gnunet-chat.1 gnunet-check.1 gnunet-convert.1 \
 		gnunet-peer-info.1 gnunet-pseudonym.1 \
 		gnunet-search.1 gnunet-stats.1 gnunet-tbench.1 \
 		gnunet-testbed.1 gnunet-tracekit.1 gnunet-transport-check.1 \
-		gnunetd.1
+		gnunet-update.1 gnunetd.1
 MAN5=		gnunet.conf.5
 
 pre-everything::
diff --git a/net-p2p/gnunet/distinfo b/net-p2p/gnunet/distinfo
index 457721d576f3..ad7647762410 100644
--- a/net-p2p/gnunet/distinfo
+++ b/net-p2p/gnunet/distinfo
@@ -1,2 +1,2 @@
-MD5 (GNUnet-0.6.2b.tar.bz2) = c3c8dcc940d3fdf35c0f606624362938
-SIZE (GNUnet-0.6.2b.tar.bz2) = 980714
+MD5 (GNUnet-0.6.3.tar.bz2) = b6de80fe927c4c7956f5fcfd9a1b19b7
+SIZE (GNUnet-0.6.3.tar.bz2) = 1021581
diff --git a/net-p2p/gnunet/files/patch-configure b/net-p2p/gnunet/files/patch-configure
index 1199b62c9db9..5934b64bc7d0 100644
--- a/net-p2p/gnunet/files/patch-configure
+++ b/net-p2p/gnunet/files/patch-configure
@@ -1,12 +1,15 @@
---- configure.orig	Wed Aug 27 15:47:59 2003
-+++ configure	Wed Aug 27 15:55:40 2003
-@@ -13748,8 +13748,8 @@
+
+$FreeBSD$
+
+--- configure.orig	Mon Aug  2 20:01:59 2004
++++ configure	Mon Aug  2 20:02:55 2004
+@@ -15035,8 +15035,8 @@
  echo "${ECHO_T}\"$with_mysql\"" >&6
     if test "$with_mysql" != "no"
     then
--    LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS"
+-    LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS"
 -    CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
-+    LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql $LDFLAGS"
++    LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql $LDFLAGS $ZLIBS"
 +    CPPFLAGS="-I${LOCALBASE}/include $CPPFLAGS"
  
  for ac_header in mysql/mysql.h
diff --git a/net-p2p/gnunet/pkg-plist b/net-p2p/gnunet/pkg-plist
index c434c7d5e922..74b88fb5be4a 100644
--- a/net-p2p/gnunet/pkg-plist
+++ b/net-p2p/gnunet/pkg-plist
@@ -2,6 +2,8 @@ bin/gnunet-chat
 bin/gnunet-check
 bin/gnunet-convert
 bin/gnunet-delete
+bin/gnunet-dht-join
+bin/gnunet-dht-query
 bin/gnunet-directory
 bin/gnunet-download
 bin/gnunet-gtk
@@ -15,12 +17,15 @@ bin/gnunet-tbench
 bin/gnunet-testbed
 bin/gnunet-tracekit
 bin/gnunet-transport-check
+bin/gnunet-update
 bin/gnunetd
 include/gnunet_afs_esed2.h
 include/gnunet_core.h
 include/gnunet_dht.h
+include/gnunet_dht_datastore_memory.h
 include/gnunet_dht_lib.h
-include/gnunet_dht_module.h
+include/gnunet_dht_service.h
+include/gnunet_rpc_service.h
 include/gnunet_transport.h
 include/gnunet_util.h
 include/platform.h
@@ -31,6 +36,17 @@ lib/libgnunet_afs_esed2.so.0
 lib/libgnunetafs_database_directory.so
 lib/libgnunetafs_protocol.so
 lib/libgnunetchat_protocol.so
+lib/libgnunetdht_api.a
+lib/libgnunetdht_api.so
+lib/libgnunetdht_api.so.0
+lib/libgnunetdht_datastore_memory.a
+lib/libgnunetdht_datastore_memory.so
+lib/libgnunetdht_datastore_memory.so.0
+lib/libgnunetdht_protocol.so
+lib/libgnunetrpc_protocol.so
+lib/libgnunetrpc_util.a
+lib/libgnunetrpc_util.so
+lib/libgnunetrpc_util.so.0
 lib/libgnunettbench_protocol.so
 lib/libgnunettestbed_protocol.so
 lib/libgnunettracekit_protocol.so
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index a3857bb3f701..419dd2ee594b 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gnunet
-PORTVERSION=	0.6.2b
+PORTVERSION=	0.6.3
 CATEGORIES=	net
 MASTER_SITES=	http://www.ovmj.org/GNUnet/download/ \
 		${MASTER_SITE_GNU}
@@ -78,7 +78,7 @@ MAN1=		gnunet-chat.1 gnunet-check.1 gnunet-convert.1 \
 		gnunet-peer-info.1 gnunet-pseudonym.1 \
 		gnunet-search.1 gnunet-stats.1 gnunet-tbench.1 \
 		gnunet-testbed.1 gnunet-tracekit.1 gnunet-transport-check.1 \
-		gnunetd.1
+		gnunet-update.1 gnunetd.1
 MAN5=		gnunet.conf.5
 
 pre-everything::
diff --git a/net/gnunet/distinfo b/net/gnunet/distinfo
index 457721d576f3..ad7647762410 100644
--- a/net/gnunet/distinfo
+++ b/net/gnunet/distinfo
@@ -1,2 +1,2 @@
-MD5 (GNUnet-0.6.2b.tar.bz2) = c3c8dcc940d3fdf35c0f606624362938
-SIZE (GNUnet-0.6.2b.tar.bz2) = 980714
+MD5 (GNUnet-0.6.3.tar.bz2) = b6de80fe927c4c7956f5fcfd9a1b19b7
+SIZE (GNUnet-0.6.3.tar.bz2) = 1021581
diff --git a/net/gnunet/files/patch-configure b/net/gnunet/files/patch-configure
index 1199b62c9db9..5934b64bc7d0 100644
--- a/net/gnunet/files/patch-configure
+++ b/net/gnunet/files/patch-configure
@@ -1,12 +1,15 @@
---- configure.orig	Wed Aug 27 15:47:59 2003
-+++ configure	Wed Aug 27 15:55:40 2003
-@@ -13748,8 +13748,8 @@
+
+$FreeBSD$
+
+--- configure.orig	Mon Aug  2 20:01:59 2004
++++ configure	Mon Aug  2 20:02:55 2004
+@@ -15035,8 +15035,8 @@
  echo "${ECHO_T}\"$with_mysql\"" >&6
     if test "$with_mysql" != "no"
     then
--    LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS"
+-    LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS"
 -    CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
-+    LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql $LDFLAGS"
++    LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql $LDFLAGS $ZLIBS"
 +    CPPFLAGS="-I${LOCALBASE}/include $CPPFLAGS"
  
  for ac_header in mysql/mysql.h
diff --git a/net/gnunet/pkg-plist b/net/gnunet/pkg-plist
index c434c7d5e922..74b88fb5be4a 100644
--- a/net/gnunet/pkg-plist
+++ b/net/gnunet/pkg-plist
@@ -2,6 +2,8 @@ bin/gnunet-chat
 bin/gnunet-check
 bin/gnunet-convert
 bin/gnunet-delete
+bin/gnunet-dht-join
+bin/gnunet-dht-query
 bin/gnunet-directory
 bin/gnunet-download
 bin/gnunet-gtk
@@ -15,12 +17,15 @@ bin/gnunet-tbench
 bin/gnunet-testbed
 bin/gnunet-tracekit
 bin/gnunet-transport-check
+bin/gnunet-update
 bin/gnunetd
 include/gnunet_afs_esed2.h
 include/gnunet_core.h
 include/gnunet_dht.h
+include/gnunet_dht_datastore_memory.h
 include/gnunet_dht_lib.h
-include/gnunet_dht_module.h
+include/gnunet_dht_service.h
+include/gnunet_rpc_service.h
 include/gnunet_transport.h
 include/gnunet_util.h
 include/platform.h
@@ -31,6 +36,17 @@ lib/libgnunet_afs_esed2.so.0
 lib/libgnunetafs_database_directory.so
 lib/libgnunetafs_protocol.so
 lib/libgnunetchat_protocol.so
+lib/libgnunetdht_api.a
+lib/libgnunetdht_api.so
+lib/libgnunetdht_api.so.0
+lib/libgnunetdht_datastore_memory.a
+lib/libgnunetdht_datastore_memory.so
+lib/libgnunetdht_datastore_memory.so.0
+lib/libgnunetdht_protocol.so
+lib/libgnunetrpc_protocol.so
+lib/libgnunetrpc_util.a
+lib/libgnunetrpc_util.so
+lib/libgnunetrpc_util.so.0
 lib/libgnunettbench_protocol.so
 lib/libgnunettestbed_protocol.so
 lib/libgnunettracekit_protocol.so