From owner-svn-ports-head@freebsd.org  Wed Dec 30 15:16:28 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 B57DCA55F0D;
 Wed, 30 Dec 2015 15:16:28 +0000 (UTC)
 (envelope-from mandree@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 73D341FD1;
 Wed, 30 Dec 2015 15:16:28 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBUFGRRZ014323;
 Wed, 30 Dec 2015 15:16:27 GMT (envelope-from mandree@FreeBSD.org)
Received: (from mandree@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBUFGRt6014321;
 Wed, 30 Dec 2015 15:16:27 GMT (envelope-from mandree@FreeBSD.org)
Message-Id: <201512301516.tBUFGRt6014321@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mandree set sender to
 mandree@FreeBSD.org using -f
From: Matthias Andree <mandree@FreeBSD.org>
Date: Wed, 30 Dec 2015 15:16:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r404861 - head/news/newsstar
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Dec 2015 15:16:28 -0000

Author: mandree
Date: Wed Dec 30 15:16:27 2015
New Revision: 404861
URL: https://svnweb.freebsd.org/changeset/ports/404861

Log:
  Cleanup and update.
  
  PR:		205574
  Submitted by:	Dmitry Marakasov (amdmi3@)

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

Modified: head/news/newsstar/Makefile
==============================================================================
--- head/news/newsstar/Makefile	Wed Dec 30 15:00:35 2015	(r404860)
+++ head/news/newsstar/Makefile	Wed Dec 30 15:16:27 2015	(r404861)
@@ -75,20 +75,20 @@ post-patch:
 	${REINPLACE_CMD} -e 's|install-data-local: install-docs|install-data-local:|' ${WRKSRC}/Makefile.in
 
 post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${MAKE} -C ${WRKSRC}/src install DESTDIR=${STAGEDIR}
+	${MAKE} -C ${WRKSRC}/docs install-man DESTDIR=${STAGEDIR}
+	${MKDIR} ${STAGEDIR}/var/spool/newsstar
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in ${EX_CONFIGS}
 	${INSTALL_DATA} ${WRKSRC}/sample_config/${i} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.else
-	${MAKE} -C ${WRKSRC}/src install DESTDIR=${STAGEDIR}
-	${MAKE} -C ${WRKSRC}/docs install-man DESTDIR=${STAGEDIR}
-.endif
 
 .include <bsd.port.post.mk>

Modified: head/news/newsstar/pkg-plist
==============================================================================
--- head/news/newsstar/pkg-plist	Wed Dec 30 15:00:35 2015	(r404860)
+++ head/news/newsstar/pkg-plist	Wed Dec 30 15:16:27 2015	(r404861)
@@ -31,11 +31,8 @@ libexec/newsstar/newsstar.bin
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/master.ignore.sample
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/master.score.sample
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsrc.sample
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/newsstar
-@dirrmtry %%ETCDIR%%
-@unexec if [ -d /var/spool/newsstar ] ; then echo "==================================================" ; echo "If you are deinstalling newsstar for good" ; echo "remove the spool: type: rm -rf /var/spool/newsstar"; echo "==================================================" ; fi
-@unexec rmdir /var/spool/newsstar/lib >/dev/null 2>&1 || :
-@unexec rmdir /var/spool/newsstar/incoming >/dev/null 2>&1 || :
-@unexec rmdir /var/spool/newsstar >/dev/null 2>&1 || :
+@dir(news,news,750) /var/spool/newsstar/incoming
+@dir(news,news,750) /var/spool/newsstar/lib
+@dir /var/spool/newsstar
+@dir %%ETCDIR%%
+@postunexec if [ -d /var/spool/newsstar ] ; then echo "==================================================" ; echo "If you are deinstalling newsstar for good" ; echo "remove the spool: type: rm -rf /var/spool/newsstar"; echo "==================================================" ; fi