12 files changed, 79 insertions, 70 deletions

diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 5787eb4c6360..a78d0ea59200 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gnunet
-PORTVERSION=	0.6.4
-PORTREVISION=	2
+PORTVERSION=	0.6.5
 CATEGORIES=	net
 MASTER_SITES=	http://www.ovmj.org/GNUnet/download/ \
 		${MASTER_SITE_GNU}
@@ -38,11 +37,11 @@ CONFIGURE_ARGS=	--disable-ltdl-install --with-crypto
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if defined(WITH_GDBM)
-LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-PLIST_SUB+=	WITH_GDBM=""
+LIB_DEPENDS+=		gdbm.3:${PORTSDIR}/databases/gdbm
+PLIST_SUB+=		WITH_GDBM=""
 .else
 CONFIGURE_ARGS+=	--without-gdbm
-PLIST_SUB+=	WITH_GDBM="@comment "
+PLIST_SUB+=		WITH_GDBM="@comment "
 .endif
 
 .if defined(WITH_MYSQL)
@@ -53,30 +52,39 @@ CONFIGURE_ARGS+=	--without-mysql
 .endif
 
 .if defined(WITH_TDB)
-LIB_DEPENDS+=	tdb.1:${PORTSDIR}/databases/tdb
-PLIST_SUB+=	WITH_TDB=""
+LIB_DEPENDS+=		tdb.1:${PORTSDIR}/databases/tdb
+PLIST_SUB+=		WITH_TDB=""
 .else
 CONFIGURE_ARGS+=	--without-tdb
-PLIST_SUB+=	WITH_TDB="@comment "
+PLIST_SUB+=		WITH_TDB="@comment "
 .endif
 
 .if defined(WITH_BDB3)
-LIB_DEPENDS+=	db3:${PORTSDIR}/databases/db3
+LIB_DEPENDS+=		db3:${PORTSDIR}/databases/db3
 CONFIGURE_ARGS+=	--with-bdb=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-bdb
 .endif
 
+.if defined(WITH_SQLITE)
+LIB_DEPENDS+=		sqlite3.8:${PORTSDIR}/databases/sqlite3
+CONFIGURE_ARGS+=	--with-sqlite
+PLIST_SUB+=		WITH_SQLITE=""
+.else
+CONFIGURE_ARGS+=	--without-sqlite
+PLIST_SUB+=		WITH_SQLITE="@comment "
+.endif
+
 .if defined(WITH_IPV6)
-PKGNAMESUFFIX=	-ipv6
+PKGNAMESUFFIX=		-ipv6
 CONFIGURE_ARGS+=	--enable-ipv6
-PLIST_SUB+=	WITH_IPV6=""
+PLIST_SUB+=		WITH_IPV6=""
 .else
-PLIST_SUB+=	WITH_IPV6="@comment "
+PLIST_SUB+=		WITH_IPV6="@comment "
 .endif
 
 MAN1=		gnunet-chat.1 gnunet-check.1 gnunet-convert.1 \
-		gnunet-delete.1 gnunet-directory.1 \
+		gnunet-delete.1 gnunet-directory.1 gnunet-download-manager.1 \
 		gnunet-download.1 gnunet-gtk.1 gnunet-insert.1 \
 		gnunet-peer-info.1 gnunet-pseudonym.1 \
 		gnunet-search.1 gnunet-stats.1 gnunet-tbench.1 \
@@ -91,6 +99,7 @@ pre-everything::
 	@${ECHO_MSG} "		WITH_TDB=yes		Turn on TDB support"
 	@${ECHO_MSG} "		WITH_BDB3=yes		Turn on Berkely DB library support"
 	@${ECHO_MSG} "		WITH_GDBM=yes		Turn on GNU dbm support"
+	@${ECHO_MSG} "		WITH_SQLITE=yes		Turn on sqlite support"
 	@${ECHO_MSG} "		WITH_IPV6=yes		Turn on to enable IPv6 support"
 	@${ECHO_MSG} ""
 
diff --git a/net-p2p/gnunet/distinfo b/net-p2p/gnunet/distinfo
index fdb4988cc107..f651e43d9d66 100644
--- a/net-p2p/gnunet/distinfo
+++ b/net-p2p/gnunet/distinfo
@@ -1,2 +1,2 @@
-MD5 (GNUnet-0.6.4.tar.bz2) = cf86db4ce3779b54596e057c24d616e3
-SIZE (GNUnet-0.6.4.tar.bz2) = 1106668
+MD5 (GNUnet-0.6.5.tar.bz2) = 8bca32b55dccdb5bde7bd2b38df9df03
+SIZE (GNUnet-0.6.5.tar.bz2) = 1267839
diff --git a/net-p2p/gnunet/files/patch-src_applications_afs_module_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_afs_module_Makefile.in
index a8aa2b712cc5..8952e613bd82 100644
--- a/net-p2p/gnunet/files/patch-src_applications_afs_module_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_applications_afs_module_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/applications/afs/module/Makefile.in.orig	Fri Oct  1 01:42:15 2004
-+++ src/applications/afs/module/Makefile.in	Fri Oct  1 01:44:57 2004
-@@ -713,7 +713,7 @@
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- src/applications/afs/module/Makefile.in.orig
++++ src/applications/afs/module/Makefile.in
+@@ -203,7 +203,7 @@
+ 	$(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- CFLAGS = @CFLAGS@
- DIST_SOURCES = $(libgnunetafs_database_bdb_la_SOURCES) \
+ SOURCES = $(libgnunetafs_database_bdb_la_SOURCES) \
  	$(libgnunetafs_database_directory_la_SOURCES) \
+ 	$(libgnunetafs_database_gdbm_la_SOURCES) \
diff --git a/net-p2p/gnunet/files/patch-src_applications_afs_tools_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_afs_tools_Makefile.in
index dbe532414a7c..d9a2b848d970 100644
--- a/net-p2p/gnunet/files/patch-src_applications_afs_tools_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_applications_afs_tools_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/applications/afs/tools/Makefile.in.orig	Fri Oct  1 01:56:26 2004
-+++ src/applications/afs/tools/Makefile.in	Fri Oct  1 01:57:39 2004
-@@ -241,7 +241,7 @@
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- src/applications/afs/tools/Makefile.in.orig
++++ src/applications/afs/tools/Makefile.in
+@@ -104,7 +104,7 @@
+ 	$(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- CFLAGS = @CFLAGS@
- DIST_SOURCES = $(gnunet_delete_SOURCES) $(gnunet_directory_SOURCES) \
+ SOURCES = $(gnunet_delete_SOURCES) $(gnunet_directory_SOURCES) \
  	$(gnunet_download_SOURCES) $(gnunet_insert_SOURCES) \
+ 	$(gnunet_pseudonym_SOURCES) $(gnunet_search_SOURCES)
diff --git a/net-p2p/gnunet/files/patch-src_applications_chat_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_chat_Makefile.in
index 05696ef81ebd..9139ec802848 100644
--- a/net-p2p/gnunet/files/patch-src_applications_chat_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_applications_chat_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/applications/chat/Makefile.in.orig	Sat Oct  2 17:15:45 2004
-+++ src/applications/chat/Makefile.in	Sat Oct  2 17:16:11 2004
-@@ -196,7 +196,7 @@
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- src/applications/chat/Makefile.in.orig
++++ src/applications/chat/Makefile.in
+@@ -80,7 +80,7 @@
+ 	$(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- CFLAGS = @CFLAGS@
+ SOURCES = $(libgnunetchat_protocol_la_SOURCES) $(gnunet_chat_SOURCES)
  DIST_SOURCES = $(libgnunetchat_protocol_la_SOURCES) \
  	$(gnunet_chat_SOURCES)
diff --git a/net-p2p/gnunet/files/patch-src_applications_dht_tools_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_dht_tools_Makefile.in
index dbe020fc06c6..6342016773f5 100644
--- a/net-p2p/gnunet/files/patch-src_applications_dht_tools_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_applications_dht_tools_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/applications/dht/tools/Makefile.in.orig	Sat Oct  2 17:57:30 2004
-+++ src/applications/dht/tools/Makefile.in	Sat Oct  2 17:57:54 2004
-@@ -210,7 +210,7 @@
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- src/applications/dht/tools/Makefile.in.orig
++++ src/applications/dht/tools/Makefile.in
+@@ -84,7 +84,7 @@
+ 	$(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- CFLAGS = @CFLAGS@
- DIST_SOURCES = $(libgnunetdht_api_la_SOURCES) $(gnunet_dht_join_SOURCES) \
+ SOURCES = $(libgnunetdht_api_la_SOURCES) $(gnunet_dht_join_SOURCES) \
  	$(gnunet_dht_query_SOURCES)
+ DIST_SOURCES = $(libgnunetdht_api_la_SOURCES) \
diff --git a/net-p2p/gnunet/files/patch-src_applications_stats_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_stats_Makefile.in
index 011dcc74e946..1134073ae1bf 100644
--- a/net-p2p/gnunet/files/patch-src_applications_stats_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_applications_stats_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/applications/stats/Makefile.in.orig	Sat Oct  2 17:02:35 2004
-+++ src/applications/stats/Makefile.in	Sat Oct  2 17:03:46 2004
-@@ -171,7 +171,7 @@
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- src/applications/stats/Makefile.in.orig
++++ src/applications/stats/Makefile.in
+@@ -71,7 +71,7 @@
+ 	$(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- CFLAGS = @CFLAGS@
+ SOURCES = $(gnunet_stats_SOURCES)
  DIST_SOURCES = $(gnunet_stats_SOURCES)
- DIST_COMMON = Makefile.am Makefile.in
+ ETAGS = etags
diff --git a/net-p2p/gnunet/files/patch-src_applications_tbench_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_tbench_Makefile.in
index fe90a3e1c509..b3c0253bf1d6 100644
--- a/net-p2p/gnunet/files/patch-src_applications_tbench_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_applications_tbench_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/applications/tbench/Makefile.in.orig	Sat Oct  2 17:25:58 2004
-+++ src/applications/tbench/Makefile.in	Sat Oct  2 17:26:29 2004
-@@ -197,7 +197,7 @@
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- src/applications/tbench/Makefile.in.orig
++++ src/applications/tbench/Makefile.in
+@@ -81,7 +81,7 @@
+ 	$(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- CFLAGS = @CFLAGS@
- DIST_SOURCES = $(libgnunettbench_protocol_la_SOURCES) \
+ SOURCES = $(libgnunettbench_protocol_la_SOURCES) \
  	$(gnunet_tbench_SOURCES)
+ DIST_SOURCES = $(libgnunettbench_protocol_la_SOURCES) \
diff --git a/net-p2p/gnunet/files/patch-src_applications_testbed_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_testbed_Makefile.in
index 6987d7a50f18..23b0ed59044f 100644
--- a/net-p2p/gnunet/files/patch-src_applications_testbed_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_applications_testbed_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/applications/testbed/Makefile.in.orig	Sat Oct  2 17:35:28 2004
-+++ src/applications/testbed/Makefile.in	Sat Oct  2 17:35:49 2004
-@@ -212,7 +212,7 @@
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- src/applications/testbed/Makefile.in.orig
++++ src/applications/testbed/Makefile.in
+@@ -84,7 +84,7 @@
+ 	$(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- CFLAGS = @CFLAGS@
- DIST_SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \
+ SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \
  	$(gnunet_testbed_SOURCES)
+ DIST_SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \
diff --git a/net-p2p/gnunet/files/patch-src_applications_tracekit_Makefile.in b/net-p2p/gnunet/files/patch-src_applications_tracekit_Makefile.in
index 19b24e7a177c..5a089ab930ab 100644
--- a/net-p2p/gnunet/files/patch-src_applications_tracekit_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_applications_tracekit_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/applications/tracekit/Makefile.in.orig	Sat Oct  2 17:46:14 2004
-+++ src/applications/tracekit/Makefile.in	Sat Oct  2 17:46:50 2004
-@@ -197,7 +197,7 @@
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- src/applications/tracekit/Makefile.in.orig
++++ src/applications/tracekit/Makefile.in
+@@ -81,7 +81,7 @@
+ 	$(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- CFLAGS = @CFLAGS@
- DIST_SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \
+ SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \
  	$(gnunet_tracekit_SOURCES)
+ DIST_SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \
diff --git a/net-p2p/gnunet/files/patch-src_server_Makefile.in b/net-p2p/gnunet/files/patch-src_server_Makefile.in
index e323d1093104..15587ef6d6bd 100644
--- a/net-p2p/gnunet/files/patch-src_server_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_server_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/server/Makefile.in.orig	Sat Oct  2 22:42:44 2004
-+++ src/server/Makefile.in	Sat Oct  2 22:43:53 2004
-@@ -265,7 +265,7 @@
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- src/server/Makefile.in.orig
++++ src/server/Makefile.in
+@@ -108,7 +108,7 @@
+ 	$(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- CFLAGS = @CFLAGS@
- DIST_SOURCES = $(gnunet_peer_info_SOURCES) \
+ SOURCES = $(fragmentationtest_SOURCES) $(gnunet_peer_info_SOURCES) \
  	$(gnunet_transport_check_SOURCES) $(gnunet_update_SOURCES) \
+ 	$(gnunetd_SOURCES)
diff --git a/net-p2p/gnunet/pkg-plist b/net-p2p/gnunet/pkg-plist
index b4d0154c1b74..6201d1406370 100644
--- a/net-p2p/gnunet/pkg-plist
+++ b/net-p2p/gnunet/pkg-plist
@@ -6,6 +6,7 @@ bin/gnunet-dht-join
 bin/gnunet-dht-query
 bin/gnunet-directory
 bin/gnunet-download
+bin/gnunet-download-manager.scm
 bin/gnunet-gtk
 bin/gnunet-insert
 bin/gnunet-peer-info
@@ -29,8 +30,6 @@ include/gnunet_dht_service.h
 include/gnunet_rpc_service.h
 include/gnunet_transport.h
 include/gnunet_util.h
-include/platform.h
-include/winproc.h
 lib/libgnunet_afs_esed2.a
 lib/libgnunet_afs_esed2.so
 lib/libgnunet_afs_esed2.so.0
@@ -63,6 +62,7 @@ share/GNUnet/gnunet_logo.png
 share/locale/de/LC_MESSAGES/GNUnet.mo
 %%WITH_GDBM%%lib/libgnunetafs_database_gdbm.so
 %%WITH_TDB%%lib/libgnunetafs_database_tdb.so
+%%WITH_SQLITE%%lib/libgnunetafs_database_sqlite.so
 %%WITH_IPV6%%lib/libgnunettransport_tcp6.so
 %%WITH_IPV6%%lib/libgnunettransport_udp6.so
 @dirrm share/GNUnet