From owner-freebsd-doc  Sun Dec 12  9:40: 5 1999
Delivered-To: freebsd-doc@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 87D7214DA0
	for <freebsd-doc@freebsd.org>; Sun, 12 Dec 1999 09:40:02 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id JAA26814;
	Sun, 12 Dec 1999 09:40:02 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: from news-ma.rhein-neckar.de (news-ma.rhein-neckar.de [193.197.90.3])
	by hub.freebsd.org (Postfix) with ESMTP id 2EB5E15095
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 12 Dec 1999 09:30:49 -0800 (PST)
	(envelope-from naddy@bigeye.rhein-neckar.de)
Received: from bigeye.rhein-neckar.de (uucp@localhost)
	by news-ma.rhein-neckar.de (8.8.8/8.8.8) with bsmtp id SAA03369
	for FreeBSD-gnats-submit@freebsd.org; Sun, 12 Dec 1999 18:30:47 +0100 (CET)
	(envelope-from naddy@bigeye.rhein-neckar.de)
Received: (from naddy@localhost)
	by bigeye.rhein-neckar.de (8.9.3/8.9.3) id SAA37226;
	Sun, 12 Dec 1999 18:02:42 +0100 (CET)
	(envelope-from naddy)
Message-Id: <199912121702.SAA37226@bigeye.rhein-neckar.de>
Date: Sun, 12 Dec 1999 18:02:42 +0100 (CET)
From: Christian Weisgerber <naddy@mips.rhein-neckar.de>
Reply-To: naddy@mips.rhein-neckar.de
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: docs/15439: Add update target to doc/Makefile
Sender: owner-freebsd-doc@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         15439
>Category:       docs
>Synopsis:       Add update target to doc/Makefile
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 12 09:40:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator:     Christian Weisgerber
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:

>Description:

Both the src and ports trees support a make target "update" which
updates the respective tree by CVSup or CVS to the latest version.
Configuration is typically provided through /etc/make.conf.

The patch below adds this capability to the top level Makefile of
the doc tree. The code is cribbed from {src,ports}/Makefile.

>How-To-Repeat:

n/a

>Fix:

--- doc/Makefile.orig	Sun Dec 12 17:34:01 1999
+++ doc/Makefile	Sun Dec 12 17:48:24 1999
@@ -14,4 +14,24 @@
 .endif
 
 DOC_PREFIX?=   ${.CURDIR}
+
+update:
+.if defined(SUP_UPDATE)
+.if !defined(DOCSUPFILE)
+	@echo "Error: Please define DOCSUPFILE before doing make update."
+	@exit 1
+.endif
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Running ${SUP}"
+	@echo "--------------------------------------------------------------"
+	@${SUP} ${SUPFLAGS} ${DOCSUPFILE}
+.elif defined(CVS_UPDATE)
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR}; cvs -q update -P -d
+.else
+	@echo "Error: Please define either SUP_UPDATE or CVS_UPDATE first."
+.endif
+
 .include "${DOC_PREFIX}/share/mk/doc.subdir.mk"
--- src/etc/defaults/make.conf.orig	Sun Dec 12 17:41:23 1999
+++ src/etc/defaults/make.conf	Sun Dec 12 17:42:11 1999
@@ -185,6 +185,7 @@
 #SUPFILE=        /usr/share/examples/cvsup/standard-supfile
 #SUPFILE1=       /usr/share/examples/cvsup/secure-supfile
 #PORTSSUPFILE=   /usr/share/examples/cvsup/ports-supfile
+#DOCSUPFILE=     /usr/share/examples/cvsup/doc-supfile
 #
 # top(1) uses a hash table for the user names.  The size of this hash
 # can be tuned to match the number of local users.  The table size should

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


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message