From owner-svn-ports-all@FreeBSD.ORG Sat Oct 11 01:12:16 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1A7481AF; Sat, 11 Oct 2014 01:12:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 06208D44; Sat, 11 Oct 2014 01:12:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9B1CFYf022306; Sat, 11 Oct 2014 01:12:15 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9B1CF1K022301; Sat, 11 Oct 2014 01:12:15 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201410110112.s9B1CF1K022301@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sat, 11 Oct 2014 01:12:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370622 - in head/news/diablo: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Oct 2014 01:12:16 -0000 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 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 -@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