17 files changed, 655 insertions, 323 deletions

diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index b04cbdf23bd1..72244a711a81 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnunet
-DISTVERSION=	0.9.3
-PORTREVISION=	11
+PORTVERSION=	0.10.1
 CATEGORIES=	net-p2p ipv6 security
 MASTER_SITES=	GNU
 
@@ -12,145 +11,105 @@ COMMENT=	Anonymous, distributed, reputation-based network
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libunistring.so:${PORTSDIR}/devel/libunistring \
-		libcurl.so:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
+		libopus.so:${PORTSDIR}/audio/opus \
+		libpulse.so:${PORTSDIR}/audio/pulseaudio \
+		libunistring.so:${PORTSDIR}/devel/libunistring \
+		libidn.so:${PORTSDIR}/dns/libidn \
 		libglpk.so:${PORTSDIR}/math/glpk \
 		libgmp.so:${PORTSDIR}/math/gmp \
+		libgnutls.so:${PORTSDIR}/security/gnutls \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libextractor.so:${PORTSDIR}/textproc/libextractor
 
-OPTIONS_DEFINE=		HTTP
-
-HTTP_DESC=	Enable HTTP transport via libmicrohttpd
-MYSQL_DESC=	Use MySQL for the data store and cache
-PGSQL_DESC=	Use PostgreSQL for the data store and cache
-SQLITE_DESC=	Use SQLite for the data store and cache
-
-OPTIONS_MULTI=		DB
-OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
-
-OPTIONS_DEFAULT=	SQLITE
-
-USE_AUTOTOOLS=	libltdl libtool
-USES=		iconv gmake
+USES=		gmake iconv libtool pathfix pkgconfig
+USE_GNOME=	glib20
+USE_GSTREAMER1=	yes
+USE_AUTOTOOLS=	libltdl
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-silent-rules \
+		--with-extractor=${LOCALBASE} \
+		--with-gnutls=${LOCALBASE} \
+		--with-libgcrypt-prefix=${LOCALBASE} \
+		--with-libunistring-prefix=${LOCALBASE} \
+		--with-ltdl=${LOCALBASE} \
+		--with-nssdir=no
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS=		--with-daemon-home-dir=${GNUNET_DAEMON_DIR} \
-			--with-daemon-config-dir=${PREFIX}/etc \
-			--with-extractor=${LOCALBASE} \
-			--with-libcurl=${LOCALBASE} \
-			--with-libgcrypt-prefix=${LOCALBASE} \
-			--with-libunistring-prefix=${LOCALBASE} \
-			--with-ltdl-include=${LOCALBASE}/include \
-			--with-ltdl-lib=${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GROUPS=		gnunet
 USERS=		gnunet
 
-MAN1=	gnunet-arm.1 gnunet-core.1 gnunet-directory.1 gnunet-download.1 \
-	gnunet-download-manager.1 gnunet-fs.1 gnunet-gns.1 gnunet-namestore.1 \
-	gnunet-nat-server.1 gnunet-peerinfo.1 gnunet-pseudonym.1 \
-	gnunet-publish.1 gnunet-rsa.1 gnunet-search.1 gnunet-statistics.1 \
-	gnunet-transport.1 gnunet-unindex.1 gnunet-vpn.1
+SUB_FILES=	pkg-install pkg-deinstall pkg-message
+SUB_LIST=	GNUNET_DAEMON_DIR="${GNUNET_DAEMON_DIR}"
+
+PLIST_SUB=	GNUNET_DAEMON_DIR="${GNUNET_DAEMON_DIR}"
+
+OPTIONS_DEFINE=		DOCS EXAMPLES HTTP NLS
+OPTIONS_MULTI=		DB
+OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
+OPTIONS_DEFAULT=	SQLITE
+OPTIONS_SUB=		yes
+
+HTTP_DESC=		Enable HTTP transport via libmicrohttpd
+HTTP_LIB_DEPENDS=	libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd
+HTTP_CONFIGURE_ON=	--with-microhttpd=${LOCALBASE}
+HTTP_CONFIGURE_OFF=	--without-microhttpd
+MYSQL_DESC=		Use MySQL for the data store and cache
+MYSQL_USE=		mysql=yes
+MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
+MYSQL_CONFIGURE_OFF=	--without-mysql
+NLS_USES=		gettext
+NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
+NLS_CONFIGURE_OFF=	--disable-nls
+PGSQL_DESC=		Use PostgreSQL for the data store and cache
+PGSQL_USE=		pgsql=yes
+PGSQL_CONFIGURE_ON=	--with-postgres=${LOCALBASE}
+PGSQL_CONFIGURE_OFF=	--without-postgres
+SQLITE_DESC=		Use SQLite for the data store and cache
+SQLITE_USE=		sqlite=yes
+SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
+SQLITE_CONFIGURE_OFF=	--without-sqlite
 
 #If a non-default GNUNET_DAEMON_DIR is defined, the home directory
 #of the gnunet user may need to be adjusted -- e.g., via:
 #pw usermod gnunet -d $GNUNET_DAEMON_DIR
 GNUNET_DAEMON_DIR?=		/var/lib/gnunet
-PLIST_SUB=	GNUNET_DAEMON_DIR=${GNUNET_DAEMON_DIR}
-SUB_FILES=	pkg-message
-NO_STAGE=	yes
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README
-.endif
-
-.if ${PORT_OPTIONS:MEXAMPLES}
-PORTEXAMPLES=	gnunet_janitor.py gnunet_pyexpect.py hostlist.cgi hostlist.php \
-report.sh
-.endif
-
-.if ${PORT_OPTIONS:MHTTP}
-BROKEN=		WITH_HTTP requires libmicrohttpd 0.9.18 or higher
-LIB_DEPENDS+=		libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd
-CONFIGURE_ARGS+=	--with-microhttpd=${LOCALBASE}
-PLIST_SUB+=		HTTP=""
-.else
-CONFIGURE_ARGS+=	--without-microhttpd
-PLIST_SUB+=		HTTP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=		yes
-CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-PLIST_SUB+=		MYSQL=""
-.else
-CONFIGURE_ARGS+=	--without-mysql
-PLIST_SUB+=		MYSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=	--with-libintl-prefix=${LOCALBASE}
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=		yes
-CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
-PLIST_SUB+=		PGSQL=""
-.else
-CONFIGURE_ARGS+=	--without-postgres
-PLIST_SUB+=		PGSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=		yes
-CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
-PLIST_SUB+=		SQLITE=""
-.else
-CONFIGURE_ARGS+=	--without-sqlite
-PLIST_SUB+=		SQLITE="@comment "
-.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|postgresql/||g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/gnunet_config.h \
-		${WRKSRC}/src/datacache/plugin_datacache_postgres.c \
-		${WRKSRC}/src/datastore/plugin_datastore_postgres.c \
-		${WRKSRC}/src/include/gnunet_postgres_lib.h
-	@${REINPLACE_CMD} \
-	-e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${WRKSRC}/pkgconfig/Makefile.in
-
-post-install:
+	@${REINPLACE_CMD} -e \
+		'/^install-data-am/s|install-docDATA||' ${WRKSRC}/Makefile.in
+.for i in configure gnunet_config.h \
+	src/datacache/plugin_datacache_postgres.c \
+	src/datastore/plugin_datastore_postgres.c \
+	src/include/gnunet_postgres_lib.h
+	@${REINPLACE_CMD} -e \
+		's|postgresql/||g' ${WRKSRC}/${i}
+.endfor
+
+post-build:
 	@${PRINTF} "%s\n%s\n%s\n" "[PATHS]" \
 	"SERVICEHOME = ${GNUNET_DAEMON_DIR}" \
 	"DEFAULTCONFIG = ${PREFIX}/etc/gnunet.conf" \
-	> ${PREFIX}/etc/gnunet.conf.sample
-.if !exists(${PREFIX}/etc/gnunet.conf)
-	@${CP} ${PREFIX}/etc/gnunet.conf.sample ${PREFIX}/etc/gnunet.conf
-.endif
-.if !exists(${GNUNET_DAEMON_DIR})
-	@${INSTALL} -d -o gnunet -g gnunet -m 700 ${GNUNET_DAEMON_DIR}
-.endif
-	@${INSTALL_PROGRAM} ${WRKSRC}/contrib/timeout_watchdog ${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	@cd ${WRKSRC}/contrib; ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
-.endif
-	@${ECHO_CMD} ""
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD} ""
+	> ${WRKDIR}/gnunet.conf.sample
+
+post-install:
+	(cd ${WRKSRC}/contrib && ${INSTALL_PROGRAM} timeout_watchdog \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKDIR} && ${INSTALL_DATA} gnunet.conf.sample \
+		${STAGEDIR}${PREFIX}/etc)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in AUTHORS ChangeLog NEWS README
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${DOCSDIR})
+.endfor
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+.for i in gnunet_janitor.py gnunet_pyexpect.py report.sh
+	(cd ${WRKSRC}/contrib && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${EXAMPLESDIR})
+.endfor
 
 .include <bsd.port.mk>
diff --git a/net-p2p/gnunet/distinfo b/net-p2p/gnunet/distinfo
index 13b4b225459b..1d0a55aa758b 100644
--- a/net-p2p/gnunet/distinfo
+++ b/net-p2p/gnunet/distinfo
@@ -1,2 +1,4 @@
-SHA256 (gnunet-0.9.3.tar.gz) = 50586ba4f82c4890f191bd79b1bb6504a5e9b9f90371f0c011879f25f9cef15e
-SIZE (gnunet-0.9.3.tar.gz) = 6518731
+SHA256 (gnunet-0.10.1.tar.gz) = f65cbbf9678d5b009b0a9ab2f2a29f8c956a3a23594fb404b10bbfc947fd9d13
+SIZE (gnunet-0.10.1.tar.gz) = 5022047
+SHA256 (gnurl-7.37.0.tar.gz) = cd5d14769c28b84aabef7a4b3cfabf06a4ae31acd320647f3175ee61604c58d0
+SIZE (gnurl-7.37.0.tar.gz) = 3377006
diff --git a/net-p2p/gnunet/files/patch-src__arm__Makefile.in b/net-p2p/gnunet/files/patch-src__arm__Makefile.in
new file mode 100644
index 000000000000..5360dc2dd2aa
--- /dev/null
+++ b/net-p2p/gnunet/files/patch-src__arm__Makefile.in
@@ -0,0 +1,12 @@
+--- src/arm/Makefile.in.orig
++++ src/arm/Makefile.in
+@@ -668,7 +668,8 @@
+   mockup-service.c
+ 
+ mockup_service_LDADD = \
+- $(top_builddir)/src/util/libgnunetutil.la  
++  $(top_builddir)/src/util/libgnunetutil.la \
++  $(GN_LIBINTL)
+ 
+ @HAVE_PYTHON_TRUE@check_SCRIPTS = \
+ @HAVE_PYTHON_TRUE@ test_gnunet_arm.py
diff --git a/net-p2p/gnunet/files/patch-src__ats-tests__Makefile.in b/net-p2p/gnunet/files/patch-src__ats-tests__Makefile.in
new file mode 100644
index 000000000000..722f740d8a40
--- /dev/null
+++ b/net-p2p/gnunet/files/patch-src__ats-tests__Makefile.in
@@ -0,0 +1,22 @@
+--- src/ats-tests/Makefile.in.orig
++++ src/ats-tests/Makefile.in
+@@ -722,7 +722,8 @@
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+- $(top_builddir)/src/transport/libgnunettransport.la
++ $(top_builddir)/src/transport/libgnunettransport.la \
++ $(GN_LIBINTL)
+ 
+ gnunet_ats_sim_DEPENDENCIES = \
+  libgnunetatstesting.la \
+@@ -735,7 +736,8 @@
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+- $(top_builddir)/src/transport/libgnunettransport.la
++ $(top_builddir)/src/transport/libgnunettransport.la \
++ $(GN_LIBINTL)
+ 
+ gnunet_solver_eval_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la
diff --git a/net-p2p/gnunet/files/patch-src__core__Makefile.in b/net-p2p/gnunet/files/patch-src__core__Makefile.in
new file mode 100644
index 000000000000..1166b1dd0c65
--- /dev/null
+++ b/net-p2p/gnunet/files/patch-src__core__Makefile.in
@@ -0,0 +1,12 @@
+--- src/core/Makefile.in.orig
++++ src/core/Makefile.in
+@@ -730,7 +730,8 @@
+ 
+ gnunet_core_LDADD = \
+   $(top_builddir)/src/core/libgnunetcore.la \
+-  $(top_builddir)/src/util/libgnunetutil.la
++  $(top_builddir)/src/util/libgnunetutil.la \
++  $(GN_LIBINTL)
+ 
+ gnunet_core_DEPENDENCIES = \
+   libgnunetcore.la
diff --git a/net-p2p/gnunet/files/patch-src__dht__Makefile.in b/net-p2p/gnunet/files/patch-src__dht__Makefile.in
new file mode 100644
index 000000000000..6e6b5e34296d
--- /dev/null
+++ b/net-p2p/gnunet/files/patch-src__dht__Makefile.in
@@ -0,0 +1,52 @@
+--- src/dht/Makefile.in.orig
++++ src/dht/Makefile.in
+@@ -754,7 +754,8 @@
+   $(top_builddir)/src/block/libgnunetblock.la \
+   $(top_builddir)/src/datacache/libgnunetdatacache.la \
+   $(top_builddir)/src/util/libgnunetutil.la \
+-  -lm
++  -lm \
++  $(LTLIBINTL)
+ 
+ gnunet_service_dht_xvine_SOURCES = \
+  gnunet-service-xdht.c gnunet-service-xdht.h \
+@@ -776,7 +777,8 @@
+   $(top_builddir)/src/block/libgnunetblock.la \
+   $(top_builddir)/src/datacache/libgnunetdatacache.la \
+   $(top_builddir)/src/util/libgnunetutil.la \
+-  -lm
++  -lm \
++  $(LTLIBINTL)
+ 
+ gnunet_dht_get_SOURCES = \
+  gnunet-dht-get.c
+@@ -784,7 +786,8 @@
+ gnunet_dht_get_LDADD = \
+   $(top_builddir)/src/dht/libgnunetdht.la \
+   $(top_builddir)/src/core/libgnunetcore.la \
+-  $(top_builddir)/src/util/libgnunetutil.la
++  $(top_builddir)/src/util/libgnunetutil.la \
++  $(LTLIBINTL)
+ 
+ gnunet_dht_get_DEPENDENCIES = \
+   libgnunetdht.la
+@@ -795,7 +798,8 @@
+ gnunet_dht_put_LDADD = \
+   $(top_builddir)/src/dht/libgnunetdht.la \
+   $(top_builddir)/src/core/libgnunetcore.la \
+-  $(top_builddir)/src/util/libgnunetutil.la
++  $(top_builddir)/src/util/libgnunetutil.la \
++  $(LTLIBINTL)
+ 
+ gnunet_dht_put_DEPENDENCIES = \
+   libgnunetdht.la
+@@ -806,7 +810,8 @@
+ gnunet_dht_monitor_LDADD = \
+   $(top_builddir)/src/dht/libgnunetdht.la \
+   $(top_builddir)/src/core/libgnunetcore.la \
+-  $(top_builddir)/src/util/libgnunetutil.la
++  $(top_builddir)/src/util/libgnunetutil.la \
++  $(LTLIBINTL)
+ 
+ gnunet_dht_monitor_DEPENDENCIES = \
+   libgnunetdht.la
diff --git a/net-p2p/gnunet/files/patch-src__hello__Makefile.in b/net-p2p/gnunet/files/patch-src__hello__Makefile.in
new file mode 100644
index 000000000000..ac5d3ee4dc09
--- /dev/null
+++ b/net-p2p/gnunet/files/patch-src__hello__Makefile.in
@@ -0,0 +1,12 @@
+--- src/hello/Makefile.in.orig
++++ src/hello/Makefile.in
+@@ -633,7 +633,8 @@
+ 
+ gnunet_hello_LDADD = \
+  $(top_builddir)/src/hello/libgnunethello.la \
+- $(top_builddir)/src/util/libgnunetutil.la  
++ $(top_builddir)/src/util/libgnunetutil.la \
++ $(LTLIBINTL)
+ 
+ gnunet_hello_DEPENDENCIES = \
+  libgnunethello.la \
diff --git a/net-p2p/gnunet/files/patch-src__mesh__Makefile.in b/net-p2p/gnunet/files/patch-src__mesh__Makefile.in
new file mode 100644
index 000000000000..dd65b74258c4
--- /dev/null
+++ b/net-p2p/gnunet/files/patch-src__mesh__Makefile.in
@@ -0,0 +1,32 @@
+--- src/mesh/Makefile.in.orig
++++ src/mesh/Makefile.in
+@@ -707,7 +707,8 @@
+ 
+ gnunet_mesh_LDADD = \
+   $(top_builddir)/src/mesh/libgnunetmesh.la \
+-  $(top_builddir)/src/util/libgnunetutil.la
++  $(top_builddir)/src/util/libgnunetutil.la \
++  $(LTLIBINTL)
+ 
+ gnunet_mesh_DEPENDENCIES = \
+   libgnunetmesh.la
+@@ -733,7 +734,8 @@
+   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+   $(top_builddir)/src/hello/libgnunethello.la \
+-  $(top_builddir)/src/block/libgnunetblock.la
++  $(top_builddir)/src/block/libgnunetblock.la \
++  $(LTLIBINTL)
+ 
+ gnunet_service_mesh_DEPENDENCIES = \
+   $(top_builddir)/src/util/libgnunetutil.la \
+@@ -764,7 +766,8 @@
+   $(top_builddir)/src/mesh/libgnunetmeshtest.a \
+   $(top_builddir)/src/mesh/libgnunetmesh.la \
+   $(top_builddir)/src/testbed/libgnunettestbed.la \
+-  $(top_builddir)/src/statistics/libgnunetstatistics.la
++  $(top_builddir)/src/statistics/libgnunetstatistics.la \
++  $(LTLIBINTL)
+ 
+ dep_mesh_test_lib = \
+   libgnunetmesh.la \
diff --git a/net-p2p/gnunet/files/patch-src__nat__Makefile.in b/net-p2p/gnunet/files/patch-src__nat__Makefile.in
new file mode 100644
index 000000000000..45a164421519
--- /dev/null
+++ b/net-p2p/gnunet/files/patch-src__nat__Makefile.in
@@ -0,0 +1,12 @@
+--- src/nat/Makefile.in.orig
++++ src/nat/Makefile.in
+@@ -657,7 +657,8 @@
+ 
+ gnunet_nat_server_LDADD = \
+   $(top_builddir)/src/nat/libgnunetnat.la \
+-  $(top_builddir)/src/util/libgnunetutil.la
++  $(top_builddir)/src/util/libgnunetutil.la \
++  $(GN_LIBINTL)
+ 
+ gnunet_nat_server_DEPENDENCIES = \
+   libgnunetnat.la
diff --git a/net-p2p/gnunet/files/patch-src__peerinfo-tools__Makefile.in b/net-p2p/gnunet/files/patch-src__peerinfo-tools__Makefile.in
new file mode 100644
index 000000000000..e766926c44ac
--- /dev/null
+++ b/net-p2p/gnunet/files/patch-src__peerinfo-tools__Makefile.in
@@ -0,0 +1,12 @@
+--- src/peerinfo-tool/Makefile.in.orig
++++ src/peerinfo-tool/Makefile.in
+@@ -594,7 +594,8 @@
+   $(top_builddir)/src/transport/libgnunettransport.la \
+   $(top_builddir)/src/hello/libgnunethello.la \
+   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+-  $(top_builddir)/src/util/libgnunetutil.la
++  $(top_builddir)/src/util/libgnunetutil.la \
++  $(GN_LIBINTL)
+ 
+ @HAVE_PYTHON_TRUE@check_SCRIPTS = \
+ @HAVE_PYTHON_TRUE@ test_gnunet_peerinfo.py
diff --git a/net-p2p/gnunet/files/patch-src__peerinfo__Makefile.in b/net-p2p/gnunet/files/patch-src__peerinfo__Makefile.in
new file mode 100644
index 000000000000..2bb422245b42
--- /dev/null
+++ b/net-p2p/gnunet/files/patch-src__peerinfo__Makefile.in
@@ -0,0 +1,12 @@
+--- src/peerinfo/Makefile.in.orig
++++ src/peerinfo/Makefile.in
+@@ -683,7 +683,8 @@
+ gnunet_service_peerinfo_LDADD = \
+   $(top_builddir)/src/hello/libgnunethello.la \
+   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+-  $(top_builddir)/src/util/libgnunetutil.la
++  $(top_builddir)/src/util/libgnunetutil.la \
++  $(LTLIBINTL)
+ 
+ @HAVE_BENCHMARKS_TRUE@PEERINFO_BENCHMARKS = \
+ @HAVE_BENCHMARKS_TRUE@ perf_peerinfo_api
diff --git a/net-p2p/gnunet/files/patch-src__regex__Makefile.in b/net-p2p/gnunet/files/patch-src__regex__Makefile.in
new file mode 100644
index 000000000000..6e39f2322911
--- /dev/null
+++ b/net-p2p/gnunet/files/patch-src__regex__Makefile.in
@@ -0,0 +1,32 @@
+--- src/regex/Makefile.in.orig
++++ src/regex/Makefile.in
+@@ -812,7 +812,8 @@
+   $(top_builddir)/src/dht/libgnunetdht.la \
+   $(top_builddir)/src/regex/libgnunetregexblock.la \
+   $(top_builddir)/src/regex/libgnunetregextest.a \
+-  $(top_builddir)/src/util/libgnunetutil.la 
++  $(top_builddir)/src/util/libgnunetutil.la \
++  $(LTLIBINTL)
+ 
+ perf_regex_DEPENDENCIES = \
+   libgnunetregex_internal.a \
+@@ -829,7 +830,8 @@
+   $(top_builddir)/src/regex/libgnunetregexblock.la \
+   $(top_builddir)/src/regex/libgnunetregextest.a \
+   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+-  $(top_builddir)/src/util/libgnunetutil.la 
++  $(top_builddir)/src/util/libgnunetutil.la \
++  $(LTLIBINTL)
+ 
+ gnunet_regex_profiler_DEPENDENCIES = \
+   $(top_builddir)/src/arm/libgnunetarm.la \
+@@ -846,7 +848,8 @@
+   $(top_builddir)/src/regex/libgnunetregexblock.la \
+   $(top_builddir)/src/regex/libgnunetregextest.a \
+   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+-  $(top_builddir)/src/util/libgnunetutil.la 
++  $(top_builddir)/src/util/libgnunetutil.la \
++  $(LTLIBINTL)
+ 
+ gnunet_daemon_regexprofiler_DEPENDENCIES = \
+   $(top_builddir)/src/dht/libgnunetdht.la \
diff --git a/net-p2p/gnunet/files/patch-src__testbed__Makefile.in b/net-p2p/gnunet/files/patch-src__testbed__Makefile.in
new file mode 100644
index 000000000000..ecddb8f72114
--- /dev/null
+++ b/net-p2p/gnunet/files/patch-src__testbed__Makefile.in
@@ -0,0 +1,22 @@
+--- src/testbed/Makefile.in.orig
++++ src/testbed/Makefile.in
+@@ -1004,7 +1004,8 @@
+   gnunet-service-testbed-logger.c
+ 
+ gnunet_service_testbed_logger_LDADD = \
+- $(top_builddir)/src/util/libgnunetutil.la
++ $(top_builddir)/src/util/libgnunetutil.la \
++ $(LTLIBINTL)
+ 
+ gnunet_service_testbed_logger_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la
+@@ -1014,7 +1015,8 @@
+ 
+ gnunet_testbed_profiler_LDADD = $(XLIB) \
+  $(top_builddir)/src/util/libgnunetutil.la \
+- $(top_builddir)/src/testbed/libgnunettestbed.la
++ $(top_builddir)/src/testbed/libgnunettestbed.la \
++ $(LTLIBINTL)
+ 
+ gnunet_testbed_profiler_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la \
diff --git a/net-p2p/gnunet/files/patch-src__transport__Makefile.in b/net-p2p/gnunet/files/patch-src__transport__Makefile.in
new file mode 100644
index 000000000000..be4f4ccfdb37
--- /dev/null
+++ b/net-p2p/gnunet/files/patch-src__transport__Makefile.in
@@ -0,0 +1,12 @@
+--- src/transport/Makefile.in.orig
++++ src/transport/Makefile.in
+@@ -1921,7 +1921,8 @@
+  gnunet-transport-certificate-creation.c
+ 
+ gnunet_transport_certificate_creation_LDADD = \
+-  $(top_builddir)/src/util/libgnunetutil.la
++  $(top_builddir)/src/util/libgnunetutil.la \
++  $(GN_LIBINTL)
+ 
+ gnunet_helper_transport_wlan_SOURCES = \
+  gnunet-helper-transport-wlan.c
diff --git a/net-p2p/gnunet/files/pkg-deinstall.in b/net-p2p/gnunet/files/pkg-deinstall.in
new file mode 100644
index 000000000000..d02df6733761
--- /dev/null
+++ b/net-p2p/gnunet/files/pkg-deinstall.in
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+GNUNET_DAEMON_DIR=%%GNUNET_DAEMON_DIR%%
+
+case $2 in
+POST-DEINSTALL)
+	rmdir $GNUNET_DAEMON_DIR 2>/dev/null || true
+	if [ -e $GNUNET_DAEMON_DIR ]; then
+		echo ""
+		echo "To completely remove the port, please remove the following"
+		echo "directories and the content manually:"
+		echo ""
+		echo "	$GNUNET_DAEMON_DIR"
+		echo ""
+	fi
+	;;
+esac
diff --git a/net-p2p/gnunet/files/pkg-install.in b/net-p2p/gnunet/files/pkg-install.in
new file mode 100644
index 000000000000..1149538a65fe
--- /dev/null
+++ b/net-p2p/gnunet/files/pkg-install.in
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+GNUNET_DAEMON_DIR=%%GNUNET_DAEMON_DIR%%
+
+case $2 in
+POST-INSTALL)
+	if [ ! -d $GNUNET_DAEMON_DIR ]; then
+		install -d -o gnunet -g gnunet -m 700 $GNUNET_DAEMON_DIR
+	fi
+	;;
+esac
diff --git a/net-p2p/gnunet/pkg-plist b/net-p2p/gnunet/pkg-plist
index c5b3b00196c3..c26f6796b672 100644
--- a/net-p2p/gnunet/pkg-plist
+++ b/net-p2p/gnunet/pkg-plist
@@ -1,70 +1,63 @@
 bin/gnunet-arm
+bin/gnunet-ats
+bin/gnunet-auto-share
+bin/gnunet-config
+bin/gnunet-conversation
+bin/gnunet-conversation-test
 bin/gnunet-core
-bin/gnunet-daemon-hostlist
-bin/gnunet-daemon-topology
-bin/gnunet-dht-get
-bin/gnunet-dht-monitor
-bin/gnunet-dht-put
+bin/gnunet-datastore
 bin/gnunet-directory
 bin/gnunet-download
 bin/gnunet-download-manager.scm
+bin/gnunet-ecc
 bin/gnunet-fs
+bin/gnunet-gns
 bin/gnunet-gns-import.sh
-bin/gnunet-helper-fs-publish
+bin/gnunet-gns-proxy-setup-ca
+bin/gnunet-identity
+bin/gnunet-mesh
+bin/gnunet-namecache
 bin/gnunet-namestore
 bin/gnunet-nat-server
+bin/gnunet-nse
 bin/gnunet-peerinfo
-bin/gnunet-pseudonym
 bin/gnunet-publish
+bin/gnunet-qr
 bin/gnunet-resolver
-bin/gnunet-rsa
+bin/gnunet-revocation
+bin/gnunet-scrypt
 bin/gnunet-search
-bin/gnunet-service-arm
-bin/gnunet-service-ats
-bin/gnunet-service-core
-bin/gnunet-service-datastore
-bin/gnunet-service-dht
-bin/gnunet-service-fs
-bin/gnunet-service-lockmanager
-bin/gnunet-service-mesh
-bin/gnunet-service-namestore
-bin/gnunet-service-nse
-bin/gnunet-service-peerinfo
-bin/gnunet-service-resolver
-bin/gnunet-service-statistics
-bin/gnunet-service-template
-bin/gnunet-service-transport
+bin/gnunet-set-ibf-profiler
+bin/gnunet-set-profiler
 bin/gnunet-statistics
 bin/gnunet-template
+bin/gnunet-testbed-profiler
 bin/gnunet-testing
 bin/gnunet-transport
 bin/gnunet-transport-certificate-creation
 bin/gnunet-unindex
-bin/mockup-service
+bin/gnunet-uri
+bin/gnunet-vpn
 bin/timeout_watchdog
-@unexec if [ -f %D/etc/gnunet.conf ] ; then cd %D/etc ; cmp -s gnunet.conf.sample gnunet.conf && rm -f gnunet.conf ; fi
-etc/gnunet.conf.sample
-@exec if [ ! -f %B/gnunet.conf ] ; then cp -p %D/%F %B/gnunet.conf ; fi
-include/gnunet/block_dns.h
-include/gnunet/block_fs.h
-include/gnunet/block_gns.h
-include/gnunet/gauger.h
+@sample etc/gnunet.conf.sample
 include/gnunet/gettext.h
 include/gnunet/gnunet_applications.h
 include/gnunet/gnunet_arm_service.h
+include/gnunet/gnunet_ats_plugin.h
 include/gnunet/gnunet_ats_service.h
 include/gnunet/gnunet_bandwidth_lib.h
 include/gnunet/gnunet_bio_lib.h
 include/gnunet/gnunet_block_lib.h
 include/gnunet/gnunet_block_plugin.h
-include/gnunet/gnunet_chat_service.h
 include/gnunet/gnunet_client_lib.h
 include/gnunet/gnunet_common.h
 include/gnunet/gnunet_config.h
 include/gnunet/gnunet_configuration_lib.h
 include/gnunet/gnunet_connection_lib.h
+include/gnunet/gnunet_consensus_service.h
 include/gnunet/gnunet_constants.h
 include/gnunet/gnunet_container_lib.h
+include/gnunet/gnunet_conversation_service.h
 include/gnunet/gnunet_core_service.h
 include/gnunet/gnunet_crypto_lib.h
 include/gnunet/gnunet_datacache_lib.h
@@ -72,21 +65,30 @@ include/gnunet/gnunet_datacache_plugin.h
 include/gnunet/gnunet_datastore_plugin.h
 include/gnunet/gnunet_datastore_service.h
 include/gnunet/gnunet_dht_service.h
-include/gnunet/gnunet_directories.h
 include/gnunet/gnunet_disk_lib.h
 include/gnunet/gnunet_dns_service.h
 include/gnunet/gnunet_dnsparser_lib.h
+include/gnunet/gnunet_dnsstub_lib.h
 include/gnunet/gnunet_dv_service.h
+include/gnunet/gnunet_env_lib.h
 include/gnunet/gnunet_fragmentation_lib.h
+include/gnunet/gnunet_friends_lib.h
 include/gnunet/gnunet_fs_service.h
 include/gnunet/gnunet_getopt_lib.h
 include/gnunet/gnunet_gns_service.h
+include/gnunet/gnunet_gnsrecord_lib.h
+include/gnunet/gnunet_gnsrecord_plugin.h
 include/gnunet/gnunet_hello_lib.h
 include/gnunet/gnunet_helper_lib.h
+include/gnunet/gnunet_identity_service.h
 include/gnunet/gnunet_load_lib.h
-include/gnunet/gnunet_lockmanager_service.h
 include/gnunet/gnunet_mesh_service.h
+include/gnunet/gnunet_microphone_lib.h
+include/gnunet/gnunet_mq_lib.h
+include/gnunet/gnunet_multicast_service.h
 include/gnunet/gnunet_mysql_lib.h
+include/gnunet/gnunet_namecache_plugin.h
+include/gnunet/gnunet_namecache_service.h
 include/gnunet/gnunet_namestore_plugin.h
 include/gnunet/gnunet_namestore_service.h
 include/gnunet/gnunet_nat_lib.h
@@ -99,19 +101,25 @@ include/gnunet/gnunet_plugin_lib.h
 include/gnunet/gnunet_postgres_lib.h
 include/gnunet/gnunet_program_lib.h
 include/gnunet/gnunet_protocols.h
-include/gnunet/gnunet_pseudonym_lib.h
-include/gnunet/gnunet_regex_lib.h
+include/gnunet/gnunet_psyc_service.h
+include/gnunet/gnunet_psycstore_plugin.h
+include/gnunet/gnunet_psycstore_service.h
+include/gnunet/gnunet_regex_service.h
 include/gnunet/gnunet_resolver_service.h
+include/gnunet/gnunet_revocation_service.h
+include/gnunet/gnunet_scalarproduct_service.h
 include/gnunet/gnunet_scheduler_lib.h
+include/gnunet/gnunet_secretsharing_service.h
 include/gnunet/gnunet_server_lib.h
 include/gnunet/gnunet_service_lib.h
+include/gnunet/gnunet_set_service.h
 include/gnunet/gnunet_signal_lib.h
 include/gnunet/gnunet_signatures.h
+include/gnunet/gnunet_speaker_lib.h
 include/gnunet/gnunet_statistics_service.h
-include/gnunet/gnunet_stream_lib.h
 include/gnunet/gnunet_strings_lib.h
+include/gnunet/gnunet_testbed_logger_service.h
 include/gnunet/gnunet_testbed_service.h
-include/gnunet/gnunet_testing_lib-new.h
 include/gnunet/gnunet_testing_lib.h
 include/gnunet/gnunet_time_lib.h
 include/gnunet/gnunet_transport_plugin.h
@@ -121,236 +129,327 @@ include/gnunet/gnunet_util_lib.h
 include/gnunet/gnunet_vpn_service.h
 include/gnunet/platform.h
 include/gnunet/plibc.h
-lib/gnunet/libgnunet_plugin_block_dht.a
-lib/gnunet/libgnunet_plugin_block_dht.la
+lib/gnunet/libexec/gnunet-daemon-exit
+lib/gnunet/libexec/gnunet-daemon-latency-logger
+lib/gnunet/libexec/gnunet-daemon-pt
+lib/gnunet/libexec/gnunet-daemon-regexprofiler
+lib/gnunet/libexec/gnunet-daemon-testbed-blacklist
+lib/gnunet/libexec/gnunet-daemon-testbed-underlay
+lib/gnunet/libexec/gnunet-daemon-topology
+lib/gnunet/libexec/gnunet-dns2gns
+lib/gnunet/libexec/gnunet-helper-audio-playback
+lib/gnunet/libexec/gnunet-helper-audio-record
+lib/gnunet/libexec/gnunet-helper-fs-publish
+lib/gnunet/libexec/gnunet-helper-nat-client
+lib/gnunet/libexec/gnunet-helper-nat-server
+lib/gnunet/libexec/gnunet-helper-testbed
+lib/gnunet/libexec/gnunet-service-arm
+lib/gnunet/libexec/gnunet-service-ats
+lib/gnunet/libexec/gnunet-service-conversation
+lib/gnunet/libexec/gnunet-service-core
+lib/gnunet/libexec/gnunet-service-datastore
+lib/gnunet/libexec/gnunet-service-dht
+lib/gnunet/libexec/gnunet-service-dht-xvine
+lib/gnunet/libexec/gnunet-service-dns
+lib/gnunet/libexec/gnunet-service-fs
+lib/gnunet/libexec/gnunet-service-gns
+lib/gnunet/libexec/gnunet-service-identity
+lib/gnunet/libexec/gnunet-service-mesh
+lib/gnunet/libexec/gnunet-service-namecache
+lib/gnunet/libexec/gnunet-service-namestore
+lib/gnunet/libexec/gnunet-service-nse
+lib/gnunet/libexec/gnunet-service-peerinfo
+lib/gnunet/libexec/gnunet-service-regex
+lib/gnunet/libexec/gnunet-service-resolver
+lib/gnunet/libexec/gnunet-service-revocation
+lib/gnunet/libexec/gnunet-service-set
+lib/gnunet/libexec/gnunet-service-statistics
+lib/gnunet/libexec/gnunet-service-template
+lib/gnunet/libexec/gnunet-service-testbed
+lib/gnunet/libexec/gnunet-service-testbed-logger
+lib/gnunet/libexec/gnunet-service-transport
+lib/gnunet/libexec/gnunet-service-vpn
+lib/gnunet/libgnunet_plugin_ats_mlp.so
+lib/gnunet/libgnunet_plugin_ats_proportional.so
+lib/gnunet/libgnunet_plugin_ats_ril.so
 lib/gnunet/libgnunet_plugin_block_dht.so
-lib/gnunet/libgnunet_plugin_block_fs.a
-lib/gnunet/libgnunet_plugin_block_fs.la
+lib/gnunet/libgnunet_plugin_block_dns.so
 lib/gnunet/libgnunet_plugin_block_fs.so
-lib/gnunet/libgnunet_plugin_block_template.a
-lib/gnunet/libgnunet_plugin_block_template.la
+lib/gnunet/libgnunet_plugin_block_gns.so
+lib/gnunet/libgnunet_plugin_block_regex.so
 lib/gnunet/libgnunet_plugin_block_template.so
-lib/gnunet/libgnunet_plugin_block_test.a
-lib/gnunet/libgnunet_plugin_block_test.la
 lib/gnunet/libgnunet_plugin_block_test.so
-%%MYSQL%%lib/gnunet/libgnunet_plugin_datacache_mysql.a
-%%MYSQL%%lib/gnunet/libgnunet_plugin_datacache_mysql.la
-%%MYSQL%%lib/gnunet/libgnunet_plugin_datacache_mysql.so
-%%PGSQL%%lib/gnunet/libgnunet_plugin_datacache_postgres.a
-%%PGSQL%%lib/gnunet/libgnunet_plugin_datacache_postgres.la
-%%PGSQL%%lib/gnunet/libgnunet_plugin_datacache_postgres.so
-%%SQLITE%%lib/gnunet/libgnunet_plugin_datacache_sqlite.a
-%%SQLITE%%lib/gnunet/libgnunet_plugin_datacache_sqlite.la
-%%SQLITE%%lib/gnunet/libgnunet_plugin_datacache_sqlite.so
-lib/gnunet/libgnunet_plugin_datacache_template.a
-lib/gnunet/libgnunet_plugin_datacache_template.la
+lib/gnunet/libgnunet_plugin_datacache_heap.so
+lib/gnunet/libgnunet_plugin_datacache_sqlite.so
 lib/gnunet/libgnunet_plugin_datacache_template.so
-%%MYSQL%%lib/gnunet/libgnunet_plugin_datastore_mysql.a
-%%MYSQL%%lib/gnunet/libgnunet_plugin_datastore_mysql.la
-%%MYSQL%%lib/gnunet/libgnunet_plugin_datastore_mysql.so
-%%PGSQL%%lib/gnunet/libgnunet_plugin_datastore_postgres.a
-%%PGSQL%%lib/gnunet/libgnunet_plugin_datastore_postgres.la
-%%PGSQL%%lib/gnunet/libgnunet_plugin_datastore_postgres.so
-%%SQLITE%%lib/gnunet/libgnunet_plugin_datastore_sqlite.a
-%%SQLITE%%lib/gnunet/libgnunet_plugin_datastore_sqlite.la
-%%SQLITE%%lib/gnunet/libgnunet_plugin_datastore_sqlite.so
-lib/gnunet/libgnunet_plugin_datastore_template.a
-lib/gnunet/libgnunet_plugin_datastore_template.la
+lib/gnunet/libgnunet_plugin_datastore_heap.so
+lib/gnunet/libgnunet_plugin_datastore_sqlite.so
 lib/gnunet/libgnunet_plugin_datastore_template.so
-%%SQLITE%%lib/gnunet/libgnunet_plugin_namestore_sqlite.a
-%%SQLITE%%lib/gnunet/libgnunet_plugin_namestore_sqlite.la
-%%SQLITE%%lib/gnunet/libgnunet_plugin_namestore_sqlite.so
-lib/gnunet/libgnunet_plugin_test.a
-lib/gnunet/libgnunet_plugin_test.la
+lib/gnunet/libgnunet_plugin_gnsrecord_conversation.so
+lib/gnunet/libgnunet_plugin_gnsrecord_dns.so
+lib/gnunet/libgnunet_plugin_gnsrecord_gns.so
+lib/gnunet/libgnunet_plugin_namecache_sqlite.so
+lib/gnunet/libgnunet_plugin_namestore_sqlite.so
 lib/gnunet/libgnunet_plugin_test.so
-%%HTTP%%lib/gnunet/libgnunet_plugin_transport_http.a
-%%HTTP%%lib/gnunet/libgnunet_plugin_transport_http.la
-%%HTTP%%lib/gnunet/libgnunet_plugin_transport_http.so
-%%HTTP%%lib/gnunet/libgnunet_plugin_transport_https.a
-%%HTTP%%lib/gnunet/libgnunet_plugin_transport_https.la
-%%HTTP%%lib/gnunet/libgnunet_plugin_transport_https.so
-lib/gnunet/libgnunet_plugin_transport_tcp.a
-lib/gnunet/libgnunet_plugin_transport_tcp.la
 lib/gnunet/libgnunet_plugin_transport_tcp.so
-lib/gnunet/libgnunet_plugin_transport_template.a
-lib/gnunet/libgnunet_plugin_transport_template.la
 lib/gnunet/libgnunet_plugin_transport_template.so
-lib/gnunet/libgnunet_plugin_transport_udp.a
-lib/gnunet/libgnunet_plugin_transport_udp.la
 lib/gnunet/libgnunet_plugin_transport_udp.so
-lib/gnunet/libgnunet_plugin_transport_unix.a
-lib/gnunet/libgnunet_plugin_transport_unix.la
 lib/gnunet/libgnunet_plugin_transport_unix.so
-lib/libgnunetarm.a
-lib/libgnunetarm.la
 lib/libgnunetarm.so
 lib/libgnunetarm.so.1
-lib/libgnunetats.a
-lib/libgnunetats.la
+lib/libgnunetarm.so.1.0.3
 lib/libgnunetats.so
-lib/libgnunetats.so.2
-lib/libgnunetblock.a
-lib/libgnunetblock.la
+lib/libgnunetats.so.4
+lib/libgnunetats.so.4.0.0
+lib/libgnunetatstesting.so
+lib/libgnunetatstesting.so.0
+lib/libgnunetatstesting.so.0.0.0
 lib/libgnunetblock.so
 lib/libgnunetblock.so.0
-lib/libgnunetcore.a
-lib/libgnunetcore.la
+lib/libgnunetblock.so.0.0.0
+lib/libgnunetconversation.so
+lib/libgnunetconversation.so.0
+lib/libgnunetconversation.so.0.0.0
 lib/libgnunetcore.so
 lib/libgnunetcore.so.0
-lib/libgnunetdatacache.a
-lib/libgnunetdatacache.la
+lib/libgnunetcore.so.0.0.1
 lib/libgnunetdatacache.so
 lib/libgnunetdatacache.so.0
-lib/libgnunetdatastore.a
-lib/libgnunetdatastore.la
+lib/libgnunetdatacache.so.0.0.1
 lib/libgnunetdatastore.so
 lib/libgnunetdatastore.so.1
-lib/libgnunetdht.a
-lib/libgnunetdht.la
+lib/libgnunetdatastore.so.1.0.0
 lib/libgnunetdht.so
-lib/libgnunetdht.so.1
-lib/libgnunetfragmentation.a
-lib/libgnunetfragmentation.la
+lib/libgnunetdht.so.0
+lib/libgnunetdht.so.0.2.0
+lib/libgnunetdns.so
+lib/libgnunetdns.so.0
+lib/libgnunetdns.so.0.0.0
+lib/libgnunetdnsparser.so
+lib/libgnunetdnsparser.so.0
+lib/libgnunetdnsparser.so.0.1.0
+lib/libgnunetdnsstub.so
+lib/libgnunetdnsstub.so.0
+lib/libgnunetdnsstub.so.0.0.0
 lib/libgnunetfragmentation.so
-lib/libgnunetfragmentation.so.1
-lib/libgnunetfs.a
-lib/libgnunetfs.la
+lib/libgnunetfragmentation.so.2
+lib/libgnunetfragmentation.so.2.0.0
+lib/libgnunetfriends.so
+lib/libgnunetfriends.so.0
+lib/libgnunetfriends.so.0.0.0
 lib/libgnunetfs.so
 lib/libgnunetfs.so.2
-lib/libgnunethello.a
-lib/libgnunethello.la
+lib/libgnunetfs.so.2.1.1
+lib/libgnunetgns.so
+lib/libgnunetgns.so.0
+lib/libgnunetgns.so.0.0.0
+lib/libgnunetgnsrecord.so
+lib/libgnunetgnsrecord.so.0
+lib/libgnunetgnsrecord.so.0.0.0
 lib/libgnunethello.so
 lib/libgnunethello.so.0
-lib/libgnunetlockmanager.a
-lib/libgnunetlockmanager.la
-lib/libgnunetlockmanager.so
-lib/libgnunetlockmanager.so.0
-lib/libgnunetmesh.a
-lib/libgnunetmesh.la
+lib/libgnunethello.so.0.1.0
+lib/libgnunetidentity.so
+lib/libgnunetidentity.so.0
+lib/libgnunetidentity.so.0.0.0
 lib/libgnunetmesh.so
-lib/libgnunetmesh.so.1
-%%MYSQL%%lib/libgnunetmysql.a
-%%MYSQL%%lib/libgnunetmysql.la
-%%MYSQL%%lib/libgnunetmysql.so
-%%MYSQL%%lib/libgnunetmysql.so.0
-lib/libgnunetnamestore.a
-lib/libgnunetnamestore.la
+lib/libgnunetmesh.so.5
+lib/libgnunetmesh.so.5.0.0
+lib/libgnunetmicrophone.so
+lib/libgnunetmicrophone.so.0
+lib/libgnunetmicrophone.so.0.0.0
+lib/libgnunetnamecache.so
+lib/libgnunetnamecache.so.0
+lib/libgnunetnamecache.so.0.0.0
 lib/libgnunetnamestore.so
 lib/libgnunetnamestore.so.0
-lib/libgnunetnat.a
-lib/libgnunetnat.la
+lib/libgnunetnamestore.so.0.0.1
 lib/libgnunetnat.so
 lib/libgnunetnat.so.0
-lib/libgnunetnse.a
-lib/libgnunetnse.la
+lib/libgnunetnat.so.0.1.1
 lib/libgnunetnse.so
 lib/libgnunetnse.so.0
-lib/libgnunetpeerinfo.a
-lib/libgnunetpeerinfo.la
+lib/libgnunetnse.so.0.0.0
 lib/libgnunetpeerinfo.so
 lib/libgnunetpeerinfo.so.0
-%%PGSQL%%lib/libgnunetpostgres.a
-%%PGSQL%%lib/libgnunetpostgres.la
-%%PGSQL%%lib/libgnunetpostgres.so
-%%PGSQL%%lib/libgnunetpostgres.so.0
-lib/libgnunetstatistics.a
-lib/libgnunetstatistics.la
+lib/libgnunetpeerinfo.so.0.0.0
+lib/libgnunetregex.so
+lib/libgnunetregex.so.3
+lib/libgnunetregex.so.3.0.1
+lib/libgnunetregexblock.so
+lib/libgnunetregexblock.so.1
+lib/libgnunetregexblock.so.1.0.0
+lib/libgnunetrevocation.so
+lib/libgnunetrevocation.so.0
+lib/libgnunetrevocation.so.0.0.0
+lib/libgnunetset.so
+lib/libgnunetset.so.0
+lib/libgnunetset.so.0.0.0
+lib/libgnunetspeaker.so
+lib/libgnunetspeaker.so.0
+lib/libgnunetspeaker.so.0.0.0
 lib/libgnunetstatistics.so
-lib/libgnunetstatistics.so.1
-lib/libgnunettestbed.a
-lib/libgnunettestbed.la
+lib/libgnunetstatistics.so.0
+lib/libgnunetstatistics.so.0.1.3
 lib/libgnunettestbed.so
 lib/libgnunettestbed.so.0
-lib/libgnunettesting.a
-lib/libgnunettesting.la
+lib/libgnunettestbed.so.0.0.0
+lib/libgnunettestbedlogger.so
+lib/libgnunettestbedlogger.so.0
+lib/libgnunettestbedlogger.so.0.0.0
 lib/libgnunettesting.so
-lib/libgnunettesting.so.0
-lib/libgnunettesting_new.a
-lib/libgnunettesting_new.la
-lib/libgnunettesting_new.so
-lib/libgnunettesting_new.so.0
-lib/libgnunettransport.a
-lib/libgnunettransport.la
+lib/libgnunettesting.so.1
+lib/libgnunettesting.so.1.1.0
 lib/libgnunettransport.so
-lib/libgnunettransport.so.1
-lib/libgnunettransporttesting.a
-lib/libgnunettransporttesting.la
+lib/libgnunettransport.so.2
+lib/libgnunettransport.so.2.2.0
 lib/libgnunettransporttesting.so
 lib/libgnunettransporttesting.so.0
-lib/libgnunettun.a
-lib/libgnunettun.la
+lib/libgnunettransporttesting.so.0.0.0
 lib/libgnunettun.so
 lib/libgnunettun.so.0
-lib/libgnunetutil.a
-lib/libgnunetutil.la
+lib/libgnunettun.so.0.1.0
 lib/libgnunetutil.so
-lib/libgnunetutil.so.8
+lib/libgnunetutil.so.12
+lib/libgnunetutil.so.12.0.0
+lib/libgnunetvpn.so
+lib/libgnunetvpn.so.0
+lib/libgnunetvpn.so.0.0.0
 libdata/pkgconfig/gnunetarm.pc
+libdata/pkgconfig/gnunetats.pc
 libdata/pkgconfig/gnunetblock.pc
+libdata/pkgconfig/gnunetconsensus.pc
+libdata/pkgconfig/gnunetconversation.pc
 libdata/pkgconfig/gnunetcore.pc
 libdata/pkgconfig/gnunetdatacache.pc
 libdata/pkgconfig/gnunetdatastore.pc
 libdata/pkgconfig/gnunetdht.pc
-libdata/pkgconfig/gnunetdhtlog.pc
+libdata/pkgconfig/gnunetdns.pc
+libdata/pkgconfig/gnunetdnsparser.pc
+libdata/pkgconfig/gnunetdnsstub.pc
 libdata/pkgconfig/gnunetdv.pc
+libdata/pkgconfig/gnunetenv.pc
 libdata/pkgconfig/gnunetfragmentation.pc
 libdata/pkgconfig/gnunetfs.pc
+libdata/pkgconfig/gnunetgns.pc
 libdata/pkgconfig/gnunethello.pc
+libdata/pkgconfig/gnunetidentity.pc
+libdata/pkgconfig/gnunetmesh.pc
+libdata/pkgconfig/gnunetmicrophone.pc
+libdata/pkgconfig/gnunetmulticast.pc
+libdata/pkgconfig/gnunetmysql.pc
+libdata/pkgconfig/gnunetnamestore.pc
 libdata/pkgconfig/gnunetnat.pc
 libdata/pkgconfig/gnunetnse.pc
 libdata/pkgconfig/gnunetpeerinfo.pc
+libdata/pkgconfig/gnunetpostgres.pc
+libdata/pkgconfig/gnunetpsyc.pc
+libdata/pkgconfig/gnunetpsycstore.pc
+libdata/pkgconfig/gnunetregex.pc
+libdata/pkgconfig/gnunetrevocation.pc
+libdata/pkgconfig/gnunetscalarproduct.pc
+libdata/pkgconfig/gnunetset.pc
+libdata/pkgconfig/gnunetspeaker.pc
 libdata/pkgconfig/gnunetstatistics.pc
+libdata/pkgconfig/gnunettestbed.pc
 libdata/pkgconfig/gnunettesting.pc
 libdata/pkgconfig/gnunettransport.pc
+libdata/pkgconfig/gnunettun.pc
 libdata/pkgconfig/gnunetutil.pc
-share/gnunet/config.d/arm.conf
-share/gnunet/config.d/ats.conf
-share/gnunet/config.d/core.conf
-share/gnunet/config.d/datacache.conf
-share/gnunet/config.d/datastore.conf
-share/gnunet/config.d/dht.conf
-share/gnunet/config.d/fs.conf
-share/gnunet/config.d/hostlist.conf
-share/gnunet/config.d/lockmanager.conf
-share/gnunet/config.d/mesh.conf
-share/gnunet/config.d/namestore.conf
-share/gnunet/config.d/nat.conf
-share/gnunet/config.d/nse.conf
-share/gnunet/config.d/peerinfo.conf
-share/gnunet/config.d/resolver.conf
-share/gnunet/config.d/statistics.conf
-share/gnunet/config.d/template.conf
-share/gnunet/config.d/testbed.conf
-share/gnunet/config.d/testing.conf
-share/gnunet/config.d/topology.conf
-share/gnunet/config.d/transport.conf
-share/gnunet/config.d/util.conf
-share/gnunet/gnunet-logo-color.png
-share/gnunet/hellos/02UK
-share/gnunet/hellos/1G1M
-share/gnunet/hellos/7RAV
-share/gnunet/hellos/8B4T
-share/gnunet/hellos/94CH
-share/gnunet/hellos/ATF4
-share/gnunet/hellos/F1GT
-share/gnunet/hellos/KD9V
-share/gnunet/hellos/KUPL
-share/gnunet/hellos/LJR8
-share/gnunet/hellos/R69Q
-share/gnunet/hellos/R6OV
-share/gnunet/hellos/RL7P
-share/gnunet/testing_hostkeys.dat
+libdata/pkgconfig/gnunetvpn.pc
+man/man1/gnunet-arm.1.gz
+man/man1/gnunet-ats.1.gz
+man/man1/gnunet-auto-share.1.gz
+man/man1/gnunet-config.1.gz
+man/man1/gnunet-conversation-test.1.gz
+man/man1/gnunet-conversation.1.gz
+man/man1/gnunet-core.1.gz
+man/man1/gnunet-datastore.1.gz
+man/man1/gnunet-directory.1.gz
+man/man1/gnunet-dns2gns.1.gz
+man/man1/gnunet-download-manager.1.gz
+man/man1/gnunet-download.1.gz
+man/man1/gnunet-ecc.1.gz
+man/man1/gnunet-fs.1.gz
+man/man1/gnunet-gns-import.1.gz
+man/man1/gnunet-gns-proxy.1.gz
+man/man1/gnunet-gns.1.gz
+man/man1/gnunet-identity.1.gz
+man/man1/gnunet-mesh.1.gz
+man/man1/gnunet-namecache.1.gz
+man/man1/gnunet-namestore-fcfsd.1.gz
+man/man1/gnunet-namestore.1.gz
+man/man1/gnunet-nat-server.1.gz
+man/man1/gnunet-peerinfo.1.gz
+man/man1/gnunet-publish.1.gz
+man/man1/gnunet-resolver.1.gz
+man/man1/gnunet-revocation.1.gz
+man/man1/gnunet-scalarproduct.1.gz
+man/man1/gnunet-search.1.gz
+man/man1/gnunet-statistics.1.gz
+man/man1/gnunet-testing-run-service.1.gz
+man/man1/gnunet-transport-certificate-creation.1.gz
+man/man1/gnunet-transport.1.gz
+man/man1/gnunet-unindex.1.gz
+man/man1/gnunet-uri.1.gz
+man/man1/gnunet-vpn.1.gz
+man/man5/gnunet.conf.5.gz
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnunet_janitor.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnunet_pyexpect.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/report.sh
+%%DATADIR%%/config.d/arm.conf
+%%DATADIR%%/config.d/ats.conf
+%%DATADIR%%/config.d/conversation.conf
+%%DATADIR%%/config.d/core.conf
+%%DATADIR%%/config.d/datacache.conf
+%%DATADIR%%/config.d/datastore.conf
+%%DATADIR%%/config.d/dht.conf
+%%DATADIR%%/config.d/dns.conf
+%%DATADIR%%/config.d/exit.conf
+%%DATADIR%%/config.d/fs.conf
+%%DATADIR%%/config.d/gns.conf
+%%DATADIR%%/config.d/hostlist.conf
+%%DATADIR%%/config.d/identity.conf
+%%DATADIR%%/config.d/mesh.conf
+%%DATADIR%%/config.d/namecache.conf
+%%DATADIR%%/config.d/namestore.conf
+%%DATADIR%%/config.d/nat.conf
+%%DATADIR%%/config.d/nse.conf
+%%DATADIR%%/config.d/peerinfo.conf
+%%DATADIR%%/config.d/pt.conf
+%%DATADIR%%/config.d/regex.conf
+%%DATADIR%%/config.d/resolver.conf
+%%DATADIR%%/config.d/revocation.conf
+%%DATADIR%%/config.d/set.conf
+%%DATADIR%%/config.d/statistics.conf
+%%DATADIR%%/config.d/template.conf
+%%DATADIR%%/config.d/testbed.conf
+%%DATADIR%%/config.d/testing.conf
+%%DATADIR%%/config.d/topology.conf
+%%DATADIR%%/config.d/transport.conf
+%%DATADIR%%/config.d/util.conf
+%%DATADIR%%/config.d/vpn.conf
+%%DATADIR%%/gns-bcd.html
+%%DATADIR%%/gns-bcd.tex
+%%DATADIR%%/gnunet-logo-color.png
+%%DATADIR%%/gnunet-logo.pdf
+%%DATADIR%%/hellos/DPQIBOOJV8QBS3FGJ6B0K5NTSQ9SULV45H5KCR4HU7PQ64N8Q9F0
+%%DATADIR%%/hellos/R8TTJ9GAL5VIFOFNM8KNT3D83BVQPBNRHJSSD0IME63V821906EG
+%%DATADIR%%/testing_hostkeys.ecc
 %%NLS%%share/locale/de/LC_MESSAGES/gnunet.mo
 %%NLS%%share/locale/es/LC_MESSAGES/gnunet.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gnunet.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/gnunet.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnunet.mo
-@dirrm share/gnunet/hellos
-@dirrm share/gnunet/config.d
-@dirrm share/gnunet
+@dirrm %%DATADIR%%/hellos
+@dirrm %%DATADIR%%/config.d
+@dirrm %%DATADIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/gnunet/libexec
 @dirrm lib/gnunet
 @dirrm include/gnunet
-@exec if [ ! -d %%GNUNET_DAEMON_DIR%% ] ; then install -d -o gnunet -g gnunet -m 700 %%GNUNET_DAEMON_DIR%% ; fi
-@exec chown -R gnunet:gnunet %%GNUNET_DAEMON_DIR%%
-@exec chmod -R 700 %%GNUNET_DAEMON_DIR%%
-@dirrmtry %%GNUNET_DAEMON_DIR%%