Date: Wed, 23 May 2012 19:37:14 GMT From: Chris Rees <crees@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/168272: [PATCH] ports/Makefile remove obsolete cvsup conditional Message-ID: <201205231937.q4NJbEdm070180@freefall.freebsd.org> Resent-Message-ID: <201205231940.q4NJe2va070285@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205231937.q4NJbEdm070180>