From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 23 19:40:02 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B45E0106566B; Wed, 23 May 2012 19:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 747F28FC14; Wed, 23 May 2012 19:40:02 +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 q4NJe2mn070286; Wed, 23 May 2012 19:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q4NJe2va070285; Wed, 23 May 2012 19:40:02 GMT (envelope-from gnats) Resent-Date: Wed, 23 May 2012 19:40:02 GMT Resent-Message-Id: <201205231940.q4NJe2va070285@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Cc: ak@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chris Rees Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 555D0106564A for ; 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 ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 X-GNATS-Notify: ak@FreeBSD.org Cc: Subject: ports/168272: [PATCH] ports/Makefile remove obsolete cvsup conditional X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Chris Rees List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 May 2012 19:40:02 -0000 >Number: 168272 >Category: ports >Synopsis: [PATCH] ports/Makefile remove obsolete cvsup conditional >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: Wed May 23 19:40:02 UTC 2012 >Closed-Date: >Last-Modified: >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: >Unformatted: