From f0b5b05bea108d232062b82304ed20036c66f7de Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Wed, 4 Nov 2015 14:43:02 +0100
Subject: [PATCH] ntp: regiter 'ntpd' alternatives group.

Remove unnecessary log service, this ntpd logs to syslog by default.
---
 srcpkgs/ntp/files/isc-ntpd/run |  2 ++
 srcpkgs/ntp/files/ntpd/log/run |  2 --
 srcpkgs/ntp/files/ntpd/run     |  8 --------
 srcpkgs/ntp/template           | 14 +++++++++++---
 4 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100755 srcpkgs/ntp/files/isc-ntpd/run
 delete mode 100755 srcpkgs/ntp/files/ntpd/log/run
 delete mode 100755 srcpkgs/ntp/files/ntpd/run

diff --git a/srcpkgs/ntp/files/isc-ntpd/run b/srcpkgs/ntp/files/isc-ntpd/run
new file mode 100755
index 00000000000..a922460174e
--- /dev/null
+++ b/srcpkgs/ntp/files/isc-ntpd/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec ntpd -g -u ntpd:ntpd -n 2>&1
diff --git a/srcpkgs/ntp/files/ntpd/log/run b/srcpkgs/ntp/files/ntpd/log/run
deleted file mode 100755
index b36c4dafa40..00000000000
--- a/srcpkgs/ntp/files/ntpd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.notice
diff --git a/srcpkgs/ntp/files/ntpd/run b/srcpkgs/ntp/files/ntpd/run
deleted file mode 100755
index b1bb66024aa..00000000000
--- a/srcpkgs/ntp/files/ntpd/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-#mkdir -p /var/chroot/ntpd/etc
-#mkdir -p /var/chroot/ntpd/var/db/ntpd
-#cp /etc/services /var/chroot/ntpd/etc/
-#ln -fs /var/db/ntpd/drift /var/chroot/ntpd/var/db/ntpd/drift
-#chown -R ntpd:ntpd /var/chroot/ntpd
-exec ntpd -g -u ntpd:ntpd -n
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index 49ba7de8b8c..eab815c0602 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p4
-revision=1
+revision=2
 build_pie=yes
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
@@ -20,11 +20,19 @@ conf_files="/etc/ntp.conf"
 system_accounts="ntpd"
 ntpd_homedir="/var/db/ntpd"
 provides="ntp-daemon-0_1"
-replaces="ntp-daemon>=0"
+alternatives="
+ ntpd:ntpd:/usr/bin/isc-ntpd
+ ntpd:ntpd.8:/usr/share/man/man1/isc-ntpd.8
+ ntpd:ntpd:/etc/sv/isc-ntpd"
 
 post_install() {
+	# Rename files for alternatives.
+	vmkdir usr/share/man/man8
+	mv ${DESTDIR}/usr/bin/{ntpd,isc-ntpd}
+	mv ${DESTDIR}/usr/share/man/man1/ntpd.1 \
+		${DESTDIR}/usr/share/man/man8/isc-ntpd.8
 	vconf ${FILESDIR}/ntp.conf
-	vsv ntpd
+	vsv isc-ntpd
 	rm -r ${DESTDIR}/usr/share/doc
 }