ports/183891: commit references a PR

[dfilter service]

The following reply was made to PR ports/183891; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/183891: commit references a PR
Date: Thu, 26 Dec 2013 16:03:02 +0000 (UTC)

 Author: rakuco
 Date: Thu Dec 26 16:02:50 2013
 New Revision: 337542
 URL: http://svnweb.freebsd.org/changeset/ports/337542
 
 Log:
   Make knotd startup script work again.
   
   From the PR:
     When submitting PR 183682 I was unaware the patch as in PR 182792 wasn't
     committed yet. So to my amazing I just noticed the startup problem still
     exists.
   
     Enclosed patch is basicly the same as the uncommited one, but besides the
     removal of the -w option, knotd now starts by default as a daemon (-d) in
     stead of interactive (-i). So I could simplify the startup script a lot.
   
   PR:		ports/183891
   Submitted by:	Leo Vandewoestijne <freebsd at dns-lab.com> (maintainer)
 
 Modified:
   head/dns/knot/Makefile
   head/dns/knot/files/knotd.in
   head/dns/knot/files/pkg-message.in
 
 Modified: head/dns/knot/Makefile
 ==============================================================================
 --- head/dns/knot/Makefile	Thu Dec 26 15:42:17 2013	(r337541)
 +++ head/dns/knot/Makefile	Thu Dec 26 16:02:50 2013	(r337542)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	knot
  DISTVERSION=	1.3.3
 +PORTREVISION=	1
  CATEGORIES=	dns ipv6
  MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
  		http://dns-lab.com/downloads/knot-dns/
 @@ -37,5 +38,9 @@ post-install:
  	${INSTALL_DATA} ${WRKSRC}/samples/knot.sample.conf ${STAGEDIR}${ETCDIR}
  	@${MKDIR} ${STAGEDIR}${DOCSDIR}
  	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 +	@${MKDIR} ${PREFIX}/var/lib/knot
 +	@${MKDIR} ${PREFIX}/var/run/knot
 +	@${CHOWN} 53:53 ${PREFIX}/var/lib/knot
 +	@${CHOWN} 53:53 ${PREFIX}/var/run/knot
  
  .include <bsd.port.mk>
 
 Modified: head/dns/knot/files/knotd.in
 ==============================================================================
 --- head/dns/knot/files/knotd.in	Thu Dec 26 15:42:17 2013	(r337541)
 +++ head/dns/knot/files/knotd.in	Thu Dec 26 16:02:50 2013	(r337542)
 @@ -19,32 +19,21 @@ name=knot
  rcvar=knot_enable
  
  extra_commands="reload"
 -reload_cmd="${name}_reload"
 -status_cmd="${name}_status"
 -stop_cmd="${name}_stop"
 +reload_cmd="${name}_x reload"
 +status_cmd="${name}_x status"
 +stop_cmd="  ${name}_x stop"
  
  load_rc_config ${name}
  
  : ${knot_enable:="NO"}
  : ${knot_config="%%PREFIX%%/etc/knot/knot.conf"}
  
 -command=%%PREFIX%%/sbin/${name}c
 -procname=%%PREFIX%%/sbin/${name}d
 -pidfile=/var/run/${name}.pid
 -
 -command_args="-c ${knot_config} -w start"
 +command=%%PREFIX%%/sbin/${name}d
 +command_args="-c ${knot_config} -d"
  required_files=${knot_config}
  
 -knot_reload() {
 -	echo "Reloading ${name}."
 -	${command} -c ${knot_config} reload
 -	}
 -knot_status() {
 -	${command} -c ${knot_config} status
 -	}
 -knot_stop() {
 -	echo "Stopping ${name}."
 -	${command} -c ${knot_config} stop
 +knot_x() {
 +	%%PREFIX%%/sbin/${name}c -c ${knot_config} "$1"
  	}
  
  run_rc_command "$1"
 
 Modified: head/dns/knot/files/pkg-message.in
 ==============================================================================
 --- head/dns/knot/files/pkg-message.in	Thu Dec 26 15:42:17 2013	(r337541)
 +++ head/dns/knot/files/pkg-message.in	Thu Dec 26 16:02:50 2013	(r337542)
 @@ -1,30 +1,21 @@
  
  ####################################################################
  #
 -# To start using Knot DNS, you should complete the following tasks:
 -#
 -# ----- configure --------------------------------------------------
 +# To get Knot DNS started:
  #
    cp %%ETCDIR%%/knot.sample.conf %%ETCDIR%%/knot.conf
    $EDITOR %%ETCDIR%%/knot.conf
 -#
 -# ----- prepare ----------------------------------------------------
 -#
 -# required:
    echo knot_enable=\"YES\" >> /etc/rc.conf
 -# for customization if desired:
  # echo knot_config=\"%%PREFIX%%/etc/knot/knot.conf\" >> /etc/rc.conf
 -#
 -# ----- startup ----------------------------------------------------
 -#
    %%PREFIX%%/etc/rc.d/knotd start
  #
  ####################################################################
  
 -
    When upgrading from version of before 1.3.0-RC1:
    mind the default config file location has changed.
  
 +  When upgrading from version of 1.3.1-RC1 or before:
 +  the startup script has changed due to parameter changes.
 +  That problem reapeared in port 1.3.3 and was fixed in 1.3.3_1.
  
  ====================================================================
 -
 _______________________________________________
 svn-ports-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"