From 4bcdeaf2ec2796ea3bb5e53304e42aaec4f6ee90 Mon Sep 17 00:00:00 2001 From: jca Date: Thu, 9 Jan 2014 14:55:42 +0000 Subject: [PATCH] Update to quilt-0.61, from maintainer Kent R. Spillner, plus a few fixes by me. --- devel/quilt/Makefile | 13 ++-- devel/quilt/distinfo | 4 +- devel/quilt/patches/patch-Makefile_in | 17 +++-- devel/quilt/patches/patch-configure_ac | 13 ++++ devel/quilt/patches/patch-test_delete_test | 16 ++--- .../patch-test_remove-trailing-ws_test | 63 +++++++++++++++++++ devel/quilt/pkg/PLIST | 4 +- 7 files changed, 110 insertions(+), 20 deletions(-) create mode 100644 devel/quilt/patches/patch-configure_ac create mode 100644 devel/quilt/patches/patch-test_remove-trailing-ws_test diff --git a/devel/quilt/Makefile b/devel/quilt/Makefile index a9fd4edb1ff..3daea7933de 100644 --- a/devel/quilt/Makefile +++ b/devel/quilt/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.4 2013/08/31 17:22:16 kirby Exp $ +# $OpenBSD: Makefile,v 1.5 2014/01/09 14:55:42 jca Exp $ 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 # 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 \ diff --git a/devel/quilt/distinfo b/devel/quilt/distinfo index d79e51b57ba..643325ecec7 100644 --- a/devel/quilt/distinfo +++ b/devel/quilt/distinfo @@ -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 diff --git a/devel/quilt/patches/patch-Makefile_in b/devel/quilt/patches/patch-Makefile_in index 9562f9668e0..2d15fd3be3f 100644 --- a/devel/quilt/patches/patch-Makefile_in +++ b/devel/quilt/patches/patch-Makefile_in @@ -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 +$OpenBSD: patch-Makefile_in,v 1.2 2014/01/09 14:55:42 jca Exp $ +--- 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@ diff --git a/devel/quilt/patches/patch-configure_ac b/devel/quilt/patches/patch-configure_ac new file mode 100644 index 00000000000..cd99a4bf12b --- /dev/null +++ b/devel/quilt/patches/patch-configure_ac @@ -0,0 +1,13 @@ +$OpenBSD: patch-configure_ac,v 1.1 2014/01/09 14:55:42 jca Exp $ +--- 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, [], [/usr/sbin]) + ++QUILT_COMPAT_PROG_PATH(CP, cp, gcp cp) ++QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, gmd5sum md5sum) ++ + AC_PATH_PROG(MSGMERGE, [msgmerge]) + AC_PATH_PROG(MSGFMT, [msgfmt]) + AC_PATH_PROG(XGETTEXT, [xgettext]) diff --git a/devel/quilt/patches/patch-test_delete_test b/devel/quilt/patches/patch-test_delete_test index 6e5e712220b..c3a94ce6687 100644 --- a/devel/quilt/patches/patch-test_delete_test +++ b/devel/quilt/patches/patch-test_delete_test @@ -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 +$OpenBSD: patch-test_delete_test,v 1.2 2014/01/09 14:55:42 jca Exp $ +--- test/delete.test.orig Sun Dec 8 10:40:42 2013 ++++ test/delete.test Mon Dec 30 18:34:19 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 diff --git a/devel/quilt/patches/patch-test_remove-trailing-ws_test b/devel/quilt/patches/patch-test_remove-trailing-ws_test new file mode 100644 index 00000000000..fd85e066f74 --- /dev/null +++ b/devel/quilt/patches/patch-test_remove-trailing-ws_test @@ -0,0 +1,63 @@ +$OpenBSD: patch-test_remove-trailing-ws_test,v 1.1 2014/01/09 14:55:42 jca Exp $ +--- 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 diff --git a/devel/quilt/pkg/PLIST b/devel/quilt/pkg/PLIST index 73fde5491cb..18c952004f0 100644 --- a/devel/quilt/pkg/PLIST +++ b/devel/quilt/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2012/10/08 15:14:25 rpe Exp $ +@comment $OpenBSD: PLIST,v 1.2 2014/01/09 14:55:42 jca Exp $ bin/guards bin/quilt @man man/man1/guards.1 @@ -25,11 +25,13 @@ share/quilt/annotate share/quilt/applied share/quilt/compat/ share/quilt/compat/awk +share/quilt/compat/cp share/quilt/compat/date share/quilt/compat/diff share/quilt/compat/find share/quilt/compat/getopt share/quilt/compat/grep +share/quilt/compat/md5sum share/quilt/compat/patch share/quilt/compat/sed share/quilt/compat/sendmail