7 files changed, 442 insertions, 327 deletions

diff --git a/net-p2p/gnunet-gtk/Makefile b/net-p2p/gnunet-gtk/Makefile
index 631a85e20076..512278a2f21e 100644
--- a/net-p2p/gnunet-gtk/Makefile
+++ b/net-p2p/gnunet-gtk/Makefile
@@ -2,58 +2,48 @@
 # $FreeBSD$
 
 PORTNAME=	gnunet-gtk
-DISTVERSION=	0.9.3
+PORTVERSION=	0.10.1
 CATEGORIES=	net-p2p ipv6 security
-MASTER_SITES=	GNU
-MASTER_SITE_SUBDIR=	gnunet
+MASTER_SITES=	GNU/gnunet
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK interface to GNUnet
 
-BROKEN=		Does not fetch
-
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libgladeui-1.so:${PORTSDIR}/devel/glade3 \
-		libgnunetutil.so:${PORTSDIR}/net-p2p/gnunet
-
-INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	libltdl libtool
-USES=		pathfix iconv gmake pkgconfig
-USE_LDCONFIG=	yes
-
-CONFIGURE_ARGS=	--with-extractor=${LOCALBASE} \
+		libqrencode.so:${PORTSDIR}/graphics/libqrencode \
+		libgnunetutil.so:${PORTSDIR}/net-p2p/gnunet \
+		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
+
+USES=		gmake iconv libtool pathfix pkgconfig
+USE_GNOME=	gtk20
+USE_AUTOTOOLS=	libltdl
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-gtktest \
+		--with-gtk-version=2 \
+		--with-extractor=${LOCALBASE} \
 		--with-gnunet=${LOCALBASE} \
 		${ICONV_CONFIGURE_ARG}
+INSTALL_TARGET=	install-strip
+USE_LDCONFIG=	yes
+INSTALLS_ICONS=	yes
 
-MAN1=	gnunet-fs-gtk.1
-
-NO_STAGE=	yes
-
-OPTIONS_DEFINE=	DOCS NLS
-
-.include <bsd.port.options.mk>
-
-.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
+OPTIONS_DEFINE=		DOCS
 
 post-patch:
-	@${FIND} ${WRKSRC} -type f -name 'Makefile.in' -print0 | \
-	${XARGS} -0 ${REINPLACE_CMD} -e \
-	'/^[[:blank:]]*mkinstalldirs[[:blank:]]*=/s/=.*/= $$(mkdir_p)/'
-
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README
+	@${REINPLACE_CMD} -e \
+		's|^\([[:space:]]\)install-docDATA$$|\1|' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|"$${mkinstalldirs}"|"$${MKDIR_P}"|' \
+		${WRKSRC}/pixmaps/Makefile.in
 
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in AUTHORS ChangeLog NEWS README 
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${DOCSDIR})
+.endfor
 
 .include <bsd.port.mk>
diff --git a/net-p2p/gnunet-gtk/distinfo b/net-p2p/gnunet-gtk/distinfo
index eef97daea92c..0299bc6ee36e 100644
--- a/net-p2p/gnunet-gtk/distinfo
+++ b/net-p2p/gnunet-gtk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnunet-gtk-0.9.3.tar.gz) = 6cbc841a3f45c8ef8e284006554af2ff0f88f04534aaa1aea0c2ec49e4b9e314
-SIZE (gnunet-gtk-0.9.3.tar.gz) = 1057982
+SHA256 (gnunet-gtk-0.10.1.tar.gz) = 8fac6aa405a0cca149b3ca373c0d80a932dff20f8e1d959863d50965749868dc
+SIZE (gnunet-gtk-0.10.1.tar.gz) = 1547207
diff --git a/net-p2p/gnunet-gtk/files/patch-configure b/net-p2p/gnunet-gtk/files/patch-configure
new file mode 100644
index 000000000000..704f80e02643
--- /dev/null
+++ b/net-p2p/gnunet-gtk/files/patch-configure
@@ -0,0 +1,24 @@
+--- configure.orig
++++ configure
+@@ -14716,17 +14716,14 @@
+   withval=$with_gtk_version; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gtk_version" >&5
+ $as_echo "$with_gtk_version" >&6; }
+     case $with_gtk_version in
+-      *)
+-        if test "x${with_gtk_version:0:1}" == "x2"
+-        then
++      2*)
+           check_for_3=false
+           check_for_2=$with_gtk_version
+-        elif test "x${with_gtk_version:0:1}" == "x3"
+-        then
++      ;;
++      3*)
+           check_for_3=$with_gtk_version
+           check_for_2=false
+-        fi
+-        ;;
++      ;;
+     esac
+ 
+ else
diff --git a/net-p2p/gnunet-gtk/files/patch-src__lib__eventloop.c b/net-p2p/gnunet-gtk/files/patch-src__lib__eventloop.c
new file mode 100644
index 000000000000..cb1826a7e899
--- /dev/null
+++ b/net-p2p/gnunet-gtk/files/patch-src__lib__eventloop.c
@@ -0,0 +1,11 @@
+--- src/lib/eventloop.c.orig
++++ src/lib/eventloop.c
+@@ -181,7 +181,7 @@
+ GNUNET_GTK_plug_me (const char *env_name,
+                     GtkWidget *main_window)
+ {
+-#ifdef GDK_WINDOWING_X11
++#if defined(GDK_WINDOWING_X11) && GTK_MAJOR_VERSION >= 3
+   const char *plugid;
+   GtkWidget *plug;
+   GtkWidget *child;
diff --git a/net-p2p/gnunet-gtk/files/patch-src__main__gnunet-gtp.c b/net-p2p/gnunet-gtk/files/patch-src__main__gnunet-gtp.c
new file mode 100644
index 000000000000..cc0f6431785f
--- /dev/null
+++ b/net-p2p/gnunet-gtk/files/patch-src__main__gnunet-gtp.c
@@ -0,0 +1,20 @@
+--- src/main/gnunet-gtk.c.orig
++++ src/main/gnunet-gtk.c
+@@ -177,7 +177,7 @@
+ }
+ 
+ 
+-#ifdef GDK_WINDOWING_X11
++#if defined(GDK_WINDOWING_X11) && GTK_MAJOR_VERSION >= 3
+ /**
+  * Start the child process for the plug.
+  *
+@@ -308,7 +308,7 @@
+   main_window = GTK_WIDGET (get_object ("gnunet_gtk_window"));
+   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ 				&cleanup_task, NULL);
+-#ifdef GDK_WINDOWING_X11
++#if defined(GDK_WINDOWING_X11) && GTK_MAJOR_VERSION >= 3
+   plug ("gnunet_statistics_hbox",
+         "gnunet-statistics-gtk",
+         "GNUNET_STATISTICS_GTK_PLUG");
diff --git a/net-p2p/gnunet-gtk/files/patch-src__setup__gnunet-setup-transport.c b/net-p2p/gnunet-gtk/files/patch-src__setup__gnunet-setup-transport.c
new file mode 100644
index 000000000000..939336d76ae8
--- /dev/null
+++ b/net-p2p/gnunet-gtk/files/patch-src__setup__gnunet-setup-transport.c
@@ -0,0 +1,12 @@
+--- src/setup/gnunet-setup-transport.c.orig
++++ src/setup/gnunet-setup-transport.c
+@@ -349,8 +349,7 @@
+   if ( (sizeof (struct sockaddr_in6) == addrlen) &&
+        (0 != memcmp (&in6addr_loopback,
+                      &((struct sockaddr_in6 *)addr)->sin6_addr,
+-		     sizeof (struct in6_addr))) &&
+-       (! IN6_IS_ADDR_LINKLOCAL ((const struct sockaddr_in6*) addr)) )
++		     sizeof (struct in6_addr))))
+   {
+     *have_v6 = GNUNET_YES;
+     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
diff --git a/net-p2p/gnunet-gtk/pkg-plist b/net-p2p/gnunet-gtk/pkg-plist
index fa8db4f2ade2..909c10e872fd 100644
--- a/net-p2p/gnunet-gtk/pkg-plist
+++ b/net-p2p/gnunet-gtk/pkg-plist
@@ -1,301 +1,359 @@
+bin/gnunet-conversation-gtk
 bin/gnunet-fs-gtk
-bin/gnunet-gns-gtk
+bin/gnunet-gtk
+bin/gnunet-identity-gtk
+bin/gnunet-namestore-gtk
 bin/gnunet-peerinfo-gtk
 bin/gnunet-setup
 bin/gnunet-statistics-gtk
 include/gnunet-gtk/gnunet_gtk.h
-lib/libgnunetgtk.a
-lib/libgnunetgtk.la
+include/gnunet-gtk/gnunet_gtk_namestore_plugin.h
+lib/gnunet/libgnunet_plugin_gtk_namestore_a.so
+lib/gnunet/libgnunet_plugin_gtk_namestore_aaaa.so
+lib/gnunet/libgnunet_plugin_gtk_namestore_cname.so
+lib/gnunet/libgnunet_plugin_gtk_namestore_gns2dns.so
+lib/gnunet/libgnunet_plugin_gtk_namestore_leho.so
+lib/gnunet/libgnunet_plugin_gtk_namestore_mx.so
+lib/gnunet/libgnunet_plugin_gtk_namestore_phone.so
+lib/gnunet/libgnunet_plugin_gtk_namestore_pkey.so
+lib/gnunet/libgnunet_plugin_gtk_namestore_ptr.so
+lib/gnunet/libgnunet_plugin_gtk_namestore_soa.so
+lib/gnunet/libgnunet_plugin_gtk_namestore_txt.so
+lib/gnunet/libgnunet_plugin_gtk_namestore_vpn.so
 lib/libgnunetgtk.so
-lib/libgnunetgtk.so.2
+lib/libgnunetgtk.so.1
+lib/libgnunetgtk.so.1.1.0
+man/man1/gnunet-fs-gtk.1.gz
+man/man1/gnunet-identity-gtk.1.gz
+man/man1/gnunet-namestore-gtk.1.gz
+man/man1/gnunet-peerinfo-gtk.1.gz
+man/man1/gnunet-setup.1.gz
+man/man1/gnunet-statistics-gtk.1.gz
 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
-share/gnunet-gtk/flags/ag.png
-share/gnunet-gtk/flags/ai.png
-share/gnunet-gtk/flags/al.png
-share/gnunet-gtk/flags/am.png
-share/gnunet-gtk/flags/an.png
-share/gnunet-gtk/flags/ao.png
-share/gnunet-gtk/flags/aq.png
-share/gnunet-gtk/flags/ar.png
-share/gnunet-gtk/flags/as.png
-share/gnunet-gtk/flags/at.png
-share/gnunet-gtk/flags/au.png
-share/gnunet-gtk/flags/aw.png
-share/gnunet-gtk/flags/ax.png
-share/gnunet-gtk/flags/az.png
-share/gnunet-gtk/flags/ba.png
-share/gnunet-gtk/flags/bb.png
-share/gnunet-gtk/flags/bd.png
-share/gnunet-gtk/flags/be.png
-share/gnunet-gtk/flags/bf.png
-share/gnunet-gtk/flags/bg.png
-share/gnunet-gtk/flags/bh.png
-share/gnunet-gtk/flags/bi.png
-share/gnunet-gtk/flags/bj.png
-share/gnunet-gtk/flags/bm.png
-share/gnunet-gtk/flags/bn.png
-share/gnunet-gtk/flags/bo.png
-share/gnunet-gtk/flags/br.png
-share/gnunet-gtk/flags/bs.png
-share/gnunet-gtk/flags/bt.png
-share/gnunet-gtk/flags/bv.png
-share/gnunet-gtk/flags/bw.png
-share/gnunet-gtk/flags/by.png
-share/gnunet-gtk/flags/ca.png
-share/gnunet-gtk/flags/cc.png
-share/gnunet-gtk/flags/cd.png
-share/gnunet-gtk/flags/cf.png
-share/gnunet-gtk/flags/cg.png
-share/gnunet-gtk/flags/ch.png
-share/gnunet-gtk/flags/ci.png
-share/gnunet-gtk/flags/ck.png
-share/gnunet-gtk/flags/cl.png
-share/gnunet-gtk/flags/cm.png
-share/gnunet-gtk/flags/cn.png
-share/gnunet-gtk/flags/co.png
-share/gnunet-gtk/flags/cr.png
-share/gnunet-gtk/flags/cs.png
-share/gnunet-gtk/flags/cu.png
-share/gnunet-gtk/flags/cv.png
-share/gnunet-gtk/flags/cx.png
-share/gnunet-gtk/flags/cy.png
-share/gnunet-gtk/flags/cz.png
-share/gnunet-gtk/flags/de.png
-share/gnunet-gtk/flags/dj.png
-share/gnunet-gtk/flags/dk.png
-share/gnunet-gtk/flags/dm.png
-share/gnunet-gtk/flags/do.png
-share/gnunet-gtk/flags/dz.png
-share/gnunet-gtk/flags/ec.png
-share/gnunet-gtk/flags/ee.png
-share/gnunet-gtk/flags/eg.png
-share/gnunet-gtk/flags/eh.png
-share/gnunet-gtk/flags/er.png
-share/gnunet-gtk/flags/es.png
-share/gnunet-gtk/flags/et.png
-share/gnunet-gtk/flags/eu.png
-share/gnunet-gtk/flags/fi.png
-share/gnunet-gtk/flags/fj.png
-share/gnunet-gtk/flags/fk.png
-share/gnunet-gtk/flags/fm.png
-share/gnunet-gtk/flags/fo.png
-share/gnunet-gtk/flags/fr.png
-share/gnunet-gtk/flags/ga.png
-share/gnunet-gtk/flags/gb.png
-share/gnunet-gtk/flags/gd.png
-share/gnunet-gtk/flags/ge.png
-share/gnunet-gtk/flags/gf.png
-share/gnunet-gtk/flags/gh.png
-share/gnunet-gtk/flags/gi.png
-share/gnunet-gtk/flags/gl.png
-share/gnunet-gtk/flags/gm.png
-share/gnunet-gtk/flags/gn.png
-share/gnunet-gtk/flags/gp.png
-share/gnunet-gtk/flags/gq.png
-share/gnunet-gtk/flags/gr.png
-share/gnunet-gtk/flags/gs.png
-share/gnunet-gtk/flags/gt.png
-share/gnunet-gtk/flags/gu.png
-share/gnunet-gtk/flags/gw.png
-share/gnunet-gtk/flags/gy.png
-share/gnunet-gtk/flags/hk.png
-share/gnunet-gtk/flags/hm.png
-share/gnunet-gtk/flags/hn.png
-share/gnunet-gtk/flags/hr.png
-share/gnunet-gtk/flags/ht.png
-share/gnunet-gtk/flags/hu.png
-share/gnunet-gtk/flags/id.png
-share/gnunet-gtk/flags/ie.png
-share/gnunet-gtk/flags/il.png
-share/gnunet-gtk/flags/in.png
-share/gnunet-gtk/flags/io.png
-share/gnunet-gtk/flags/iq.png
-share/gnunet-gtk/flags/ir.png
-share/gnunet-gtk/flags/it.png
-share/gnunet-gtk/flags/jm.png
-share/gnunet-gtk/flags/jo.png
-share/gnunet-gtk/flags/jp.png
-share/gnunet-gtk/flags/ke.png
-share/gnunet-gtk/flags/kg.png
-share/gnunet-gtk/flags/kh.png
-share/gnunet-gtk/flags/ki.png
-share/gnunet-gtk/flags/km.png
-share/gnunet-gtk/flags/kn.png
-share/gnunet-gtk/flags/kp.png
-share/gnunet-gtk/flags/kr.png
-share/gnunet-gtk/flags/kw.png
-share/gnunet-gtk/flags/ky.png
-share/gnunet-gtk/flags/kz.png
-share/gnunet-gtk/flags/la.png
-share/gnunet-gtk/flags/lb.png
-share/gnunet-gtk/flags/lc.png
-share/gnunet-gtk/flags/li.png
-share/gnunet-gtk/flags/lk.png
-share/gnunet-gtk/flags/lr.png
-share/gnunet-gtk/flags/ls.png
-share/gnunet-gtk/flags/lt.png
-share/gnunet-gtk/flags/lu.png
-share/gnunet-gtk/flags/lv.png
-share/gnunet-gtk/flags/ly.png
-share/gnunet-gtk/flags/ma.png
-share/gnunet-gtk/flags/mc.png
-share/gnunet-gtk/flags/md.png
-share/gnunet-gtk/flags/mg.png
-share/gnunet-gtk/flags/mh.png
-share/gnunet-gtk/flags/mk.png
-share/gnunet-gtk/flags/ml.png
-share/gnunet-gtk/flags/mm.png
-share/gnunet-gtk/flags/mn.png
-share/gnunet-gtk/flags/mo.png
-share/gnunet-gtk/flags/mp.png
-share/gnunet-gtk/flags/mq.png
-share/gnunet-gtk/flags/mr.png
-share/gnunet-gtk/flags/ms.png
-share/gnunet-gtk/flags/mt.png
-share/gnunet-gtk/flags/mu.png
-share/gnunet-gtk/flags/mv.png
-share/gnunet-gtk/flags/mw.png
-share/gnunet-gtk/flags/mx.png
-share/gnunet-gtk/flags/my.png
-share/gnunet-gtk/flags/mz.png
-share/gnunet-gtk/flags/na.png
-share/gnunet-gtk/flags/nc.png
-share/gnunet-gtk/flags/ne.png
-share/gnunet-gtk/flags/nf.png
-share/gnunet-gtk/flags/ng.png
-share/gnunet-gtk/flags/ni.png
-share/gnunet-gtk/flags/nl.png
-share/gnunet-gtk/flags/no.png
-share/gnunet-gtk/flags/np.png
-share/gnunet-gtk/flags/nr.png
-share/gnunet-gtk/flags/nu.png
-share/gnunet-gtk/flags/nz.png
-share/gnunet-gtk/flags/om.png
-share/gnunet-gtk/flags/pa.png
-share/gnunet-gtk/flags/pe.png
-share/gnunet-gtk/flags/pf.png
-share/gnunet-gtk/flags/pg.png
-share/gnunet-gtk/flags/ph.png
-share/gnunet-gtk/flags/pk.png
-share/gnunet-gtk/flags/pl.png
-share/gnunet-gtk/flags/pm.png
-share/gnunet-gtk/flags/pn.png
-share/gnunet-gtk/flags/pr.png
-share/gnunet-gtk/flags/ps.png
-share/gnunet-gtk/flags/pt.png
-share/gnunet-gtk/flags/pw.png
-share/gnunet-gtk/flags/py.png
-share/gnunet-gtk/flags/qa.png
-share/gnunet-gtk/flags/re.png
-share/gnunet-gtk/flags/ro.png
-share/gnunet-gtk/flags/ru.png
-share/gnunet-gtk/flags/rw.png
-share/gnunet-gtk/flags/sa.png
-share/gnunet-gtk/flags/sb.png
-share/gnunet-gtk/flags/sc.png
-share/gnunet-gtk/flags/sd.png
-share/gnunet-gtk/flags/se.png
-share/gnunet-gtk/flags/sg.png
-share/gnunet-gtk/flags/sh.png
-share/gnunet-gtk/flags/si.png
-share/gnunet-gtk/flags/sj.png
-share/gnunet-gtk/flags/sk.png
-share/gnunet-gtk/flags/sl.png
-share/gnunet-gtk/flags/sm.png
-share/gnunet-gtk/flags/sn.png
-share/gnunet-gtk/flags/so.png
-share/gnunet-gtk/flags/sr.png
-share/gnunet-gtk/flags/st.png
-share/gnunet-gtk/flags/sv.png
-share/gnunet-gtk/flags/sy.png
-share/gnunet-gtk/flags/sz.png
-share/gnunet-gtk/flags/tc.png
-share/gnunet-gtk/flags/td.png
-share/gnunet-gtk/flags/tf.png
-share/gnunet-gtk/flags/tg.png
-share/gnunet-gtk/flags/th.png
-share/gnunet-gtk/flags/tj.png
-share/gnunet-gtk/flags/tk.png
-share/gnunet-gtk/flags/tl.png
-share/gnunet-gtk/flags/tm.png
-share/gnunet-gtk/flags/tn.png
-share/gnunet-gtk/flags/to.png
-share/gnunet-gtk/flags/tr.png
-share/gnunet-gtk/flags/tt.png
-share/gnunet-gtk/flags/tv.png
-share/gnunet-gtk/flags/tw.png
-share/gnunet-gtk/flags/tz.png
-share/gnunet-gtk/flags/ua.png
-share/gnunet-gtk/flags/ug.png
-share/gnunet-gtk/flags/um.png
-share/gnunet-gtk/flags/us.png
-share/gnunet-gtk/flags/uy.png
-share/gnunet-gtk/flags/uz.png
-share/gnunet-gtk/flags/va.png
-share/gnunet-gtk/flags/vc.png
-share/gnunet-gtk/flags/ve.png
-share/gnunet-gtk/flags/vg.png
-share/gnunet-gtk/flags/vi.png
-share/gnunet-gtk/flags/vn.png
-share/gnunet-gtk/flags/vu.png
-share/gnunet-gtk/flags/wf.png
-share/gnunet-gtk/flags/ws.png
-share/gnunet-gtk/flags/ye.png
-share/gnunet-gtk/flags/yt.png
-share/gnunet-gtk/flags/za.png
-share/gnunet-gtk/flags/zm.png
-share/gnunet-gtk/flags/zw.png
-share/gnunet-gtk/gnunet-setup-oxygen-cancel.png
-share/gnunet-gtk/gnunet-setup-oxygen-ok.png
-share/gnunet-gtk/gnunet_fs_gtk_about_window.glade
-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
-share/gnunet-gtk/gnunet_fs_gtk_publish_dialog.glade
-share/gnunet-gtk/gnunet_fs_gtk_publish_directory_dialog.glade
-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
-share/gnunet-gtk/gnunet_peerinfo_gtk_main_window.glade
-share/gnunet-gtk/gnunet_setup_gtk_main_window.glade
-share/gnunet-gtk/gnunet_statistics_gtk_about_window.glade
-share/gnunet-gtk/gnunet_statistics_gtk_main_window.glade
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%DATADIR%%/config.d/gnunet-fs-gtk.conf
+%%DATADIR%%/config.d/gnunet-namestore-gtk.conf
+%%DATADIR%%/downloaded.gif
+%%DATADIR%%/downloading.gif
+%%DATADIR%%/downloading_not_receiving.gif
+%%DATADIR%%/error.gif
+%%DATADIR%%/flags/ad.png
+%%DATADIR%%/flags/ae.png
+%%DATADIR%%/flags/af.png
+%%DATADIR%%/flags/ag.png
+%%DATADIR%%/flags/ai.png
+%%DATADIR%%/flags/al.png
+%%DATADIR%%/flags/am.png
+%%DATADIR%%/flags/an.png
+%%DATADIR%%/flags/ao.png
+%%DATADIR%%/flags/aq.png
+%%DATADIR%%/flags/ar.png
+%%DATADIR%%/flags/as.png
+%%DATADIR%%/flags/at.png
+%%DATADIR%%/flags/au.png
+%%DATADIR%%/flags/aw.png
+%%DATADIR%%/flags/ax.png
+%%DATADIR%%/flags/az.png
+%%DATADIR%%/flags/ba.png
+%%DATADIR%%/flags/bb.png
+%%DATADIR%%/flags/bd.png
+%%DATADIR%%/flags/be.png
+%%DATADIR%%/flags/bf.png
+%%DATADIR%%/flags/bg.png
+%%DATADIR%%/flags/bh.png
+%%DATADIR%%/flags/bi.png
+%%DATADIR%%/flags/bj.png
+%%DATADIR%%/flags/bm.png
+%%DATADIR%%/flags/bn.png
+%%DATADIR%%/flags/bo.png
+%%DATADIR%%/flags/br.png
+%%DATADIR%%/flags/bs.png
+%%DATADIR%%/flags/bt.png
+%%DATADIR%%/flags/bv.png
+%%DATADIR%%/flags/bw.png
+%%DATADIR%%/flags/by.png
+%%DATADIR%%/flags/ca.png
+%%DATADIR%%/flags/cc.png
+%%DATADIR%%/flags/cd.png
+%%DATADIR%%/flags/cf.png
+%%DATADIR%%/flags/cg.png
+%%DATADIR%%/flags/ch.png
+%%DATADIR%%/flags/ci.png
+%%DATADIR%%/flags/ck.png
+%%DATADIR%%/flags/cl.png
+%%DATADIR%%/flags/cm.png
+%%DATADIR%%/flags/cn.png
+%%DATADIR%%/flags/co.png
+%%DATADIR%%/flags/cr.png
+%%DATADIR%%/flags/cs.png
+%%DATADIR%%/flags/cu.png
+%%DATADIR%%/flags/cv.png
+%%DATADIR%%/flags/cx.png
+%%DATADIR%%/flags/cy.png
+%%DATADIR%%/flags/cz.png
+%%DATADIR%%/flags/de.png
+%%DATADIR%%/flags/dj.png
+%%DATADIR%%/flags/dk.png
+%%DATADIR%%/flags/dm.png
+%%DATADIR%%/flags/do.png
+%%DATADIR%%/flags/dz.png
+%%DATADIR%%/flags/ec.png
+%%DATADIR%%/flags/ee.png
+%%DATADIR%%/flags/eg.png
+%%DATADIR%%/flags/eh.png
+%%DATADIR%%/flags/er.png
+%%DATADIR%%/flags/es.png
+%%DATADIR%%/flags/et.png
+%%DATADIR%%/flags/eu.png
+%%DATADIR%%/flags/fi.png
+%%DATADIR%%/flags/fj.png
+%%DATADIR%%/flags/fk.png
+%%DATADIR%%/flags/fm.png
+%%DATADIR%%/flags/fo.png
+%%DATADIR%%/flags/fr.png
+%%DATADIR%%/flags/ga.png
+%%DATADIR%%/flags/gb.png
+%%DATADIR%%/flags/gd.png
+%%DATADIR%%/flags/ge.png
+%%DATADIR%%/flags/gf.png
+%%DATADIR%%/flags/gh.png
+%%DATADIR%%/flags/gi.png
+%%DATADIR%%/flags/gl.png
+%%DATADIR%%/flags/gm.png
+%%DATADIR%%/flags/gn.png
+%%DATADIR%%/flags/gp.png
+%%DATADIR%%/flags/gq.png
+%%DATADIR%%/flags/gr.png
+%%DATADIR%%/flags/gs.png
+%%DATADIR%%/flags/gt.png
+%%DATADIR%%/flags/gu.png
+%%DATADIR%%/flags/gw.png
+%%DATADIR%%/flags/gy.png
+%%DATADIR%%/flags/hk.png
+%%DATADIR%%/flags/hm.png
+%%DATADIR%%/flags/hn.png
+%%DATADIR%%/flags/hr.png
+%%DATADIR%%/flags/ht.png
+%%DATADIR%%/flags/hu.png
+%%DATADIR%%/flags/id.png
+%%DATADIR%%/flags/ie.png
+%%DATADIR%%/flags/il.png
+%%DATADIR%%/flags/in.png
+%%DATADIR%%/flags/io.png
+%%DATADIR%%/flags/iq.png
+%%DATADIR%%/flags/ir.png
+%%DATADIR%%/flags/it.png
+%%DATADIR%%/flags/jm.png
+%%DATADIR%%/flags/jo.png
+%%DATADIR%%/flags/jp.png
+%%DATADIR%%/flags/ke.png
+%%DATADIR%%/flags/kg.png
+%%DATADIR%%/flags/kh.png
+%%DATADIR%%/flags/ki.png
+%%DATADIR%%/flags/km.png
+%%DATADIR%%/flags/kn.png
+%%DATADIR%%/flags/kp.png
+%%DATADIR%%/flags/kr.png
+%%DATADIR%%/flags/kw.png
+%%DATADIR%%/flags/ky.png
+%%DATADIR%%/flags/kz.png
+%%DATADIR%%/flags/la.png
+%%DATADIR%%/flags/lb.png
+%%DATADIR%%/flags/lc.png
+%%DATADIR%%/flags/li.png
+%%DATADIR%%/flags/lk.png
+%%DATADIR%%/flags/lr.png
+%%DATADIR%%/flags/ls.png
+%%DATADIR%%/flags/lt.png
+%%DATADIR%%/flags/lu.png
+%%DATADIR%%/flags/lv.png
+%%DATADIR%%/flags/ly.png
+%%DATADIR%%/flags/ma.png
+%%DATADIR%%/flags/mc.png
+%%DATADIR%%/flags/md.png
+%%DATADIR%%/flags/mg.png
+%%DATADIR%%/flags/mh.png
+%%DATADIR%%/flags/mk.png
+%%DATADIR%%/flags/ml.png
+%%DATADIR%%/flags/mm.png
+%%DATADIR%%/flags/mn.png
+%%DATADIR%%/flags/mo.png
+%%DATADIR%%/flags/mp.png
+%%DATADIR%%/flags/mq.png
+%%DATADIR%%/flags/mr.png
+%%DATADIR%%/flags/ms.png
+%%DATADIR%%/flags/mt.png
+%%DATADIR%%/flags/mu.png
+%%DATADIR%%/flags/mv.png
+%%DATADIR%%/flags/mw.png
+%%DATADIR%%/flags/mx.png
+%%DATADIR%%/flags/my.png
+%%DATADIR%%/flags/mz.png
+%%DATADIR%%/flags/na.png
+%%DATADIR%%/flags/nc.png
+%%DATADIR%%/flags/ne.png
+%%DATADIR%%/flags/nf.png
+%%DATADIR%%/flags/ng.png
+%%DATADIR%%/flags/ni.png
+%%DATADIR%%/flags/nl.png
+%%DATADIR%%/flags/no.png
+%%DATADIR%%/flags/np.png
+%%DATADIR%%/flags/nr.png
+%%DATADIR%%/flags/nu.png
+%%DATADIR%%/flags/nz.png
+%%DATADIR%%/flags/om.png
+%%DATADIR%%/flags/pa.png
+%%DATADIR%%/flags/pe.png
+%%DATADIR%%/flags/pf.png
+%%DATADIR%%/flags/pg.png
+%%DATADIR%%/flags/ph.png
+%%DATADIR%%/flags/pk.png
+%%DATADIR%%/flags/pl.png
+%%DATADIR%%/flags/pm.png
+%%DATADIR%%/flags/pn.png
+%%DATADIR%%/flags/pr.png
+%%DATADIR%%/flags/ps.png
+%%DATADIR%%/flags/pt.png
+%%DATADIR%%/flags/pw.png
+%%DATADIR%%/flags/py.png
+%%DATADIR%%/flags/qa.png
+%%DATADIR%%/flags/re.png
+%%DATADIR%%/flags/ro.png
+%%DATADIR%%/flags/ru.png
+%%DATADIR%%/flags/rw.png
+%%DATADIR%%/flags/sa.png
+%%DATADIR%%/flags/sb.png
+%%DATADIR%%/flags/sc.png
+%%DATADIR%%/flags/sd.png
+%%DATADIR%%/flags/se.png
+%%DATADIR%%/flags/sg.png
+%%DATADIR%%/flags/sh.png
+%%DATADIR%%/flags/si.png
+%%DATADIR%%/flags/sj.png
+%%DATADIR%%/flags/sk.png
+%%DATADIR%%/flags/sl.png
+%%DATADIR%%/flags/sm.png
+%%DATADIR%%/flags/sn.png
+%%DATADIR%%/flags/so.png
+%%DATADIR%%/flags/sr.png
+%%DATADIR%%/flags/st.png
+%%DATADIR%%/flags/sv.png
+%%DATADIR%%/flags/sy.png
+%%DATADIR%%/flags/sz.png
+%%DATADIR%%/flags/tc.png
+%%DATADIR%%/flags/td.png
+%%DATADIR%%/flags/tf.png
+%%DATADIR%%/flags/tg.png
+%%DATADIR%%/flags/th.png
+%%DATADIR%%/flags/tj.png
+%%DATADIR%%/flags/tk.png
+%%DATADIR%%/flags/tl.png
+%%DATADIR%%/flags/tm.png
+%%DATADIR%%/flags/tn.png
+%%DATADIR%%/flags/to.png
+%%DATADIR%%/flags/tr.png
+%%DATADIR%%/flags/tt.png
+%%DATADIR%%/flags/tv.png
+%%DATADIR%%/flags/tw.png
+%%DATADIR%%/flags/tz.png
+%%DATADIR%%/flags/ua.png
+%%DATADIR%%/flags/ug.png
+%%DATADIR%%/flags/um.png
+%%DATADIR%%/flags/us.png
+%%DATADIR%%/flags/uy.png
+%%DATADIR%%/flags/uz.png
+%%DATADIR%%/flags/va.png
+%%DATADIR%%/flags/vc.png
+%%DATADIR%%/flags/ve.png
+%%DATADIR%%/flags/vg.png
+%%DATADIR%%/flags/vi.png
+%%DATADIR%%/flags/vn.png
+%%DATADIR%%/flags/vu.png
+%%DATADIR%%/flags/wf.png
+%%DATADIR%%/flags/ws.png
+%%DATADIR%%/flags/ye.png
+%%DATADIR%%/flags/yt.png
+%%DATADIR%%/flags/za.png
+%%DATADIR%%/flags/zm.png
+%%DATADIR%%/flags/zw.png
+%%DATADIR%%/found_source.gif
+%%DATADIR%%/fs.png
+%%DATADIR%%/fs.svg
+%%DATADIR%%/gns.png
+%%DATADIR%%/gns.svg
+%%DATADIR%%/gnunet-setup-oxygen-cancel.png
+%%DATADIR%%/gnunet-setup-oxygen-ok.png
+%%DATADIR%%/gnunet_conversation_gtk_about_window.glade
+%%DATADIR%%/gnunet_conversation_gtk_main_window.glade
+%%DATADIR%%/gnunet_fs_gtk_about_window.glade
+%%DATADIR%%/gnunet_fs_gtk_download_as_dialog.glade
+%%DATADIR%%/gnunet_fs_gtk_edit_publication.glade
+%%DATADIR%%/gnunet_fs_gtk_enter_nick_dialog.glade
+%%DATADIR%%/gnunet_fs_gtk_main_window.glade
+%%DATADIR%%/gnunet_fs_gtk_open_directory_dialog.glade
+%%DATADIR%%/gnunet_fs_gtk_open_url_dialog.glade
+%%DATADIR%%/gnunet_fs_gtk_progress_dialog.glade
+%%DATADIR%%/gnunet_fs_gtk_pseu_progress_dialog.glade
+%%DATADIR%%/gnunet_fs_gtk_publish_dialog.glade
+%%DATADIR%%/gnunet_fs_gtk_publish_directory_dialog.glade
+%%DATADIR%%/gnunet_fs_gtk_publish_file_dialog.glade
+%%DATADIR%%/gnunet_fs_gtk_publish_tab.glade
+%%DATADIR%%/gnunet_fs_gtk_search_tab.glade
+%%DATADIR%%/gnunet_fs_gtk_unindex.glade
+%%DATADIR%%/gnunet_gtk.glade
+%%DATADIR%%/gnunet_gtk_status_bar_menu.glade
+%%DATADIR%%/gnunet_identity_gtk_about_window.glade
+%%DATADIR%%/gnunet_identity_gtk_advertise_dialog.glade
+%%DATADIR%%/gnunet_identity_gtk_main_window.glade
+%%DATADIR%%/gnunet_logo.png
+%%DATADIR%%/gnunet_namestore_edit_a.glade
+%%DATADIR%%/gnunet_namestore_edit_aaaa.glade
+%%DATADIR%%/gnunet_namestore_edit_cname.glade
+%%DATADIR%%/gnunet_namestore_edit_gns2dns.glade
+%%DATADIR%%/gnunet_namestore_edit_leho.glade
+%%DATADIR%%/gnunet_namestore_edit_mx.glade
+%%DATADIR%%/gnunet_namestore_edit_phone.glade
+%%DATADIR%%/gnunet_namestore_edit_pkey.glade
+%%DATADIR%%/gnunet_namestore_edit_ptr.glade
+%%DATADIR%%/gnunet_namestore_edit_soa.glade
+%%DATADIR%%/gnunet_namestore_edit_srv.glade
+%%DATADIR%%/gnunet_namestore_edit_txt.glade
+%%DATADIR%%/gnunet_namestore_edit_vpn.glade
+%%DATADIR%%/gnunet_namestore_gtk_main_window.glade
+%%DATADIR%%/gnunet_namestore_gtk_qr_save_as_dialog.glade
+%%DATADIR%%/gnunet_peerinfo_gtk_about_window.glade
+%%DATADIR%%/gnunet_peerinfo_gtk_main_window.glade
+%%DATADIR%%/gnunet_setup_calendar_dialog.glade
+%%DATADIR%%/gnunet_setup_main_window.glade
+%%DATADIR%%/gnunet_statistics_gtk_about_window.glade
+%%DATADIR%%/gnunet_statistics_gtk_main_window.glade
+%%DATADIR%%/green.png
+%%DATADIR%%/identity.png
+%%DATADIR%%/identity.svg
+%%DATADIR%%/peerinfo.png
+%%DATADIR%%/peerinfo.svg
+%%DATADIR%%/published.gif
+%%DATADIR%%/publishing.gif
+%%DATADIR%%/qr_dummy.png
+%%DATADIR%%/red.png
+%%DATADIR%%/searching_sources.gif
+%%DATADIR%%/setup.png
+%%DATADIR%%/setup.svg
+%%DATADIR%%/statistics.png
+%%DATADIR%%/statistics.svg
 share/icons/hicolor/16x16/apps/gnunet-fs-gtk.png
+share/icons/hicolor/16x16/status/gnunet-fs-gtk-ns-association.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/scalable/apps/gnunet-fs-gtk.svg
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrm share/gnunet-gtk/flags
-@dirrm share/gnunet-gtk/config.d
-@dirrm share/gnunet-gtk
+share/icons/hicolor/scalable/status/gnunet-fs-gtk-ns-association.svg
+@dirrm %%DATADIR%%/flags
+@dirrm %%DATADIR%%/config.d
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/gnunet-gtk