diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2018-09-06 19:22:47 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2018-09-06 19:22:47 +0000 |
| commit | 93c59bcee2981db35bf193acaa6e192e8a7405ee (patch) | |
| tree | d521c29901513493e01c5ec9798124d5a1baf5fa | |
| parent | 2a303f33107f21914397eea3f32e954fe218aa28 (diff) | |
| download | ports-93c59bcee2981db35bf193acaa6e192e8a7405ee.tar.gz ports-93c59bcee2981db35bf193acaa6e192e8a7405ee.zip | |
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@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@)
Notes
Notes:
svn path=/branches/2018Q3/; revision=479143
| -rw-r--r-- | net/ntp-devel/Makefile | 4 | ||||
| -rw-r--r-- | net/ntp-devel/files/pkg-message.in | 7 | ||||
| -rw-r--r-- | net/ntp/Makefile | 3 | ||||
| -rw-r--r-- | net/ntp/files/pkg-message.in | 11 |
4 files changed, 24 insertions, 1 deletions
diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile index bb89e0966de5..72ab2d11ad25 100644 --- a/net/ntp-devel/Makefile +++ b/net/ntp-devel/Makefile @@ -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/ @@ -33,6 +33,8 @@ SHEBANG_FILES= scripts/ntptrace/ntptrace.in \ scripts/update-leap/update-leap.in perl_OLD_CMD= @PATH_PERL@ +SUB_FILES= pkg-message + .include "Makefile.inc" OPTIONS_DEFINE+= DEBUG NLS THREADS diff --git a/net/ntp-devel/files/pkg-message.in b/net/ntp-devel/files/pkg-message.in new file mode 100644 index 000000000000..9798b4e781b5 --- /dev/null +++ b/net/ntp-devel/files/pkg-message.in @@ -0,0 +1,7 @@ +Please add + + ntpd_program="%%PREFIX%%/sbin/ntpd" + ntpdate_program="%%PREFIX%%/sbin/ntpdate" + +to your /etc/rc.conf to enable ntp from ports/packages instead +of base ntp. diff --git a/net/ntp/Makefile b/net/ntp/Makefile index 7bc22ba211f2..3f0d184f1d68 100644 --- a/net/ntp/Makefile +++ b/net/ntp/Makefile @@ -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/ \ @@ -29,6 +30,8 @@ SHEBANG_FILES= scripts/ntptrace/ntptrace.in \ scripts/update-leap/update-leap.in perl_OLD_CMD= @PATH_PERL@ +SUB_FILES= pkg-message + .include "Makefile.inc" OPTIONS_DEFINE+= DEBUG NLS THREADS diff --git a/net/ntp/files/pkg-message.in b/net/ntp/files/pkg-message.in new file mode 100644 index 000000000000..5c1aa1544488 --- /dev/null +++ b/net/ntp/files/pkg-message.in @@ -0,0 +1,11 @@ +Please add + + ntpd_program="%%PREFIX%%/sbin/ntpd" + ntpdate_program="%%PREFIX%%/sbin/ntpdate" + +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. |