From c529a90d0bf44c73dfe17e8003f843b5a0c98f29 Mon Sep 17 00:00:00 2001 From: ryoon Date: Tue, 29 Jan 2019 14:54:03 +0000 Subject: [PATCH] Do not conflict with nsd in NetBSD base. Rename rc.d script to nlsnd Bump PKGREVISION. --- net/nsd/Makefile | 5 +++-- net/nsd/files/{nsd.sh => nlnsd.sh} | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) rename net/nsd/files/{nsd.sh => nlnsd.sh} (75%) diff --git a/net/nsd/Makefile b/net/nsd/Makefile index 83e93149fa31..3cfc17dba4df 100644 --- a/net/nsd/Makefile +++ b/net/nsd/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.100 2019/01/17 13:59:37 prlw1 Exp $ +# $NetBSD: Makefile,v 1.101 2019/01/29 14:54:03 ryoon Exp $ DISTNAME= nsd-4.1.26 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.nlnetlabs.nl/downloads/nsd/ @@ -55,7 +56,7 @@ CONFIGURE_ARGS+=--with-ssl=${BUILDLINK_PREFIX.openssl} CPPFLAGS+= -D_OPENBSD_SOURCE .endif -RCD_SCRIPTS= nsd +RCD_SCRIPTS= nlnsd NSD_USER?= nsd NSD_GROUP?= nsd diff --git a/net/nsd/files/nsd.sh b/net/nsd/files/nlnsd.sh similarity index 75% rename from net/nsd/files/nsd.sh rename to net/nsd/files/nlnsd.sh index 4d79958501e3..3fab520f62f6 100644 --- a/net/nsd/files/nsd.sh +++ b/net/nsd/files/nlnsd.sh @@ -1,18 +1,18 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: nsd.sh,v 1.4 2015/03/09 11:34:26 pettai Exp $ +# $NetBSD: nlnsd.sh,v 1.1 2019/01/29 14:54:03 ryoon Exp $ # -# PROVIDE: nsd +# PROVIDE: nlnsd # REQUIRE: DAEMON # . /etc/rc.subr -name="nsd" +name="nlnsd" rcvar=${name} -command=@PREFIX@/sbin/${name} -pidfile=/var/run/${name}/${name}.pid +command=@PREFIX@/sbin/nsd +pidfile=/var/run/nsd/nsd.pid required_files="@PKG_SYSCONFDIR@/nsd.conf" start_precmd="nsd_precmd"