[pkgsrc/trunk]: pkgsrc/net/nsd Do not conflict with nsd in NetBSD base. Renam...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5fa62a624da6
branches:  trunk
changeset: 318782:5fa62a624da6
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Tue Jan 29 14:54:03 2019 +0000

description:
Do not conflict with nsd in NetBSD base. Rename rc.d script to nlsnd

Bump PKGREVISION.

diffstat:

 net/nsd/Makefile       |   5 +++--
 net/nsd/files/nlnsd.sh |  36 ++++++++++++++++++++++++++++++++++++
 net/nsd/files/nsd.sh   |  36 ------------------------------------
 3 files changed, 39 insertions(+), 38 deletions(-)

diffs (101 lines):

diff -r 01b283cf277a -r 5fa62a624da6 net/nsd/Makefile
--- a/net/nsd/Makefile  Tue Jan 29 14:34:15 2019 +0000
+++ b/net/nsd/Makefile  Tue Jan 29 14:54:03 2019 +0000
@@ -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 @@
 CPPFLAGS+=     -D_OPENBSD_SOURCE
 .endif
 
-RCD_SCRIPTS=   nsd
+RCD_SCRIPTS=   nlnsd
 
 NSD_USER?=     nsd
 NSD_GROUP?=    nsd
diff -r 01b283cf277a -r 5fa62a624da6 net/nsd/files/nlnsd.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/nsd/files/nlnsd.sh    Tue Jan 29 14:54:03 2019 +0000
@@ -0,0 +1,36 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: nlnsd.sh,v 1.1 2019/01/29 14:54:03 ryoon Exp $
+#
+# PROVIDE: nlnsd
+# REQUIRE: DAEMON
+#
+
+. /etc/rc.subr
+
+name="nlnsd"
+rcvar=${name}
+
+command=@PREFIX@/sbin/nsd
+pidfile=/var/run/nsd/nsd.pid
+required_files="@PKG_SYSCONFDIR@/nsd.conf"
+start_precmd="nsd_precmd"
+
+nsd_precmd()
+{
+       if [ ! -d @VARBASE@/run/nsd ]; then
+               @MKDIR@ @VARBASE@/run/nsd
+               @CHMOD@ 0750 @VARBASE@/run/nsd
+               @CHOWN@ @NSD_USER@:@NSD_GROUP@ @VARBASE@/run/nsd
+       fi
+}
+
+nsd_flags=${nsd_flags:-""}
+
+if [ -f /etc/rc.subr ]; then
+       load_rc_config ${name}
+       run_rc_command "$1"
+else
+       echo -n " ${name}"
+       ${command} ${nsd_flags}
+fi
diff -r 01b283cf277a -r 5fa62a624da6 net/nsd/files/nsd.sh
--- a/net/nsd/files/nsd.sh      Tue Jan 29 14:34:15 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: nsd.sh,v 1.4 2015/03/09 11:34:26 pettai Exp $
-#
-# PROVIDE: nsd
-# REQUIRE: DAEMON
-#
-
-. /etc/rc.subr
-
-name="nsd"
-rcvar=${name}
-
-command=@PREFIX@/sbin/${name}
-pidfile=/var/run/${name}/${name}.pid
-required_files="@PKG_SYSCONFDIR@/nsd.conf"
-start_precmd="nsd_precmd"
-
-nsd_precmd()
-{
-       if [ ! -d @VARBASE@/run/nsd ]; then
-               @MKDIR@ @VARBASE@/run/nsd
-               @CHMOD@ 0750 @VARBASE@/run/nsd
-               @CHOWN@ @NSD_USER@:@NSD_GROUP@ @VARBASE@/run/nsd
-       fi
-}
-
-nsd_flags=${nsd_flags:-""}
-
-if [ -f /etc/rc.subr ]; then
-       load_rc_config ${name}
-       run_rc_command "$1"
-else
-       echo -n " ${name}"
-       ${command} ${nsd_flags}
-fi