quilt v0.64 was released this morning (mostly bug fixes and performance optimizations). A few of our patches were accepted upstream and can go away, and we no longer need to build the gcp wrapper script.
Ok? Index: Makefile =================================================================== RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v retrieving revision 1.8 diff -p -u -r1.8 Makefile --- Makefile 6 Feb 2015 20:14:48 -0000 1.8 +++ Makefile 9 Feb 2015 20:40:58 -0000 @@ -2,8 +2,7 @@ COMMENT= manage large numbers of patches -DISTNAME= quilt-0.63 -REVISION= 1 +DISTNAME= quilt-0.64 CATEGORIES= devel HOMEPAGE= http://savannah.nongnu.org/projects/quilt/ @@ -35,8 +34,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS} CONFIGURE_STYLE= autoconf no-autoheader AUTOCONF_VERSION= 2.69 -CONFIGURE_ARGS= --with-cp=${LOCALBASE}/bin/gcp \ - --with-date=${LOCALBASE}/bin/gdate \ +CONFIGURE_ARGS= --with-date=${LOCALBASE}/bin/gdate \ --with-diff=${LOCALBASE}/bin/gdiff \ --with-find=${LOCALBASE}/bin/gfind \ --with-getopt=${LOCALBASE}/bin/gnugetopt \ Index: distinfo =================================================================== RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v retrieving revision 1.3 diff -p -u -r1.3 distinfo --- distinfo 20 Jul 2014 20:40:25 -0000 1.3 +++ distinfo 9 Feb 2015 19:44:09 -0000 @@ -1,2 +1,2 @@ -SHA256 (quilt-0.63.tar.gz) = KEZ4giGqiETFTxAjnHy8XogDGFkWK8woVElEbDz//lI= -SIZE (quilt-0.63.tar.gz) = 389593 +SHA256 (quilt-0.64.tar.gz) = xL/TKCIUoojo0+khrk1S5z4kxP6tcrVEZ1Kt7pmnr/0= +SIZE (quilt-0.64.tar.gz) = 407845 Index: patches/patch-Makefile_in =================================================================== RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-Makefile_in,v retrieving revision 1.3 diff -p -u -r1.3 patch-Makefile_in --- patches/patch-Makefile_in 20 Jul 2014 20:40:25 -0000 1.3 +++ patches/patch-Makefile_in 9 Feb 2015 20:50:27 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-Makefile_in,v 1.3 2014/07/20 20:40:25 landry Exp $ ---- Makefile.in.orig Wed May 7 13:41:15 2014 -+++ Makefile.in Tue Jun 3 13:11:41 2014 +--- Makefile.in.orig Thu Jan 29 06:31:11 2015 ++++ Makefile.in Mon Feb 9 14:47:19 2015 @@ -13,7 +13,7 @@ docdir := @docdir@ mandir := @mandir@ localedir := $(datadir)/locale @@ -10,26 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2014/0 INSTALL := @INSTALL@ POD2MAN := @POD2MAN@ -@@ -42,7 +42,6 @@ MSGCAT := @MSGCAT@ - DIFFSTAT := @DIFFSTAT@ - RPMBUILD := @RPMBUILD@ - SENDMAIL := @SENDMAIL@ --CP := @CP@ - MD5SUM := @MD5SUM@ - - USE_NLS := @USE_NLS@ -@@ -122,8 +121,10 @@ GIT_DESC := $(shell ./git-desc | sed -e 's:^v::') - - TESTS := $(filter-out test/patch-wrapper.test,$(wildcard test/*.test)) - ifneq ($(PATCH_WRAPPER),) -+ifneq ($(PATCH_WRAPPER), no) - TESTS += test/patch-wrapper.test - endif -+endif - DIRT += test/.depend $(wildcard test/.*.ok) - - # Settings for running the uninstalled version of quilt in the source tree: -@@ -316,9 +317,11 @@ install-main :: scripts +@@ -315,9 +315,11 @@ install-main :: scripts $(INSTALL) -m 644 quilt/scripts/patchfns quilt/scripts/utilfns \ $(BUILD_ROOT)$(datadir)/$(PACKAGE)/scripts ifneq ($(PATCH_WRAPPER),) Index: patches/patch-configure_ac =================================================================== RCS file: patches/patch-configure_ac diff -N patches/patch-configure_ac --- patches/patch-configure_ac 20 Jul 2014 20:40:25 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-configure_ac,v 1.2 2014/07/20 20:40:25 landry Exp $ ---- configure.ac.orig Tue Jun 3 13:01:15 2014 -+++ configure.ac Tue Jun 3 13:01:33 2014 -@@ -367,7 +367,6 @@ fi - - QUILT_COMPAT_PROG_PATH(SENDMAIL, sendmail, [], [/usr/sbin]) - --QUILT_COMPAT_PROG_PATH(CP, cp, [cp]) - QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, [gmd5sum md5sum]) - - AC_PATH_PROG(MSGMERGE, [msgmerge]) Index: patches/patch-quilt_mail_in =================================================================== RCS file: patches/patch-quilt_mail_in diff -N patches/patch-quilt_mail_in --- patches/patch-quilt_mail_in 6 Feb 2015 20:14:50 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,111 +0,0 @@ -$OpenBSD: patch-quilt_mail_in,v 1.1 2015/02/06 20:14:50 kspillner Exp $ - -Remove formail/procmail dependency - ---- quilt/mail.in.orig Wed May 7 13:41:15 2014 -+++ quilt/mail.in Wed Jan 7 23:08:06 2015 -@@ -81,6 +81,18 @@ msgid() - echo "$timestamp@${opt_sender_address#*@}" - } - -+# Extract RFC 2822 compliant header values, including Long Header Fields, -+# from messages -+ -+extract_header_value() -+{ -+ local header=$1 -+ -+ # Long Header Fields may span multiple lines, in which case CRLF -+ # is followed by space or tab (RFC 2822) -+ sed -n "/^${header}/,/^[^[:blank:]]/ { /^${header}/ { p; n; }; /^[^[:blank:]]/q; /^$/q; p; }" | sed "s/^${header}//" -+} -+ - # See RFC 2822 Internet Message Format for how the In-Reply-To and - # References headers are generated... - -@@ -88,7 +100,7 @@ in_reply_to_header() - { - local message=$1 message_id - -- message_id=$(formail -x Message-ID: < "$message") -+ message_id=$(extract_header_value Message-ID: < "$message") - message_id=${message_id# } - [ -n "$message_id" ] && echo "In-Reply-To: $message_id" - } -@@ -97,14 +109,14 @@ references_header() - { - local message=$1 message_id references in_reply_to - -- message_id=$(formail -x Message-ID: < "$message") -+ message_id=$(extract_header_value Message-ID: < "$message") - message_id=${message_id# } - -- references=$(formail -x References: < "$message") -+ references=$(extract_header_value References: < "$message") - references=${references# } - if [ -z "$references" ] - then -- in_reply_to=$(formail -x In-Reply-To: < "$message") -+ in_reply_to=$(extract_header_value In-Reply-To: < "$message") - in_reply_to=${in_reply_to# } - if [ -n "$in_reply_to" ] - then -@@ -256,13 +268,6 @@ then - usage - fi - --# check if formail is installed before doing anything --if ! type formail &> /dev/null --then -- echo $"You have to install 'formail' to use 'quilt mail'" >&2 -- exit 1 --fi -- - if [ $# -ge 1 ] - then - if [ "$1" = - ] -@@ -333,7 +338,7 @@ then - local -a mh - - # Does this patch have a Subject: line? -- subject=$(formail -x Subject: < $tmpdir/header) -+ subject=$(extract_header_value Subject: < $tmpdir/header) - if [ -n "$subject" ] - then - awk ' -@@ -443,7 +448,7 @@ do - | quilt_mail_patch_filter "$patch" > "$tmpdir/$patch" - status=${PIPESTATUS[1]} - -- subject=$(formail -x Replace-Subject: < "$tmpdir/$patch" | join_lines) -+ subject=$(extract_header_value Replace-Subject: < "$tmpdir/$patch" | join_lines) - if [ $status -ne 0 -o -z "$subject" ] - then - printf \ -@@ -486,7 +491,7 @@ then - - if [ -z "$opt_subject" ] - then -- opt_subject="Re: $(formail -x Subject: < "$opt_reply_to" \ -+ opt_subject="Re: $(extract_header_value Subject: < "$opt_reply_to" \ - | sed -e 's/^ *\([rR][eE]: *\)*//')" - fi - fi -@@ -535,7 +540,7 @@ then - fi - fi - --subject=$(formail -x Subject: < $introduction | join_lines) -+subject=$(extract_header_value Subject: < $introduction | join_lines) - if [ -z "$subject" ] - then - if [ -z "$opt_message" ] -@@ -554,7 +559,7 @@ then - exec 1> $opt_mbox - fi - --subject_prefix=$(formail -x Subject-Prefix: < $introduction | join_lines) -+subject_prefix=$(extract_header_value Subject-Prefix: < $introduction | join_lines) - [ -n "$subject_prefix" ] && subject_prefix="$subject_prefix " - - subject_prefix=${subject_prefix//\'/\'\'} Index: patches/patch-test_delete_test =================================================================== RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-test_delete_test,v retrieving revision 1.3 diff -p -u -r1.3 patch-test_delete_test --- patches/patch-test_delete_test 20 Jul 2014 20:40:25 -0000 1.3 +++ patches/patch-test_delete_test 9 Feb 2015 20:00:40 -0000 @@ -1,12 +1,7 @@ $OpenBSD: patch-test_delete_test,v 1.3 2014/07/20 20:40:25 landry Exp $ ---- test/delete.test.orig Wed May 7 13:41:15 2014 -+++ test/delete.test Tue Jun 3 13:02:44 2014 -@@ -1,3 +1,4 @@ -+# >~ .*find: [`']?\./dir'?: Permission denied - Test the delete command. - - $ mkdir patches -@@ -79,7 +80,7 @@ Test the delete command. +--- test/delete.test.orig Fri Feb 28 07:15:45 2014 ++++ test/delete.test Mon Feb 9 14:00:08 2015 +@@ -79,7 +79,7 @@ Test the delete command. # running as root, but you shouldn't do that anyway. $ quilt delete "test3" > Removing patch %{P}test3 Index: patches/patch-test_faildiff_test =================================================================== RCS file: patches/patch-test_faildiff_test diff -N patches/patch-test_faildiff_test --- patches/patch-test_faildiff_test 20 Jul 2014 20:40:25 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-test_faildiff_test,v 1.1 2014/07/20 20:40:25 landry Exp $ ---- test/faildiff.test.orig Mon Jun 2 16:31:00 2014 -+++ test/faildiff.test Mon Jun 2 16:32:18 2014 -@@ -13,7 +13,7 @@ What happens when diff fails because of a permission e - $ chmod -r test.txt - - $ quilt refresh -- > diff: test.txt: Permission denied -+ >~ .*diff: test\.txt: Permission denied - > Diff failed on file 'test.txt', aborting - $ echo %{?} - > 1 Index: pkg/PLIST =================================================================== RCS file: /work/cvsroot/ports/devel/quilt/pkg/PLIST,v retrieving revision 1.3 diff -p -u -r1.3 PLIST --- pkg/PLIST 20 Jul 2014 20:40:25 -0000 1.3 +++ pkg/PLIST 9 Feb 2015 20:18:35 -0000 @@ -25,7 +25,6 @@ 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 @@ -60,7 +59,7 @@ share/quilt/scripts/ share/quilt/scripts/backup-files share/quilt/scripts/dependency-graph share/quilt/scripts/edmail -share/quilt/scripts/inspect +share/quilt/scripts/inspect-wrapper share/quilt/scripts/patchfns share/quilt/scripts/remove-trailing-ws share/quilt/scripts/utilfns
