summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--news/newsstar/Makefile18
-rw-r--r--news/newsstar/pkg-plist13
2 files changed, 14 insertions, 17 deletions
diff --git a/news/newsstar/Makefile b/news/newsstar/Makefile
index cc9d1c4..c09af3a 100644
--- a/news/newsstar/Makefile
+++ b/news/newsstar/Makefile
@@ -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>
diff --git a/news/newsstar/pkg-plist b/news/newsstar/pkg-plist
index 0600140..408b4bf 100644
--- a/news/newsstar/pkg-plist
+++ b/news/newsstar/pkg-plist
@@ -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
OpenPOWER on IntegriCloud