From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 19 11:10:22 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA13616A481 for ; Mon, 19 Jun 2006 11:10:22 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 635E643D48 for ; Mon, 19 Jun 2006 11:10:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k5JBAM20066870 for ; Mon, 19 Jun 2006 11:10:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k5JBAMPo066868; Mon, 19 Jun 2006 11:10:22 GMT (envelope-from gnats) Date: Mon, 19 Jun 2006 11:10:22 GMT Message-Id: <200606191110.k5JBAMPo066868@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: =?ISO-8859-1?Q?K=F6vesd=E1n_G=E1bor?= Cc: Subject: Re: ports/97852: [UPDATE] adds rc.subr support to dns/pdnsd X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: =?ISO-8859-1?Q?K=F6vesd=E1n_G=E1bor?= List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jun 2006 11:10:23 -0000 The following reply was made to PR ports/97852; it has been noted by GNATS. From: =?ISO-8859-1?Q?K=F6vesd=E1n_G=E1bor?= To: bug-followup@FreeBSD.org, v.velox@vvelox.net Cc: Subject: Re: ports/97852: [UPDATE] adds rc.subr support to dns/pdnsd Date: Mon, 19 Jun 2006 13:02:22 +0200 This is a multi-part message in MIME format. --------------020005080205060001000500 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Here's a better patch, suggestions from flz included. Gabor Kovesdan --------------020005080205060001000500 Content-Type: text/plain; name="dns-pdnsd.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="dns-pdnsd.diff" Index: Makefile =================================================================== RCS file: /usr/cvs/ports/dns/pdnsd/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- Makefile 12 May 2006 14:58:35 -0000 1.16 +++ Makefile 18 Jun 2006 09:27:03 -0000 @@ -7,7 +7,7 @@ PORTNAME= pdnsd PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns MASTER_SITES= http://www.phys.uu.nl/~rombouts/pdnsd/releases/ DISTNAME= ${PORTNAME}-${PORTVERSION}-par @@ -17,6 +17,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes +USE_RC_SUBR= pdnsd CONFIGURE_ARGS= --with-cachedir=${PDNSDB} \ --disable-src-addr-disc @@ -39,12 +40,9 @@ .endif post-install: - @${MKDIR} ${PREFIX}/etc/rc.d - @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pdnsd.sh > ${PREFIX}/etc/rc.d/pdnsd.sh - @${CHMOD} 750 ${PREFIX}/etc/rc.d/pdnsd.sh .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES:S@^@${DOCSRCDIR}/@} ${DOCSDIR} + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${DOC_FILES:S@^@${DOCSRCDIR}/@} ${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} Index: pkg-plist =================================================================== RCS file: /usr/cvs/ports/dns/pdnsd/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- pkg-plist 31 Oct 2005 01:17:37 -0000 1.3 +++ pkg-plist 18 Jun 2006 09:29:34 -0000 @@ -1,5 +1,4 @@ etc/pdnsd.conf.sample -etc/rc.d/pdnsd.sh sbin/pdnsd sbin/pdnsd-ctl %%PORTDOCS%%%%DOCSDIR%%/dl.html Index: files/pdnsd.in =================================================================== RCS file: files/pdnsd.in diff -N files/pdnsd.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pdnsd.in 19 Jun 2006 10:54:52 -0000 @@ -0,0 +1,16 @@ +#!/bin/sh + +# PROVIDE: pdnsd +# REQUIRE: netif +# BEFORE: LOGIN + +. %%RC_SUBR%% + +name="pdnsd" +rcvar=${name}_enable +command="%%PREFIX%%/sbin/pdnsd" +pdnsd_flags="-d" +required_files="%%PREFIX%%/etc/pdnsd.conf" +load_rc_config $name + +run_rc_command "$1" Index: files/pdnsd.sh =================================================================== RCS file: files/pdnsd.sh diff -N files/pdnsd.sh --- files/pdnsd.sh 28 Jan 2001 07:51:34 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -#!/bin/sh - -case $1 in -start) - if [ -x %%PREFIX%%/sbin/pdnsd -a -f %%PREFIX%%/etc/pdnsd.conf ]; then - %%PREFIX%%/sbin/pdnsd -d - echo -n ' pdnsd' - fi - ;; -stop) - killall pdnsd && echo -n ' pdnsd' - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - exit 64 - ;; -esac - -exit 0 --------------020005080205060001000500--