From 54066adc9735b75dd716b41fd3dbe1c69909678e Mon Sep 17 00:00:00 2001
From: landry <landry@openbsd.org>
Date: Mon, 11 Jul 2011 17:43:14 +0000
Subject: [PATCH] Rename 'Reference NTP' rc script to xntpd to avoid conflict
 with the basesystem's ntpd rc script. Adjust PLIST and bump. Previous diff
 looked ok to aja@, rename to xntpd instead of isc_ntpd prodded by naddy@.

---
 net/ntp/Makefile                  | 6 +++---
 net/ntp/pkg/PLIST                 | 4 ++--
 net/ntp/pkg/README                | 8 ++++----
 net/ntp/pkg/{ntpd.rc => xntpd.rc} | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename net/ntp/pkg/{ntpd.rc => xntpd.rc} (59%)

diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index 0678e531dc7..f21ae913fdc 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.52 2011/07/08 02:14:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.53 2011/07/11 17:43:14 landry Exp $
 
 COMMENT=	Network Time Protocol reference implementation
 
-# ISC's NTP has a 'pN' in its version number, which we don't want
+# NTP has a 'pN' in its version number, which we don't want
 # to confuse with the ports system's 'pN' convention, so we
 # convert it to 'pl' for local use.
 
 VERSION=	4.2.6p2
 DISTNAME=	ntp-${VERSION}
 PKGNAME=	ntp-${VERSION:S/p/pl/}
-REVISION=	6
+REVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	http://archive.ntp.org/ntp4/ntp-4.2/
 
diff --git a/net/ntp/pkg/PLIST b/net/ntp/pkg/PLIST
index cd3399742c9..a32fd398afd 100644
--- a/net/ntp/pkg/PLIST
+++ b/net/ntp/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.17 2010/11/10 21:21:26 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.18 2011/07/11 17:43:14 landry Exp $
 @conflict ntp-doc-*
 @pkgpath net/ntp,-main
 @man man/man1/ntp-keygen.1
@@ -233,4 +233,4 @@ share/examples/ntp/malarky.conf
 share/examples/ntp/pogo.conf
 share/examples/ntp/rackety.conf
 @extra ${SYSCONFDIR}/ntp.conf
-@rcscript ${RCDIR}/ntpd
+@rcscript ${RCDIR}/xntpd
diff --git a/net/ntp/pkg/README b/net/ntp/pkg/README
index 4c720e9ccd3..e2aa84257aa 100644
--- a/net/ntp/pkg/README
+++ b/net/ntp/pkg/README
@@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.3 2011/07/08 02:14:58 ajacoutot Exp $
+$OpenBSD: README,v 1.4 2011/07/11 17:43:14 landry Exp $
 
 +-----------------------------------------------------------------------
 | Running ${FULLPKGNAME} on OpenBSD
@@ -11,9 +11,9 @@ Several steps need to be taken to properly configure the NTP daemon.
 
      ${PREFIX}/share/examples/ntp
 
-2. Now ntp can be started with:
+2. Now xntpd can be started with:
 
-     /etc/rc.d/ntpd start
+     /etc/rc.d/xntpd start
 
-   Or to start 'ntpd' at every boot, add it to pkg_scripts in
+   Or to start 'xntpd' at every boot, add it to pkg_scripts in
    /etc/rc.conf.local.
diff --git a/net/ntp/pkg/ntpd.rc b/net/ntp/pkg/xntpd.rc
similarity index 59%
rename from net/ntp/pkg/ntpd.rc
rename to net/ntp/pkg/xntpd.rc
index c23fc1a21da..639db2911c8 100644
--- a/net/ntp/pkg/ntpd.rc
+++ b/net/ntp/pkg/xntpd.rc
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: ntpd.rc,v 1.5 2010/12/27 14:50:23 ajacoutot Exp $
+# $OpenBSD: xntpd.rc,v 1.1 2011/07/11 17:43:14 landry Exp $
 
 daemon="${TRUEPREFIX}/sbin/ntpd"