From erwin@rabbit.home.droso.net  Fri Nov 24 21:38:18 2006
Return-Path: <erwin@rabbit.home.droso.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 67CC416A415
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <erwin@freebsd.org>
Reply-To: Erwin Lansing <erwin@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Use portsnap by default for 'make update' 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         105835
>Category:       ports
>Synopsis:       Use portsnap by default for 'make update'
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 24 21:40:13 GMT 2006
>Closed-Date:    Thu May 24 23:56:15 GMT 2007
>Last-Modified:  Fri May 25 00:00:13 GMT 2007
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: erwin 
Responsible-Changed-When: Fri Nov 24 21:47:40 UTC 2006 
Responsible-Changed-Why:  
Over to portmgr for pointyhat testing. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105835 

From: Erwin Lansing <erwin@FreeBSD.org>
To: freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/105835: Use portsnap by default for 'make update'
Date: Wed, 29 Nov 2006 18:43:21 +0100

 MFp4:
 Be a bit more userfriendly now portsnap is used by default.
 Test that portsnap has created PORTSDIR to make sure that an
 unsuspecting user doesn't need to fetch 45Mb only to be told
 afterwards that portsnap can't run anyway. Print a helpful
 text instead to tell the user to run 'portsnap fetch extract'
 by hand or use another way to update.
 
 New diff against cvs:
 
 --- /usr/ports/Makefile	Sat Feb 11 03:26:30 2006
 +++ Makefile	Wed Nov 29 18:39:18 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,17 @@
  	@${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 "--------------------------------------------------------------"
 +.if !exists(${PORTSDIR}/.portsnap.INDEX)
 +	@echo "Error: 'make update' uses portsnap(8) by default and"
 +	@echo "needs ${PORTSDIR} to be created by portsnap on its first run."
 +	@echo "Please run 'portsnap fetch extract' first."
 +	@echo "You can also define SUP_UPDATE and PORTSSUPFILE to use csup(1)"
 +	@echo "or CVS_UPDATE to use cvs(1) for updating."
 +.else
 +	@${PORTSNAP} ${PORTSNAP_FLAGS} fetch
 +	@${PORTSNAP} ${PORTSNAP_FLAGS} update
 +.endif
  .endif
 
 _______________________________________________
 freebsd-ports-bugs@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
 To unsubscribe, send any mail to "freebsd-ports-bugs-unsubscribe@freebsd.org"
State-Changed-From-To: open->analyzed 
State-Changed-By: linimon 
State-Changed-When: Wed May 16 21:50:34 UTC 2007 
State-Changed-Why:  
Accepted for a test build on the cluster. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105835 
State-Changed-From-To: analyzed->closed 
State-Changed-By: linimon 
State-Changed-When: Thu May 24 23:55:45 UTC 2007 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105835 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/105835: commit references a PR
Date: Thu, 24 May 2007 23:58:35 +0000 (UTC)

 linimon     2007-05-24 23:58:29 UTC
 
   FreeBSD ports repository
 
   Modified files:
     .                    Makefile 
   Log:
   The default method for 'make update' is now portsnap.  Previously,
   you had to manually select one of 3 methods: SUP_UPDATE, CVS_UPDATE,
   or PORTSNAP_UPDATE.  The latter is now obsolete.
   
   This should help some novice administrators just-start their system.
   
   PR:             ports/105835
   Submitted by:   erwin
   
   Revision  Changes    Path
   1.102     +14 -8     ports/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
