svn commit: r332195 - in head/news/leafnode: . files

[Matthias Andree]

Author: mandree
Date: Thu Oct 31 02:22:14 2013
New Revision: 332195
URL: http://svnweb.freebsd.org/changeset/ports/332195

Log:
  Give up on empty directory games about lib/leafnode.
  Fix massively broken pkg-plist. (Bump PORTREVISION.)

Modified:
  head/news/leafnode/Makefile
  head/news/leafnode/files/pkg-install.in
  head/news/leafnode/pkg-plist

Modified: head/news/leafnode/Makefile
==============================================================================
--- head/news/leafnode/Makefile	Thu Oct 31 02:03:01 2013	(r332194)
+++ head/news/leafnode/Makefile	Thu Oct 31 02:22:14 2013	(r332195)
@@ -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}/

Modified: head/news/leafnode/files/pkg-install.in
==============================================================================
--- head/news/leafnode/files/pkg-install.in	Thu Oct 31 02:03:01 2013	(r332194)
+++ head/news/leafnode/files/pkg-install.in	Thu Oct 31 02:22:14 2013	(r332195)
@@ -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"
 	;;
 
     *)

Modified: head/news/leafnode/pkg-plist
==============================================================================
--- head/news/leafnode/pkg-plist	Thu Oct 31 02:03:01 2013	(r332194)
+++ head/news/leafnode/pkg-plist	Thu Oct 31 02:22:14 2013	(r332195)
@@ -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
- at cwd /
- at unexec rm -f %%SPOOLDIR%%/leaf.node/lock.file
- at dirrmtry %%SPOOLDIR%%/failed.postings
- at dirrmtry %%SPOOLDIR%%/leaf.node
+ at unexec rm -f %%SPOOLDIR%%/leaf.node/lock.file 2>/dev/null || :
+ at unexec rmdir %%SPOOLDIR%%/failed.postings 2>/dev/null || :
+ at unexec rmdir %%SPOOLDIR%%/leaf.node 2>/dev/null || :
 @unexec rmdir %%SPOOLDIR%%/message.id/* 2>/dev/null || :
- at dirrmtry %%SPOOLDIR%%/message.id
- at dirrmtry %%SPOOLDIR%%/interesting.groups
- at dirrmtry %%SPOOLDIR%%/out.going
- at dirrmtry %%SPOOLDIR%%/temp.files
- at dirrmtry %%SPOOLDIR%%
- at cwd %%REALPREFIX%%
- at unexec rmdir %D/var/spool %D/var %D/lib/leafnode 2>/dev/null || :
+ at unexec rmdir %%SPOOLDIR%%/message.id 2>/dev/null || :
+ at unexec rmdir %%SPOOLDIR%%/interesting.groups 2>/dev/null || :
+ at unexec rmdir %%SPOOLDIR%%/out.going 2>/dev/null || :
+ at unexec rmdir %%SPOOLDIR%%/temp.files 2>/dev/null || :
+ at 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