From owner-svn-ports-all@FreeBSD.ORG  Mon Jun  2 15:03:35 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E192FAB7;
 Mon,  2 Jun 2014 15:03:35 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B50CC2042;
 Mon,  2 Jun 2014 15:03:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s52F3ZNO064064;
 Mon, 2 Jun 2014 15:03:35 GMT (envelope-from naddy@svn.freebsd.org)
Received: (from naddy@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s52F3Z7i064061;
 Mon, 2 Jun 2014 15:03:35 GMT (envelope-from naddy@svn.freebsd.org)
Message-Id: <201406021503.s52F3Z7i064061@svn.freebsd.org>
From: Christian Weisgerber <naddy@FreeBSD.org>
Date: Mon, 2 Jun 2014 15:03:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356234 - in head/net/openntpd: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jun 2014 15:03:36 -0000

Author: naddy
Date: Mon Jun  2 15:03:34 2014
New Revision: 356234
URL: http://svnweb.freebsd.org/changeset/ports/356234
QAT: https://qat.redports.org/buildarchive/r356234/

Log:
  The sample configurarion file moves to etc/ntpd.conf.sample.
  
  Fix a race and make sure the rc.d script only matches the master
  process.

Modified:
  head/net/openntpd/Makefile
  head/net/openntpd/files/openntpd.in
  head/net/openntpd/pkg-plist

Modified: head/net/openntpd/Makefile
==============================================================================
--- head/net/openntpd/Makefile	Mon Jun  2 14:53:32 2014	(r356233)
+++ head/net/openntpd/Makefile	Mon Jun  2 15:03:34 2014	(r356234)
@@ -2,7 +2,7 @@
 
 PORTNAME=	openntpd
 PORTVERSION=	4.6
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_OPENBSD}
@@ -30,7 +30,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ntpd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/ntpd.conf.5 ${STAGEDIR}${PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${STAGEDIR}${PREFIX}/man/man8
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${FILESDIR}/ntpd.conf ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${FILESDIR}/ntpd.conf \
+	    ${STAGEDIR}${PREFIX}/etc/ntpd.conf.sample
 
 .include <bsd.port.mk>

Modified: head/net/openntpd/files/openntpd.in
==============================================================================
--- head/net/openntpd/files/openntpd.in	Mon Jun  2 14:53:32 2014	(r356233)
+++ head/net/openntpd/files/openntpd.in	Mon Jun  2 15:03:34 2014	(r356234)
@@ -15,6 +15,11 @@
 
 . /etc/rc.subr
 
+check_process()
+{
+        /bin/pgrep -f 'ntpd: \[priv\]'
+}
+
 name=openntpd
 rcvar=openntpd_enable
 

Modified: head/net/openntpd/pkg-plist
==============================================================================
--- head/net/openntpd/pkg-plist	Mon Jun  2 14:53:32 2014	(r356233)
+++ head/net/openntpd/pkg-plist	Mon Jun  2 15:03:34 2014	(r356234)
@@ -1,7 +1,4 @@
+@sample etc/ntpd.conf.sample
 man/man5/ntpd.conf.5.gz
 man/man8/ntpd.8.gz
 sbin/ntpd
-@unexec if cmp -s %D/etc/ntpd.conf %D/%%EXAMPLESDIR%%/ntpd.conf; then rm -f %D/etc/ntpd.conf; fi
-%%EXAMPLESDIR%%/ntpd.conf
-@exec if [ ! -f %D/etc/ntpd.conf ]; then cp %D/%F %D/etc; fi
-@dirrm %%EXAMPLESDIR%%