Rename files/diablo.sh-sample to files/diablo.in.

Clean up @dirrmtry from pkg-plist.
Bump PORTREVISION.

PR:		193855
Submitted by:	Nikolai Lifanov (maintainer)

3 files changed, 5 insertions, 23 deletions

diff --git a/news/diablo/Makefile b/news/diablo/Makefile
index 642a6ab327c3..cb39760365f4 100644
--- a/news/diablo/Makefile
+++ b/news/diablo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	diablo
 PORTVERSION=	5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	news
 MASTER_SITES=	http://www.openusenet.org/diablo/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-REL
@@ -25,12 +25,12 @@ USES=	tar:tgz
 .include <bsd.port.options.mk>
 
 post-patch:
-	${CP} ${FILESDIR}/diablo.sh-sample ${WRKDIR}
+	${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' \
-		${WRKDIR}/diablo.sh-sample ${WRKSRC}/XMakefile.inst
+		${WRKDIR}/diablo ${WRKSRC}/XMakefile.inst
 # Fix for GCC 4.2
 	${REINPLACE_CMD} -e 's|VServerConfig\[\]|*VServerConfig|' \
 		${WRKSRC}/dreaderd/main.c
@@ -52,7 +52,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/postq
 	(cd ${WRKSRC} && xmake install)
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/news/dbin/*
-	${INSTALL_SCRIPT} ${WRKDIR}/diablo.sh-sample ${STAGEDIR}${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${WRKDIR}/diablo ${STAGEDIR}${PREFIX}/etc/rc.d
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
diff --git a/news/diablo/files/diablo.sh-sample b/news/diablo/files/diablo.in
index 4d00b4dd3571..4d00b4dd3571 100644
--- a/news/diablo/files/diablo.sh-sample
+++ b/news/diablo/files/diablo.in
diff --git a/news/diablo/pkg-plist b/news/diablo/pkg-plist
index 3387db14fce2..cd652ba29982 100644
--- a/news/diablo/pkg-plist
+++ b/news/diablo/pkg-plist
@@ -1,4 +1,4 @@
-etc/rc.d/diablo.sh-sample
+etc/rc.d/diablo
 man/man5/diablo-files.5.gz
 man/man5/diablo-kp.5.gz
 man/man8/dexpire.8.gz
@@ -124,21 +124,3 @@ news/samples/reader/dserver.hosts
 news/samples/reader/moderators
 @owner
 @group
-@dirrmtry news/dbin
-@dirrmtry news/dqueue
-@dirrmtry news/log
-@dirrmtry news/man/man5
-@dirrmtry news/man/man8
-@dirrmtry news/man
-@dirrmtry news/run
-@dirrmtry news/samples/adm
-@dirrmtry news/samples/feeder
-@dirrmtry news/samples/feeder+reader
-@dirrmtry news/samples/reader
-@dirrmtry news/samples
-@dirrmtry news/spool/cache
-@dirrmtry news/spool/group
-@dirrmtry news/spool/news
-@dirrmtry news/spool/postq
-@dirrmtry news/spool
-@dirrmtry news