update to 0.9.3 and convert options to new style

7 files changed, 137 insertions, 64 deletions

diff --git a/net-p2p/gnunet-gtk/Makefile b/net-p2p/gnunet-gtk/Makefile
index 0fe482954195..6cee5980a8d8 100644
--- a/net-p2p/gnunet-gtk/Makefile
+++ b/net-p2p/gnunet-gtk/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=		gnunet-gtk
-DISTVERSION=		0.9.2
+DISTVERSION=		0.9.3
 CATEGORIES=		net-p2p ipv6 security
 MASTER_SITES=		GNU
 MASTER_SITE_SUBDIR=	gnunet
diff --git a/net-p2p/gnunet-gtk/distinfo b/net-p2p/gnunet-gtk/distinfo
index 20aa2fa24501..eef97daea92c 100644
--- a/net-p2p/gnunet-gtk/distinfo
+++ b/net-p2p/gnunet-gtk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnunet-gtk-0.9.2.tar.gz) = e66488e324295a05456a372ab795fd559d42b780f55f76ef455b3bd898a9c782
-SIZE (gnunet-gtk-0.9.2.tar.gz) = 1010744
+SHA256 (gnunet-gtk-0.9.3.tar.gz) = 6cbc841a3f45c8ef8e284006554af2ff0f88f04534aaa1aea0c2ec49e4b9e314
+SIZE (gnunet-gtk-0.9.3.tar.gz) = 1057982
diff --git a/net-p2p/gnunet-gtk/pkg-plist b/net-p2p/gnunet-gtk/pkg-plist
index da4bb655603c..b1f38f02eef7 100644
--- a/net-p2p/gnunet-gtk/pkg-plist
+++ b/net-p2p/gnunet-gtk/pkg-plist
@@ -1,4 +1,5 @@
 bin/gnunet-fs-gtk
+bin/gnunet-gns-gtk
 bin/gnunet-peerinfo-gtk
 bin/gnunet-setup
 bin/gnunet-statistics-gtk
@@ -9,6 +10,7 @@ lib/libgnunetgtk.so
 lib/libgnunetgtk.so.2
 share/applications/gnunet-fs-gtk.desktop
 share/applications/gnunet-setup.desktop
+share/gnunet-gtk/config.d/gnunet-fs-gtk.conf
 share/gnunet-gtk/flags/ad.png
 share/gnunet-gtk/flags/ae.png
 share/gnunet-gtk/flags/af.png
@@ -255,6 +257,7 @@ share/gnunet-gtk/gnunet_fs_gtk_create_namespace_dialog.glade
 share/gnunet-gtk/gnunet_fs_gtk_download_as_dialog.glade
 share/gnunet-gtk/gnunet_fs_gtk_edit_publication.glade
 share/gnunet-gtk/gnunet_fs_gtk_main_window.glade
+share/gnunet-gtk/gnunet_fs_gtk_namespace_manager.glade
 share/gnunet-gtk/gnunet_fs_gtk_open_directory_dialog.glade
 share/gnunet-gtk/gnunet_fs_gtk_open_url_dialog.glade
 share/gnunet-gtk/gnunet_fs_gtk_progress_dialog.glade
@@ -264,6 +267,10 @@ share/gnunet-gtk/gnunet_fs_gtk_publish_file_dialog.glade
 share/gnunet-gtk/gnunet_fs_gtk_publish_tab.glade
 share/gnunet-gtk/gnunet_fs_gtk_search_tab.glade
 share/gnunet-gtk/gnunet_fs_gtk_select_pseudonym_dialog.glade
+share/gnunet-gtk/gnunet_fs_gtk_unindex.glade
+share/gnunet-gtk/gnunet_gns_gtk_about_window.glade
+share/gnunet-gtk/gnunet_gns_gtk_main_window.glade
+share/gnunet-gtk/gnunet_gns_gtk_zone_open.glade
 share/gnunet-gtk/gnunet_gtk_status_bar_menu.glade
 share/gnunet-gtk/gnunet_logo.png
 share/gnunet-gtk/gnunet_peerinfo_gtk_about_window.glade
@@ -275,7 +282,6 @@ share/icons/hicolor/16x16/apps/gnunet-fs-gtk.png
 share/icons/hicolor/22x22/apps/gnunet-fs-gtk.png
 share/icons/hicolor/24x24/apps/gnunet-fs-gtk.png
 share/icons/hicolor/32x32/apps/gnunet-fs-gtk.png
-share/icons/hicolor/icon-theme.cache
 share/icons/hicolor/scalable/apps/gnunet-fs-gtk.svg
 @dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
@@ -290,6 +296,7 @@ share/icons/hicolor/scalable/apps/gnunet-fs-gtk.svg
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrm share/gnunet-gtk/flags
+@dirrm share/gnunet-gtk/config.d
 @dirrm share/gnunet-gtk
 @dirrmtry share/applications
 @dirrm include/gnunet-gtk
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index f7e43c5c11e0..670dbfc5e445 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gnunet
-DISTVERSION=	0.9.2
-PORTREVISION=	2
+DISTVERSION=	0.9.3
 CATEGORIES=	net-p2p ipv6 security
 MASTER_SITES=	GNU
 
@@ -24,11 +23,17 @@ LIB_DEPENDS=	unistring:${PORTSDIR}/devel/libunistring \
 		gcrypt:${PORTSDIR}/security/libgcrypt \
 		extractor:${PORTSDIR}/textproc/libextractor
 
-OPTIONS=	HTTP	"Enable HTTP transport via libmicrohttpd" off \
-		MYSQL	"Use MySQL for the datastore and datacache" off \
-		NLS	"Enable Native Language support" on \
-		PGSQL	"Use PostgreSQL for the datastore and datacache" off \
-		SQLITE	"Use SQLite for the datastore and datacache" on
+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
 USE_GMAKE=	yes
@@ -47,11 +52,11 @@ CONFIGURE_ARGS =	--with-daemon-home-dir=${GNUNET_DAEMON_DIR} \
 GROUPS =	gnunet
 USERS=		gnunet
 
-MAN1=	gnunet-arm.1 gnunet-directory.1 gnunet-download.1 \
-	gnunet-download-manager.1 gnunet-fs.1 gnunet-nat-server.1 \
-	gnunet-peerinfo.1 gnunet-pseudonym.1 gnunet-publish.1 \
-	gnunet-search.1 gnunet-statistics.1 gnunet-transport.1 \
-	gnunet-unindex.1 gnunet-vpn.1
+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
 
 #If a non-default GNUNET_DAEMON_DIR is defined, the home directory
 #of the gnunet user may need to be adjusted -- e.g., via:
@@ -60,18 +65,18 @@ GNUNET_DAEMON_DIR?=		/var/lib/gnunet
 PLIST_SUB=	GNUNET_DAEMON_DIR=${GNUNET_DAEMON_DIR}
 SUB_FILES=	pkg-message
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README
 .endif
 
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	gnunet_janitor.py gnunet_pyexpect.py hostlist.cgi hostlist.php \
 report.sh
 .endif
 
-.if defined(WITH_HTTP)
+.if ${PORT_OPTIONS:MHTTP}
 BROKEN =	WITH_HTTP requires libmicrohttpd 0.9.18 or higher
 LIB_DEPENDS+=		microhttpd:${PORTSDIR}/www/libmicrohttpd
 CONFIGURE_ARGS+=	--with-microhttpd=${LOCALBASE}
@@ -81,19 +86,16 @@ CONFIGURE_ARGS+=	--without-microhttpd
 PLIST_SUB+=		HTTP="@comment "
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 PLIST_SUB+=		MYSQL=""
 .else
-.if !(defined(WITH_PGSQL) || defined(WITH_SQLITE))
-IGNORE =	define at least one of WITH_MYSQL, WITH_PGSQL, and WITH_SQLITE
-.endif
 CONFIGURE_ARGS+=	--without-mysql
 PLIST_SUB+=		MYSQL="@comment "
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=	--with-libintl-prefix=${LOCALBASE}
 PLIST_SUB+=		NLS=""
@@ -102,7 +104,7 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
 PLIST_SUB+=		PGSQL=""
@@ -111,7 +113,7 @@ CONFIGURE_ARGS+=	--without-postgres
 PLIST_SUB+=		PGSQL="@comment "
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=		yes
 CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 PLIST_SUB+=		SQLITE=""
@@ -123,15 +125,19 @@ PLIST_SUB+=		SQLITE="@comment "
 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/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:
-	@${PRINTF} "%s\n%s\n%s\n" "[PATHS]" "SERVICEHOME = ${GNUNET_DAEMON_DIR}" \
-	"DEFAULTCONFIG = ${PREFIX}/etc/gnunet.conf" > ${PREFIX}/etc/gnunet.conf.sample
+	@${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
@@ -139,11 +145,11 @@ post-install:
 	@${INSTALL} -d -o gnunet -g gnunet -m 700 ${GNUNET_DAEMON_DIR}
 .endif
 	@${INSTALL_PROGRAM} ${WRKSRC}/contrib/timeout_watchdog ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@cd ${WRKSRC}/contrib; ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
 .endif
@@ -151,4 +157,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-p2p/gnunet/distinfo b/net-p2p/gnunet/distinfo
index e1b270a55db9..13b4b225459b 100644
--- a/net-p2p/gnunet/distinfo
+++ b/net-p2p/gnunet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnunet-0.9.2.tar.gz) = 24f5f1cb93782c22bd61ffdc9d99b7cfb2532dc4b6fb7d3468931e5a10eb47e9
-SIZE (gnunet-0.9.2.tar.gz) = 6239795
+SHA256 (gnunet-0.9.3.tar.gz) = 50586ba4f82c4890f191bd79b1bb6504a5e9b9f90371f0c011879f25f9cef15e
+SIZE (gnunet-0.9.3.tar.gz) = 6518731
diff --git a/net-p2p/gnunet/files/patch-src__mysql__Makefile.in b/net-p2p/gnunet/files/patch-src__mysql__Makefile.in
new file mode 100644
index 000000000000..cac574c45656
--- /dev/null
+++ b/net-p2p/gnunet/files/patch-src__mysql__Makefile.in
@@ -0,0 +1,11 @@
+--- src/mysql/Makefile.in.orig	2012-06-01 15:56:58.000000000 -0400
++++ src/mysql/Makefile.in	2012-06-07 11:58:29.000000000 -0400
+@@ -338,7 +338,7 @@
+  $(top_builddir)/src/util/libgnunetutil.la  
+ 
+ libgnunetmysql_la_LDFLAGS = \
+- $(GN_LIB_LDFLAGS) \
++ $(GN_LIB_LDFLAGS) $(MYSQL_LDFLAGS) \
+   -version-info 0:0:0
+ 
+ all: all-am
diff --git a/net-p2p/gnunet/pkg-plist b/net-p2p/gnunet/pkg-plist
index 1d169be65d2f..c5b3b00196c3 100644
--- a/net-p2p/gnunet/pkg-plist
+++ b/net-p2p/gnunet/pkg-plist
@@ -1,19 +1,23 @@
 bin/gnunet-arm
-bin/gnunet-core-list-connections
+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-directory
 bin/gnunet-download
 bin/gnunet-download-manager.scm
 bin/gnunet-fs
+bin/gnunet-gns-import.sh
 bin/gnunet-helper-fs-publish
+bin/gnunet-namestore
 bin/gnunet-nat-server
 bin/gnunet-peerinfo
 bin/gnunet-pseudonym
 bin/gnunet-publish
 bin/gnunet-resolver
+bin/gnunet-rsa
 bin/gnunet-search
 bin/gnunet-service-arm
 bin/gnunet-service-ats
@@ -21,6 +25,7 @@ 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
@@ -37,7 +42,7 @@ bin/gnunet-transport-certificate-creation
 bin/gnunet-unindex
 bin/mockup-service
 bin/timeout_watchdog
-@unexec cd %D/etc ; if cmp -s gnunet.conf.sample gnunet.conf ; then rm -f gnunet.conf ; fi
+@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
@@ -79,7 +84,9 @@ include/gnunet/gnunet_gns_service.h
 include/gnunet/gnunet_hello_lib.h
 include/gnunet/gnunet_helper_lib.h
 include/gnunet/gnunet_load_lib.h
+include/gnunet/gnunet_lockmanager_service.h
 include/gnunet/gnunet_mesh_service.h
+include/gnunet/gnunet_mysql_lib.h
 include/gnunet/gnunet_namestore_plugin.h
 include/gnunet/gnunet_namestore_service.h
 include/gnunet/gnunet_nat_lib.h
@@ -89,9 +96,11 @@ include/gnunet/gnunet_os_lib.h
 include/gnunet/gnunet_peer_lib.h
 include/gnunet/gnunet_peerinfo_service.h
 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_resolver_service.h
 include/gnunet/gnunet_scheduler_lib.h
 include/gnunet/gnunet_server_lib.h
@@ -101,6 +110,8 @@ include/gnunet/gnunet_signatures.h
 include/gnunet/gnunet_statistics_service.h
 include/gnunet/gnunet_stream_lib.h
 include/gnunet/gnunet_strings_lib.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
@@ -177,7 +188,7 @@ lib/libgnunetarm.so.1
 lib/libgnunetats.a
 lib/libgnunetats.la
 lib/libgnunetats.so
-lib/libgnunetats.so.1
+lib/libgnunetats.so.2
 lib/libgnunetblock.a
 lib/libgnunetblock.la
 lib/libgnunetblock.so
@@ -201,7 +212,7 @@ lib/libgnunetdht.so.1
 lib/libgnunetfragmentation.a
 lib/libgnunetfragmentation.la
 lib/libgnunetfragmentation.so
-lib/libgnunetfragmentation.so.0
+lib/libgnunetfragmentation.so.1
 lib/libgnunetfs.a
 lib/libgnunetfs.la
 lib/libgnunetfs.so
@@ -210,10 +221,18 @@ lib/libgnunethello.a
 lib/libgnunethello.la
 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/libgnunetmesh.so
-lib/libgnunetmesh.so.0
+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/libgnunetnamestore.so
@@ -230,18 +249,30 @@ lib/libgnunetpeerinfo.a
 lib/libgnunetpeerinfo.la
 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/libgnunetstatistics.so
 lib/libgnunetstatistics.so.1
+lib/libgnunettestbed.a
+lib/libgnunettestbed.la
+lib/libgnunettestbed.so
+lib/libgnunettestbed.so.0
 lib/libgnunettesting.a
 lib/libgnunettesting.la
 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/libgnunettransport.so
-lib/libgnunettransport.so.0
+lib/libgnunettransport.so.1
 lib/libgnunettransporttesting.a
 lib/libgnunettransporttesting.la
 lib/libgnunettransporttesting.so
@@ -253,7 +284,7 @@ lib/libgnunettun.so.0
 lib/libgnunetutil.a
 lib/libgnunetutil.la
 lib/libgnunetutil.so
-lib/libgnunetutil.so.7
+lib/libgnunetutil.so.8
 libdata/pkgconfig/gnunetarm.pc
 libdata/pkgconfig/gnunetblock.pc
 libdata/pkgconfig/gnunetcore.pc
@@ -272,33 +303,51 @@ libdata/pkgconfig/gnunetstatistics.pc
 libdata/pkgconfig/gnunettesting.pc
 libdata/pkgconfig/gnunettransport.pc
 libdata/pkgconfig/gnunetutil.pc
-%%DATADIR%%/config.d/arm.conf
-%%DATADIR%%/config.d/ats.conf
-%%DATADIR%%/config.d/core.conf
-%%DATADIR%%/config.d/datacache.conf
-%%DATADIR%%/config.d/datastore.conf
-%%DATADIR%%/config.d/dht.conf
-%%DATADIR%%/config.d/fs.conf
-%%DATADIR%%/config.d/hostlist.conf
-%%DATADIR%%/config.d/mesh.conf
-%%DATADIR%%/config.d/nat.conf
-%%DATADIR%%/config.d/nse.conf
-%%DATADIR%%/config.d/peerinfo.conf
-%%DATADIR%%/config.d/resolver.conf
-%%DATADIR%%/config.d/statistics.conf
-%%DATADIR%%/config.d/template.conf
-%%DATADIR%%/config.d/testing.conf
-%%DATADIR%%/config.d/topology.conf
-%%DATADIR%%/config.d/transport.conf
-%%DATADIR%%/config.d/util.conf
-%%DATADIR%%/gnunet-logo-color.png
+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
 %%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 %%DATADIR%%/config.d
-@dirrm %%DATADIR%%
+@dirrm share/gnunet/hellos
+@dirrm share/gnunet/config.d
+@dirrm share/gnunet
 @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