misc/118261: Base NTP: NO_NTP support + NO_SHAREDOCS applies to NTP's HTMLs

[Denis Eremenko <moonshade at pnhz.kz>]

>Number:         118261
>Category:       misc
>Synopsis:       Base NTP: NO_NTP support + NO_SHAREDOCS applies to NTP's HTMLs
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 26 09:50:05 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Denis Eremenko <moonshade at pnhz.kz>
>Release:        FreeBSD 6.3-PRERELEASE i386
>Organization:
>Environment:


System: FreeBSD 6.3-PRERELEASE #0: Mon Nov 19 17:10:51 ALMT 2007
    moonshade at abyss.pnhz.kz:/usr/obj/data/os/FreeBSD/src/6/src/sys/ABYSS-6



>Description:


1. NTP-related stuff does not built with NO_NTP=yes in make.conf (just like NO_BIND, NO_SENDMAIL and etc.)

2. If NO_SHAREDOCS defined, NTP HTML docs does not installed to /usr/share/doc/ntp (this is not applies to man pages).



>How-To-Repeat:





>Fix:


--- no_ntp.diff begins here ---
diff -Nur share/doc.orig/Makefile share/doc/Makefile
--- share/doc.orig/Makefile	2007-11-26 13:07:28.000000000 +0600
+++ share/doc/Makefile	2007-11-26 13:06:46.000000000 +0600
@@ -1,12 +1,16 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD: src/share/doc/Makefile,v 1.19 2004/09/25 09:11:39 dougb Exp $
 
-SUBDIR=	${_bind9} IPv6 papers psd smm usd
+SUBDIR=	${_bind9} ${_ntp} IPv6 papers psd smm usd
 
 .if !defined(NO_BIND)
 _bind9=	bind9
 .endif
 
+.if !defined(NO_NTP)
+_ntp=	ntp
+.endif
+
 # Default output format for troff documents is ascii.
 # To generate postscript versions of troff documents, use:
 #  make PRINTERDEVICE=ps
diff -Nur share/doc.orig/ntp/Makefile share/doc/ntp/Makefile
--- share/doc.orig/ntp/Makefile	1970-01-01 06:00:00.000000000 +0600
+++ share/doc/ntp/Makefile	2007-11-26 12:53:37.000000000 +0600
@@ -0,0 +1,25 @@
+# $FreeBSD: src/usr.sbin/ntp/doc/Makefile,v 1.11.2.1 2006/05/25 20:22:54 pav Exp $
+
+FILESDIR=	${SHAREDIR}/doc/ntp
+
+FILES=	accopt.html assoc.html audio.html authopt.html build.html \
+	clockopt.html \
+	config.html confopt.html copyright.html debug.html driver1.html \
+	driver10.html driver11.html driver12.html driver16.html driver18.html \
+	driver19.html driver2.html driver20.html driver22.html driver23.html \
+	driver24.html driver26.html driver27.html driver28.html driver29.html \
+	driver3.html driver30.html driver32.html driver33.html driver34.html \
+	driver35.html driver36.html driver37.html \
+	driver4.html driver5.html driver6.html driver7.html driver8.html \
+	driver9.html extern.html hints.html \
+	howto.html index.html kern.html \
+	ldisc.html measure.html miscopt.html monopt.html mx4200data.html \
+	notes.html ntpd.html ntpdate.html ntpdc.html ntpq.html ntptime.html \
+	ntptrace.html parsedata.html parsenew.html patches.html porting.html \
+	pps.html prefer.html quick.html rdebug.html refclock.html \
+	release.html tickadj.html
+
+.PATH: ${.CURDIR}/../../../contrib/ntp/html \
+	${.CURDIR}/../../../contrib/ntp/html/drivers
+
+.include <bsd.prog.mk>
--- usr.sbin/Makefile.orig	2007-11-26 13:03:20.000000000 +0600
+++ usr.sbin/Makefile	2007-11-26 13:03:55.000000000 +0600
@@ -106,7 +106,7 @@
 	ngctl \
 	nghook \
 	nologin \
-	ntp \
+	${_ntp} \
 	${_ofwdump} \
 	${_pccard} \
 	pciconf \
@@ -259,6 +259,10 @@
 _lpr=		lpr
 .endif
 
+.if !defined(NO_NTP)
+_ntp=		ntp
+.endif
+
 .if !defined(NO_SENDMAIL)
 _editmap=	editmap
 _mailstats=	mailstats
--- share/examples/etc/make.conf.orig	2007-11-26 13:19:51.000000000 +0600
+++ share/examples/etc/make.conf	2007-11-26 13:20:58.000000000 +0600
@@ -130,6 +130,7 @@
 #			# If NO_NIS is set, you might need to adopt your
 #			# nsswitch.conf(5) and remove `nis' entries.
 #NO_NLS_CATALOGS=	# do not build NLS catalog support for csh(1)
+#NO_NTP=		# do not build NTP related programs
 #NO_OBJC=		# do not build Objective C support
 #NO_OPENSSH=		# do not build OpenSSH
 #NO_OPENSSL=		# do not build OpenSSL (implies NO_KERBEROS/NO_OPENSSH)
--- usr.sbin/ntp/doc/Makefile.orig	2007-11-26 12:52:56.000000000 +0600
+++ usr.sbin/ntp/doc/Makefile	2007-11-26 12:54:03.000000000 +0600
@@ -1,28 +1,6 @@
 # $FreeBSD: src/usr.sbin/ntp/doc/Makefile,v 1.11.2.1 2006/05/25 20:22:54 pav Exp $
 
-FILESDIR=	${SHAREDIR}/doc/ntp
-
-FILES=	accopt.html assoc.html audio.html authopt.html build.html \
-	clockopt.html \
-	config.html confopt.html copyright.html debug.html driver1.html \
-	driver10.html driver11.html driver12.html driver16.html driver18.html \
-	driver19.html driver2.html driver20.html driver22.html driver23.html \
-	driver24.html driver26.html driver27.html driver28.html driver29.html \
-	driver3.html driver30.html driver32.html driver33.html driver34.html \
-	driver35.html driver36.html driver37.html \
-	driver4.html driver5.html driver6.html driver7.html driver8.html \
-	driver9.html extern.html hints.html \
-	howto.html index.html kern.html \
-	ldisc.html measure.html miscopt.html monopt.html mx4200data.html \
-	notes.html ntpd.html ntpdate.html ntpdc.html ntpq.html ntptime.html \
-	ntptrace.html parsedata.html parsenew.html patches.html porting.html \
-	pps.html prefer.html quick.html rdebug.html refclock.html \
-	release.html tickadj.html
-
 MAN=	ntp.conf.5 ntp.keys.5
 MAN+=	ntp-keygen.8 ntpd.8 ntpdate.8 ntpdc.8 ntpq.8 ntptime.8 ntptrace.8
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/html \
-	${.CURDIR}/../../../contrib/ntp/html/drivers
-
 .include <bsd.prog.mk>
--- share/man/man5/make.conf.5.orig	2007-11-26 14:40:30.000000000 +0600
+++ share/man/man5/make.conf.5	2007-11-26 14:42:26.000000000 +0600
@@ -585,6 +585,9 @@
 .Pq Vt bool
 Set to not build NLS catalog support for
 .Xr csh 1 .
+.It Va NO_NTP
+.Pq Vt bool
+Set to not build NTP related programs.
 .It Va NO_OBJC
 .Pq Vt bool
 Set to not build Objective C support.
--- no_ntp.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: