svn commit: r370622 - in head/news/diablo: . files

[Matthias Andree]

Author: mandree
Date: Sat Oct 11 01:12:14 2014
New Revision: 370622
URL: https://svnweb.freebsd.org/changeset/ports/370622
QAT: https://qat.redports.org/buildarchive/r370622/

Log:
  Rename files/diablo.sh-sample to files/diablo.in.
  Clean up @dirrmtry from pkg-plist.
  Bump PORTREVISION.
  
  PR:		193855
  Submitted by:	Nikolai Lifanov (maintainer)

Added:
  head/news/diablo/files/diablo.in   (contents, props changed)
Deleted:
  head/news/diablo/files/diablo.sh-sample
Modified:
  head/news/diablo/Makefile
  head/news/diablo/pkg-plist

Modified: head/news/diablo/Makefile
==============================================================================
--- head/news/diablo/Makefile	Sat Oct 11 01:00:45 2014	(r370621)
+++ head/news/diablo/Makefile	Sat Oct 11 01:12:14 2014	(r370622)
@@ -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}

Added: head/news/diablo/files/diablo.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/news/diablo/files/diablo.in	Sat Oct 11 01:12:14 2014	(r370622)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+case $1 in
+start)
+	if [ -x %%PREFIX%%/news/rc.news ] ; then
+	    %%PREFIX%%/news/rc.news && echo -n ' diablo'
+	fi
+	;;
+stop)
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	exit 64
+	;;
+esac
+
+exit 0

Modified: head/news/diablo/pkg-plist
==============================================================================
--- head/news/diablo/pkg-plist	Sat Oct 11 01:00:45 2014	(r370621)
+++ head/news/diablo/pkg-plist	Sat Oct 11 01:12:14 2014	(r370622)
@@ -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
- at dirrmtry news/dbin
- at dirrmtry news/dqueue
- at dirrmtry news/log
- at dirrmtry news/man/man5
- at dirrmtry news/man/man8
- at dirrmtry news/man
- at dirrmtry news/run
- at dirrmtry news/samples/adm
- at dirrmtry news/samples/feeder
- at dirrmtry news/samples/feeder+reader
- at dirrmtry news/samples/reader
- at dirrmtry news/samples
- at dirrmtry news/spool/cache
- at dirrmtry news/spool/group
- at dirrmtry news/spool/news
- at dirrmtry news/spool/postq
- at dirrmtry news/spool
- at dirrmtry news