From owner-svn-ports-all@freebsd.org  Wed Sep  7 16:11:01 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 887A2BCFED3;
 Wed,  7 Sep 2016 16:11:01 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 58AB3789;
 Wed,  7 Sep 2016 16:11:01 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u87GB0M8059747;
 Wed, 7 Sep 2016 16:11:00 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u87GB0Mx059744;
 Wed, 7 Sep 2016 16:11:00 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201609071611.u87GB0Mx059744@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tijl set sender to
 tijl@FreeBSD.org using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Wed, 7 Sep 2016 16:11:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r421507 - head/news/sn
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Sep 2016 16:11:01 -0000

Author: tijl
Date: Wed Sep  7 16:11:00 2016
New Revision: 421507
URL: https://svnweb.freebsd.org/changeset/ports/421507

Log:
  Fix package install failure when /var/spool/news already exists.

Modified:
  head/news/sn/Makefile
  head/news/sn/pkg-plist

Modified: head/news/sn/Makefile
==============================================================================
--- head/news/sn/Makefile	Wed Sep  7 15:03:24 2016	(r421506)
+++ head/news/sn/Makefile	Wed Sep  7 16:11:00 2016	(r421507)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sn
 PORTVERSION=	0.3.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	news
 MASTER_SITES=	http://www.infa.abo.fi/~patrik/sn/files/ \
 		http://home.arcor.de/teambushido/fbsd_ports/ \
@@ -36,10 +36,8 @@ post-patch:
 		s|/bin/bash|${LOCALBASE}/bin/bash|' \
 			${WRKSRC}/Makefile
 
-pre-install:
-	@${MKDIR} ${STAGEDIR}/var/spool/news
-
 post-install:
+	@${MKDIR} ${STAGEDIR}/var/spool/news
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 

Modified: head/news/sn/pkg-plist
==============================================================================
--- head/news/sn/pkg-plist	Wed Sep  7 15:03:24 2016	(r421506)
+++ head/news/sn/pkg-plist	Wed Sep  7 16:11:00 2016	(r421507)
@@ -35,5 +35,5 @@ sbin/snscan
 sbin/snsend
 sbin/snsplit
 sbin/snstore
-@exec /bin/mkdir /var/spool/news
-@unexec rmdir /var/spool/news 2>/dev/null ||( echo "===>  If you don't plan to use them later, you can safely remove /var/spool/news. Deinstall process kept these files intact:" | fmt && for i in $(find /var/spool/news -type f); do echo "    - $i"; done)
+@dir /var/spool/news
+@postunexec [ ! -d /var/spool/news ] || ( echo "===>  If you don't plan to use them later, you can safely remove /var/spool/news. Deinstall process kept these files intact:" | fmt && for i in $(find /var/spool/news -type f); do echo "    - $i"; done)