- Update to 0.6.0

8 files changed, 42 insertions, 94 deletions

diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 4a23075ba739..33475dc634fb 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gnunet
-PORTVERSION=	0.5.5
-PORTREVISION=	1
+PORTVERSION=	0.6.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.ovmj.org/GNUnet/download/ \
 		${MASTER_SITE_GNU}
@@ -93,8 +92,9 @@ pre-everything::
 	@${ECHO_MSG} ""
 
 post-patch:
+	@{FIND} ${WRKSRC} -name configure | ${XARGS} \
 	@${REINPLACE_CMD} -e \
 		's|-pthread [\$$]CFLAGS|${PTHREAD_CFLAGS} \$$CFLAGS|g ; \
-		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+		 s|-lpthread|${PTHREAD_LIBS}|g'
 
 .include <bsd.port.mk>
diff --git a/net-p2p/gnunet/distinfo b/net-p2p/gnunet/distinfo
index 3d2fd8527e47..f25dc9453cf8 100644
--- a/net-p2p/gnunet/distinfo
+++ b/net-p2p/gnunet/distinfo
@@ -1 +1 @@
-MD5 (GNUnet-0.5.5.tar.bz2) = 9cf47ded8472e73ec7d0c17d930d17e2
+MD5 (GNUnet-0.6.0.tar.bz2) = 7ca228d22f68f46218420b5ec97a2d32
diff --git a/net-p2p/gnunet/files/patch-types.h b/net-p2p/gnunet/files/patch-types.h
index d7c28b652a75..a0cdb542e6b3 100644
--- a/net-p2p/gnunet/files/patch-types.h
+++ b/net-p2p/gnunet/files/patch-types.h
@@ -1,5 +1,5 @@
---- src/include/util/gcry/types.h.orig	Fri Aug 22 09:57:16 2003
-+++ src/include/util/gcry/types.h	Fri Aug 22 09:57:24 2003
+--- src/util/gcry/types.h.orig	Mon Oct  6 20:17:50 2003
++++ src/util/gcry/types.h	Mon Oct  6 20:18:10 2003
 @@ -48,12 +48,6 @@
    #define HAVE_BYTE_TYPEDEF
  #endif
diff --git a/net-p2p/gnunet/pkg-plist b/net-p2p/gnunet/pkg-plist
index f9b64a5582c2..a2671721bab0 100644
--- a/net-p2p/gnunet/pkg-plist
+++ b/net-p2p/gnunet/pkg-plist
@@ -16,81 +16,55 @@ bin/gnunet-search
 bin/gnunet-search-sblock
 bin/gnunet-stats
 bin/gnunet-tbench
+bin/gnunet-testbed
 bin/gnunet-tracekit
 bin/gnunet-transport-check
 bin/gnunetd
-lib/libgnunetafs_blocks.la
-lib/libgnunetafs_blocks.so
-lib/libgnunetafs_blocks.so.0
-lib/libgnunetafs_database.la
-lib/libgnunetafs_database.so
-lib/libgnunetafs_database.so.0
+include/gnunet_afs_esed2.h
+include/gnunet_core.h
+include/gnunet_transport.h
+include/gnunet_util.h
+include/ltdl.h
+lib/libgnunet_afs_esed2.la
+lib/libgnunet_afs_esed2.so
+lib/libgnunet_afs_esed2.so.0
 lib/libgnunetafs_database_directory.la
 lib/libgnunetafs_database_directory.so
-lib/libgnunetafs_database_directory.so.0
 %%WITH_GDBM%%lib/libgnunetafs_database_gdbm.la
 %%WITH_GDBM%%lib/libgnunetafs_database_gdbm.so
 %%WITH_GDBM%%lib/libgnunetafs_database_gdbm.so.0
 %%WITH_TDB%%lib/libgnunetafs_database_tdb.la
 %%WITH_TDB%%lib/libgnunetafs_database_tdb.so
 %%WITH_TDB%%lib/libgnunetafs_database_tdb.so.0
-lib/libgnunetafs_decoding.la
-lib/libgnunetafs_decoding.so
-lib/libgnunetafs_decoding.so.0
-lib/libgnunetafs_delete.la
-lib/libgnunetafs_delete.so
-lib/libgnunetafs_delete.so.0
-lib/libgnunetafs_directory.la
-lib/libgnunetafs_directory.so
-lib/libgnunetafs_directory.so.0
-lib/libgnunetafs_encoding.la
-lib/libgnunetafs_encoding.so
-lib/libgnunetafs_encoding.so.0
-lib/libgnunetafs_policy.la
-lib/libgnunetafs_policy.so
-lib/libgnunetafs_policy.so.0
 lib/libgnunetafs_protocol.la
 lib/libgnunetafs_protocol.so
-lib/libgnunetafs_protocol.so.0
-lib/libgnunetafs_sblock.la
-lib/libgnunetafs_sblock.so
-lib/libgnunetafs_sblock.so.0
-lib/libgnunetafs_search.la
-lib/libgnunetafs_search.so
-lib/libgnunetafs_search.so.0
-lib/libgnunetafs_util.la
-lib/libgnunetafs_util.so
-lib/libgnunetafs_util.so.0
 lib/libgnunetchat_protocol.la
 lib/libgnunetchat_protocol.so
-lib/libgnunetchat_protocol.so.0
-lib/libgnunetcommon.la
-lib/libgnunetcommon.so
-lib/libgnunetcommon.so.0
 lib/libgnunettbench_protocol.la
 lib/libgnunettbench_protocol.so
-lib/libgnunettbench_protocol.so.0
+lib/libgnunettestbed_protocol.la
+lib/libgnunettestbed_protocol.so
 lib/libgnunettracekit_protocol.la
 lib/libgnunettracekit_protocol.so
-lib/libgnunettracekit_protocol.so.0
 lib/libgnunettransport_http.la
 lib/libgnunettransport_http.so
 lib/libgnunettransport_http.so.0
 lib/libgnunettransport_smtp.la
 lib/libgnunettransport_smtp.so
-lib/libgnunettransport_smtp.so.0
 lib/libgnunettransport_tcp.la
 lib/libgnunettransport_tcp.so
-lib/libgnunettransport_tcp.so.0
 %%WITH_IPV6%%lib/libgnunettransport_tcp6.la
 %%WITH_IPV6%%lib/libgnunettransport_tcp6.so
 %%WITH_IPV6%%lib/libgnunettransport_tcp6.so.0
 lib/libgnunettransport_udp.la
 lib/libgnunettransport_udp.so
-lib/libgnunettransport_udp.so.0
 %%WITH_IPV6%%lib/libgnunettransport_udp6.la
 %%WITH_IPV6%%lib/libgnunettransport_udp6.so
 %%WITH_IPV6%%lib/libgnunettransport_udp6.so.0
 lib/libgnunetutil.la
 lib/libgnunetutil.so
 lib/libgnunetutil.so.0
+lib/libltdl.a
+lib/libltdl.la
+lib/libltdl.so
+lib/libltdl.so.4
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index 4a23075ba739..33475dc634fb 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gnunet
-PORTVERSION=	0.5.5
-PORTREVISION=	1
+PORTVERSION=	0.6.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.ovmj.org/GNUnet/download/ \
 		${MASTER_SITE_GNU}
@@ -93,8 +92,9 @@ pre-everything::
 	@${ECHO_MSG} ""
 
 post-patch:
+	@{FIND} ${WRKSRC} -name configure | ${XARGS} \
 	@${REINPLACE_CMD} -e \
 		's|-pthread [\$$]CFLAGS|${PTHREAD_CFLAGS} \$$CFLAGS|g ; \
-		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+		 s|-lpthread|${PTHREAD_LIBS}|g'
 
 .include <bsd.port.mk>
diff --git a/net/gnunet/distinfo b/net/gnunet/distinfo
index 3d2fd8527e47..f25dc9453cf8 100644
--- a/net/gnunet/distinfo
+++ b/net/gnunet/distinfo
@@ -1 +1 @@
-MD5 (GNUnet-0.5.5.tar.bz2) = 9cf47ded8472e73ec7d0c17d930d17e2
+MD5 (GNUnet-0.6.0.tar.bz2) = 7ca228d22f68f46218420b5ec97a2d32
diff --git a/net/gnunet/files/patch-types.h b/net/gnunet/files/patch-types.h
index d7c28b652a75..a0cdb542e6b3 100644
--- a/net/gnunet/files/patch-types.h
+++ b/net/gnunet/files/patch-types.h
@@ -1,5 +1,5 @@
---- src/include/util/gcry/types.h.orig	Fri Aug 22 09:57:16 2003
-+++ src/include/util/gcry/types.h	Fri Aug 22 09:57:24 2003
+--- src/util/gcry/types.h.orig	Mon Oct  6 20:17:50 2003
++++ src/util/gcry/types.h	Mon Oct  6 20:18:10 2003
 @@ -48,12 +48,6 @@
    #define HAVE_BYTE_TYPEDEF
  #endif
diff --git a/net/gnunet/pkg-plist b/net/gnunet/pkg-plist
index f9b64a5582c2..a2671721bab0 100644
--- a/net/gnunet/pkg-plist
+++ b/net/gnunet/pkg-plist
@@ -16,81 +16,55 @@ bin/gnunet-search
 bin/gnunet-search-sblock
 bin/gnunet-stats
 bin/gnunet-tbench
+bin/gnunet-testbed
 bin/gnunet-tracekit
 bin/gnunet-transport-check
 bin/gnunetd
-lib/libgnunetafs_blocks.la
-lib/libgnunetafs_blocks.so
-lib/libgnunetafs_blocks.so.0
-lib/libgnunetafs_database.la
-lib/libgnunetafs_database.so
-lib/libgnunetafs_database.so.0
+include/gnunet_afs_esed2.h
+include/gnunet_core.h
+include/gnunet_transport.h
+include/gnunet_util.h
+include/ltdl.h
+lib/libgnunet_afs_esed2.la
+lib/libgnunet_afs_esed2.so
+lib/libgnunet_afs_esed2.so.0
 lib/libgnunetafs_database_directory.la
 lib/libgnunetafs_database_directory.so
-lib/libgnunetafs_database_directory.so.0
 %%WITH_GDBM%%lib/libgnunetafs_database_gdbm.la
 %%WITH_GDBM%%lib/libgnunetafs_database_gdbm.so
 %%WITH_GDBM%%lib/libgnunetafs_database_gdbm.so.0
 %%WITH_TDB%%lib/libgnunetafs_database_tdb.la
 %%WITH_TDB%%lib/libgnunetafs_database_tdb.so
 %%WITH_TDB%%lib/libgnunetafs_database_tdb.so.0
-lib/libgnunetafs_decoding.la
-lib/libgnunetafs_decoding.so
-lib/libgnunetafs_decoding.so.0
-lib/libgnunetafs_delete.la
-lib/libgnunetafs_delete.so
-lib/libgnunetafs_delete.so.0
-lib/libgnunetafs_directory.la
-lib/libgnunetafs_directory.so
-lib/libgnunetafs_directory.so.0
-lib/libgnunetafs_encoding.la
-lib/libgnunetafs_encoding.so
-lib/libgnunetafs_encoding.so.0
-lib/libgnunetafs_policy.la
-lib/libgnunetafs_policy.so
-lib/libgnunetafs_policy.so.0
 lib/libgnunetafs_protocol.la
 lib/libgnunetafs_protocol.so
-lib/libgnunetafs_protocol.so.0
-lib/libgnunetafs_sblock.la
-lib/libgnunetafs_sblock.so
-lib/libgnunetafs_sblock.so.0
-lib/libgnunetafs_search.la
-lib/libgnunetafs_search.so
-lib/libgnunetafs_search.so.0
-lib/libgnunetafs_util.la
-lib/libgnunetafs_util.so
-lib/libgnunetafs_util.so.0
 lib/libgnunetchat_protocol.la
 lib/libgnunetchat_protocol.so
-lib/libgnunetchat_protocol.so.0
-lib/libgnunetcommon.la
-lib/libgnunetcommon.so
-lib/libgnunetcommon.so.0
 lib/libgnunettbench_protocol.la
 lib/libgnunettbench_protocol.so
-lib/libgnunettbench_protocol.so.0
+lib/libgnunettestbed_protocol.la
+lib/libgnunettestbed_protocol.so
 lib/libgnunettracekit_protocol.la
 lib/libgnunettracekit_protocol.so
-lib/libgnunettracekit_protocol.so.0
 lib/libgnunettransport_http.la
 lib/libgnunettransport_http.so
 lib/libgnunettransport_http.so.0
 lib/libgnunettransport_smtp.la
 lib/libgnunettransport_smtp.so
-lib/libgnunettransport_smtp.so.0
 lib/libgnunettransport_tcp.la
 lib/libgnunettransport_tcp.so
-lib/libgnunettransport_tcp.so.0
 %%WITH_IPV6%%lib/libgnunettransport_tcp6.la
 %%WITH_IPV6%%lib/libgnunettransport_tcp6.so
 %%WITH_IPV6%%lib/libgnunettransport_tcp6.so.0
 lib/libgnunettransport_udp.la
 lib/libgnunettransport_udp.so
-lib/libgnunettransport_udp.so.0
 %%WITH_IPV6%%lib/libgnunettransport_udp6.la
 %%WITH_IPV6%%lib/libgnunettransport_udp6.so
 %%WITH_IPV6%%lib/libgnunettransport_udp6.so.0
 lib/libgnunetutil.la
 lib/libgnunetutil.so
 lib/libgnunetutil.so.0
+lib/libltdl.a
+lib/libltdl.la
+lib/libltdl.so
+lib/libltdl.so.4