X-Recipient: archive-cygwin AT delorie DOT com
X-SWARE-Spam-Status: No, hits=-3.6 required=5.0 	tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,SPF_PASS
X-Spam-Check-By: sourceware.org
Message-ID: <4B3C06C1.9080007@cwilson.fastmail.fm>
Date: Wed, 30 Dec 2009 21:04:49 -0500
From: Charles Wilson <cygwin AT cwilson DOT fastmail DOT fm>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.8.1.23) Gecko/20090812 Thunderbird/2.0.0.23 Mnenhy/0.7.6.666
MIME-Version: 1.0
To: cygwin AT cygwin DOT com
Subject: cygport: latest diffutils issues warning
Content-Type: multipart/mixed;  boundary="------------080900040803030208060007"
Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id: <cygwin.cygwin.com>
List-Subscribe: <mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive: <http://sourceware.org/ml/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com
Delivered-To: mailing list cygwin AT cygwin DOT com

--------------080900040803030208060007
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

The -u0 syntax has been deprecated, and now causes this message:

>>> Checking packages for missing or duplicate files
diff: `-0' option is obsolete; use `-U 0'
diff: Try `diff --help' for more information.
diff: `-0' option is obsolete; use `-U 0'
diff: Try `diff --help' for more information.


Fixed as below.

--
Chuck

--------------080900040803030208060007
Content-Type: text/x-patch;
 name="cygport-new-diffutils.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="cygport-new-diffutils.patch"

Index: lib/pkg_pkg.cygpart
===================================================================
--- lib/pkg_pkg.cygpart	(revision 8418)
+++ lib/pkg_pkg.cygpart	(working copy)
@@ -112,10 +112,10 @@
 
 	find * -type f -o -type l | sort > ${tmp2}
 
-	if ! diff -u0 ${tmp2} ${tmp1} > /dev/null
+	if ! diff -U 0 ${tmp2} ${tmp1} > /dev/null
 	then
 		# detect duplicates and/or missing files
-		diff -u0 ${tmp2} ${tmp1} | grep -E -v '^@' > ${T}/pkgcheck.diff
+		diff -U 0 ${tmp2} ${tmp1} | grep -E -v '^@' > ${T}/pkgcheck.diff
 
 		if grep -E '^-[^\-]' ${T}/pkgcheck.diff > /dev/null
 		then


--------------080900040803030208060007
Content-Type: text/plain; charset=us-ascii

--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
--------------080900040803030208060007--