ports/113819: It's impossible to use csup for 'src' and portsnap for 'ports' via 'make update'

[Alex Dupre]

>Number:         113819
>Category:       ports
>Synopsis:       It's impossible to use csup for 'src' and portsnap for 'ports' via 'make update'
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 18 10:50:09 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Alex Dupre
>Release:        FreeBSD 6.x
>Organization:
>Environment:
>Description:
ports/Makefile commit 1.102 broke the use of portsnap to update ports via 'make update', when SUP_UPDATE is set for updating src. The correct fix is in the attached patch, that removes a (now obsolete and bogus) check introduced in rev. 1.61.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/Makefile,v
retrieving revision 1.102
diff -u -r1.102 Makefile
--- Makefile	24 May 2007 23:58:29 -0000	1.102
+++ Makefile	18 Jun 2007 10:35:39 -0000
@@ -163,9 +163,6 @@
 	@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR}; ${CVS} -R -q update -A -P -d -I!
-.elif defined(SUP_UPDATE) && !defined(PORTSSUPFILE)
-	@${ECHO_MSG} "Error: Please define PORTSSUPFILE before doing make update."
-	@exit 1
 .else
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Running ${PORTSNAP}"


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