added more comments for end users to read

5 files changed, 41 insertions, 8 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index ffd156d76ca9..c70afa89f10f 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/ntp
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.19 2003/01/09 12:33:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.20 2003/01/12 22:06:19 vapier Exp $
+
+*ntp-4.1.1b-r4 (12 Jan 2003)
+
+  12 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added a lot more comments to hopefully keep people from
+  messing up their ntp installs.
 
 *ntp-4.1.1b-r3 (31 Dec 2002)
 
diff --git a/net-misc/ntp/files/digest-ntp-4.1.1b-r3 b/net-misc/ntp/files/digest-ntp-4.1.1b-r4
index dcdc2e9a8f30..dcdc2e9a8f30 100644
--- a/net-misc/ntp/files/digest-ntp-4.1.1b-r3
+++ b/net-misc/ntp/files/digest-ntp-4.1.1b-r4
diff --git a/net-misc/ntp/files/ntp.conf b/net-misc/ntp/files/ntp.conf
index 95f6f8374c87..2392da3985d6 100644
--- a/net-misc/ntp/files/ntp.conf
+++ b/net-misc/ntp/files/ntp.conf
@@ -1,5 +1,9 @@
-logfile		/var/log/ntpd.log
-driftfile	/var/lib/misc/ntp.drift
+# NOTES:
+#  - you should only have to update the server line below
+#  - if you start getting lines like 'restrict' and 'fudge'
+#    and you didnt add them, AND you run dhcpcd on your
+#    network interfaces, be sure to add '-Y -N' to the
+#    dhcpcd_ethX variables in /etc/conf.d/net
 
 # Name of the servers ntpd should sync with
 # Please respect the access policy as stated by the responsible person.
@@ -11,3 +15,7 @@ driftfile	/var/lib/misc/ntp.drift
 # and
 # * http://www.eecis.udel.edu/~mills/ntp/clock2.html
 ##
+
+# you should not need to modify the following paths
+logfile		/var/log/ntpd.log
+driftfile	/var/lib/misc/ntp.drift
diff --git a/net-misc/ntp/files/ntpd.confd b/net-misc/ntp/files/ntpd.confd
index 908abcca724b..24e5934cce26 100644
--- a/net-misc/ntp/files/ntpd.confd
+++ b/net-misc/ntp/files/ntpd.confd
@@ -1,22 +1,35 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2         
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.confd,v 1.8 2003/01/01 01:27:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.confd,v 1.9 2003/01/12 22:06:19 vapier Exp $
+
+# NOTES:
+#  - NTPDATE variables below are used if you wish to set your
+#    clock when you start the ntp init.d script
+#  - make sure that the NTPDATE_CMD will close by itself ...
+#    the init.d script will not attempt to kill/stop it
+#  - ntpd will be used to maintain synchronization with a time
+#    server regardless of what NTPDATE is set to
+#  - read each of the comments above each of the variable
 
 # Comment this out if you dont want the init script to warn
 # about not having ntpdate setup
 NTPDATE_WARN="y"
 
 # Command to run to set the clock initially
-# if you want to use ntpd to set the clock, change this to 'ntpd'
+# Most people should just uncomment this line ...
+# however, if you know what you're doing, and you
+# want to use ntpd to set the clock, change this to 'ntpd'
 #NTPDATE_CMD="ntpdate"
 
 # Options to pass to the above command
-# you might want to change 'someserver' to a valid
-# hostname which you can aquire below
+# Most people should just uncomment this variable and
+# change 'someserver' to a valid hostname which you
+# can aquire from the URL's below
 #NTPDATE_OPTS="-b someserver"
 
 ##
 # A list of available servers is available here:
+# Please respect the access policy as stated by the responsible person.
 # * http://www.eecis.udel.edu/~mills/ntp/clock1.html
 # and
 # * http://www.eecis.udel.edu/~mills/ntp/clock2.html
diff --git a/net-misc/ntp/ntp-4.1.1b-r3.ebuild b/net-misc/ntp/ntp-4.1.1b-r4.ebuild
index 13984711ac8b..c8539b71f405 100644
--- a/net-misc/ntp/ntp-4.1.1b-r3.ebuild
+++ b/net-misc/ntp/ntp-4.1.1b-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.1.1b-r3.ebuild,v 1.3 2003/01/06 18:12:33 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.1.1b-r4.ebuild,v 1.1 2003/01/12 22:06:19 vapier Exp $
 
 inherit eutils
 
@@ -46,3 +46,9 @@ src_install() {
 	exeinto /etc/init.d ; newexe ${FILESDIR}/ntpd.rc ntpd
 	insinto /etc/conf.d ; newins ${FILESDIR}/ntpd.confd ntpd
 }
+
+pkg_postinst() {
+	ewarn "Please run etc-update and then read"
+	ewarn "all the comments in /etc/ntp.conf and"
+	ewarn "/etc/conf.d/ntpd"
+}