svn commit: r356234 - in head/net/openntpd: . files

[Christian Weisgerber]

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 @@
+ at sample etc/ntpd.conf.sample
 man/man5/ntpd.conf.5.gz
 man/man8/ntpd.8.gz
 sbin/ntpd
- at unexec if cmp -s %D/etc/ntpd.conf %D/%%EXAMPLESDIR%%/ntpd.conf; then rm -f %D/etc/ntpd.conf; fi
-%%EXAMPLESDIR%%/ntpd.conf
- at exec if [ ! -f %D/etc/ntpd.conf ]; then cp %D/%F %D/etc; fi
- at dirrm %%EXAMPLESDIR%%