Update to new upstream release 1.11.11. (Bugfixes)

4 files changed, 38 insertions, 15 deletions

diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index 2cc69c702292..f7175d6a3010 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	leafnode
-DISTVERSION=	1.11.10
-PORTREVISION=	1
+DISTVERSION=	1.11.11
 CATEGORIES=	news ipv6
 MASTER_SITES=	SF \
 		http://www.dt.e-technik.uni-dortmund.de/~ma/${PORTNAME}/
@@ -35,7 +34,7 @@ PLIST_SUB=	SPOOLDIR=${LEAFNODE_SPOOLDIR} REALPREFIX=${PREFIX}
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/leafnode \
 		--with-spooldir=${LEAFNODE_SPOOLDIR} --with-ipv6 \
 		--exec-prefix=${PREFIX}
-SUB_FILES=	pkg-message pkg-install
+SUB_FILES=	pkg-message pkg-install pkg-deinstall
 SUB_LIST=	SPOOLDIR=${LEAFNODE_SPOOLDIR}
 
 MAN1=		leafnode-version.1 newsq.1
diff --git a/news/leafnode/distinfo b/news/leafnode/distinfo
index 53e1cfc8d91d..a9507d092a4b 100644
--- a/news/leafnode/distinfo
+++ b/news/leafnode/distinfo
@@ -1,2 +1,2 @@
-SHA256 (leafnode-1.11.10.tar.xz) = 4ee87edc4bfffce285656dbc4b78d9f1d5b5286b218bfa8869a62ecf2c39045e
-SIZE (leafnode-1.11.10.tar.xz) = 446368
+SHA256 (leafnode-1.11.11.tar.xz) = 163ed21d613dc22e33e19d65b58da16ae34899ce57c23508b107d4706debd331
+SIZE (leafnode-1.11.11.tar.xz) = 453396
diff --git a/news/leafnode/files/pkg-deinstall.in b/news/leafnode/files/pkg-deinstall.in
new file mode 100644
index 000000000000..ea028ff7fadd
--- /dev/null
+++ b/news/leafnode/files/pkg-deinstall.in
@@ -0,0 +1,25 @@
+#! /bin/sh
+set -eu
+case "$2" in
+    DEINSTALL)
+	;;
+
+    POST-DEINSTALL)
+	for d in \
+		failed.postings \
+		interesting.groups \
+		leaf.node \
+		message.id/* \
+		message.id \
+		out.going \
+		temp.files \
+		""; do
+		rmdir "%%SPOOLDIR%%/$d" 2>/dev/null || :
+	done
+	;;
+
+    *)
+	echo >&2 "Unknown argument in $0 $@"
+	exit 1
+	;;
+esac
diff --git a/news/leafnode/pkg-plist b/news/leafnode/pkg-plist
index 9a6f9c7dd59a..0d421b38fa5d 100644
--- a/news/leafnode/pkg-plist
+++ b/news/leafnode/pkg-plist
@@ -27,16 +27,15 @@ sbin/texpire
 sbin/checkgroups
 sbin/applyfilter
 sbin/setup-daemontools.sh
-@dirrmtry %%ETCDIR%%
+@dir %%ETCDIR%%
 @comment only remove these when empty:
 @comment we don't want to kill the news spool across updates
-@unexec rm -f %%SPOOLDIR%%/leaf.node/lock.file 2>/dev/null || :
-@unexec rmdir %%SPOOLDIR%%/failed.postings 2>/dev/null || :
-@unexec rmdir %%SPOOLDIR%%/leaf.node 2>/dev/null || :
-@unexec rmdir %%SPOOLDIR%%/message.id/* 2>/dev/null || :
-@unexec rmdir %%SPOOLDIR%%/message.id 2>/dev/null || :
-@unexec rmdir %%SPOOLDIR%%/interesting.groups 2>/dev/null || :
-@unexec rmdir %%SPOOLDIR%%/out.going 2>/dev/null || :
-@unexec rmdir %%SPOOLDIR%%/temp.files 2>/dev/null || :
-@unexec rmdir %%SPOOLDIR%% 2>/dev/null || :
+@unexec rm -f %%SPOOLDIR%%/leaf.node/lock.file
+@dir %%SPOOLDIR%%/failed.postings
+@dir %%SPOOLDIR%%/interesting.groups
+@dir %%SPOOLDIR%%/leaf.node
+@dir %%SPOOLDIR%%/message.id
+@dir %%SPOOLDIR%%/out.going
+@dir %%SPOOLDIR%%/temp.files
+@dir %%SPOOLDIR%%
 @unexec if test -d "%%SPOOLDIR%%" || test -d "%D/etc/leafnode" ; then echo ; echo "==============================================================================" ; echo "If you want to remove leafnode for good, delete spool and configuration:" ; echo "type: rm -rf %D/etc/leafnode %%SPOOLDIR%%" ; echo "==============================================================================" ; fi