Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Nov 2006 22:38:14 +0100 (CET)
From:      Erwin Lansing <erwin@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/105835: Use portsnap by default for 'make update' 
Message-ID:  <200611242138.kAOLcEBC003649@rabbit.home.droso.net>
Resent-Message-ID: <200611242140.kAOLeDQU018998@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611242138.kAOLcEBC003649>