3 files changed, 22 insertions, 8 deletions

diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 8cfd07b004e4..f310389a6ca6 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnunet
 DISTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	net-p2p ipv6 security
 MASTER_SITES=	GNU
 
@@ -52,6 +53,9 @@ MAN1=	gnunet-arm.1 gnunet-directory.1 gnunet-download.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:
+#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
@@ -63,7 +67,8 @@ PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README
 .endif
 
 .if !defined(NOPORTEXAMPLES)
-PORTEXAMPLES=	gnunet_janitor.py gnunet_pyexpect.py hostlist.cgi hostlist.php report.sh
+PORTEXAMPLES=	gnunet_janitor.py gnunet_pyexpect.py hostlist.cgi hostlist.php \
+report.sh
 .endif
 
 .if defined(WITH_HTTP)
@@ -125,8 +130,8 @@ post-patch:
 		${WRKSRC}/pkgconfig/Makefile.in
 
 post-install:
-	@${PRINTF} "%s\n%s\n" "[PATHS]" "SERVICEHOME = ${GNUNET_DAEMON_DIR}" \
-	> ${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
diff --git a/net-p2p/gnunet/files/pkg-message.in b/net-p2p/gnunet/files/pkg-message.in
index 5e67fc085d45..eb2517a7d121 100644
--- a/net-p2p/gnunet/files/pkg-message.in
+++ b/net-p2p/gnunet/files/pkg-message.in
@@ -1,14 +1,23 @@
 This port requires configuration after installation.  Recommended
-practices and configuration information can be found in the
-Installation and User Handbooks at the gnunet website:
+practices and configuration information can be found in:
+
+%%DOCSDIR%%/README
+
+and the Installation and User Handbooks at the gnunet website:
 
 https://gnunet.org/book
 
-After consulting these documents, users should create a suitable
-configuration file,
+After consulting these documents, a suitable system-wide configuration
+file should be created, by editing:
 
 %%PREFIX%%/etc/gnunet.conf
 
+Also, each user should create a user-specific configuration file (this
+must be present, although it can be empty):
+
+mkdir ~/.gnunet
+touch ~/.gnunet/gnunet.conf
+
 Information on using gnunet with MySQL and PostgreSQL databases can be
 found in the README.mysql and README.postgres documents in the doc
 subdirectory of the gnunet distfile.
diff --git a/net-p2p/gnunet/pkg-plist b/net-p2p/gnunet/pkg-plist
index 4c987c7f1a7e..1d169be65d2f 100644
--- a/net-p2p/gnunet/pkg-plist
+++ b/net-p2p/gnunet/pkg-plist
@@ -37,9 +37,9 @@ 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
 etc/gnunet.conf.sample
 @exec if [ ! -f %B/gnunet.conf ] ; then cp -p %D/%F %B/gnunet.conf ; fi
-@unexec if cmp -s %D/%F %B/gnunet.conf ; then rm -f %B/gnunet.conf ; fi
 include/gnunet/block_dns.h
 include/gnunet/block_fs.h
 include/gnunet/block_gns.h