From owner-svn-ports-head@FreeBSD.ORG  Mon Mar 24 20:30:01 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 12A9CF45;
 Mon, 24 Mar 2014 20:30:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0007F77B;
 Mon, 24 Mar 2014 20:30:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2OKU0aW079763;
 Mon, 24 Mar 2014 20:30:00 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2OKU07d079762;
 Mon, 24 Mar 2014 20:30:00 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201403242030.s2OKU07d079762@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Mon, 24 Mar 2014 20:30:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349064 - head/Tools/scripts
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Mar 2014 20:30:01 -0000

Author: crees
Date: Mon Mar 24 20:30:00 2014
New Revision: 349064
URL: http://svnweb.freebsd.org/changeset/ports/349064
QAT: https://qat.redports.org/buildarchive/r349064/

Log:
  Fix cdiff
  
  Reported by:	swills

Modified:
  head/Tools/scripts/rmport

Modified: head/Tools/scripts/rmport
==============================================================================
--- head/Tools/scripts/rmport	Mon Mar 24 20:24:48 2014	(r349063)
+++ head/Tools/scripts/rmport	Mon Mar 24 20:30:00 2014	(r349064)
@@ -47,7 +47,7 @@ SED="sed -i .orig -E"
 SVNREPO=${SVNREPO:-svn+ssh://svn.FreeBSD.org/ports}
 
 if ! CDIFF=$(which cdiff) ; then
-	CDIFF=${EDITOR}
+	CDIFF=${PAGER}
 fi
 
 log()
@@ -529,7 +529,7 @@ answer=y
 while [ "${answer}" = "y" ] ; do
 	diffout=$(diff)
 
-	${CDIFF} ${diffout}
+	${CDIFF} < ${diffout}
 
 	echo "" >&2
 	echo "you can now edit files under ${codir}/ by hand" >&2