Update to 0.6.6

28 files changed, 106 insertions, 108 deletions

diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 0596916b280b..b186542b783f 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gnunet
-PORTVERSION=	0.6.5
-PORTREVISION=	1
+PORTVERSION=	0.6.6
 CATEGORIES=	net
 MASTER_SITES=	http://www.ovmj.org/GNUnet/download/ \
 		${MASTER_SITE_GNU}
diff --git a/net-p2p/gnunet/distinfo b/net-p2p/gnunet/distinfo
index f651e43d9d66..d98f989cc14a 100644
--- a/net-p2p/gnunet/distinfo
+++ b/net-p2p/gnunet/distinfo
@@ -1,2 +1,2 @@
-MD5 (GNUnet-0.6.5.tar.bz2) = 8bca32b55dccdb5bde7bd2b38df9df03
-SIZE (GNUnet-0.6.5.tar.bz2) = 1267839
+MD5 (GNUnet-0.6.6.tar.bz2) = 46db6a3952416f222e10d68ad31e24ed
+SIZE (GNUnet-0.6.6.tar.bz2) = 1267600
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 8952e613bd82..ed9c6fa42c10 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
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/afs/module/Makefile.in.orig
 +++ src/applications/afs/module/Makefile.in
-@@ -203,7 +203,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -1031,7 +1031,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(libgnunetafs_database_bdb_la_SOURCES) \
+ DIST_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 d9a2b848d970..f07ef036b211 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
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/afs/tools/Makefile.in.orig
 +++ src/applications/afs/tools/Makefile.in
-@@ -104,7 +104,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -310,7 +310,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(gnunet_delete_SOURCES) $(gnunet_directory_SOURCES) \
+ DIST_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 9139ec802848..c35810645ba1 100644
--- a/net-p2p/gnunet/files/patch-src_applications_chat_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_applications_chat_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/chat/Makefile.in.orig
 +++ src/applications/chat/Makefile.in
-@@ -80,7 +80,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -265,7 +265,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(libgnunetchat_protocol_la_SOURCES) $(gnunet_chat_SOURCES)
  DIST_SOURCES = $(libgnunetchat_protocol_la_SOURCES) \
  	$(gnunet_chat_SOURCES)
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
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 6342016773f5..683fdf94a673 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
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/dht/tools/Makefile.in.orig
 +++ src/applications/dht/tools/Makefile.in
-@@ -84,7 +84,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -279,7 +279,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(libgnunetdht_api_la_SOURCES) $(gnunet_dht_join_SOURCES) \
+ DIST_SOURCES = $(libgnunetdht_api_la_SOURCES) $(gnunet_dht_join_SOURCES) \
  	$(gnunet_dht_query_SOURCES)
- DIST_SOURCES = $(libgnunetdht_api_la_SOURCES) \
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
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 1134073ae1bf..363cedae963e 100644
--- a/net-p2p/gnunet/files/patch-src_applications_stats_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_applications_stats_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/stats/Makefile.in.orig
 +++ src/applications/stats/Makefile.in
-@@ -71,7 +71,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -240,7 +240,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(gnunet_stats_SOURCES)
  DIST_SOURCES = $(gnunet_stats_SOURCES)
- ETAGS = etags
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ SOURCES = $(gnunet_stats_SOURCES)
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 b3c0253bf1d6..0987f8395984 100644
--- a/net-p2p/gnunet/files/patch-src_applications_tbench_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_applications_tbench_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/tbench/Makefile.in.orig
 +++ src/applications/tbench/Makefile.in
-@@ -81,7 +81,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -266,7 +266,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(libgnunettbench_protocol_la_SOURCES) \
- 	$(gnunet_tbench_SOURCES)
  DIST_SOURCES = $(libgnunettbench_protocol_la_SOURCES) \
+ 	$(gnunet_tbench_SOURCES)
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
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 23b0ed59044f..b48de24acaed 100644
--- a/net-p2p/gnunet/files/patch-src_applications_testbed_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_applications_testbed_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/testbed/Makefile.in.orig
 +++ src/applications/testbed/Makefile.in
-@@ -84,7 +84,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -281,7 +281,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \
- 	$(gnunet_testbed_SOURCES)
  DIST_SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \
+ 	$(gnunet_testbed_SOURCES)
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
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 5a089ab930ab..de24d7d5cd42 100644
--- a/net-p2p/gnunet/files/patch-src_applications_tracekit_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_applications_tracekit_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/tracekit/Makefile.in.orig
 +++ src/applications/tracekit/Makefile.in
-@@ -81,7 +81,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -266,7 +266,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \
- 	$(gnunet_tracekit_SOURCES)
  DIST_SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \
+ 	$(gnunet_tracekit_SOURCES)
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
diff --git a/net-p2p/gnunet/files/patch-src_conf_Makefile.in b/net-p2p/gnunet/files/patch-src_conf_Makefile.in
index 52a4e64b1ae8..74c5c69df56d 100644
--- a/net-p2p/gnunet/files/patch-src_conf_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_conf_Makefile.in
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- src/conf/Makefile.in.orig	Fri Oct  1 01:13:52 2004
-+++ src/conf/Makefile.in	Fri Oct  1 01:18:56 2004
-@@ -184,7 +184,7 @@
+--- src/conf/Makefile.in.orig
++++ src/conf/Makefile.in
+@@ -253,7 +253,7 @@
  
  
  gnunet_setup_LDFLAGS = \
@@ -12,3 +12,12 @@ $FreeBSD$
  
  
  gnunet_setup_LDADD = \
+@@ -319,7 +319,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
+ DIST_SOURCES = $(am__gnunet_setup_SOURCES_DIST) gnunet-win-tool.c
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ SOURCES = $(gnunet_setup_SOURCES) gnunet-win-tool.c
diff --git a/net-p2p/gnunet/files/patch-src_include_gnunet__util.h b/net-p2p/gnunet/files/patch-src_include_gnunet__util.h
index 114bfecf7e0a..89867ccbfa46 100644
--- a/net-p2p/gnunet/files/patch-src_include_gnunet__util.h
+++ b/net-p2p/gnunet/files/patch-src_include_gnunet__util.h
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- src/include/gnunet_util.h.orig	Tue Aug 24 17:58:14 2004
-+++ src/include/gnunet_util.h	Sat Oct  2 23:25:56 2004
-@@ -628,7 +628,7 @@
+--- src/include/gnunet_util.h.orig
++++ src/include/gnunet_util.h
+@@ -637,7 +637,7 @@
   * Default names of the configuration files.
   */
  #define DEFAULT_CLIENT_CONFIG_FILE "~/.gnunet/gnunet.conf"
@@ -12,7 +12,7 @@ $FreeBSD$
  
  /* *******************API *********************** */
  
-@@ -1027,8 +1027,8 @@
+@@ -1053,8 +1053,8 @@
   * @param ip the IP to check (in network byte order)
   * @return NO if the IP is not in the list, YES if it it is
   */
@@ -23,12 +23,3 @@ $FreeBSD$
  
  /**
   * Parse a network specification. The argument specifies
-@@ -1041,7 +1041,7 @@
-  * @param routeList a string specifying the forbidden networks
-  * @return the converted list, NULL if the synatx is flawed
-  */
--CIDR6Network * parseRoutes6(const char * routeList);
-+CIDR6Network * parseRoutes6(char * routeList);
- 
- 
- 
diff --git a/net-p2p/gnunet/files/patch-src_server_Makefile.in b/net-p2p/gnunet/files/patch-src_server_Makefile.in
index 15587ef6d6bd..ad6351ed3b2c 100644
--- a/net-p2p/gnunet/files/patch-src_server_Makefile.in
+++ b/net-p2p/gnunet/files/patch-src_server_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/server/Makefile.in.orig
 +++ src/server/Makefile.in
-@@ -108,7 +108,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -362,7 +362,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(fragmentationtest_SOURCES) $(gnunet_peer_info_SOURCES) \
+ DIST_SOURCES = $(fragmentationtest_SOURCES) $(gnunet_peer_info_SOURCES) \
  	$(gnunet_transport_check_SOURCES) $(gnunet_update_SOURCES) \
  	$(gnunetd_SOURCES)
diff --git a/net-p2p/gnunet/files/patch-src_transports_udp6.c b/net-p2p/gnunet/files/patch-src_transports_udp6.c
index 880a836c35ea..bcab32ed46c0 100644
--- a/net-p2p/gnunet/files/patch-src_transports_udp6.c
+++ b/net-p2p/gnunet/files/patch-src_transports_udp6.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- src/transports/udp6.c.orig	Fri Oct  1 01:38:25 2004
-+++ src/transports/udp6.c	Fri Oct  1 01:39:15 2004
+--- src/transports/udp6.c.orig
++++ src/transports/udp6.c
 @@ -275,6 +275,7 @@
  #endif
      /* quick test of the packet, if failed, repeat! */
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index 0596916b280b..b186542b783f 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gnunet
-PORTVERSION=	0.6.5
-PORTREVISION=	1
+PORTVERSION=	0.6.6
 CATEGORIES=	net
 MASTER_SITES=	http://www.ovmj.org/GNUnet/download/ \
 		${MASTER_SITE_GNU}
diff --git a/net/gnunet/distinfo b/net/gnunet/distinfo
index f651e43d9d66..d98f989cc14a 100644
--- a/net/gnunet/distinfo
+++ b/net/gnunet/distinfo
@@ -1,2 +1,2 @@
-MD5 (GNUnet-0.6.5.tar.bz2) = 8bca32b55dccdb5bde7bd2b38df9df03
-SIZE (GNUnet-0.6.5.tar.bz2) = 1267839
+MD5 (GNUnet-0.6.6.tar.bz2) = 46db6a3952416f222e10d68ad31e24ed
+SIZE (GNUnet-0.6.6.tar.bz2) = 1267600
diff --git a/net/gnunet/files/patch-src_applications_afs_module_Makefile.in b/net/gnunet/files/patch-src_applications_afs_module_Makefile.in
index 8952e613bd82..ed9c6fa42c10 100644
--- a/net/gnunet/files/patch-src_applications_afs_module_Makefile.in
+++ b/net/gnunet/files/patch-src_applications_afs_module_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/afs/module/Makefile.in.orig
 +++ src/applications/afs/module/Makefile.in
-@@ -203,7 +203,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -1031,7 +1031,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(libgnunetafs_database_bdb_la_SOURCES) \
+ DIST_SOURCES = $(libgnunetafs_database_bdb_la_SOURCES) \
  	$(libgnunetafs_database_directory_la_SOURCES) \
  	$(libgnunetafs_database_gdbm_la_SOURCES) \
diff --git a/net/gnunet/files/patch-src_applications_afs_tools_Makefile.in b/net/gnunet/files/patch-src_applications_afs_tools_Makefile.in
index d9a2b848d970..f07ef036b211 100644
--- a/net/gnunet/files/patch-src_applications_afs_tools_Makefile.in
+++ b/net/gnunet/files/patch-src_applications_afs_tools_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/afs/tools/Makefile.in.orig
 +++ src/applications/afs/tools/Makefile.in
-@@ -104,7 +104,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -310,7 +310,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(gnunet_delete_SOURCES) $(gnunet_directory_SOURCES) \
+ DIST_SOURCES = $(gnunet_delete_SOURCES) $(gnunet_directory_SOURCES) \
  	$(gnunet_download_SOURCES) $(gnunet_insert_SOURCES) \
  	$(gnunet_pseudonym_SOURCES) $(gnunet_search_SOURCES)
diff --git a/net/gnunet/files/patch-src_applications_chat_Makefile.in b/net/gnunet/files/patch-src_applications_chat_Makefile.in
index 9139ec802848..c35810645ba1 100644
--- a/net/gnunet/files/patch-src_applications_chat_Makefile.in
+++ b/net/gnunet/files/patch-src_applications_chat_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/chat/Makefile.in.orig
 +++ src/applications/chat/Makefile.in
-@@ -80,7 +80,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -265,7 +265,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(libgnunetchat_protocol_la_SOURCES) $(gnunet_chat_SOURCES)
  DIST_SOURCES = $(libgnunetchat_protocol_la_SOURCES) \
  	$(gnunet_chat_SOURCES)
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
diff --git a/net/gnunet/files/patch-src_applications_dht_tools_Makefile.in b/net/gnunet/files/patch-src_applications_dht_tools_Makefile.in
index 6342016773f5..683fdf94a673 100644
--- a/net/gnunet/files/patch-src_applications_dht_tools_Makefile.in
+++ b/net/gnunet/files/patch-src_applications_dht_tools_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/dht/tools/Makefile.in.orig
 +++ src/applications/dht/tools/Makefile.in
-@@ -84,7 +84,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -279,7 +279,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(libgnunetdht_api_la_SOURCES) $(gnunet_dht_join_SOURCES) \
+ DIST_SOURCES = $(libgnunetdht_api_la_SOURCES) $(gnunet_dht_join_SOURCES) \
  	$(gnunet_dht_query_SOURCES)
- DIST_SOURCES = $(libgnunetdht_api_la_SOURCES) \
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
diff --git a/net/gnunet/files/patch-src_applications_stats_Makefile.in b/net/gnunet/files/patch-src_applications_stats_Makefile.in
index 1134073ae1bf..363cedae963e 100644
--- a/net/gnunet/files/patch-src_applications_stats_Makefile.in
+++ b/net/gnunet/files/patch-src_applications_stats_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/stats/Makefile.in.orig
 +++ src/applications/stats/Makefile.in
-@@ -71,7 +71,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -240,7 +240,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(gnunet_stats_SOURCES)
  DIST_SOURCES = $(gnunet_stats_SOURCES)
- ETAGS = etags
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ SOURCES = $(gnunet_stats_SOURCES)
diff --git a/net/gnunet/files/patch-src_applications_tbench_Makefile.in b/net/gnunet/files/patch-src_applications_tbench_Makefile.in
index b3c0253bf1d6..0987f8395984 100644
--- a/net/gnunet/files/patch-src_applications_tbench_Makefile.in
+++ b/net/gnunet/files/patch-src_applications_tbench_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/tbench/Makefile.in.orig
 +++ src/applications/tbench/Makefile.in
-@@ -81,7 +81,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -266,7 +266,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(libgnunettbench_protocol_la_SOURCES) \
- 	$(gnunet_tbench_SOURCES)
  DIST_SOURCES = $(libgnunettbench_protocol_la_SOURCES) \
+ 	$(gnunet_tbench_SOURCES)
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
diff --git a/net/gnunet/files/patch-src_applications_testbed_Makefile.in b/net/gnunet/files/patch-src_applications_testbed_Makefile.in
index 23b0ed59044f..b48de24acaed 100644
--- a/net/gnunet/files/patch-src_applications_testbed_Makefile.in
+++ b/net/gnunet/files/patch-src_applications_testbed_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/testbed/Makefile.in.orig
 +++ src/applications/testbed/Makefile.in
-@@ -84,7 +84,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -281,7 +281,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \
- 	$(gnunet_testbed_SOURCES)
  DIST_SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \
+ 	$(gnunet_testbed_SOURCES)
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
diff --git a/net/gnunet/files/patch-src_applications_tracekit_Makefile.in b/net/gnunet/files/patch-src_applications_tracekit_Makefile.in
index 5a089ab930ab..de24d7d5cd42 100644
--- a/net/gnunet/files/patch-src_applications_tracekit_Makefile.in
+++ b/net/gnunet/files/patch-src_applications_tracekit_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/applications/tracekit/Makefile.in.orig
 +++ src/applications/tracekit/Makefile.in
-@@ -81,7 +81,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -266,7 +266,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \
- 	$(gnunet_tracekit_SOURCES)
  DIST_SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \
+ 	$(gnunet_tracekit_SOURCES)
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
diff --git a/net/gnunet/files/patch-src_conf_Makefile.in b/net/gnunet/files/patch-src_conf_Makefile.in
index 52a4e64b1ae8..74c5c69df56d 100644
--- a/net/gnunet/files/patch-src_conf_Makefile.in
+++ b/net/gnunet/files/patch-src_conf_Makefile.in
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- src/conf/Makefile.in.orig	Fri Oct  1 01:13:52 2004
-+++ src/conf/Makefile.in	Fri Oct  1 01:18:56 2004
-@@ -184,7 +184,7 @@
+--- src/conf/Makefile.in.orig
++++ src/conf/Makefile.in
+@@ -253,7 +253,7 @@
  
  
  gnunet_setup_LDFLAGS = \
@@ -12,3 +12,12 @@ $FreeBSD$
  
  
  gnunet_setup_LDADD = \
+@@ -319,7 +319,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
+ DIST_SOURCES = $(am__gnunet_setup_SOURCES_DIST) gnunet-win-tool.c
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+ SOURCES = $(gnunet_setup_SOURCES) gnunet-win-tool.c
diff --git a/net/gnunet/files/patch-src_include_gnunet__util.h b/net/gnunet/files/patch-src_include_gnunet__util.h
index 114bfecf7e0a..89867ccbfa46 100644
--- a/net/gnunet/files/patch-src_include_gnunet__util.h
+++ b/net/gnunet/files/patch-src_include_gnunet__util.h
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- src/include/gnunet_util.h.orig	Tue Aug 24 17:58:14 2004
-+++ src/include/gnunet_util.h	Sat Oct  2 23:25:56 2004
-@@ -628,7 +628,7 @@
+--- src/include/gnunet_util.h.orig
++++ src/include/gnunet_util.h
+@@ -637,7 +637,7 @@
   * Default names of the configuration files.
   */
  #define DEFAULT_CLIENT_CONFIG_FILE "~/.gnunet/gnunet.conf"
@@ -12,7 +12,7 @@ $FreeBSD$
  
  /* *******************API *********************** */
  
-@@ -1027,8 +1027,8 @@
+@@ -1053,8 +1053,8 @@
   * @param ip the IP to check (in network byte order)
   * @return NO if the IP is not in the list, YES if it it is
   */
@@ -23,12 +23,3 @@ $FreeBSD$
  
  /**
   * Parse a network specification. The argument specifies
-@@ -1041,7 +1041,7 @@
-  * @param routeList a string specifying the forbidden networks
-  * @return the converted list, NULL if the synatx is flawed
-  */
--CIDR6Network * parseRoutes6(const char * routeList);
-+CIDR6Network * parseRoutes6(char * routeList);
- 
- 
- 
diff --git a/net/gnunet/files/patch-src_server_Makefile.in b/net/gnunet/files/patch-src_server_Makefile.in
index 15587ef6d6bd..ad6351ed3b2c 100644
--- a/net/gnunet/files/patch-src_server_Makefile.in
+++ b/net/gnunet/files/patch-src_server_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- src/server/Makefile.in.orig
 +++ src/server/Makefile.in
-@@ -108,7 +108,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -362,7 +362,7 @@
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 +	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(fragmentationtest_SOURCES) $(gnunet_peer_info_SOURCES) \
+ DIST_SOURCES = $(fragmentationtest_SOURCES) $(gnunet_peer_info_SOURCES) \
  	$(gnunet_transport_check_SOURCES) $(gnunet_update_SOURCES) \
  	$(gnunetd_SOURCES)
diff --git a/net/gnunet/files/patch-src_transports_udp6.c b/net/gnunet/files/patch-src_transports_udp6.c
index 880a836c35ea..bcab32ed46c0 100644
--- a/net/gnunet/files/patch-src_transports_udp6.c
+++ b/net/gnunet/files/patch-src_transports_udp6.c
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- src/transports/udp6.c.orig	Fri Oct  1 01:38:25 2004
-+++ src/transports/udp6.c	Fri Oct  1 01:39:15 2004
+--- src/transports/udp6.c.orig
++++ src/transports/udp6.c
 @@ -275,6 +275,7 @@
  #endif
      /* quick test of the packet, if failed, repeat! */