Bug 178381 - remove CVS and csup from ports/Makefile
Summary: remove CVS and csup from ports/Makefile
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-05-07 02:30 UTC by Eitan Adler
Modified: 2013-05-20 01:50 UTC (History)
0 users

See Also:


Attachments
file.diff (5.00 KB, patch)
2013-05-07 02:30 UTC, Eitan Adler
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Eitan Adler freebsd_committer freebsd_triage 2013-05-07 02:30:02 UTC
Makefile and various b.*.m files still reference CVS.
Note: I only tested svn update w.r.t. the Makefile change

Fix: Patch attached with submission follows:
Comment 1 Eitan Adler freebsd_committer freebsd_triage 2013-05-07 02:39:02 UTC
Responsible Changed
From-To: freebsd-bugs->portmgr

over to maintainer
Comment 2 Martin Wilke freebsd_committer 2013-05-07 09:19:11 UTC
Responsible Changed
From-To: portmgr->miwi

I'll take it.
Comment 3 dfilter service freebsd_committer 2013-05-20 01:45:35 UTC
Author: miwi
Date: Mon May 20 00:45:26 2013
New Revision: 318556
URL: http://svnweb.freebsd.org/changeset/ports/318556

Log:
  - Remove CVS reference
  
  PR:		178381
  		177581
  Submitted by:	Eitan Adler <lists@eitanadler.com>
  		Alex Kozlov <spam@rm-rf.kiev.ua>
  
  With hat:	portmgr

Modified:
  head/Makefile   (contents, props changed)
  head/Mk/bsd.drupal.mk
  head/Mk/bsd.fpc.mk   (contents, props changed)
  head/Mk/bsd.java.mk
  head/Mk/bsd.perl.mk
  head/Mk/bsd.php.mk

Modified: head/Makefile
==============================================================================
--- head/Makefile	Sun May 19 22:32:47 2013	(r318555)
+++ head/Makefile	Mon May 20 00:45:26 2013	(r318556)
@@ -122,13 +122,12 @@ ${INDEXDIR}/${INDEXFILE}:
 			echo "Before reporting this error, verify that you are running a supported"; \
 			echo "version of FreeBSD (see http://www.FreeBSD.org/ports/) and that you"; \
 			echo "have a complete and up-to-date ports collection.  (INDEX builds are"; \
-			echo "not supported with partial or out-of-date ports collections -- in"; \
-			echo "particular, if you are using cvsup, you must cvsup the \"ports-all\""; \
-			echo "collection, and have no \"refuse\" files.)  If that is the case, then"; \
+			echo "not supported with partial or out-of-date ports collections."; \
+			echo "If that is the case, then"; \
 			echo "report the failure to ports@FreeBSD.org together with relevant"; \
 			echo "details of your ports configuration (including FreeBSD version,"; \
 			echo "your architecture, your environment, and your /etc/make.conf"; \
-			echo "settings, especially compiler flags and WITH/WITHOUT settings)."; \
+			echo "settings, especially compiler flags and OPTIONS_SET/UNSET settings)."; \
 			echo; \
 			echo "Note: the latest pre-generated version of INDEX may be fetched"; \
 			echo "automatically with \"make fetchindex\"."; \
@@ -151,28 +150,13 @@ ${INDEXDIR}/${INDEXFILE}:
 print-index:	${INDEXDIR}/${INDEXFILE}
 	@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
 GIT?= git
 SVN?= svn
-SUP?= csup
 PORTSNAP?= portsnap
 PORTSNAP_FLAGS?= -p ${.CURDIR}
-.if defined(SUPHOST)
-SUPFLAGS+=	-h ${SUPHOST}
-.endif
 .if !target(update)
 update:
-.if defined(SUP_UPDATE) && defined(PORTSSUPFILE)
-	@echo "--------------------------------------------------------------"
-	@echo ">>> Running ${SUP}"
-	@echo "--------------------------------------------------------------"
-	@${SUP} ${SUPFLAGS} ${PORTSSUPFILE}
-.elif defined(CVS_UPDATE)
-	@echo "--------------------------------------------------------------"
-	@echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT}
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; ${CVS} -R -q update -A -P -d -I!
-.elif exists(${.CURDIR}/.svn)
+.if exists(${.CURDIR}/.svn)
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Updating ${.CURDIR} using Subversion"
 	@echo "--------------------------------------------------------------"
@@ -190,8 +174,6 @@ update:
 	@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

Modified: head/Mk/bsd.drupal.mk
==============================================================================
--- head/Mk/bsd.drupal.mk	Sun May 19 22:32:47 2013	(r318555)
+++ head/Mk/bsd.drupal.mk	Mon May 20 00:45:26 2013	(r318556)
@@ -7,7 +7,7 @@
 #
 # For FreeBSD committers:
 # Please send all suggested changes to the maintainer instead of committing
-# them to CVS yourself.
+# them to SVN yourself.
 
 bsd_drupal_mk_MAINTAINER=       miwi@FreeBSD.org
 

Modified: head/Mk/bsd.fpc.mk
==============================================================================
--- head/Mk/bsd.fpc.mk	Sun May 19 22:32:47 2013	(r318555)
+++ head/Mk/bsd.fpc.mk	Mon May 20 00:45:26 2013	(r318556)
@@ -7,7 +7,7 @@
 #
 # For FreeBSD committers:
 # Please send all suggested changes to the maintainer instead of committing
-# them to CVS yourself.
+# them to SVN yourself.
 #
 # USE_FPC		- If you set this to "yes", this automatically will install
 #			  free pascal compiler, if you need install additional fpc

Modified: head/Mk/bsd.java.mk
==============================================================================
--- head/Mk/bsd.java.mk	Sun May 19 22:32:47 2013	(r318555)
+++ head/Mk/bsd.java.mk	Mon May 20 00:45:26 2013	(r318556)
@@ -7,7 +7,7 @@
 #
 # For FreeBSD committers:
 # Please send all suggested changes to the maintainer instead of committing
-# them to CVS yourself.
+# them to svn yourself.
 #
 # $FreeBSD$
 #

Modified: head/Mk/bsd.perl.mk
==============================================================================
--- head/Mk/bsd.perl.mk	Sun May 19 22:32:47 2013	(r318555)
+++ head/Mk/bsd.perl.mk	Mon May 20 00:45:26 2013	(r318556)
@@ -9,7 +9,7 @@
 #
 # For FreeBSD committers:
 # Please send all suggested changes to the maintainer instead of committing
-# them to CVS yourself.
+# them to SVN yourself.
 #
 # PERL5			- Set to full path of perl5, either in the system or
 #				  installed from a port.

Modified: head/Mk/bsd.php.mk
==============================================================================
--- head/Mk/bsd.php.mk	Sun May 19 22:32:47 2013	(r318555)
+++ head/Mk/bsd.php.mk	Mon May 20 00:45:26 2013	(r318556)
@@ -5,7 +5,7 @@
 #
 # For FreeBSD committers:
 # Please send all suggested changes to the maintainer instead of committing
-# them to CVS yourself.
+# them to SVN yourself.
 #
 # $FreeBSD$
 #
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Martin Wilke freebsd_committer 2013-05-20 01:47:41 UTC
State Changed
From-To: open->closed

Committed. Thanks!