Bug 118261

Summary:

[patch] Base NTP: NO_NTP support + NO_SHAREDOCS applies to NTP's HTMLs

Product:

Documentation

Reporter:

Denis Eremenko <moonshade> <moonshade>

Component:

Books & Articles

Assignee:

Tom Rhodes <trhodes>

Status:

Closed FIXED

Severity:

Affects Only Me

Priority:

Normal

Version:

Latest

Hardware:

Any

OS:

Any

Attachments:

Description	Flags
no_ntp.diff	none

Description Denis Eremenko <moonshade@pnhz.kz> 2007-11-26 09:50:05 UTC


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).

Comment 1 Mark Linimon freebsd_committer

2007-11-26 10:47:47 UTC

Responsible Changed
From-To: freebsd-bugs->freebsd-doc

reclassify.

Comment 2 Tom Rhodes freebsd_committer

2008-01-24 01:48:44 UTC

Hi,

The patch here is actually incorrect and is the long way to do it.

Looking at the Makefile(s) in question, it appears that NO_MAN
implies both NO_MAN and NO_SHAREDOCS whether the user wants this
or not.  I've submitted the following patch to another person
for review.  It correctly wraps the manual pages in NO_MAN, and
wraps the share docs into NO_SHAREDOCS.  The only issues I
think the only other changes to this patch would probably be
to not enter the docs directory at all if both NO_SHAREDOCS
and NO_MAN are set.  This could be done with a different change
to the Makefile if:

.if !defined(NO_SHAREDOCS) && !defined(NO_MAN)
subdir+=	doc
.endif

In place of my change which implicitly adds the doc subdir to
the list.

--- doc/Makefile	25 May 2006 20:22:54 -0000	1.11.2.1
+++ doc/Makefile	24 Jan 2008 01:42:50 -0000
@@ -1,5 +1,6 @@
 # $FreeBSD: src/usr.sbin/ntp/doc/Makefile,v 1.11.2.1 2006/05/25 20:22:54 pav Exp $
 
+.if !defined(NO_SHAREDOCS)
 FILESDIR=	${SHAREDIR}/doc/ntp
 
 FILES=	accopt.html assoc.html audio.html authopt.html build.html \
@@ -19,10 +20,14 @@
 	pps.html prefer.html quick.html rdebug.html refclock.html \
 	release.html tickadj.html
 
+.PATH: ${.CURDIR}/../../../contrib/ntp/html \
+        ${.CURDIR}/../../../contrib/ntp/html/drivers
+
+.endif
+
+.if !defined(NO_MAN)
 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
+.endif
 
 .include <bsd.prog.mk>

Thanks,

-- 
Tom Rhodes

Comment 3 Tom Rhodes freebsd_committer

2008-01-24 01:50:13 UTC

State Changed
From-To: open->analyzed

Switch to analyzed, I have submitted a patch for review which is available in 
this PR.

Comment 4 Tom Rhodes freebsd_committer

2008-01-24 01:50:13 UTC

Responsible Changed
From-To: freebsd-doc->trhodes

Take - I'll see it through.

Comment 5 dfilter service freebsd_committer

2008-01-24 09:46:11 UTC

trhodes     2008-01-24 09:46:05 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    usr.sbin/ntp         Makefile 
    usr.sbin/ntp/doc     Makefile 
  Log:
  MFC:
  : ru          2006-03-15 11:17:31 UTC
  :
  :   FreeBSD src repository
  :
  :   Modified files:
  :     usr.sbin/ntp         Makefile
  :     usr.sbin/ntp/doc     Makefile
  :   Log:
  :   If we don't want HTML docs, we might still want manpages.
  :   If we don't want manpages, we might still want HTML docs.
  :
  :   Revision  Changes    Path
  :   1.12      +0 -3      src/usr.sbin/ntp/Makefile
  :   1.12      +2 -0      src/usr.sbin/ntp/doc/Makefile
  
  PR:     118261
  
  Revision  Changes    Path
  1.11.2.1  +0 -3      src/usr.sbin/ntp/Makefile
  1.11.2.2  +2 -0      src/usr.sbin/ntp/doc/Makefile
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"

Comment 6 Tom Rhodes freebsd_committer

2008-01-24 09:46:30 UTC

State Changed
From-To: analyzed->closed

This has now been fixed in RELENG_6, thanks!