svn commit: r479143 - in branches/2018Q3/net: ntp ntp-devel ntp-devel/files ntp/files

[Cy Schubert]

Author: cy
Date: Thu Sep  6 19:22:47 2018
New Revision: 479143
URL: https://svnweb.freebsd.org/changeset/ports/479143

Log:
  MFH: r478512 r478840 r479083
  
  r478512:
  Add a package message instructing the user how to use ports ntp
  instead of base ntp.
  
  Reported by:	adamw
  
  r478840:
  Fix a typo.
  
  Reported by:	Herbert J. Skuhra <herbert at gojira.at>
  
  r479083:
  Also tell people how to enable ntpd and ntpdate from ports using
  sysrc.
  
  mat@ suggested this however as I'm not enamoured with sysrc, it has
  been added as annother approach to add/edit rc.conf variables.
  
  Reported by:	mat@
  
  Approved by:	portmgr (miwi@)

Added:
  branches/2018Q3/net/ntp-devel/files/pkg-message.in
     - copied, changed from r478512, head/net/ntp-devel/files/pkg-message.in
  branches/2018Q3/net/ntp/files/pkg-message.in
     - copied, changed from r478512, head/net/ntp/files/pkg-message.in
Modified:
  branches/2018Q3/net/ntp-devel/Makefile
  branches/2018Q3/net/ntp/Makefile
Directory Properties:
  branches/2018Q3/   (props changed)

Modified: branches/2018Q3/net/ntp-devel/Makefile
==============================================================================
--- branches/2018Q3/net/ntp-devel/Makefile	Thu Sep  6 19:21:06 2018	(r479142)
+++ branches/2018Q3/net/ntp-devel/Makefile	Thu Sep  6 19:22:47 2018	(r479143)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ntp
 PORTVERSION=	4.3.93
-PORTREVISION=	8
+PORTREVISION=	10
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \
 		http://archive.ntp.org/ntp4/ntp-dev/
@@ -32,6 +32,8 @@ SHEBANG_FILES=	scripts/ntptrace/ntptrace.in \
 		scripts/ntp-wait/ntp-wait.in \
 		scripts/update-leap/update-leap.in
 perl_OLD_CMD=	@PATH_PERL@
+
+SUB_FILES=	pkg-message
 
 .include "Makefile.inc"
 

Copied and modified: branches/2018Q3/net/ntp-devel/files/pkg-message.in (from r478512, head/net/ntp-devel/files/pkg-message.in)
==============================================================================
--- head/net/ntp-devel/files/pkg-message.in	Fri Aug 31 03:11:41 2018	(r478512, copy source)
+++ branches/2018Q3/net/ntp-devel/files/pkg-message.in	Thu Sep  6 19:22:47 2018	(r479143)
@@ -1,7 +1,7 @@
 Please add
 
 	ntpd_program="%%PREFIX%%/sbin/ntpd"
-	ntpddate_program="%%PREFIX%%/sbin/ntpdate"
+	ntpdate_program="%%PREFIX%%/sbin/ntpdate"
 
 to your /etc/rc.conf to enable ntp from ports/packages instead
 of base ntp.

Modified: branches/2018Q3/net/ntp/Makefile
==============================================================================
--- branches/2018Q3/net/ntp/Makefile	Thu Sep  6 19:21:06 2018	(r479142)
+++ branches/2018Q3/net/ntp/Makefile	Thu Sep  6 19:22:47 2018	(r479143)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ntp
 PORTVERSION=	4.2.8p12
+PORTREVISION=	3
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
 		http://archive.ntp.org/ntp4/ntp-4.2/ \
@@ -28,6 +29,8 @@ SHEBANG_FILES=	scripts/ntptrace/ntptrace.in \
 		scripts/ntp-wait/ntp-wait.in \
 		scripts/update-leap/update-leap.in
 perl_OLD_CMD=	@PATH_PERL@
+
+SUB_FILES=	pkg-message
 
 .include "Makefile.inc"
 

Copied and modified: branches/2018Q3/net/ntp/files/pkg-message.in (from r478512, head/net/ntp/files/pkg-message.in)
==============================================================================
--- head/net/ntp/files/pkg-message.in	Fri Aug 31 03:11:41 2018	(r478512, copy source)
+++ branches/2018Q3/net/ntp/files/pkg-message.in	Thu Sep  6 19:22:47 2018	(r479143)
@@ -1,7 +1,11 @@
 Please add
 
 	ntpd_program="%%PREFIX%%/sbin/ntpd"
-	ntpddate_program="%%PREFIX%%/sbin/ntpdate"
+	ntpdate_program="%%PREFIX%%/sbin/ntpdate"
 
-to your /etc/rc.conf to enable ntp from ports/packages instead
-of base ntp.
+to your /etc/rc.conf or run
+
+	sysrc ntpd_program="%%PREFIX%%/sbin/ntpd"
+	sysrc ntpdate_program="%%PREFIX%%/sbin/ntpdate"
+
+to enable ntp from ports/packages instead of base ntp.