From d50a61aa7baf5094c6e882eb57be81a93987f4ca Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Mon, 12 Oct 2015 17:34:44 +0000
Subject: - Add missing directories to plist, fixing stage-qa - Silence
 patching - Switch to options helpers

PR:		203665
Submitted by:	amdmi3
Approved by:	lifanov@mail.lifanov.com (maintainer)
---
 news/diablo/Makefile  | 20 ++++++++++----------
 news/diablo/pkg-plist |  9 +++++++++
 2 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'news/diablo')

diff --git a/news/diablo/Makefile b/news/diablo/Makefile
index cb39760365f4..ac8bbf89190b 100644
--- a/news/diablo/Makefile
+++ b/news/diablo/Makefile
@@ -20,24 +20,21 @@ PORTDOCS=	COPYRIGHT INSTALL README.READER README.SERVER RELEASE_NOTES
 OPTIONS_DEFINE=	DES DOCS
 DES_DESC=	DES encryption support
 
-USES=	tar:tgz
-
-.include <bsd.port.options.mk>
+USES=		tar:tgz
 
 post-patch:
-	${CP} ${FILESDIR}/diablo.in ${WRKDIR}/diablo
-	${REINPLACE_CMD} -E 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g ;\
+	@${CP} ${FILESDIR}/diablo.in ${WRKDIR}/diablo
+	@${REINPLACE_CMD} -E 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g ;\
 		s|-g -O.?|${CFLAGS}| ; s|g?cc|${CC}|' \
 		${WRKSRC}/XMakefile.inc
-	${REINPLACE_CMD} -E 's|%%PREFIX%%|${PREFIX}|g' \
+	@${REINPLACE_CMD} -E 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKDIR}/diablo ${WRKSRC}/XMakefile.inst
 # Fix for GCC 4.2
-	${REINPLACE_CMD} -e 's|VServerConfig\[\]|*VServerConfig|' \
+	@${REINPLACE_CMD} -e 's|VServerConfig\[\]|*VServerConfig|' \
 		${WRKSRC}/dreaderd/main.c
 
-.if empty(PORT_OPTIONS:MDES)
-	${REINPLACE_CMD} -e 's| -ldes||g' ${WRKSRC}/XMakefile.inc
-.endif
+post-patch-DES-off:
+	@${REINPLACE_CMD} -e 's| -ldes||g' ${WRKSRC}/XMakefile.inc
 
 do-build:
 	(cd ${WRKSRC} && xmake all)
@@ -51,8 +48,11 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/group
 	${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/postq
 	(cd ${WRKSRC} && xmake install)
+	@${RM} -rf ${STAGEDIR}${PREFIX}/news/man
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/news/dbin/*
 	${INSTALL_SCRIPT} ${WRKDIR}/diablo ${STAGEDIR}${PREFIX}/etc/rc.d
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
diff --git a/news/diablo/pkg-plist b/news/diablo/pkg-plist
index cd652ba29982..d36c70998299 100644
--- a/news/diablo/pkg-plist
+++ b/news/diablo/pkg-plist
@@ -122,5 +122,14 @@ news/samples/reader/distrib.pats
 news/samples/reader/dreader.access
 news/samples/reader/dserver.hosts
 news/samples/reader/moderators
+@dir news/spool/postq
+@dir news/spool/news
+@dir news/spool/group
+@dir news/spool/cache
+@dir news/spool
+@dir news/run
+@dir news/log
+@dir news/dqueue
+@dir news
 @owner
 @group
-- 
cgit v1.2.3