Re: UPDATE: devel/quilt 0.66
On Thu, Apr 25 2019, Jeremie Courreges-Anglas wrote:
> On Tue, Apr 23 2019, "Kent R. Spillner" wrote:
>> On Mon, Apr 08, 2019 at 10:40:50AM +0200, Jeremie Courreges-Anglas wrote:
>>> On Wed, Apr 03 2019, "Kent R. Spillner" wrote:
>>> > On Tue, Apr 02, 2019 at 09:46:31PM -0400, Brian Callahan wrote:
>>> >> Couple things:
>>> >> 1. Patch applied with fuzz so re-run `make update-patches'
>>> >> 2. When I ran `make update-plist' the PLIST got updated.
>>> >> It added a 7z wrapper. So looks like either
>>> >> archivers/p7zip has to be added to the deps or
>>> >> --without-7z in the configure args.
>>>
>>> I don't think we should add a RUN_DEPENDS on p7zip.
>>>
>>> We *could* add a BUILD_DEPENDS to avoid the warning message and have the
>>> compat symlink shipped by the package. But we have only one '7z'
>>> executable in base + ports so the compat symlink doesn't help much.
>>>
>>> A RUN_DEPENDS on p7zip means 7MB of extra binaries for a rather limited
>>> use case IMO. By following the same logic we would add archivers/bzip2,
>>> archivers/xz, archivers/lzip etc to RUN_DEPENDS.
>>
>> Good point, I'll just disable 7z support. Ok?
>
> Thanks. Technically this doesn't remove 7z support, it just removes the
> wrapper.
>
> I see that you're removing patches/patch-test_failbackup_test, but it
> would be trivial to update instead, diff below.
>
> ok jca@
Hi Kent, is there any problem preventing to update to be committed?
quilt-0.66 works fine for me.
> Index: patches/patch-test_failbackup_test
> ===
> RCS file: /cvs/ports/devel/quilt/patches/patch-test_failbackup_test,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-test_failbackup_test
> --- patches/patch-test_failbackup_test17 Nov 2017 14:59:18 -
> 1.1
> +++ patches/patch-test_failbackup_test24 Apr 2019 18:44:41 -
> @@ -7,8 +7,8 @@ Index: test/failbackup.test
> $ cat > test.txt
> < This is updated test.txt.
> $ quilt refresh --backup
> -->~ mv: cannot move [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?:
> Permission denied
> -+>~ mv: rename [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?: Permission
> denied
> +->~ mv: cannot move [`']?patches/test.diff'? to
> [`']?patches/test.diff~'?: Permission denied
> ++>~ mv: rename [`']?patches/test.diff'? to [`']?patches/test.diff~'?:
> Permission denied
> $ echo %{?}
> > 1
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: devel/quilt 0.66
On Tue, Apr 23 2019, "Kent R. Spillner" wrote:
> On Mon, Apr 08, 2019 at 10:40:50AM +0200, Jeremie Courreges-Anglas wrote:
>> On Wed, Apr 03 2019, "Kent R. Spillner" wrote:
>> > On Tue, Apr 02, 2019 at 09:46:31PM -0400, Brian Callahan wrote:
>> >> Couple things:
>> >> 1. Patch applied with fuzz so re-run `make update-patches'
>> >> 2. When I ran `make update-plist' the PLIST got updated.
>> >> It added a 7z wrapper. So looks like either
>> >> archivers/p7zip has to be added to the deps or
>> >> --without-7z in the configure args.
>>
>> I don't think we should add a RUN_DEPENDS on p7zip.
>>
>> We *could* add a BUILD_DEPENDS to avoid the warning message and have the
>> compat symlink shipped by the package. But we have only one '7z'
>> executable in base + ports so the compat symlink doesn't help much.
>>
>> A RUN_DEPENDS on p7zip means 7MB of extra binaries for a rather limited
>> use case IMO. By following the same logic we would add archivers/bzip2,
>> archivers/xz, archivers/lzip etc to RUN_DEPENDS.
>
> Good point, I'll just disable 7z support. Ok?
Thanks. Technically this doesn't remove 7z support, it just removes the
wrapper.
I see that you're removing patches/patch-test_failbackup_test, but it
would be trivial to update instead, diff below.
ok jca@
Index: patches/patch-test_failbackup_test
===
RCS file: /cvs/ports/devel/quilt/patches/patch-test_failbackup_test,v
retrieving revision 1.1
diff -u -p -r1.1 patch-test_failbackup_test
--- patches/patch-test_failbackup_test 17 Nov 2017 14:59:18 - 1.1
+++ patches/patch-test_failbackup_test 24 Apr 2019 18:44:41 -
@@ -7,8 +7,8 @@ Index: test/failbackup.test
$ cat > test.txt
< This is updated test.txt.
$ quilt refresh --backup
-- >~ mv: cannot move [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?:
Permission denied
-+ >~ mv: rename [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?: Permission
denied
+- >~ mv: cannot move [`']?patches/test.diff'? to
[`']?patches/test.diff~'?: Permission denied
++ >~ mv: rename [`']?patches/test.diff'? to [`']?patches/test.diff~'?:
Permission denied
$ echo %{?}
> 1
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: devel/quilt 0.66
On Mon, Apr 08, 2019 at 10:40:50AM +0200, Jeremie Courreges-Anglas wrote:
> On Wed, Apr 03 2019, "Kent R. Spillner" wrote:
> > On Tue, Apr 02, 2019 at 09:46:31PM -0400, Brian Callahan wrote:
> >> Couple things:
> >> 1. Patch applied with fuzz so re-run `make update-patches'
> >> 2. When I ran `make update-plist' the PLIST got updated.
> >> It added a 7z wrapper. So looks like either
> >> archivers/p7zip has to be added to the deps or
> >> --without-7z in the configure args.
>
> I don't think we should add a RUN_DEPENDS on p7zip.
>
> We *could* add a BUILD_DEPENDS to avoid the warning message and have the
> compat symlink shipped by the package. But we have only one '7z'
> executable in base + ports so the compat symlink doesn't help much.
>
> A RUN_DEPENDS on p7zip means 7MB of extra binaries for a rather limited
> use case IMO. By following the same logic we would add archivers/bzip2,
> archivers/xz, archivers/lzip etc to RUN_DEPENDS.
Good point, I'll just disable 7z support. Ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/quilt/Makefile,v
retrieving revision 1.12
diff -u -p -p -u -r1.12 Makefile
--- Makefile17 Nov 2017 15:20:00 - 1.12
+++ Makefile23 Apr 2019 15:32:06 -
@@ -2,8 +2,7 @@
COMMENT= manage large numbers of patches
-DISTNAME= quilt-0.65
-REVISION= 0
+DISTNAME= quilt-0.66
CATEGORIES=devel
HOMEPAGE= http://savannah.nongnu.org/projects/quilt/
@@ -39,6 +38,7 @@ CONFIGURE_ARGS= --with-date=${LOCALBASE
--with-md5sum=${LOCALBASE}/bin/gmd5sum \
--with-patch=${LOCALBASE}/bin/gpatch \
--with-sed=${LOCALBASE}/bin/gsed \
+ --without-7z \
--without-patch-wrapper \
--without-rpmbuild
Index: distinfo
===
RCS file: /cvs/ports/devel/quilt/distinfo,v
retrieving revision 1.5
diff -u -p -p -u -r1.5 distinfo
--- distinfo17 Nov 2017 14:59:18 - 1.5
+++ distinfo23 Apr 2019 15:32:06 -
@@ -1,2 +1,2 @@
-SHA256 (quilt-0.65.tar.gz) = 9svHiOXLuzgaPG6rW5785nx3aoZip3lcdDL9J6oJaBk=
-SIZE (quilt-0.65.tar.gz) = 410780
+SHA256 (quilt-0.66.tar.gz) = MUsxmm/rE7+dD5/6fOZoOwaRnnNKQSdQh+pFfMncbgc=
+SIZE (quilt-0.66.tar.gz) = 413069
Index: patches/patch-test_delete_test
===
RCS file: /cvs/ports/devel/quilt/patches/patch-test_delete_test,v
retrieving revision 1.4
diff -u -p -p -u -r1.4 patch-test_delete_test
--- patches/patch-test_delete_test 10 Feb 2015 16:02:05 - 1.4
+++ patches/patch-test_delete_test 23 Apr 2019 15:32:06 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-test_delete_test,v 1.4 2015/02/10 16:02:05 kspillner Exp $
test/delete.test.orig Fri Feb 28 07:15:45 2014
-+++ test/delete.test Mon Feb 9 14:00:08 2015
+Index: test/delete.test
+--- test/delete.test.orig
test/delete.test
@@ -79,7 +79,7 @@ Test the delete command.
# running as root, but you shouldn't do that anyway.
$ quilt delete "test3"
@@ -8,5 +9,5 @@ $OpenBSD: patch-test_delete_test,v 1.4 2
- >~ .*find: [`']?\./dir'?: Permission denied
+ >~ ${LOCALBASE}/bin/gfind: [`']?\./dir'?: Permission denied
- $ chmod a+rx .pc/test3/dir
+ $ chmod a+rx %{QUILT_PC}/test3/dir
Index: patches/patch-test_failbackup_test
===
RCS file: patches/patch-test_failbackup_test
diff -N patches/patch-test_failbackup_test
--- patches/patch-test_failbackup_test 17 Nov 2017 14:59:18 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-test_failbackup_test,v 1.1 2017/11/17 14:59:18 jca Exp $
-
-Index: test/failbackup.test
test/failbackup.test.orig
-+++ test/failbackup.test
-@@ -16,7 +16,7 @@ What happens when refresh fails because of a permissio
- $ cat > test.txt
- < This is updated test.txt.
- $ quilt refresh --backup
-- >~ mv: cannot move [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?:
Permission denied
-+ >~ mv: rename [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?: Permission
denied
- $ echo %{?}
- > 1
-
Re: UPDATE: devel/quilt 0.66
On Wed, Apr 03 2019, "Kent R. Spillner" wrote:
> On Tue, Apr 02, 2019 at 09:46:31PM -0400, Brian Callahan wrote:
>> Couple things:
>> 1. Patch applied with fuzz so re-run `make update-patches'
>> 2. When I ran `make update-plist' the PLIST got updated.
>> It added a 7z wrapper. So looks like either
>> archivers/p7zip has to be added to the deps or
>> --without-7z in the configure args.
I don't think we should add a RUN_DEPENDS on p7zip.
We *could* add a BUILD_DEPENDS to avoid the warning message and have the
compat symlink shipped by the package. But we have only one '7z'
executable in base + ports so the compat symlink doesn't help much.
A RUN_DEPENDS on p7zip means 7MB of extra binaries for a rather limited
use case IMO. By following the same logic we would add archivers/bzip2,
archivers/xz, archivers/lzip etc to RUN_DEPENDS.
> Sorry about that! Updated diff below.
>
> Ok?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/quilt/Makefile,v
> retrieving revision 1.12
> diff -u -p -p -u -r1.12 Makefile
> --- Makefile 17 Nov 2017 15:20:00 - 1.12
> +++ Makefile 3 Apr 2019 15:37:57 -
> @@ -2,8 +2,7 @@
>
> COMMENT= manage large numbers of patches
>
> -DISTNAME=quilt-0.65
> -REVISION=0
> +DISTNAME=quilt-0.66
> CATEGORIES= devel
>
> HOMEPAGE=http://savannah.nongnu.org/projects/quilt/
> @@ -16,7 +15,8 @@ MASTER_SITES= ${MASTER_SITE_SAVANNAH:=q
>
> USE_GMAKE= Yes
>
> -RUN_DEPENDS= devel/gpatch \
> +RUN_DEPENDS= archivers/p7zip \
> + devel/gpatch \
> lang/gawk \
> misc/findutils \
> misc/gnugetopt \
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/quilt/distinfo,v
> retrieving revision 1.5
> diff -u -p -p -u -r1.5 distinfo
> --- distinfo 17 Nov 2017 14:59:18 - 1.5
> +++ distinfo 3 Apr 2019 15:37:57 -
> @@ -1,2 +1,2 @@
> -SHA256 (quilt-0.65.tar.gz) = 9svHiOXLuzgaPG6rW5785nx3aoZip3lcdDL9J6oJaBk=
> -SIZE (quilt-0.65.tar.gz) = 410780
> +SHA256 (quilt-0.66.tar.gz) = MUsxmm/rE7+dD5/6fOZoOwaRnnNKQSdQh+pFfMncbgc=
> +SIZE (quilt-0.66.tar.gz) = 413069
> Index: patches/patch-test_delete_test
> ===
> RCS file: /cvs/ports/devel/quilt/patches/patch-test_delete_test,v
> retrieving revision 1.4
> diff -u -p -p -u -r1.4 patch-test_delete_test
> --- patches/patch-test_delete_test10 Feb 2015 16:02:05 - 1.4
> +++ patches/patch-test_delete_test3 Apr 2019 15:37:57 -
> @@ -1,6 +1,7 @@
> $OpenBSD: patch-test_delete_test,v 1.4 2015/02/10 16:02:05 kspillner Exp $
> test/delete.test.origFri Feb 28 07:15:45 2014
> -+++ test/delete.test Mon Feb 9 14:00:08 2015
> +Index: test/delete.test
> +--- test/delete.test.orig
> test/delete.test
> @@ -79,7 +79,7 @@ Test the delete command.
> # running as root, but you shouldn't do that anyway.
> $ quilt delete "test3"
> @@ -8,5 +9,5 @@ $OpenBSD: patch-test_delete_test,v 1.4 2
> ->~ .*find: [`']?\./dir'?: Permission denied
> +>~ ${LOCALBASE}/bin/gfind: [`']?\./dir'?: Permission denied
>
> - $ chmod a+rx .pc/test3/dir
> + $ chmod a+rx %{QUILT_PC}/test3/dir
>
> Index: patches/patch-test_failbackup_test
> ===
> RCS file: patches/patch-test_failbackup_test
> diff -N patches/patch-test_failbackup_test
> --- patches/patch-test_failbackup_test17 Nov 2017 14:59:18 -
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-test_failbackup_test,v 1.1 2017/11/17 14:59:18 jca Exp $
> -
> -Index: test/failbackup.test
> test/failbackup.test.orig
> -+++ test/failbackup.test
> -@@ -16,7 +16,7 @@ What happens when refresh fails because of a permissio
> - $ cat > test.txt
> - < This is updated test.txt.
> - $ quilt refresh --backup
> -->~ mv: cannot move [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?:
> Permission denied
> -+>~ mv: rename [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?: Permission
> denied
> - $ echo %{?}
> - > 1
> -
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/quilt/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -p -u -r1.5 PLIST
> --- pkg/PLIST 17 Nov 2017 15:09:05 - 1.5
> +++ pkg/PLIST 3 Apr 2019 15:37:57 -
> @@ -26,6 +26,7 @@ share/quilt/add
> share/quilt/annotate
> share/quilt/applied
> share/quilt/compat/
> +share/quilt/compat/7z
> share/quilt/compat/awk
> share/quilt/compat/date
> share/quilt/compat/diff
>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: devel/quilt 0.66
On Tue, Apr 02, 2019 at 09:46:31PM -0400, Brian Callahan wrote:
> Couple things:
> 1. Patch applied with fuzz so re-run `make update-patches'
> 2. When I ran `make update-plist' the PLIST got updated.
> It added a 7z wrapper. So looks like either
> archivers/p7zip has to be added to the deps or
> --without-7z in the configure args.
Sorry about that! Updated diff below.
Ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/quilt/Makefile,v
retrieving revision 1.12
diff -u -p -p -u -r1.12 Makefile
--- Makefile17 Nov 2017 15:20:00 - 1.12
+++ Makefile3 Apr 2019 15:37:57 -
@@ -2,8 +2,7 @@
COMMENT= manage large numbers of patches
-DISTNAME= quilt-0.65
-REVISION= 0
+DISTNAME= quilt-0.66
CATEGORIES=devel
HOMEPAGE= http://savannah.nongnu.org/projects/quilt/
@@ -16,7 +15,8 @@ MASTER_SITES= ${MASTER_SITE_SAVANNAH:=q
USE_GMAKE= Yes
-RUN_DEPENDS= devel/gpatch \
+RUN_DEPENDS= archivers/p7zip \
+ devel/gpatch \
lang/gawk \
misc/findutils \
misc/gnugetopt \
Index: distinfo
===
RCS file: /cvs/ports/devel/quilt/distinfo,v
retrieving revision 1.5
diff -u -p -p -u -r1.5 distinfo
--- distinfo17 Nov 2017 14:59:18 - 1.5
+++ distinfo3 Apr 2019 15:37:57 -
@@ -1,2 +1,2 @@
-SHA256 (quilt-0.65.tar.gz) = 9svHiOXLuzgaPG6rW5785nx3aoZip3lcdDL9J6oJaBk=
-SIZE (quilt-0.65.tar.gz) = 410780
+SHA256 (quilt-0.66.tar.gz) = MUsxmm/rE7+dD5/6fOZoOwaRnnNKQSdQh+pFfMncbgc=
+SIZE (quilt-0.66.tar.gz) = 413069
Index: patches/patch-test_delete_test
===
RCS file: /cvs/ports/devel/quilt/patches/patch-test_delete_test,v
retrieving revision 1.4
diff -u -p -p -u -r1.4 patch-test_delete_test
--- patches/patch-test_delete_test 10 Feb 2015 16:02:05 - 1.4
+++ patches/patch-test_delete_test 3 Apr 2019 15:37:57 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-test_delete_test,v 1.4 2015/02/10 16:02:05 kspillner Exp $
test/delete.test.orig Fri Feb 28 07:15:45 2014
-+++ test/delete.test Mon Feb 9 14:00:08 2015
+Index: test/delete.test
+--- test/delete.test.orig
test/delete.test
@@ -79,7 +79,7 @@ Test the delete command.
# running as root, but you shouldn't do that anyway.
$ quilt delete "test3"
@@ -8,5 +9,5 @@ $OpenBSD: patch-test_delete_test,v 1.4 2
- >~ .*find: [`']?\./dir'?: Permission denied
+ >~ ${LOCALBASE}/bin/gfind: [`']?\./dir'?: Permission denied
- $ chmod a+rx .pc/test3/dir
+ $ chmod a+rx %{QUILT_PC}/test3/dir
Index: patches/patch-test_failbackup_test
===
RCS file: patches/patch-test_failbackup_test
diff -N patches/patch-test_failbackup_test
--- patches/patch-test_failbackup_test 17 Nov 2017 14:59:18 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-test_failbackup_test,v 1.1 2017/11/17 14:59:18 jca Exp $
-
-Index: test/failbackup.test
test/failbackup.test.orig
-+++ test/failbackup.test
-@@ -16,7 +16,7 @@ What happens when refresh fails because of a permissio
- $ cat > test.txt
- < This is updated test.txt.
- $ quilt refresh --backup
-- >~ mv: cannot move [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?:
Permission denied
-+ >~ mv: rename [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?: Permission
denied
- $ echo %{?}
- > 1
-
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/quilt/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -p -u -r1.5 PLIST
--- pkg/PLIST 17 Nov 2017 15:09:05 - 1.5
+++ pkg/PLIST 3 Apr 2019 15:37:57 -
@@ -26,6 +26,7 @@ share/quilt/add
share/quilt/annotate
share/quilt/applied
share/quilt/compat/
+share/quilt/compat/7z
share/quilt/compat/awk
share/quilt/compat/date
share/quilt/compat/diff
Re: UPDATE: devel/quilt 0.66
On 4/2/19 5:23 PM, Kent R. Spillner wrote:
Quilt 0.66 was just released last Friday, mostly bugfixes.
Ok?
Couple things:
1. Patch applied with fuzz so re-run `make update-patches'
2. When I ran `make update-plist' the PLIST got updated. It added a 7z
wrapper. So looks like either archivers/p7zip has to be added to the
deps or --without-7z in the configure args.
~Brian
Index: Makefile
===
RCS file: /cvs/ports/devel/quilt/Makefile,v
retrieving revision 1.12
diff -u -p -p -u -r1.12 Makefile
--- Makefile17 Nov 2017 15:20:00 - 1.12
+++ Makefile31 Mar 2019 16:42:24 -
@@ -2,8 +2,7 @@
COMMENT= manage large numbers of patches
-DISTNAME= quilt-0.65
-REVISION= 0
+DISTNAME= quilt-0.66
CATEGORIES= devel
HOMEPAGE= http://savannah.nongnu.org/projects/quilt/
Index: distinfo
===
RCS file: /cvs/ports/devel/quilt/distinfo,v
retrieving revision 1.5
diff -u -p -p -u -r1.5 distinfo
--- distinfo17 Nov 2017 14:59:18 - 1.5
+++ distinfo31 Mar 2019 16:42:24 -
@@ -1,2 +1,2 @@
-SHA256 (quilt-0.65.tar.gz) = 9svHiOXLuzgaPG6rW5785nx3aoZip3lcdDL9J6oJaBk=
-SIZE (quilt-0.65.tar.gz) = 410780
+SHA256 (quilt-0.66.tar.gz) = MUsxmm/rE7+dD5/6fOZoOwaRnnNKQSdQh+pFfMncbgc=
+SIZE (quilt-0.66.tar.gz) = 413069
Index: patches/patch-test_failbackup_test
===
RCS file: patches/patch-test_failbackup_test
diff -N patches/patch-test_failbackup_test
--- patches/patch-test_failbackup_test 17 Nov 2017 14:59:18 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-test_failbackup_test,v 1.1 2017/11/17 14:59:18 jca Exp $
-
-Index: test/failbackup.test
test/failbackup.test.orig
-+++ test/failbackup.test
-@@ -16,7 +16,7 @@ What happens when refresh fails because of a permissio
- $ cat > test.txt
- < This is updated test.txt.
- $ quilt refresh --backup
-- >~ mv: cannot move [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?:
Permission denied
-+ >~ mv: rename [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?: Permission
denied
- $ echo %{?}
- > 1
-
Re: UPDATE: devel/quilt
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
Kent R. Spillner kspill...@acm.org writes:
On Tue, Dec 24, 2013 at 08:11:13AM -0600, Kent R. Spillner wrote:
Here is an updated patch with the portability improvments suggested by jca@.
Actually, after cluebat from Quilt maintainers this diff should be ignored
and my original diff preferred.
When you configure quilt with --with-foo=/path/to/gnu/gfoo Quilt actually
creates a compat/ directory and copies gfoo to compat/foo. Then the quilt
wrapper (bin/quilt.in) adds compat/ to the front of PATH.
So long story short, those uses of sed 's/.../i' are actually portable
because sed is really gsed at run-time. Slightly misleading, but portable.
:)
I did not notice the compat/ symlinks, sorry if you wasted time on this.
OTOH we have a better understanding of how this port works now. O:)
I reviewed all the scripts and did not find any offender but those:
- md5sum in quilt/scripts/inspect
- cp --parents --blabla in quilt/scripts/backup-files
The latter is handled by the script if there's an error, using
a file-by-file copy. Since we depend on coreutils anyway, why not use
gcp?
Another issue is that ${SYSCONFDIR} in Makefile.in wasn't expanded
(using MAKE_FLAGS). Let's use @sysconfdir@ instead so that quilt
properly finds /etc/quilt.quiltrc.
ok?
I intend to commit this tomorrow.
Index: Makefile
===
RCS file: /cvs/ports/devel/quilt/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 31 Aug 2013 17:22:16 - 1.4
+++ Makefile 30 Dec 2013 17:23:19 -
@@ -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
@@ -33,12 +33,15 @@ RUN_DEPENDS= devel/gpatch \
BUILD_DEPENDS= ${RUN_DEPENDS}
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS= --with-date=${LOCALBASE}/bin/gdate \
+CONFIGURE_STYLE= autoconf no-autoheader
+AUTOCONF_VERSION=2.69
+CONFIGURE_ARGS= --with-cp=${LOCALBASE}/bin/gcp \
+ --with-date=${LOCALBASE}/bin/gdate \
--with-diff=${LOCALBASE}/bin/gdiff \
--with-find=${LOCALBASE}/bin/gfind \
--with-getopt=${LOCALBASE}/bin/gnugetopt \
--with-grep=${LOCALBASE}/bin/ggrep \
+ --with-md5sum=${LOCALBASE}/bin/gmd5sum \
--with-patch=${LOCALBASE}/bin/gpatch \
--with-sed=${LOCALBASE}/bin/gsed \
--without-patch-wrapper \
Index: distinfo
===
RCS file: /cvs/ports/devel/quilt/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 8 Oct 2012 15:14:25 - 1.1.1.1
+++ distinfo 27 Dec 2013 16:18:36 -
@@ -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-Makefile_in
===
RCS file: /cvs/ports/devel/quilt/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in 8 Oct 2012 15:14:25 - 1.1.1.1
+++ patches/patch-Makefile_in 30 Dec 2013 17:41:26 -
@@ -1,12 +1,21 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/10/08 15:14:25 rpe Exp $
Makefile.in.orig Sun Sep 2 19:19:00 2012
-+++ Makefile.in Sun Sep 2 19:19:16 2012
+--- Makefile.in.orig Sun Dec 8 10:40:42 2013
Makefile.in Mon Dec 30 18:40:55 2013
@@ -13,7 +13,7 @@ docdir := @docdir@
mandir := @mandir@
localedir :=$(datadir)/locale
emacsdir := $(datadir)/emacs/site-lisp
-etcdir := $(subst /usr/etc,/etc,$(prefix)/etc)
-+etcdir := ${SYSCONFDIR}
++etcdir := @sysconfdir@
INSTALL := @INSTALL@
POD2MAN := @POD2MAN@
+@@ -42,6 +42,8 @@ MSGCAT := @MSGCAT@
+ DIFFSTAT := @DIFFSTAT@
+ RPMBUILD := @RPMBUILD@
+ SENDMAIL := @SENDMAIL@
++CP := @CP@
++MD5SUM := @MD5SUM@
+
+ USE_NLS := @USE_NLS@
+ STAT_HARDLINK := @STAT_HARDLINK@
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac30 Dec 2013 17:33:48 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- configure.ac.origSun Dec 8
Re: UPDATE: devel/quilt
Kent R. Spillner kspill...@acm.org writes:
On Tue, Dec 24, 2013 at 08:11:13AM -0600, Kent R. Spillner wrote:
Here is an updated patch with the portability improvments suggested by jca@.
Actually, after cluebat from Quilt maintainers this diff should be ignored
and my original diff preferred.
When you configure quilt with --with-foo=/path/to/gnu/gfoo Quilt actually
creates a compat/ directory and copies gfoo to compat/foo. Then the quilt
wrapper (bin/quilt.in) adds compat/ to the front of PATH.
So long story short, those uses of sed 's/.../i' are actually portable
because sed is really gsed at run-time. Slightly misleading, but portable.
:)
I did not notice the compat/ symlinks, sorry if you wasted time on this.
OTOH we have a better understanding of how this port works now. O:)
I reviewed all the scripts and did not find any offender but those:
- md5sum in quilt/scripts/inspect
- cp --parents --blabla in quilt/scripts/backup-files
The latter is handled by the script if there's an error, using
a file-by-file copy. Since we depend on coreutils anyway, why not use
gcp?
Another issue is that ${SYSCONFDIR} in Makefile.in wasn't expanded
(using MAKE_FLAGS). Let's use @sysconfdir@ instead so that quilt
properly finds /etc/quilt.quiltrc.
ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/quilt/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile31 Aug 2013 17:22:16 - 1.4
+++ Makefile30 Dec 2013 17:23:19 -
@@ -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
@@ -33,12 +33,15 @@ RUN_DEPENDS=devel/gpatch \
BUILD_DEPENDS= ${RUN_DEPENDS}
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=--with-date=${LOCALBASE}/bin/gdate \
+CONFIGURE_STYLE= autoconf no-autoheader
+AUTOCONF_VERSION= 2.69
+CONFIGURE_ARGS=--with-cp=${LOCALBASE}/bin/gcp \
+ --with-date=${LOCALBASE}/bin/gdate \
--with-diff=${LOCALBASE}/bin/gdiff \
--with-find=${LOCALBASE}/bin/gfind \
--with-getopt=${LOCALBASE}/bin/gnugetopt \
--with-grep=${LOCALBASE}/bin/ggrep \
+ --with-md5sum=${LOCALBASE}/bin/gmd5sum \
--with-patch=${LOCALBASE}/bin/gpatch \
--with-sed=${LOCALBASE}/bin/gsed \
--without-patch-wrapper \
Index: distinfo
===
RCS file: /cvs/ports/devel/quilt/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo8 Oct 2012 15:14:25 - 1.1.1.1
+++ distinfo27 Dec 2013 16:18:36 -
@@ -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-Makefile_in
===
RCS file: /cvs/ports/devel/quilt/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in 8 Oct 2012 15:14:25 - 1.1.1.1
+++ patches/patch-Makefile_in 30 Dec 2013 17:41:26 -
@@ -1,12 +1,21 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/10/08 15:14:25 rpe Exp $
Makefile.in.orig Sun Sep 2 19:19:00 2012
-+++ Makefile.inSun Sep 2 19:19:16 2012
+--- Makefile.in.orig Sun Dec 8 10:40:42 2013
Makefile.inMon Dec 30 18:40:55 2013
@@ -13,7 +13,7 @@ docdir :=@docdir@
mandir := @mandir@
localedir := $(datadir)/locale
emacsdir := $(datadir)/emacs/site-lisp
-etcdir := $(subst /usr/etc,/etc,$(prefix)/etc)
-+etcdir := ${SYSCONFDIR}
++etcdir := @sysconfdir@
INSTALL :=@INSTALL@
POD2MAN :=@POD2MAN@
+@@ -42,6 +42,8 @@ MSGCAT :=@MSGCAT@
+ DIFFSTAT := @DIFFSTAT@
+ RPMBUILD := @RPMBUILD@
+ SENDMAIL := @SENDMAIL@
++CP := @CP@
++MD5SUM := @MD5SUM@
+
+ USE_NLS :=@USE_NLS@
+ STAT_HARDLINK := @STAT_HARDLINK@
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac 30 Dec 2013 17:33:48 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- configure.ac.orig Sun Dec 8 21:51:39 2013
configure.ac Mon Dec 30 18:28:26 2013
+@@ -367,6 +367,9 @@ fi
+
+ QUILT_COMPAT_PROG_PATH(SENDMAIL, sendmail,
Re: UPDATE: devel/quilt
Thanks! I'm away from home and unable to test for a few days, but this reads
ok to me. I'll work with upstream to incorporate your patches later this week.
On Dec 30, 2013, at 11:49, j...@wxcvbn.org (Jérémie Courrèges-Anglas) wrote:
Kent R. Spillner kspill...@acm.org writes:
On Tue, Dec 24, 2013 at 08:11:13AM -0600, Kent R. Spillner wrote:
Here is an updated patch with the portability improvments suggested by jca@.
Actually, after cluebat from Quilt maintainers this diff should be ignored
and my original diff preferred.
When you configure quilt with --with-foo=/path/to/gnu/gfoo Quilt actually
creates a compat/ directory and copies gfoo to compat/foo. Then the quilt
wrapper (bin/quilt.in) adds compat/ to the front of PATH.
So long story short, those uses of sed 's/.../i' are actually portable
because sed is really gsed at run-time. Slightly misleading, but portable.
:)
I did not notice the compat/ symlinks, sorry if you wasted time on this.
OTOH we have a better understanding of how this port works now. O:)
I reviewed all the scripts and did not find any offender but those:
- md5sum in quilt/scripts/inspect
- cp --parents --blabla in quilt/scripts/backup-files
The latter is handled by the script if there's an error, using
a file-by-file copy. Since we depend on coreutils anyway, why not use
gcp?
Another issue is that ${SYSCONFDIR} in Makefile.in wasn't expanded
(using MAKE_FLAGS). Let's use @sysconfdir@ instead so that quilt
properly finds /etc/quilt.quiltrc.
ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/quilt/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile31 Aug 2013 17:22:16 -1.4
+++ Makefile30 Dec 2013 17:23:19 -
@@ -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
@@ -33,12 +33,15 @@ RUN_DEPENDS=devel/gpatch \
BUILD_DEPENDS=${RUN_DEPENDS}
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=--with-date=${LOCALBASE}/bin/gdate \
+CONFIGURE_STYLE=autoconf no-autoheader
+AUTOCONF_VERSION=2.69
+CONFIGURE_ARGS=--with-cp=${LOCALBASE}/bin/gcp \
+--with-date=${LOCALBASE}/bin/gdate \
--with-diff=${LOCALBASE}/bin/gdiff \
--with-find=${LOCALBASE}/bin/gfind \
--with-getopt=${LOCALBASE}/bin/gnugetopt \
--with-grep=${LOCALBASE}/bin/ggrep \
+--with-md5sum=${LOCALBASE}/bin/gmd5sum \
--with-patch=${LOCALBASE}/bin/gpatch \
--with-sed=${LOCALBASE}/bin/gsed \
--without-patch-wrapper \
Index: distinfo
===
RCS file: /cvs/ports/devel/quilt/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo8 Oct 2012 15:14:25 -1.1.1.1
+++ distinfo27 Dec 2013 16:18:36 -
@@ -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-Makefile_in
===
RCS file: /cvs/ports/devel/quilt/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in8 Oct 2012 15:14:25 -1.1.1.1
+++ patches/patch-Makefile_in30 Dec 2013 17:41:26 -
@@ -1,12 +1,21 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/10/08 15:14:25 rpe Exp $
Makefile.in.origSun Sep 2 19:19:00 2012
-+++ Makefile.inSun Sep 2 19:19:16 2012
+--- Makefile.in.origSun Dec 8 10:40:42 2013
Makefile.inMon Dec 30 18:40:55 2013
@@ -13,7 +13,7 @@ docdir :=@docdir@
mandir :=@mandir@
localedir :=$(datadir)/locale
emacsdir :=$(datadir)/emacs/site-lisp
-etcdir :=$(subst /usr/etc,/etc,$(prefix)/etc)
-+etcdir :=${SYSCONFDIR}
++etcdir :=@sysconfdir@
INSTALL :=@INSTALL@
POD2MAN :=@POD2MAN@
+@@ -42,6 +42,8 @@ MSGCAT :=@MSGCAT@
+ DIFFSTAT :=@DIFFSTAT@
+ RPMBUILD :=@RPMBUILD@
+ SENDMAIL :=@SENDMAIL@
++CP :=@CP@
++MD5SUM :=@MD5SUM@
+
+ USE_NLS :=@USE_NLS@
+ STAT_HARDLINK := @STAT_HARDLINK@
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac30 Dec 2013 17:33:48 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- configure.ac.origSun
Re: UPDATE: devel/quilt
On Tue, Dec 24, 2013 at 08:11:13AM -0600, Kent R. Spillner wrote: Here is an updated patch with the portability improvments suggested by jca@. Actually, after cluebat from Quilt maintainers this diff should be ignored and my original diff preferred. When you configure quilt with --with-foo=/path/to/gnu/gfoo Quilt actually creates a compat/ directory and copies gfoo to compat/foo. Then the quilt wrapper (bin/quilt.in) adds compat/ to the front of PATH. So long story short, those uses of sed 's/.../i' are actually portable because sed is really gsed at run-time. Slightly misleading, but portable. :)
Re: UPDATE: devel/quilt
On Mon, Dec 23, 2013 at 01:27:53PM -0600, Kent R. Spillner wrote:
On Mon, Dec 23, 2013 at 06:57:25PM +0100, Jérémie Courrèges-Anglas wrote:
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.
Thanks for pointing that out. I'll looking into fixing those portability
issues.
Here is an updated patch with the portability improvments suggested by jca@.
I'm only patching quilt/mail.in at the moment because that was the only place
where I saw non-portable flags to the substitution command (but since I was
there I decided to patch all invocations anyways). I'll send a larger diff
upstream that actually fixes every invocation.
Still only tested on amd64.
Index: Makefile
===
RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- Makefile31 Aug 2013 17:22:16 - 1.4
+++ Makefile14 Dec 2013 04:11:46 -
@@ -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
--- distinfo8 Oct 2012 15:14:25 - 1.1.1.1
+++ distinfo14 Dec 2013 03:34:38 -
@@ -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-Makefile_in
===
RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in 8 Oct 2012 15:14:25 - 1.1.1.1
+++ patches/patch-Makefile_in 24 Dec 2013 12:45:07 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/10/08 15:14:25 rpe Exp $
Makefile.in.orig Sun Sep 2 19:19:00 2012
-+++ Makefile.inSun Sep 2 19:19:16 2012
+$OpenBSD$
+--- Makefile.in.orig Tue Dec 24 06:44:51 2013
Makefile.inTue Dec 24 06:43:04 2013
@@ -13,7 +13,7 @@ docdir :=@docdir@
mandir := @mandir@
localedir := $(datadir)/locale
@@ -10,3 +10,11 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
INSTALL :=@INSTALL@
POD2MAN :=@POD2MAN@
+@@ -256,6 +256,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in quilt/*.in quilt
+ @$(SED) -e 's:@QUILT_DIR''@:$(datadir)/$(PACKAGE):g'\
+ -e 's:@PERL''@:$(PERL):g' \
+ -e 's:@BASH''@:$(BASH):g' \
++ -e 's:@SED''@:$(SED):g' \
+ -e 's:@PATCH''@:$(PATCH):g' \
+ -e 's:@STAT_HARDLINK''@:$(STAT_HARDLINK):g' \
+ -e 's:@VERSION''@:$(VERSION):g' \
Index: patches/patch-quilt_mail_in
===
RCS file: patches/patch-quilt_mail_in
diff -N patches/patch-quilt_mail_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-quilt_mail_in 24 Dec 2013 14:00:44 -
@@ -0,0 +1,111 @@
+$OpenBSD$
+--- quilt/mail.in.orig Sun Dec 8 14:39:50 2013
quilt/mail.in Tue Dec 24 08:00:32 2013
+@@ -6,6 +6,8 @@
+ #
+ # See the COPYING and AUTHORS files for more details.
+
++SED=@SED@
++
+ : ${EDITOR:=vi}
+
+ # Read in library functions
+@@ -146,7 +148,7 @@ process_mail()
+ else
+ local from_date=$(LC_ALL=POSIX date +%a %b %e %H:%M:%S %Y)
+ echo From $opt_sender_address $from_date
+- sed -e 's/^From /From /' $tmpfile
++ $SED -e 's/^From /From /' $tmpfile
+ echo
+ fi
+ rm -f $tmpfile
+@@ -305,7 +307,7 @@ Could not determine the envelope sender address. Pleas
+ ;;
+ esac
+ fi
+-opt_sender_address=$(echo $opt_sender | sed -re 's:.*([^]+).*:\1:')
++opt_sender_address=$(echo $opt_sender | $SED -re 's:.*([^]+).*:\1:')
+
+ if [ -z $opt_charset ]
+ then
+@@ -360,7 +362,7 @@ then
+ # Is the first paragraph short enough to be used as the subject?
+ if [ -z $subject ]
+ then
+- local para=$(sed -e $'/^[ \t]*$/q' $tmpdir/header)
++ local
Re: UPDATE: devel/quilt
Blargh, mush-mouth! Sorry, been up since 3:00am because our furnace died... Anyhoo, what I wanted to say is: Here is an updated patch with the portability improvments suggested by jca@. ... updated *diff* ... I'm only patching quilt/mail.in at the moment because that was the only place where I saw non-portable flags to the substitution command (but since I was there I decided to patch all invocations anyways). Translation: I'm substituting every use of sed in quilt/main.in even though only one or two actually used the non-portable flags. I'll send a larger diff upstream that actually fixes every invocation. Said diff will substitute every use of sed in every script.
Re: UPDATE: devel/quilt
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 - 1.4
+++ Makefile 14 Dec 2013 04:11:46 -
@@ -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 - 1.1.1.1
+++ distinfo 14 Dec 2013 03:34:38 -
@@ -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 - 1.1.1.1
+++ patches/patch-test_delete_test 13 Dec 2013 23:56:08 -
@@ -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.testSun Sep 2 21:40:26 2012
+--- test/delete.test.orig Sun Dec 8 03:40:42 2013
test/delete.testFri 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/null1 Jan 1970 00:00:00 -
+++ patches/patch-test_remove-trailing-ws_test 14 Dec 2013 03:15:03
-
@@ -0,0 +1,63 @@
+$OpenBSD$
+--- test/remove-trailing-ws.test.orig Fri Dec 13 17:38:41 2013
test/remove-trailing-ws.testFri 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
Re: UPDATE: devel/quilt
On Mon, Dec 23, 2013 at 06:57:25PM +0100, Jérémie Courrèges-Anglas wrote: 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. Thanks for pointing that out. I'll looking into fixing those portability issues.
Re: UPDATE: devel/quilt
Ping.
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 - 1.4
+++ Makefile 14 Dec 2013 04:11:46 -
@@ -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 - 1.1.1.1
+++ distinfo 14 Dec 2013 03:34:38 -
@@ -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_test8 Oct 2012 15:14:25 - 1.1.1.1
+++ patches/patch-test_delete_test13 Dec 2013 23:56:08 -
@@ -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.origSun Sep 2 21:40:18 2012
-+++ test/delete.test Sun Sep 2 21:40:26 2012
+--- test/delete.test.origSun 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 -
+++ patches/patch-test_remove-trailing-ws_test14 Dec 2013 03:15:03
-
@@ -0,0 +1,63 @@
+$OpenBSD$
+--- test/remove-trailing-ws.test.origFri 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 |
