On Mon, Apr 08, 2019 at 10:40:50AM +0200, Jeremie Courreges-Anglas wrote: > On Wed, Apr 03 2019, "Kent R. Spillner" <kspill...@acm.org> 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 --- Makefile 17 Nov 2017 15:20:00 -0000 1.12 +++ Makefile 23 Apr 2019 15:32:06 -0000 @@ -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 --- distinfo 17 Nov 2017 14:59:18 -0000 1.5 +++ distinfo 23 Apr 2019 15:32:06 -0000 @@ -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 -0000 1.4 +++ patches/patch-test_delete_test 23 Apr 2019 15:32:06 -0000 @@ -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 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 -
