From crees@FreeBSD.org  Wed May 23 19:37:14 2012
Return-Path: <crees@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 555D0106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 May 2012 19:37:14 +0000 (UTC)
	(envelope-from crees@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 3F5D38FC18
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 May 2012 19:37:14 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q4NJbEqn070181
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 May 2012 19:37:14 GMT
	(envelope-from crees@freefall.freebsd.org)
Received: (from crees@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q4NJbEdm070180;
	Wed, 23 May 2012 19:37:14 GMT
	(envelope-from crees)
Message-Id: <201205231937.q4NJbEdm070180@freefall.freebsd.org>
Date: Wed, 23 May 2012 19:37:14 GMT
From: Chris Rees <crees@freebsd.org>
Reply-To: Chris Rees <crees@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] ports/Makefile remove obsolete cvsup conditional
X-Send-Pr-Version: 3.113
X-GNATS-Notify: ak@FreeBSD.org

>Number:         168272
>Category:       ports
>Synopsis:       [PATCH] ports/Makefile remove obsolete cvsup conditional
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 23 19:40:02 UTC 2012
>Closed-Date:    Thu May 24 07:00:37 UTC 2012
>Last-Modified:  Thu May 24 07:00:37 UTC 2012
>Originator:     Chris Rees
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD pegasus.bayofrum.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Sun Apr 29 12:29:02 BST 2012 root@pegasus.bayofrum.net:/usr/obj/usr/src/sys/PEGASUS amd64


	I am led to believe that ports no longer works for <7.X.  In that case, we can stop conditionally using csup, and be unconditional about it.
>Description:
	
>How-To-Repeat:
	
>Fix:

	

--- patch.txt begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/Makefile,v
retrieving revision 1.109
diff -u -r1.109 Makefile
--- Makefile	4 May 2011 22:33:13 -0000	1.109
+++ Makefile	23 May 2012 19:33:13 -0000
@@ -152,11 +152,7 @@
 	@awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nE-deps:\t%s\nP-deps:\t%s\nF-deps:\t%s\nWWW:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$11, $$12, $$13, $$10); }' < ${INDEXDIR}/${INDEXFILE}
 
 CVS?= cvs
-.if ${OSVERSION} >= 601101
 SUP?= csup
-.else
-SUP?= cvsup
-.endif
 PORTSNAP?= portsnap
 PORTSNAP_FLAGS?= -p ${.CURDIR}
 .if defined(SUPHOST)
--- patch.txt ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: crees 
Responsible-Changed-When: Wed May 23 19:52:14 UTC 2012 
Responsible-Changed-Why:  
ports/Makefile is portmgr territory 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168272 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Thu May 24 07:00:35 UTC 2012 
State-Changed-Why:  
duplicate with 155511 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168272 
>Unformatted:
