From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 24 21:40:18 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4560E16A47E for ; Fri, 24 Nov 2006 21:40:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2F4043D62 for ; Fri, 24 Nov 2006 21:39:30 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kAOLeDfn018999 for ; Fri, 24 Nov 2006 21:40:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kAOLeDQU018998; Fri, 24 Nov 2006 21:40:13 GMT (envelope-from gnats) Resent-Date: Fri, 24 Nov 2006 21:40:13 GMT Resent-Message-Id: <200611242140.kAOLeDQU018998@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Erwin Lansing Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 67CC416A415 for ; Fri, 24 Nov 2006 21:38:18 +0000 (UTC) (envelope-from erwin@rabbit.home.droso.net) Received: from rabbit.home.droso.net (tdk.net [194.239.134.102]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75C7B43D45 for ; Fri, 24 Nov 2006 21:37:34 +0000 (GMT) (envelope-from erwin@rabbit.home.droso.net) Received: from rabbit.home.droso.net (localhost [127.0.0.1]) by rabbit.home.droso.net (8.13.8/8.13.6) with ESMTP id kAOLcFXK003650 for ; Fri, 24 Nov 2006 22:38:15 +0100 (CET) (envelope-from erwin@rabbit.home.droso.net) Received: (from erwin@localhost) by rabbit.home.droso.net (8.13.8/8.13.6/Submit) id kAOLcEBC003649; Fri, 24 Nov 2006 22:38:14 +0100 (CET) (envelope-from erwin) Message-Id: <200611242138.kAOLcEBC003649@rabbit.home.droso.net> Date: Fri, 24 Nov 2006 22:38:14 +0100 (CET) From: Erwin Lansing To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/105835: Use portsnap by default for 'make update' X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Erwin Lansing List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Nov 2006 21:40:18 -0000 >Number: 105835 >Category: ports >Synopsis: Use portsnap by default for 'make update' >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Nov 24 21:40:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Erwin Lansing >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: >Environment: System: FreeBSD rabbit.home.droso.net 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #: Thu Sep 28 21:13:08 CEST 2006 root@rabbit.home.droso.net:/usr/obj/usr/src/sys/RABBIT i386 >Description: Now that we have portsnap in the base system, use it as per default for 'make update' for ports/ so no other environment variables need to be set by the (lazy) administrator. More advanced users can still set SUP_UPDATE or CVS_UPDATE, but if none of those are set, portsnap is assumed. This depricated PORTSNAP_UPDATE. Inspired by ports/45613 which is superseded by this patch. >How-To-Repeat: >Fix: --- makefile.diff begins here --- --- /usr/ports/Makefile Sat Feb 11 03:26:30 2006 +++ Makefile Fri Nov 24 22:00:25 2006 @@ -146,13 +146,7 @@ SUPFLAGS+= -h ${SUPHOST} .endif update: -.if defined(PORTSNAP_UPDATE) - @echo "--------------------------------------------------------------" - @echo ">>> Running ${PORTSNAP}" - @echo "--------------------------------------------------------------" - @${PORTSNAP} ${PORTSNAP_FLAGS} fetch - @${PORTSNAP} ${PORTSNAP_FLAGS} update -.elif defined(SUP_UPDATE) && defined(PORTSSUPFILE) +.if defined(SUP_UPDATE) && defined(PORTSSUPFILE) @echo "--------------------------------------------------------------" @echo ">>> Running ${SUP}" @echo "--------------------------------------------------------------" @@ -166,5 +160,9 @@ @${ECHO_MSG} "Error: Please define PORTSSUPFILE before doing make update." @exit 1 .else - @${ECHO_MSG} "Error: Please define either PORTSNAP_UPDATE, SUP_UPDATE, or CVS_UPDATE first." + @echo "--------------------------------------------------------------" + @echo ">>> Running ${PORTSNAP}" + @echo "--------------------------------------------------------------" + @${PORTSNAP} ${PORTSNAP_FLAGS} fetch + @${PORTSNAP} ${PORTSNAP_FLAGS} update .endif --- makefile.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: