From owner-freebsd-bugs  Mon Sep  3  0:40: 7 2001
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id C7E1337B405
	for <freebsd-bugs@hub.freebsd.org>; Mon,  3 Sep 2001 00:40:01 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f837e1212219;
	Mon, 3 Sep 2001 00:40:01 -0700 (PDT)
	(envelope-from gnats)
Received: from guru.mired.org (okc-94-248-46.mmcable.com [24.94.248.46])
	by hub.freebsd.org (Postfix) with SMTP id DF16637B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 Sep 2001 00:35:32 -0700 (PDT)
Received: (qmail 88227 invoked by uid 100); 3 Sep 2001 07:35:32 -0000
Message-Id: <20010903073532.88226.qmail@guru.mired.org>
Date: 3 Sep 2001 07:35:32 -0000
From: Mike Meyer <mwm@mired.org>
Reply-To: Mike Meyer <mwm@mired.org>
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.113
Subject: misc/30281: [PATCH] ports/INDEX in the cvs repository is out of date
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-bugs.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-bugs>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-bugs>
X-Loop: FreeBSD.org


>Number:         30281
>Category:       misc
>Synopsis:       [PATCH] ports/INDEX in the cvs repository is out of date
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 03 00:40:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Mike Meyer
>Release:        FreeBSD 4.4-RC i386
>Organization:
Meyer Consulting
>Environment:
System: FreeBSD guru.mired.org 4.4-RC FreeBSD 4.4-RC #5: Sun Aug 26 15:14:14 CDT 2001 mwm@guru.mired.org:/sharetmp/obj/usr/src/sys/GURU i386

	Any machine tracking /usr/ports.

>Description:

	The /usr/ports/INDEX file in the CVS repository is out of date.

>How-To-Repeat:

        Do "make index" in /usr/ports, and note that are ~5800 lines
        in the resulting INDEX file. Do "make update" on a properly
        configured system, and then note that INDEX has lost a number
        of ports, and that many listed are now out of date.

>Fix:

	As suggested by wca in PR ports/30268, here's a patch for
	src/Makefile.inc1 to add a switch to make.conf to allow updating
	the index after it updates the the ports tree. I'm not positive
	where the PORTSDIR?= should go, but this at least keeps them
	together.

--- Makefile.inc1       Fri Aug 17 17:47:13 2001
+++ Makefile.inc1.fixed Mon Sep  3 01:57:16 2001
@@ -483,6 +483,7 @@
 # Update the source tree, by running sup and/or running cvs to update to the
 # latest copy.
 #
+PORTSDIR?=/usr/ports
 update:
 .if defined(SUP_UPDATE)
        @echo "--------------------------------------------------------------"
@@ -499,6 +500,9 @@
 .endif
 .if defined(PORTSSUPFILE) && !defined(NO_PORTSUPDATE)
        @${SUP} ${SUPFLAGS} ${PORTSSUPFILE}
+.if defined(UPDATE_PORTS_INDEX)
+       cd ${PORTSDIR}; ${MAKE} index
+.endif
 .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