summaryrefslogtreecommitdiff
path: root/news/leafnode
diff options
context:
space:
mode:
authorMatthias Andree <mandree@FreeBSD.org>2013-10-31 02:22:14 +0000
committerMatthias Andree <mandree@FreeBSD.org>2013-10-31 02:22:14 +0000
commit826216342dd214222525c4b97a0ffc9398ec33e9 (patch)
tree5a0c8d79407c8bcdda2428fedc84bd4c0afbdb99 /news/leafnode
parent- Split the library part of multimedia/rtmpdump into multimedia/librtmp. (diff)
Give up on empty directory games about lib/leafnode.
Fix massively broken pkg-plist. (Bump PORTREVISION.)
Notes
Notes: svn path=/head/; revision=332195
Diffstat (limited to 'news/leafnode')
-rw-r--r--news/leafnode/Makefile1
-rw-r--r--news/leafnode/files/pkg-install.in1
-rw-r--r--news/leafnode/pkg-plist19
3 files changed, 9 insertions, 12 deletions
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index 3bdfa7d91aab..9bca210b69ca 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -3,6 +3,7 @@
PORTNAME= leafnode
DISTVERSION= 1.11.10
+PORTREVISION= 1
CATEGORIES= news ipv6
MASTER_SITES= SF \
http://www.dt.e-technik.uni-dortmund.de/~ma/${PORTNAME}/
diff --git a/news/leafnode/files/pkg-install.in b/news/leafnode/files/pkg-install.in
index c57e7e5e566c..532dc67fcd9e 100644
--- a/news/leafnode/files/pkg-install.in
+++ b/news/leafnode/files/pkg-install.in
@@ -16,7 +16,6 @@ case "$2" in
install -d -o news -g news -m 2775 %%SPOOLDIR%%/$d
done
mkdir -p "${PKG_PREFIX}/var/spool"
- mkdir -p "${PKG_PREFIX}/lib/leafnode"
;;
*)
diff --git a/news/leafnode/pkg-plist b/news/leafnode/pkg-plist
index 53088c009e39..4d15591aa3d1 100644
--- a/news/leafnode/pkg-plist
+++ b/news/leafnode/pkg-plist
@@ -31,16 +31,13 @@ sbin/setup-daemontools.sh
@dirrmtry %%ETCDIR%%
@comment only remove these when empty:
@comment we don't want to kill the news spool across updates
-@cwd /
-@unexec rm -f %%SPOOLDIR%%/leaf.node/lock.file
-@dirrmtry %%SPOOLDIR%%/failed.postings
-@dirrmtry %%SPOOLDIR%%/leaf.node
+@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 || :
-@dirrmtry %%SPOOLDIR%%/message.id
-@dirrmtry %%SPOOLDIR%%/interesting.groups
-@dirrmtry %%SPOOLDIR%%/out.going
-@dirrmtry %%SPOOLDIR%%/temp.files
-@dirrmtry %%SPOOLDIR%%
-@cwd %%REALPREFIX%%
-@unexec rmdir %D/var/spool %D/var %D/lib/leafnode 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 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