Date: Wed, 30 Dec 2015 15:16:27 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404861 - head/news/newsstar Message-ID: <201512301516.tBUFGRt6014321@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512301516.tBUFGRt6014321>