From owner-freebsd-bugs  Mon Mar 20 13:30:10 2000
Delivered-To: freebsd-bugs@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 440A337BA50
	for <freebsd-bugs@FreeBSD.org>; Mon, 20 Mar 2000 13:30:02 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id NAA05752;
	Mon, 20 Mar 2000 13:30:01 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: from mail.ruhr.de (ns.ruhr.de [141.39.224.34])
	by hub.freebsd.org (Postfix) with SMTP id CF03D37C26E
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 20 Mar 2000 12:51:07 -0800 (PST)
	(envelope-from ue@nathan.ruhr.de)
Received: (qmail 22308 invoked by alias); 20 Mar 2000 20:51:03 -0000
Received: (from ue@localhost)
	by nathan.ruhr.de (8.9.3/8.9.3) id VAA03026;
	Mon, 20 Mar 2000 21:55:31 +0100 (CET)
	(envelope-from ue)
Message-Id: <200003202055.VAA03026@nathan.ruhr.de>
Date: Mon, 20 Mar 2000 21:55:31 +0100 (CET)
From: ue@nathan.ruhr.de
Reply-To: ue@nathan.ruhr.de
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: misc/17514: Inconsistent behaviour of "make update" [PATCH]
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         17514
>Category:       misc
>Synopsis:       Inconsistent behaviour of "make update" [PATCH]
>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 Mar 20 13:30:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Udo Erdelhoff
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:

5.0-current, /usr/src/Makefile.inc1 revision 1.141
(and all prior revisions since revision 1.77)

>Description:

The comments in both /usr/src/Makefile.inc1 and /usr/src/Makefile.inc1 state
that "make update" updates the source tree. Since rev. 1.77 of Makefile.inc1,
a "make update" will also update the ports tree. There are good arguments for
and against this behaviour.

The same arguments are valid for the doc tree, too. The current version of
Makefile.inc1 doesn't include code to update the doc tree during make update.

The patch fixes this inconsistency. make update will update the source tree,
the ports tree and the doc tree. The limitations of the original extension
remain: PORTSSUPFILE/DOCSUPFILE need to be defined in make.conf; if you're
cvsup'ing the ports or doc repository, a simple make update WON'T update
your ports/doc tree.

I've also added two knobs called NO_PORTUPDATE and NO_DOCUPDATE. Their
purpose should be obvious.

Tested by:
make update
make -DNO_PORTUPDATE update
make -DNO_DOCUPDATE update
make -DNO_PORTUPDATE -DNO_DOCUPDATE update

>How-To-Repeat:

make update in /usr/src

>Fix:

Index: Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.141
diff -r1.141 Makefile.inc1
16a17,18
> #	-DNO_PORTUPDATE do not update ports tree/repo during make update
> #	-DNO_DOCUPDATE do not update docs tree/repo during make update
420c422
< .if defined(PORTSSUPFILE)
---
> .if defined(PORTSSUPFILE) && !defined(NO_PORTUPDATE)
421a424,426
> .endif
> .if defined(DOCSUPFILE) && !defined(NO_DOCUPDATE)
> 	@${SUP} ${SUPFLAGS} ${DOCSUPFILE}

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


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