svn commit: r343896 - in head/dns/nsd: . files
Erwin Lansing
erwin at FreeBSD.org
Wed Feb 12 10:46:25 UTC 2014
Author: erwin
Date: Wed Feb 12 10:46:24 2014
New Revision: 343896
URL: http://svnweb.freebsd.org/changeset/ports/343896
QAT: https://qat.redports.org/buildarchive/r343896/
Log:
There was a wrong rc script in the port preventing the daemon to run.
Added STAGING support
Added LICENSE (NSD3CLAUSE) statement
Other small changes to make portlint more happy
PR: 186631
Submitted by: Jaap Akkerhuis <jaap at NLnetLabs.nl> (maintainer)
Modified:
head/dns/nsd/Makefile
head/dns/nsd/files/nsd.in
head/dns/nsd/pkg-message
Modified: head/dns/nsd/Makefile
==============================================================================
--- head/dns/nsd/Makefile Wed Feb 12 10:46:23 2014 (r343895)
+++ head/dns/nsd/Makefile Wed Feb 12 10:46:24 2014 (r343896)
@@ -3,6 +3,7 @@
PORTNAME= nsd
PORTVERSION= 4.0.1
+PORTREVISION= 1
CATEGORIES= dns ipv6
MASTER_SITES= http://www.nlnetlabs.nl/downloads/nsd/ \
ftp://ftp.rhnet.is/pub/nsd/
@@ -10,7 +11,9 @@ MASTER_SITES= http://www.nlnetlabs.nl/do
MAINTAINER= jaap at NLnetLabs.nl
COMMENT= An authoritative only non-recursive name server
-CONFLICTS= nsd-[0-]* nsd3-*
+LICENSE= BSD3CLAUSE
+
+CONFLICTS= nsd-[0-3]* nsd3-[0-9]*
USE_RC_SUBR= nsd
@@ -46,7 +49,7 @@ PORTDOCS= CREDITS ChangeLog LICENSE NSD-
differences.tex
OPTIONS_DEFINE= ROOT_SERVER LARGEFILE IPV6 BIND8_STATS CHECKING \
- MINRESPSIZE NSEC3 NSEC3PREHASH MMAP MAXIPS DOCS EUI_RRTYPES
+ MINRESPSIZE NSEC3 NSEC3PREHASH MMAP MAXIPS DOCS RRL EUI_RRTYPES
OPTIONS_DEFAULT= LARGEFILE IPV6 NSEC3 NSEC3PREHASH MINRESPSIZE RRL \
EUI_RRTYPES
@@ -62,7 +65,6 @@ MAXIPS_DESC= Raise max-ips from 8 to ${
RRL_DESC= Response Rate Limiting
EUI_RRTYPES_DESC= EUI48 and EUI64 RRtypes support
-NO_STAGE= yes
.include <bsd.port.options.mk>
LIB_DEPENDS+= event-1:${PORTSDIR}/devel/libevent
@@ -132,11 +134,11 @@ pre-patch:
post-install:
${INSTALL_DATA} ${WRKSRC}/nsd.conf.sample \
- ${PREFIX}/etc/nsd/nsd.conf.sample
+ ${STAGEDIR}${PREFIX}/etc/nsd/nsd.conf.sample
.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/${f}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}/${f}
.endfor
.endif
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
Modified: head/dns/nsd/files/nsd.in
==============================================================================
--- head/dns/nsd/files/nsd.in Wed Feb 12 10:46:23 2014 (r343895)
+++ head/dns/nsd/files/nsd.in Wed Feb 12 10:46:24 2014 (r343896)
@@ -12,21 +12,22 @@
# nsd_enable="YES"
#
+: ${nsd_enable="NO"}
+
. /etc/rc.subr
name=nsd
-rcvar=${name}_enable
+rcvar=nsd_enable
config=${nsd_config:=%%PREFIX%%/etc/nsd/nsd.conf}
required_files=${config}
-
-command=%%PREFIX%%/sbin/nsd-control
-command_args="start"
pidfile=`%%PREFIX%%/sbin/nsd-checkconf -o pidfile ${config}`
-procname=%%PREFIX%%/sbin/${name}
-
+command="%%PREFIX%%/sbin/${name}"
+command_args="-c ${required_files}"
extra_commands="reload"
+load_rc_config $name
+
run_rc_command "$1"
Modified: head/dns/nsd/pkg-message
==============================================================================
--- head/dns/nsd/pkg-message Wed Feb 12 10:46:23 2014 (r343895)
+++ head/dns/nsd/pkg-message Wed Feb 12 10:46:24 2014 (r343896)
@@ -1,6 +1,6 @@
**************************************************************************
*
-* To run nsd from startup, add nsd_enable="YES" to your /etc/rc.conf
+* To run nsd from startup, add nsd_enable="YES" to your etc/rc.conf
*
* Starting with nsd version 4 the old nsdc control program has been
* replaced by nsd-control. This requires some manual setup with
More information about the svn-ports-head
mailing list