17 files changed, 350 insertions, 412 deletions

diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 4c875d8fd321..57fafa084537 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -7,129 +7,103 @@
 #
 
 PORTNAME=	gnunet
-PORTVERSION=	0.6.6b
-PORTREVISION=	9
+PORTVERSION=	0.8.0c
 CATEGORIES=	net-p2p ipv6
-MASTER_SITES=	http://www.ovmj.org/GNUnet/download/ \
-		${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU \
+		http://gnunet.org/download/
 DISTNAME=	GNUnet-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An anonymous, distributed, reputation-based network
 
-LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
+LIB_DEPENDS=	adns.1:${PORTSDIR}/dns/adns \
+		cares.2:${PORTSDIR}/dns/c-ares \
+		curl.5:${PORTSDIR}/ftp/curl \
+		guile.20:${PORTSDIR}/lang/guile \
+		esmtp.6:${PORTSDIR}/mail/libesmtp \
+		gmp.8:${PORTSDIR}/math/libgmp4 \
+		gcrypt.16:${PORTSDIR}/security/libgcrypt \
+		extractor.2:${PORTSDIR}/textproc/libextractor \
+		microhttpd.6:${PORTSDIR}/www/libmicrohttpd
+
+OPTIONS=	MYSQL	"Enable MySQL support"		on \
+		PGSQL	"Enable PostgreSQL support"	off \
+		SQLITE	"Enable SQLite support"		off
 
-USE_AUTOTOOLS=	libltdl:22 libtool:22
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+USE_GNOME=	gnomehack libglade2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnometarget gtk20 lthack
-USE_OPENSSL=	yes
+USE_AUTOTOOLS=	libltdl:22 libtool:22
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--disable-ltdl-install \
+		--without-dialog \
+		--without-cdialog \
+		--without-qt
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
-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=""
-.else
-CONFIGURE_ARGS+=	--without-gdbm
-PLIST_SUB+=		WITH_GDBM="@comment "
-.endif
+MAN1=		gnunet-auto-share.1 gnunet-chat.1 gnunet-directory.1 \
+		gnunet-download-manager.1 gnunet-download.1 gnunet-insert.1 \
+		gnunet-peer-info.1 gnunet-pseudonym.1 gnunet-search.1 \
+		gnunet-setup.1 gnunet-stats.1 gnunet-tbench.1 \
+		gnunet-testbed.1 gnunet-tracekit.1 gnunet-transport-check.1 \
+		gnunet-unindex.1 gnunet-update.1 gnunet-vpn.1 \
+		gnunetd.1
+MAN5=		gnunet.conf.5 gnunetd.conf.5
 
-.if defined(WITH_MYSQL)
-USE_MYSQL=	yes
-CONFIGURE_ARGS+=	--with-mysql
-.else
-CONFIGURE_ARGS+=	--without-mysql
-.endif
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
-.if defined(WITH_TDB)
-LIB_DEPENDS+=		tdb.1:${PORTSDIR}/databases/tdb
-PLIST_SUB+=		WITH_TDB=""
-.else
-CONFIGURE_ARGS+=	--without-tdb
-PLIST_SUB+=		WITH_TDB="@comment "
-.endif
+.include <bsd.port.pre.mk>
 
-.if defined(WITH_BDB3)
-LIB_DEPENDS+=		db3:${PORTSDIR}/databases/db3
-CONFIGURE_ARGS+=	--with-bdb=${LOCALBASE}
+.if defined(WITHOUT_MYSQL)
+CONFIGURE_ARGS+=	--without-mysql
+PLIST_SUB+=		MYSQL="@comment "
 .else
-CONFIGURE_ARGS+=	--without-bdb
+USE_MYSQL=		yes
+CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
+PLIST_SUB+=		MYSQL=""
 .endif
 
-.if defined(WITH_SQLITE)
-LIB_DEPENDS+=		sqlite3.8:${PORTSDIR}/databases/sqlite3
-CONFIGURE_ARGS+=	--with-sqlite
-PLIST_SUB+=		WITH_SQLITE=""
+.if defined(WITH_PGSQL)
+USE_PGSQL=		yes
+CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
+PLIST_SUB+=		PGSQL=""
 .else
-CONFIGURE_ARGS+=	--without-sqlite
-PLIST_SUB+=		WITH_SQLITE="@comment "
-.endif
 
-.if defined(WITH_IPV6)
-PKGNAMESUFFIX=		-ipv6
-CONFIGURE_ARGS+=	--enable-ipv6
-PLIST_SUB+=		WITH_IPV6=""
-.else
-PLIST_SUB+=		WITH_IPV6="@comment "
+CONFIGURE_ARGS+=	--without-postgres
+PLIST_SUB+=		PGSQL="@comment "
 .endif
 
-.if defined(WITH_GUILE)
-LIB_DEPENDS+=		guile.20:${PORTSDIR}/lang/guile
-CONFIGURE_ARGS+=	--enable-guile
-MAN1+=			gnunet-download-manager.1
-PLIST_SUB+=		WITH_GUILE=""
+.if defined(WITH_SQLITE)
+USE_SQLITE=		yes
+CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
+PLIST_SUB+=		SQLITE=""
 .else
-CONFIGURE_ARGS+=	--disable-guile
-PLIST_SUB+=		WITH_GUILE="@comment "
+CONFIGURE_ARGS+=	--without-sqlite
+PLIST_SUB+=		SQLITE="@comment "
 .endif
 
-MAN1=		gnunet-chat.1 gnunet-check.1 gnunet-convert.1 \
-		gnunet-delete.1 gnunet-directory.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 \
-		gnunet-testbed.1 gnunet-tracekit.1 gnunet-transport-check.1 \
-		gnunet-update.1 gnunetd.1
-MAN5=		gnunet.conf.5
-
-.include <bsd.port.pre.mk>
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You can build GNUnet with the following options:"
-	@${ECHO_MSG} "		WITH_MYSQL=yes		Turn on MySQL support"
-	@${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} ""
-
 post-patch:
-	@${FIND} ${WRKSRC} -name configure | ${XARGS} \
-	${REINPLACE_CMD} -e \
-		's|-pthread [\$$]CFLAGS|${PTHREAD_CFLAGS} \$$CFLAGS|g ; \
-		 s|-lpthread|${PTHREAD_LIBS}|g'
-	${REINPLACE_CMD} -e \
-		's|^#include <values.h>|#include <limits.h>|g' \
-		${WRKSRC}/src/applications/afs/module/manager.c
-	${REINPLACE_CMD} -e \
-		's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/src/include/gnunet_util.h
+.for i in configure src/applications/sqstore_postgres/postgres.c
+	@${REINPLACE_CMD} -e 's|postgresql/||g' ${WRKSRC}/${i}
+.endfor
 
 post-install:
-	${INSTALL_DATA}	${WRKSRC}/contrib/gnunet.root ${PREFIX}/etc/gnunet.conf-dist
-.ifndef(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA}	${WRKSRC}/contrib/gnunet.user ${DOCSDIR}
-	${INSTALL_DATA}	${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA}	${WRKSRC}/ChangeLog ${DOCSDIR}
+.for i in gnunet.conf gnunetd.conf
+	${INSTALL_DATA}	${WRKSRC}/contrib/${i} ${PREFIX}/etc/${i}-dist
+.endfor
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for i in AUTHORS ChangeLog HACKING README UPDATING
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/*.cgi ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/*.php ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/*.sh ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/gnunet/distinfo b/net-p2p/gnunet/distinfo
index 822ecdff095e..8356c366b6ef 100644
--- a/net-p2p/gnunet/distinfo
+++ b/net-p2p/gnunet/distinfo
@@ -1,3 +1,3 @@
-MD5 (GNUnet-0.6.6b.tar.bz2) = dc04ecf7d1e7d4ccfde62fad101a301f
-SHA256 (GNUnet-0.6.6b.tar.bz2) = d454715a0531b2e0fe2a94ba60b5a8b89d720f3c384c65e94d24118be1a47bb1
-SIZE (GNUnet-0.6.6b.tar.bz2) = 1291441
+MD5 (GNUnet-0.8.0c.tar.bz2) = c98c4c8c538013f69e12e586c63b281e
+SHA256 (GNUnet-0.8.0c.tar.bz2) = 03ad449f8acc3abb0f6afcd496dfb04a48c1eb811df57a856f46eb9334e79c22
+SIZE (GNUnet-0.8.0c.tar.bz2) = 1448541
diff --git a/net-p2p/gnunet/files/patch-configure b/net-p2p/gnunet/files/patch-configure
deleted file mode 100644
index 5934b64bc7d0..000000000000
--- a/net-p2p/gnunet/files/patch-configure
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$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 $ZLIBS"
--    CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
-+    LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql $LDFLAGS $ZLIBS"
-+    CPPFLAGS="-I${LOCALBASE}/include $CPPFLAGS"
- 
- for ac_header in mysql/mysql.h
- do
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
deleted file mode 100644
index 8952e613bd82..000000000000
--- a/net-p2p/gnunet/files/patch-src_applications_afs_module_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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 $@
- 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
deleted file mode 100644
index d9a2b848d970..000000000000
--- a/net-p2p/gnunet/files/patch-src_applications_afs_tools_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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 $@
- 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
deleted file mode 100644
index 9139ec802848..000000000000
--- a/net-p2p/gnunet/files/patch-src_applications_chat_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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 $@
- 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
deleted file mode 100644
index 6342016773f5..000000000000
--- a/net-p2p/gnunet/files/patch-src_applications_dht_tools_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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 $@
- 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
deleted file mode 100644
index 1134073ae1bf..000000000000
--- a/net-p2p/gnunet/files/patch-src_applications_stats_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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 $@
- SOURCES = $(gnunet_stats_SOURCES)
- DIST_SOURCES = $(gnunet_stats_SOURCES)
- 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
deleted file mode 100644
index b3c0253bf1d6..000000000000
--- a/net-p2p/gnunet/files/patch-src_applications_tbench_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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 $@
- 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
deleted file mode 100644
index 23b0ed59044f..000000000000
--- a/net-p2p/gnunet/files/patch-src_applications_testbed_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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 $@
- 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
deleted file mode 100644
index 5a089ab930ab..000000000000
--- a/net-p2p/gnunet/files/patch-src_applications_tracekit_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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 $@
- SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \
- 	$(gnunet_tracekit_SOURCES)
- DIST_SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \
diff --git a/net-p2p/gnunet/files/patch-src_conf_Makefile.in b/net-p2p/gnunet/files/patch-src_conf_Makefile.in
deleted file mode 100644
index 270399434142..000000000000
--- a/net-p2p/gnunet/files/patch-src_conf_Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/conf/Makefile.in.orig
-+++ src/conf/Makefile.in
-@@ -100,7 +100,7 @@
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+	$(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@
- SOURCES = $(gnunet_setup_SOURCES) gnunet-win-tool.c
- DIST_SOURCES = $(am__gnunet_setup_SOURCES_DIST) gnunet-win-tool.c
- ETAGS = etags
-@@ -312,7 +312,7 @@
-  gnunet-setup.c
- 
- gnunet_setup_LDFLAGS = \
-- $(curses_lib)
-+ $(curses_lib) $(LTLIBINTL)
- 
- gnunet_setup_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la
diff --git a/net-p2p/gnunet/files/patch-src_include_gnunet__util.h b/net-p2p/gnunet/files/patch-src_include_gnunet__util.h
deleted file mode 100644
index 89867ccbfa46..000000000000
--- a/net-p2p/gnunet/files/patch-src_include_gnunet__util.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- 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"
--#define DEFAULT_DAEMON_CONFIG_FILE "/etc/gnunet.conf"
-+#define DEFAULT_DAEMON_CONFIG_FILE "%%PREFIX%%/etc/gnunet.conf"
- 
- /* *******************API *********************** */
- 
-@@ -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
-  */
--int checkIP6Listed(const CIDR6Network * list,
--		   const IP6addr * ip);
-+int checkIP6Listed(CIDR6Network * list,
-+		   IP6addr * ip);
- 
- /**
-  * Parse a network specification. The argument specifies
diff --git a/net-p2p/gnunet/files/patch-src_include_platform.h b/net-p2p/gnunet/files/patch-src_include_platform.h
deleted file mode 100644
index 5896b4a92d15..000000000000
--- a/net-p2p/gnunet/files/patch-src_include_platform.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/include/platform.h.orig	Sat Nov  5 20:32:56 2005
-+++ src/include/platform.h	Sat Nov  5 20:33:19 2005
-@@ -57,6 +57,7 @@
-  #include <Winsock2.h>
- #else
- #ifndef MINGW
-+ #include <sys/types.h>
-  #include <netdb.h>
-  #include <sys/socket.h>
-  #include <netinet/in.h>
diff --git a/net-p2p/gnunet/files/patch-src_server_Makefile.in b/net-p2p/gnunet/files/patch-src_server_Makefile.in
deleted file mode 100644
index 15587ef6d6bd..000000000000
--- a/net-p2p/gnunet/files/patch-src_server_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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 $@
- 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
deleted file mode 100644
index bcab32ed46c0..000000000000
--- a/net-p2p/gnunet/files/patch-src_transports_udp6.c
+++ /dev/null
@@ -1,21 +0,0 @@
-
-$FreeBSD$
-
---- src/transports/udp6.c.orig
-+++ src/transports/udp6.c
-@@ -275,6 +275,7 @@
- #endif
-     /* quick test of the packet, if failed, repeat! */
-     if (size != ntohs(udp6m.size)) {
-+      char * tmp = MALLOC(INET6_ADDRSTRLEN);
-       LOG(LOG_WARNING,
- 	  _("Packed received from %s:%d (UDP6) failed format check."),
- 	  inet_ntop(AF_INET6,
-@@ -282,6 +283,7 @@
- 		    tmp,
- 		    INET6_ADDRSTRLEN), 
- 	  ntohs(incoming.sin6_port));
-+      FREE(tmp);
-       goto RETRY;
-     }
-     GNUNET_ASSERT(sizeof(struct in6_addr) == sizeof(IP6addr));
diff --git a/net-p2p/gnunet/pkg-plist b/net-p2p/gnunet/pkg-plist
index 157821131b56..ed25ad3789d1 100644
--- a/net-p2p/gnunet/pkg-plist
+++ b/net-p2p/gnunet/pkg-plist
@@ -1,13 +1,7 @@
+bin/gnunet-auto-share
 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
-%%WITH_GUILE%%bin/gnunet-download-manager.scm
-bin/gnunet-gtk
 bin/gnunet-insert
 bin/gnunet-peer-info
 bin/gnunet-pseudonym
@@ -15,99 +9,290 @@ bin/gnunet-search
 bin/gnunet-setup
 bin/gnunet-stats
 bin/gnunet-tbench
-bin/gnunet-testbed
 bin/gnunet-tracekit
 bin/gnunet-transport-check
+bin/gnunet-unindex
 bin/gnunet-update
 bin/gnunetd
+bin/remotetest
 etc/gnunet.conf-dist
-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_service.h
-include/gnunet_rpc_service.h
-include/gnunet_transport.h
-include/gnunet_util.h
-lib/libgnunet_afs_esed2.a
-lib/libgnunet_afs_esed2.la
-lib/libgnunet_afs_esed2.so
-lib/libgnunet_afs_esed2.so.0
-lib/libgnunetafs_protocol.a
-lib/libgnunetafs_protocol.la
-lib/libgnunetafs_protocol.so
-lib/libgnunetchat_protocol.a
-lib/libgnunetchat_protocol.la
-lib/libgnunetchat_protocol.so
-lib/libgnunetdht_api.a
-lib/libgnunetdht_api.la
-lib/libgnunetdht_api.so
-lib/libgnunetdht_api.so.0
-lib/libgnunetdht_datastore_memory.a
-lib/libgnunetdht_datastore_memory.la
-lib/libgnunetdht_datastore_memory.so
-lib/libgnunetdht_datastore_memory.so.0
-lib/libgnunetdht_protocol.a
-lib/libgnunetdht_protocol.la
-lib/libgnunetdht_protocol.so
-lib/libgnunetrpc_protocol.a
-lib/libgnunetrpc_protocol.la
-lib/libgnunetrpc_protocol.so
-lib/libgnunetrpc_util.a
-lib/libgnunetrpc_util.la
-lib/libgnunetrpc_util.so
-lib/libgnunetrpc_util.so.0
-lib/libgnunettbench_protocol.a
-lib/libgnunettbench_protocol.la
-lib/libgnunettbench_protocol.so
-lib/libgnunettestbed_protocol.a
-lib/libgnunettestbed_protocol.la
-lib/libgnunettestbed_protocol.so
-lib/libgnunettracekit_protocol.a
-lib/libgnunettracekit_protocol.la
-lib/libgnunettracekit_protocol.so
-lib/libgnunettransport_http.a
-lib/libgnunettransport_http.la
-lib/libgnunettransport_http.so
-lib/libgnunettransport_nat.a
-lib/libgnunettransport_nat.la
-lib/libgnunettransport_nat.so
-lib/libgnunettransport_smtp.a
-lib/libgnunettransport_smtp.la
-lib/libgnunettransport_smtp.so
-lib/libgnunettransport_tcp.a
-lib/libgnunettransport_tcp.la
-lib/libgnunettransport_tcp.so
-lib/libgnunettransport_udp.a
-lib/libgnunettransport_udp.la
-lib/libgnunettransport_udp.so
+etc/gnunetd.conf-dist
+include/GNUnet/gnunet_bootstrap_service.h
+include/GNUnet/gnunet_chat_lib.h
+include/GNUnet/gnunet_collection_lib.h
+include/GNUnet/gnunet_core.h
+include/GNUnet/gnunet_datastore_service.h
+include/GNUnet/gnunet_dht_lib.h
+include/GNUnet/gnunet_dht_service.h
+include/GNUnet/gnunet_directories.h
+include/GNUnet/gnunet_dstore_service.h
+include/GNUnet/gnunet_ecrs_lib.h
+include/GNUnet/gnunet_fragmentation_service.h
+include/GNUnet/gnunet_fs_lib.h
+include/GNUnet/gnunet_fsui_lib.h
+include/GNUnet/gnunet_getoption_lib.h
+include/GNUnet/gnunet_identity_lib.h
+include/GNUnet/gnunet_identity_service.h
+include/GNUnet/gnunet_kvstore_service.h
+include/GNUnet/gnunet_mysql.h
+include/GNUnet/gnunet_namespace_lib.h
+include/GNUnet/gnunet_pingpong_service.h
+include/GNUnet/gnunet_protocols.h
+include/GNUnet/gnunet_remote_lib.h
+include/GNUnet/gnunet_rpc_lib.h
+include/GNUnet/gnunet_rpc_service.h
+include/GNUnet/gnunet_session_service.h
+include/GNUnet/gnunet_setup_lib.h
+include/GNUnet/gnunet_sqstore_service.h
+include/GNUnet/gnunet_state_service.h
+include/GNUnet/gnunet_stats_lib.h
+include/GNUnet/gnunet_stats_service.h
+include/GNUnet/gnunet_testing_lib.h
+include/GNUnet/gnunet_topology_service.h
+include/GNUnet/gnunet_tracekit_lib.h
+include/GNUnet/gnunet_traffic_lib.h
+include/GNUnet/gnunet_traffic_service.h
+include/GNUnet/gnunet_transport.h
+include/GNUnet/gnunet_transport_service.h
+include/GNUnet/gnunet_upnp_service.h
+include/GNUnet/gnunet_uritrack_lib.h
+include/GNUnet/gnunet_util.h
+include/GNUnet/gnunet_util_boot.h
+include/GNUnet/gnunet_util_common.h
+include/GNUnet/gnunet_util_config.h
+include/GNUnet/gnunet_util_containers.h
+include/GNUnet/gnunet_util_core.h
+include/GNUnet/gnunet_util_cron.h
+include/GNUnet/gnunet_util_crypto.h
+include/GNUnet/gnunet_util_disk.h
+include/GNUnet/gnunet_util_error.h
+include/GNUnet/gnunet_util_error_loggers.h
+include/GNUnet/gnunet_util_getopt.h
+include/GNUnet/gnunet_util_network.h
+include/GNUnet/gnunet_util_network_client.h
+include/GNUnet/gnunet_util_os.h
+include/GNUnet/gnunet_util_pseudonym.h
+include/GNUnet/gnunet_util_string.h
+include/GNUnet/gnunet_util_threads.h
+lib/GNUnet/libgnunetmodule_advertising.a
+lib/GNUnet/libgnunetmodule_advertising.la
+lib/GNUnet/libgnunetmodule_advertising.so
+lib/GNUnet/libgnunetmodule_bootstrap.a
+lib/GNUnet/libgnunetmodule_bootstrap.la
+lib/GNUnet/libgnunetmodule_bootstrap.so
+lib/GNUnet/libgnunetmodule_chat.a
+lib/GNUnet/libgnunetmodule_chat.la
+lib/GNUnet/libgnunetmodule_chat.so
+lib/GNUnet/libgnunetmodule_datastore.a
+lib/GNUnet/libgnunetmodule_datastore.la
+lib/GNUnet/libgnunetmodule_datastore.so
+lib/GNUnet/libgnunetmodule_dht.a
+lib/GNUnet/libgnunetmodule_dht.la
+lib/GNUnet/libgnunetmodule_dht.so
+%%MYSQL%%lib/GNUnet/libgnunetmodule_dstore_mysql.a
+%%MYSQL%%lib/GNUnet/libgnunetmodule_dstore_mysql.la
+%%MYSQL%%lib/GNUnet/libgnunetmodule_dstore_mysql.so
+%%SQLITE%%lib/GNUnet/libgnunetmodule_dstore_sqlite.a
+%%SQLITE%%lib/GNUnet/libgnunetmodule_dstore_sqlite.la
+%%SQLITE%%lib/GNUnet/libgnunetmodule_dstore_sqlite.so
+lib/GNUnet/libgnunetmodule_fragmentation.a
+lib/GNUnet/libgnunetmodule_fragmentation.la
+lib/GNUnet/libgnunetmodule_fragmentation.so
+lib/GNUnet/libgnunetmodule_fs.a
+lib/GNUnet/libgnunetmodule_fs.la
+lib/GNUnet/libgnunetmodule_fs.so
+lib/GNUnet/libgnunetmodule_getoption.a
+lib/GNUnet/libgnunetmodule_getoption.la
+lib/GNUnet/libgnunetmodule_getoption.so
+lib/GNUnet/libgnunetmodule_hostlist.a
+lib/GNUnet/libgnunetmodule_hostlist.la
+lib/GNUnet/libgnunetmodule_hostlist.so
+lib/GNUnet/libgnunetmodule_identity.a
+lib/GNUnet/libgnunetmodule_identity.la
+lib/GNUnet/libgnunetmodule_identity.so
+%%SQLITE%%lib/GNUnet/libgnunetmodule_kvstore_sqlite.a
+%%SQLITE%%lib/GNUnet/libgnunetmodule_kvstore_sqlite.la
+%%SQLITE%%lib/GNUnet/libgnunetmodule_kvstore_sqlite.so
+lib/GNUnet/libgnunetmodule_pingpong.a
+lib/GNUnet/libgnunetmodule_pingpong.la
+lib/GNUnet/libgnunetmodule_pingpong.so
+lib/GNUnet/libgnunetmodule_rpc.a
+lib/GNUnet/libgnunetmodule_rpc.la
+lib/GNUnet/libgnunetmodule_rpc.so
+lib/GNUnet/libgnunetmodule_session.a
+lib/GNUnet/libgnunetmodule_session.la
+lib/GNUnet/libgnunetmodule_session.so
+%%MYSQL%%lib/GNUnet/libgnunetmodule_sqstore_mysql.a
+%%MYSQL%%lib/GNUnet/libgnunetmodule_sqstore_mysql.la
+%%MYSQL%%lib/GNUnet/libgnunetmodule_sqstore_mysql.so
+%%PGSQL%%lib/GNUnet/libgnunetmodule_sqstore_postgres.a
+%%PGSQL%%lib/GNUnet/libgnunetmodule_sqstore_postgres.la
+%%PGSQL%%lib/GNUnet/libgnunetmodule_sqstore_postgres.so
+%%SQLITE%%lib/GNUnet/libgnunetmodule_sqstore_sqlite.a
+%%SQLITE%%lib/GNUnet/libgnunetmodule_sqstore_sqlite.la
+%%SQLITE%%lib/GNUnet/libgnunetmodule_sqstore_sqlite.so
+lib/GNUnet/libgnunetmodule_state.a
+lib/GNUnet/libgnunetmodule_state.la
+lib/GNUnet/libgnunetmodule_state.so
+lib/GNUnet/libgnunetmodule_stats.a
+lib/GNUnet/libgnunetmodule_stats.la
+lib/GNUnet/libgnunetmodule_stats.so
+lib/GNUnet/libgnunetmodule_tbench.a
+lib/GNUnet/libgnunetmodule_tbench.la
+lib/GNUnet/libgnunetmodule_tbench.so
+lib/GNUnet/libgnunetmodule_template.a
+lib/GNUnet/libgnunetmodule_template.la
+lib/GNUnet/libgnunetmodule_template.so
+lib/GNUnet/libgnunetmodule_topology_default.a
+lib/GNUnet/libgnunetmodule_topology_default.la
+lib/GNUnet/libgnunetmodule_topology_default.so
+lib/GNUnet/libgnunetmodule_tracekit.a
+lib/GNUnet/libgnunetmodule_tracekit.la
+lib/GNUnet/libgnunetmodule_tracekit.so
+lib/GNUnet/libgnunetmodule_traffic.a
+lib/GNUnet/libgnunetmodule_traffic.la
+lib/GNUnet/libgnunetmodule_traffic.so
+lib/GNUnet/libgnunetmodule_transport.a
+lib/GNUnet/libgnunetmodule_transport.la
+lib/GNUnet/libgnunetmodule_transport.so
+lib/GNUnet/libgnunetmodule_upnp.a
+lib/GNUnet/libgnunetmodule_upnp.la
+lib/GNUnet/libgnunetmodule_upnp.so
+lib/GNUnet/libgnunetsetup_gtk.a
+lib/GNUnet/libgnunetsetup_gtk.la
+lib/GNUnet/libgnunetsetup_gtk.so
+lib/GNUnet/libgnunetsetup_text.a
+lib/GNUnet/libgnunetsetup_text.la
+lib/GNUnet/libgnunetsetup_text.so
+lib/GNUnet/libgnunettransport_http.a
+lib/GNUnet/libgnunettransport_http.la
+lib/GNUnet/libgnunettransport_http.so
+lib/GNUnet/libgnunettransport_nat.a
+lib/GNUnet/libgnunettransport_nat.la
+lib/GNUnet/libgnunettransport_nat.so
+lib/GNUnet/libgnunettransport_smtp.a
+lib/GNUnet/libgnunettransport_smtp.la
+lib/GNUnet/libgnunettransport_smtp.so
+lib/GNUnet/libgnunettransport_tcp.a
+lib/GNUnet/libgnunettransport_tcp.la
+lib/GNUnet/libgnunettransport_tcp.so
+lib/GNUnet/libgnunettransport_udp.a
+lib/GNUnet/libgnunettransport_udp.la
+lib/GNUnet/libgnunettransport_udp.so
+lib/libgnunetchatapi.a
+lib/libgnunetchatapi.la
+lib/libgnunetchatapi.so
+lib/libgnunetchatapi.so.0
+lib/libgnunetcollection.a
+lib/libgnunetcollection.la
+lib/libgnunetcollection.so
+lib/libgnunetcollection.so.0
+lib/libgnunetcore.a
+lib/libgnunetcore.la
+lib/libgnunetcore.so
+lib/libgnunetcore.so.0
+lib/libgnunetdhtapi.a
+lib/libgnunetdhtapi.la
+lib/libgnunetdhtapi.so
+lib/libgnunetdhtapi.so.0
+lib/libgnunetecrs.a
+lib/libgnunetecrs.la
+lib/libgnunetecrs.so
+lib/libgnunetecrs.so.0
+lib/libgnunetecrscore.a
+lib/libgnunetecrscore.la
+lib/libgnunetecrscore.so
+lib/libgnunetecrscore.so.0
+lib/libgnunetfs.a
+lib/libgnunetfs.la
+lib/libgnunetfs.so
+lib/libgnunetfs.so.0
+lib/libgnunetfsui.a
+lib/libgnunetfsui.la
+lib/libgnunetfsui.so
+lib/libgnunetfsui.so.0
+lib/libgnunetgetoptionapi.a
+lib/libgnunetgetoptionapi.la
+lib/libgnunetgetoptionapi.so
+lib/libgnunetgetoptionapi.so.0
+lib/libgnunetidentityapi.a
+lib/libgnunetidentityapi.la
+lib/libgnunetidentityapi.so
+lib/libgnunetidentityapi.so.0
+lib/libgnunetip.a
+lib/libgnunetip.la
+lib/libgnunetip.so
+lib/libgnunetip.so.0
+%%MYSQL%%lib/libgnunetmysql.a
+%%MYSQL%%lib/libgnunetmysql.la
+%%MYSQL%%lib/libgnunetmysql.so
+%%MYSQL%%lib/libgnunetmysql.so.0
+lib/libgnunetnamespace.a
+lib/libgnunetnamespace.la
+lib/libgnunetnamespace.so
+lib/libgnunetnamespace.so.0
+lib/libgnunetremoteapi.a
+lib/libgnunetremoteapi.la
+lib/libgnunetremoteapi.so
+lib/libgnunetremoteapi.so.0
+lib/libgnunetrpcutil.a
+lib/libgnunetrpcutil.la
+lib/libgnunetrpcutil.so
+lib/libgnunetrpcutil.so.0
+lib/libgnunetsetup.a
+lib/libgnunetsetup.la
+lib/libgnunetsetup.so
+lib/libgnunetsetup.so.0
+lib/libgnunetstatsapi.a
+lib/libgnunetstatsapi.la
+lib/libgnunetstatsapi.so
+lib/libgnunetstatsapi.so.0
+lib/libgnunettestingapi.a
+lib/libgnunettestingapi.la
+lib/libgnunettestingapi.so
+lib/libgnunettestingapi.so.0
+lib/libgnunettracekitapi.a
+lib/libgnunettracekitapi.la
+lib/libgnunettracekitapi.so
+lib/libgnunettracekitapi.so.0
+lib/libgnunettrafficapi.a
+lib/libgnunettrafficapi.la
+lib/libgnunettrafficapi.so
+lib/libgnunettrafficapi.so.0
+lib/libgnuneturitrack.a
+lib/libgnuneturitrack.la
+lib/libgnuneturitrack.so
+lib/libgnuneturitrack.so.0
 lib/libgnunetutil.a
 lib/libgnunetutil.la
 lib/libgnunetutil.so
-lib/libgnunetutil.so.0
-share/GNUnet/gnunet_logo.png
-share/locale/de/LC_MESSAGES/GNUnet.mo
-lib/libgnunetafs_database_directory.a
-lib/libgnunetafs_database_directory.la
-lib/libgnunetafs_database_directory.so
-%%WITH_GDBM%%lib/libgnunetafs_database_gdbm.a
-%%WITH_GDBM%%lib/libgnunetafs_database_gdbm.la
-%%WITH_GDBM%%lib/libgnunetafs_database_gdbm.so
-%%WITH_TDB%%lib/libgnunetafs_database_tdb.a
-%%WITH_TDB%%lib/libgnunetafs_database_tdb.la
-%%WITH_TDB%%lib/libgnunetafs_database_tdb.so
-%%WITH_SQLITE%%lib/libgnunetafs_database_sqlite.a
-%%WITH_SQLITE%%lib/libgnunetafs_database_sqlite.la
-%%WITH_SQLITE%%lib/libgnunetafs_database_sqlite.so
-%%WITH_IPV6%%lib/libgnunettransport_tcp6.a
-%%WITH_IPV6%%lib/libgnunettransport_tcp6.la
-%%WITH_IPV6%%lib/libgnunettransport_tcp6.so
-%%WITH_IPV6%%lib/libgnunettransport_udp6.a
-%%WITH_IPV6%%lib/libgnunettransport_udp6.la
-%%WITH_IPV6%%lib/libgnunettransport_udp6.so
-@dirrm share/GNUnet
-%%PORTDOCS%%%%DOCSDIR%%/README
+lib/libgnunetutil.so.3
+share/GNUnet/config-client.scm
+share/GNUnet/config-daemon.scm
+share/GNUnet/gnunet-lab-testing.conf
+share/GNUnet/gnunet-logo-color.png
+share/GNUnet/gnunet-setup.glade
+share/GNUnet/gnunet-testing.conf
+share/GNUnet/gnunetd.conf.skel
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/gnunet.user
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/UPDATING
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnmessage.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hostlist.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hostlist.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/junkinsert.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/junklookup.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/namespacehelper.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/report.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/visualize_stats.sh
+share/locale/de/LC_MESSAGES/GNUnet.mo
+share/locale/es/LC_MESSAGES/GNUnet.mo
+share/locale/sv/LC_MESSAGES/GNUnet.mo
+share/locale/vi/LC_MESSAGES/GNUnet.mo
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm share/GNUnet
+@dirrm lib/GNUnet
+@dirrm include/GNUnet