"Kent R. Spillner" <kspill...@acm.org> writes: > Ping.
This looks fine to me. If no one objects I'll commit it tomorrow. If you want to improve this port, though, there are portability problems that could be fixed. I noticed a few sed s/.../.../iasdf flags that don't work with our sed. This could be dealt with patching the scritps to use @SED@ and amending the % :: %.in rule in Makefile.in. > On Fri, Dec 13, 2013 at 10:19:34PM -0600, Kent R. Spillner wrote: >> Update to quilt v0.61 and take maintainer. I passed the >> remove-trailing-whitespace test diff upstream. >> >> Tested on amd64. >> >> Index: Makefile >> =================================================================== >> RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v >> retrieving revision 1.4 >> diff -p -u -r1.4 Makefile >> --- Makefile 31 Aug 2013 17:22:16 -0000 1.4 >> +++ Makefile 14 Dec 2013 04:11:46 -0000 >> @@ -2,11 +2,11 @@ >> >> COMMENT= manage large numbers of patches >> >> -DISTNAME= quilt-0.60 >> -REVISION= 1 >> +DISTNAME= quilt-0.61 >> CATEGORIES= devel >> >> HOMEPAGE= http://savannah.nongnu.org/projects/quilt/ >> +MAINTAINER= Kent R. Spillner <kspill...@acm.org> >> >> # GPLv3+ >> PERMIT_PACKAGE_CDROM= Yes >> Index: distinfo >> =================================================================== >> RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v >> retrieving revision 1.1.1.1 >> diff -p -u -r1.1.1.1 distinfo >> --- distinfo 8 Oct 2012 15:14:25 -0000 1.1.1.1 >> +++ distinfo 14 Dec 2013 03:34:38 -0000 >> @@ -1,2 +1,2 @@ >> -SHA256 (quilt-0.60.tar.gz) = PXKikuQyvrmnP50Kz+OnfJtNfkIgmRm7JE6ZWMfP5ks= >> -SIZE (quilt-0.60.tar.gz) = 442369 >> +SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M= >> +SIZE (quilt-0.61.tar.gz) = 450552 >> Index: patches/patch-test_delete_test >> =================================================================== >> RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-test_delete_test,v >> retrieving revision 1.1.1.1 >> diff -p -u -r1.1.1.1 patch-test_delete_test >> --- patches/patch-test_delete_test 8 Oct 2012 15:14:25 -0000 1.1.1.1 >> +++ patches/patch-test_delete_test 13 Dec 2013 23:56:08 -0000 >> @@ -1,17 +1,17 @@ >> $OpenBSD: patch-test_delete_test,v 1.1.1.1 2012/10/08 15:14:25 rpe Exp $ >> ---- test/delete.test.orig Sun Sep 2 21:40:18 2012 >> -+++ test/delete.test Sun Sep 2 21:40:26 2012 >> +--- test/delete.test.orig Sun Dec 8 03:40:42 2013 >> ++++ test/delete.test Fri Dec 13 17:55:39 2013 >> @@ -1,3 +1,4 @@ >> -+# >~ find: `?\./dir'?: Permission denied >> ++# >~ .*find: [`']?\./dir'?: Permission denied >> Test the delete command. >> >> $ mkdir patches >> -@@ -77,7 +78,7 @@ Test the delete command. >> - >> +@@ -79,7 +80,7 @@ Test the delete command. >> + # running as root, but you shouldn't do that anyway. >> $ quilt delete "test3" >> > Removing patch %{P}test3 >> -- >~ find: `?\./dir'?: Permission denied >> -+ > ${LOCALBASE}/bin/gfind: `./dir': Permission denied >> +- >~ .*find: [`']?\./dir'?: Permission denied >> ++ >~ /usr/local/bin/gfind: [`']?\./dir'?: Permission denied >> >> $ chmod a+rx .pc/test3/dir >> >> Index: patches/patch-test_remove-trailing-ws_test >> =================================================================== >> RCS file: patches/patch-test_remove-trailing-ws_test >> diff -N patches/patch-test_remove-trailing-ws_test >> --- /dev/null 1 Jan 1970 00:00:00 -0000 >> +++ patches/patch-test_remove-trailing-ws_test 14 Dec 2013 03:15:03 >> -0000 >> @@ -0,0 +1,63 @@ >> +$OpenBSD$ >> +--- test/remove-trailing-ws.test.orig Fri Dec 13 17:38:41 2013 >> ++++ test/remove-trailing-ws.test Fri Dec 13 17:50:26 2013 >> +@@ -134,21 +134,21 @@ $ %{QUILT_DIR}/scripts/remove-trailing-ws < unified.di >> + > Removing trailing whitespace from lines 12,16 of files/complex >> + > Removing trailing whitespace from lines 1,2,3 of files/create >> + $ wc -l files/add >> +-> 8 files/add >> ++>~ (\s+)?8 files/add >> + $ wc -l files/change >> +-> 3 files/change >> ++>~ (\s+)?3 files/change >> + $ wc -l files/complex >> +-> 21 files/complex >> ++>~ (\s+)?21 files/complex >> + $ wc -l files/create >> +-> 3 files/create >> ++>~ (\s+)?3 files/create >> + $ wc -l files/remove >> +-> 6 files/remove >> ++>~ (\s+)?6 files/remove >> + $ wc -l files/remove-at-end >> +-> 8 files/remove-at-end >> ++>~ (\s+)?8 files/remove-at-end >> + $ wc -l unified.diff >> +-> 85 unified.diff >> ++>~ (\s+)?85 unified.diff >> + $ wc -l unified-wsok.diff >> +-> 85 unified-wsok.diff >> ++>~ (\s+)?85 unified-wsok.diff >> + $ diff -u unified.diff unified-wsok.diff | grep '^++[^+]' >> + > ++Line 4 >> + > ++to >> +@@ -167,21 +167,21 @@ $ %{QUILT_DIR}/scripts/remove-trailing-ws < context.di >> + > Removing trailing whitespace from lines 12,16 of files/complex >> + > Removing trailing whitespace from lines 1,2,3 of files/create >> + $ wc -l files/add >> +-> 8 files/add >> ++>~ (\s+)?8 files/add >> + $ wc -l files/change >> +-> 3 files/change >> ++>~ (\s+)?3 files/change >> + $ wc -l files/complex >> +-> 21 files/complex >> ++>~ (\s+)?21 files/complex >> + $ wc -l files/create >> +-> 3 files/create >> ++>~ (\s+)?3 files/create >> + $ wc -l files/remove >> +-> 6 files/remove >> ++>~ (\s+)?6 files/remove >> + $ wc -l files/remove-at-end >> +-> 8 files/remove-at-end >> ++>~ (\s+)?8 files/remove-at-end >> + $ wc -l context.diff >> +-> 104 context.diff >> ++>~ (\s+)?104 context.diff >> + $ wc -l context-wsok.diff >> +-> 104 context-wsok.diff >> ++>~ (\s+)?104 context-wsok.diff >> + $ diff -u context.diff context-wsok.diff | grep '^+[+!] ' >> + > ++ Line 4 >> + > ++ create >> > -- jca | PGP: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
