From owner-svn-ports-head@FreeBSD.ORG Thu Oct 31 02:22:15 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 86E25827; Thu, 31 Oct 2013 02:22:15 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6578825B9; Thu, 31 Oct 2013 02:22:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9V2MFbC061481; Thu, 31 Oct 2013 02:22:15 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9V2MEZ2061477; Thu, 31 Oct 2013 02:22:14 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201310310222.r9V2MEZ2061477@svn.freebsd.org> From: Matthias Andree Date: Thu, 31 Oct 2013 02:22:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332195 - in head/news/leafnode: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Oct 2013 02:22:15 -0000 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 -@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