Attachment 147582 Details for Bug 193855 – news/diablo: trim pkg-plist, rename RC script

[patch] news/diablo: trim pkg-plist, rename RC script

diablo.diff (text/plain), 2.90 KB, created by Nikolai Lifanov on 2014-09-22 23:04:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolai Lifanov

Created: 2014-09-22 23:04:33 UTC

Size: 2.90 KB

patch

obsolete

>Index: files/diablo.sh-sample
>===================================================================
>--- files/diablo.sh-sample	(revision 32344)
>+++ files/diablo.sh-sample	(revision 32346)
>@@ -1,17 +0,0 @@
>-#!/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
>Index: files/diablo.in
>===================================================================
>--- files/diablo.in	(revision 0)
>+++ files/diablo.in	(revision 32346)
>@@ -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
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 32344)
>+++ pkg-plist	(revision 32346)
>@@ -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/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
>Index: Makefile
>===================================================================
>--- Makefile	(revision 32344)
>+++ Makefile	(revision 32346)
>@@ -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
>@@ -23,12 +23,12 @@
> .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
>@@ -50,7 +50,7 @@
> 	${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}

Flags:

lifanov: maintainer-approval+

Actions: View | Diff

Attachments on bug 193855: 147582 | 148106