svn commit: r349064 - head/Tools/scripts

[Chris Rees]

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