Date: Mon, 10 Sep 2007 11:20:12 +0800 (CST) From: Xin LI <delphij@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: sergei@FreeBSD.org Subject: ports/116248: [PATCH] ports-mgmt/porttolls: add -R to cvs update/diff commands Message-ID: <20070910032012.C8D592846F@tarsier.delphij.net> Resent-Message-ID: <200709100330.l8A3U2LD087688@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 116248
>Category: ports
>Synopsis: [PATCH] ports-mgmt/porttolls: add -R to cvs update/diff commands
>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: Mon Sep 10 03:30:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Xin LI
>Release: FreeBSD 6.2-RELEASE-p7 i386
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD tarsier.delphij.net 6.2-RELEASE-p7 FreeBSD 6.2-RELEASE-p7 #5: Thu Aug 2 22:09:50 CST 2007 delphij@tarsier.delphij.net:/usr/obj/usr/src/sys/TARSIER i386
>Description:
While doing 'port diff', porttools would attempt to do 'cvs update' and
'cvs diff' rather than 'cvs -R update' and 'cvs -R diff'.
With a local repository, adding -R would make it possible to run against
a read-only repository (e.g. when the repository is run under by a different user)
and is generally a speed-up.
The proposed change also unrolls MASTER_SITE=SF notation.
>How-To-Repeat:
>Fix:
--- porttools.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/ports-mgmt/porttools/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile 5 Feb 2007 01:08:31 -0000 1.19
+++ Makefile 10 Sep 2007 03:13:10 -0000
@@ -7,9 +7,9 @@
PORTNAME= porttools
PORTVERSION= 0.77
+PORTREVISION= 1
CATEGORIES= ports-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= sergei@FreeBSD.org
COMMENT= Tools for testing and submitting port updates and new ports
Index: files/patch-util_diff.in
===================================================================
RCS file: files/patch-util_diff.in
diff -N files/patch-util_diff.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-util_diff.in 10 Sep 2007 03:14:46 -0000
@@ -0,0 +1,20 @@
+--- ./util_diff.in.orig 2006-05-06 19:31:58.000000000 +0800
++++ ./util_diff.in 2007-09-10 11:14:41.199138345 +0800
+@@ -54,7 +54,7 @@
+
+ # Run 'cvs update' first
+ echo "===> Updating from CVS"
+- cvs update -Pd
++ cvs -R update -Pd
+ if [ $? -ne 0 ]
+ then
+ echo "Error updating CVS"
+@@ -62,7 +62,7 @@
+ exit 1
+ fi
+
+- DIFF_CMD="cvs diff -uN"
++ DIFF_CMD="cvs -R diff -uN"
+ else
+ # Non-CVS modes
+ if [ -d ${DIFF_MODE} ]
--- porttools.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070910032012.C8D592846F>