Re: devel/quilt: maintainer update to v0.63

2014-07-18 Thread Kent R. Spillner
Maintainer update.  Passes portcheck.  Tested on amd64-current.  Removes
previous patches merged upstream.  New patches already fed  merged
upstream for the next release, too.

On Wed, Jul 16, 2014 at 05:52:46PM -0500, Kent R. Spillner wrote:
 *Bump*
 
  On Jul 10, 2014, at 12:34, Kent R. Spillner kspill...@acm.org wrote:
  
  Ping.
  
  On Tue, Jun 03, 2014 at 01:32:17PM -0500, Kent R. Spillner wrote:
  This diff updates devel/quilt to v0.63.  Our previous patches were
  merged upstream; one goes away completly.  I also fed the new patches
  upstream as well.
  
  Passes portcheck.  Ok?
  
  
  Index: Makefile
  ===
  RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v
  retrieving revision 1.5
  diff -p -u -r1.5 Makefile
  --- Makefile9 Jan 2014 14:55:42 -1.5
  +++ Makefile2 Jun 2014 21:09:53 -
  @@ -2,7 +2,7 @@
  
  COMMENT=manage large numbers of patches
  
  -DISTNAME=quilt-0.61
  +DISTNAME=quilt-0.63
  CATEGORIES=devel
  
  HOMEPAGE=http://savannah.nongnu.org/projects/quilt/
  Index: distinfo
  ===
  RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v
  retrieving revision 1.2
  diff -p -u -r1.2 distinfo
  --- distinfo9 Jan 2014 14:55:42 -1.2
  +++ distinfo2 Jun 2014 22:24:44 -
  @@ -1,2 +1,2 @@
  -SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M=
  -SIZE (quilt-0.61.tar.gz) = 450552
  +SHA256 (quilt-0.63.tar.gz) = KEZ4giGqiETFTxAjnHy8XogDGFkWK8woVElEbDz//lI=
  +SIZE (quilt-0.63.tar.gz) = 389593
  Index: patches/patch-Makefile_in
  ===
  RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-Makefile_in,v
  retrieving revision 1.2
  diff -p -u -r1.2 patch-Makefile_in
  --- patches/patch-Makefile_in9 Jan 2014 14:55:42 -1.2
  +++ patches/patch-Makefile_in3 Jun 2014 18:12:39 -
  @@ -1,6 +1,6 @@
  $OpenBSD: patch-Makefile_in,v 1.2 2014/01/09 14:55:42 jca Exp $
   Makefile.in.origSun Dec  8 10:40:42 2013
  -+++ Makefile.inMon Dec 30 18:40:55 2013
  +--- Makefile.in.origWed May  7 13:41:15 2014
   Makefile.inTue Jun  3 13:11:41 2014
  @@ -13,7 +13,7 @@ docdir :=@docdir@
   mandir :=@mandir@
   localedir :=$(datadir)/locale
  @@ -10,12 +10,34 @@ $OpenBSD: patch-Makefile_in,v 1.2 2014/0
  
   INSTALL :=@INSTALL@
   POD2MAN :=@POD2MAN@
  -@@ -42,6 +42,8 @@ MSGCAT :=@MSGCAT@
  +@@ -42,7 +42,6 @@ MSGCAT :=@MSGCAT@
   DIFFSTAT :=@DIFFSTAT@
   RPMBUILD :=@RPMBUILD@
   SENDMAIL :=@SENDMAIL@
  -+CP :=@CP@
  -+MD5SUM :=@MD5SUM@
  +-CP :=@CP@
  + MD5SUM :=@MD5SUM@
  
   USE_NLS :=@USE_NLS@
  - STAT_HARDLINK := @STAT_HARDLINK@
  +@@ -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
  +$(INSTALL) -m 644 quilt/scripts/patchfns quilt/scripts/utilfns\
  +   $(BUILD_ROOT)$(datadir)/$(PACKAGE)/scripts
  + ifneq ($(PATCH_WRAPPER),)
  ++ifneq ($(PATCH_WRAPPER), no)
  +$(INSTALL) -d $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper
  +$(INSTALL) -m 755 bin/patch-wrapper\
  +   $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch
  ++endif
  + endif
  + 
  +$(INSTALL) -d $(BUILD_ROOT)$(docdir)/
  Index: patches/patch-configure_ac
  ===
  RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-configure_ac,v
  retrieving revision 1.1
  diff -p -u -r1.1 patch-configure_ac
  --- patches/patch-configure_ac9 Jan 2014 14:55:42 -1.1
  +++ patches/patch-configure_ac3 Jun 2014 18:01:51 -
  @@ -1,13 +1,11 @@
  -$OpenBSD: patch-configure_ac,v 1.1 2014/01/09 14:55:42 jca Exp $
   configure.ac.origSun Dec  8 21:51:39 2013
  -+++ configure.acMon Dec 30 18:28:26 2013
  -@@ -367,6 +367,9 @@ fi
  +$OpenBSD$
  +--- configure.ac.origTue Jun  3 13:01:15 2014
   configure.acTue 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, gcp cp)
  -+QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, gmd5sum md5sum)
  -+
  +-QUILT_COMPAT_PROG_PATH(CP, cp, [cp])
  + QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, [gmd5sum md5sum])
  + 
   AC_PATH_PROG(MSGMERGE, [msgmerge])
  - AC_PATH_PROG(MSGFMT, [msgfmt])
  - AC_PATH_PROG(XGETTEXT, [xgettext])
  Index: patches/patch-test_delete_test
  

Re: devel/quilt: maintainer update to v0.63

2014-07-16 Thread Kent R. Spillner
*Bump*

 On Jul 10, 2014, at 12:34, Kent R. Spillner kspill...@acm.org wrote:
 
 Ping.
 
 On Tue, Jun 03, 2014 at 01:32:17PM -0500, Kent R. Spillner wrote:
 This diff updates devel/quilt to v0.63.  Our previous patches were
 merged upstream; one goes away completly.  I also fed the new patches
 upstream as well.
 
 Passes portcheck.  Ok?
 
 
 Index: Makefile
 ===
 RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v
 retrieving revision 1.5
 diff -p -u -r1.5 Makefile
 --- Makefile9 Jan 2014 14:55:42 -1.5
 +++ Makefile2 Jun 2014 21:09:53 -
 @@ -2,7 +2,7 @@
 
 COMMENT=manage large numbers of patches
 
 -DISTNAME=quilt-0.61
 +DISTNAME=quilt-0.63
 CATEGORIES=devel
 
 HOMEPAGE=http://savannah.nongnu.org/projects/quilt/
 Index: distinfo
 ===
 RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v
 retrieving revision 1.2
 diff -p -u -r1.2 distinfo
 --- distinfo9 Jan 2014 14:55:42 -1.2
 +++ distinfo2 Jun 2014 22:24:44 -
 @@ -1,2 +1,2 @@
 -SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M=
 -SIZE (quilt-0.61.tar.gz) = 450552
 +SHA256 (quilt-0.63.tar.gz) = KEZ4giGqiETFTxAjnHy8XogDGFkWK8woVElEbDz//lI=
 +SIZE (quilt-0.63.tar.gz) = 389593
 Index: patches/patch-Makefile_in
 ===
 RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-Makefile_in,v
 retrieving revision 1.2
 diff -p -u -r1.2 patch-Makefile_in
 --- patches/patch-Makefile_in9 Jan 2014 14:55:42 -1.2
 +++ patches/patch-Makefile_in3 Jun 2014 18:12:39 -
 @@ -1,6 +1,6 @@
 $OpenBSD: patch-Makefile_in,v 1.2 2014/01/09 14:55:42 jca Exp $
  Makefile.in.origSun Dec  8 10:40:42 2013
 -+++ Makefile.inMon Dec 30 18:40:55 2013
 +--- Makefile.in.origWed May  7 13:41:15 2014
  Makefile.inTue Jun  3 13:11:41 2014
 @@ -13,7 +13,7 @@ docdir :=@docdir@
  mandir :=@mandir@
  localedir :=$(datadir)/locale
 @@ -10,12 +10,34 @@ $OpenBSD: patch-Makefile_in,v 1.2 2014/0
 
  INSTALL :=@INSTALL@
  POD2MAN :=@POD2MAN@
 -@@ -42,6 +42,8 @@ MSGCAT :=@MSGCAT@
 +@@ -42,7 +42,6 @@ MSGCAT :=@MSGCAT@
  DIFFSTAT :=@DIFFSTAT@
  RPMBUILD :=@RPMBUILD@
  SENDMAIL :=@SENDMAIL@
 -+CP :=@CP@
 -+MD5SUM :=@MD5SUM@
 +-CP :=@CP@
 + MD5SUM :=@MD5SUM@
 
  USE_NLS :=@USE_NLS@
 - STAT_HARDLINK := @STAT_HARDLINK@
 +@@ -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
 +$(INSTALL) -m 644 quilt/scripts/patchfns quilt/scripts/utilfns\
 +   $(BUILD_ROOT)$(datadir)/$(PACKAGE)/scripts
 + ifneq ($(PATCH_WRAPPER),)
 ++ifneq ($(PATCH_WRAPPER), no)
 +$(INSTALL) -d $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper
 +$(INSTALL) -m 755 bin/patch-wrapper\
 +   $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch
 ++endif
 + endif
 + 
 +$(INSTALL) -d $(BUILD_ROOT)$(docdir)/
 Index: patches/patch-configure_ac
 ===
 RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-configure_ac,v
 retrieving revision 1.1
 diff -p -u -r1.1 patch-configure_ac
 --- patches/patch-configure_ac9 Jan 2014 14:55:42 -1.1
 +++ patches/patch-configure_ac3 Jun 2014 18:01:51 -
 @@ -1,13 +1,11 @@
 -$OpenBSD: patch-configure_ac,v 1.1 2014/01/09 14:55:42 jca Exp $
  configure.ac.origSun Dec  8 21:51:39 2013
 -+++ configure.acMon Dec 30 18:28:26 2013
 -@@ -367,6 +367,9 @@ fi
 +$OpenBSD$
 +--- configure.ac.origTue Jun  3 13:01:15 2014
  configure.acTue 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, gcp cp)
 -+QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, gmd5sum md5sum)
 -+
 +-QUILT_COMPAT_PROG_PATH(CP, cp, [cp])
 + QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, [gmd5sum md5sum])
 + 
  AC_PATH_PROG(MSGMERGE, [msgmerge])
 - AC_PATH_PROG(MSGFMT, [msgfmt])
 - AC_PATH_PROG(XGETTEXT, [xgettext])
 Index: patches/patch-test_delete_test
 ===
 RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-test_delete_test,v
 retrieving revision 1.2
 diff -p -u -r1.2 patch-test_delete_test
 --- patches/patch-test_delete_test9 Jan 2014 14:55:42 -1.2
 +++ patches/patch-test_delete_test3 Jun 2014 18:12:25 -
 @@ -1,6 +1,6 @@
 $OpenBSD: patch-test_delete_test,v 1.2 

Re: devel/quilt: maintainer update to v0.63

2014-07-10 Thread Kent R. Spillner
Ping.

On Tue, Jun 03, 2014 at 01:32:17PM -0500, Kent R. Spillner wrote:
 This diff updates devel/quilt to v0.63.  Our previous patches were
 merged upstream; one goes away completly.  I also fed the new patches
 upstream as well.
 
 Passes portcheck.  Ok?
 
 
 Index: Makefile
 ===
 RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v
 retrieving revision 1.5
 diff -p -u -r1.5 Makefile
 --- Makefile  9 Jan 2014 14:55:42 -   1.5
 +++ Makefile  2 Jun 2014 21:09:53 -
 @@ -2,7 +2,7 @@
  
  COMMENT= manage large numbers of patches
  
 -DISTNAME=quilt-0.61
 +DISTNAME=quilt-0.63
  CATEGORIES=  devel
  
  HOMEPAGE=http://savannah.nongnu.org/projects/quilt/
 Index: distinfo
 ===
 RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v
 retrieving revision 1.2
 diff -p -u -r1.2 distinfo
 --- distinfo  9 Jan 2014 14:55:42 -   1.2
 +++ distinfo  2 Jun 2014 22:24:44 -
 @@ -1,2 +1,2 @@
 -SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M=
 -SIZE (quilt-0.61.tar.gz) = 450552
 +SHA256 (quilt-0.63.tar.gz) = KEZ4giGqiETFTxAjnHy8XogDGFkWK8woVElEbDz//lI=
 +SIZE (quilt-0.63.tar.gz) = 389593
 Index: patches/patch-Makefile_in
 ===
 RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-Makefile_in,v
 retrieving revision 1.2
 diff -p -u -r1.2 patch-Makefile_in
 --- patches/patch-Makefile_in 9 Jan 2014 14:55:42 -   1.2
 +++ patches/patch-Makefile_in 3 Jun 2014 18:12:39 -
 @@ -1,6 +1,6 @@
  $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
 +--- Makefile.in.orig Wed May  7 13:41:15 2014
  Makefile.in  Tue Jun  3 13:11:41 2014
  @@ -13,7 +13,7 @@ docdir :=  @docdir@
   mandir :=   @mandir@
   localedir :=$(datadir)/locale
 @@ -10,12 +10,34 @@ $OpenBSD: patch-Makefile_in,v 1.2 2014/0
   
   INSTALL :=  @INSTALL@
   POD2MAN :=  @POD2MAN@
 -@@ -42,6 +42,8 @@ MSGCAT :=  @MSGCAT@
 +@@ -42,7 +42,6 @@ MSGCAT :=  @MSGCAT@
   DIFFSTAT := @DIFFSTAT@
   RPMBUILD := @RPMBUILD@
   SENDMAIL := @SENDMAIL@
 -+CP :=   @CP@
 -+MD5SUM :=   @MD5SUM@
 +-CP :=   @CP@
 + MD5SUM :=   @MD5SUM@
   
   USE_NLS :=  @USE_NLS@
 - STAT_HARDLINK := @STAT_HARDLINK@
 +@@ -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
 + $(INSTALL) -m 644 quilt/scripts/patchfns quilt/scripts/utilfns  \
 +$(BUILD_ROOT)$(datadir)/$(PACKAGE)/scripts
 + ifneq ($(PATCH_WRAPPER),)
 ++ifneq ($(PATCH_WRAPPER), no)
 + $(INSTALL) -d $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper
 + $(INSTALL) -m 755 bin/patch-wrapper \
 +$(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch
 ++endif
 + endif
 + 
 + $(INSTALL) -d $(BUILD_ROOT)$(docdir)/
 Index: patches/patch-configure_ac
 ===
 RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-configure_ac,v
 retrieving revision 1.1
 diff -p -u -r1.1 patch-configure_ac
 --- patches/patch-configure_ac9 Jan 2014 14:55:42 -   1.1
 +++ patches/patch-configure_ac3 Jun 2014 18:01:51 -
 @@ -1,13 +1,11 @@
 -$OpenBSD: patch-configure_ac,v 1.1 2014/01/09 14:55:42 jca Exp $
  configure.ac.origSun Dec  8 21:51:39 2013
 -+++ configure.ac Mon Dec 30 18:28:26 2013
 -@@ -367,6 +367,9 @@ fi
 +$OpenBSD$
 +--- configure.ac.origTue 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, gcp cp)
 -+QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, gmd5sum md5sum)
 -+
 +-QUILT_COMPAT_PROG_PATH(CP, cp, [cp])
 + QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, [gmd5sum md5sum])
 + 
   AC_PATH_PROG(MSGMERGE, [msgmerge])
 - AC_PATH_PROG(MSGFMT, [msgfmt])
 - AC_PATH_PROG(XGETTEXT, [xgettext])
 Index: patches/patch-test_delete_test
 ===
 RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-test_delete_test,v
 retrieving revision 1.2
 diff -p -u -r1.2 patch-test_delete_test
 --- patches/patch-test_delete_test9 Jan 2014 14:55:42 -   1.2
 +++ patches/patch-test_delete_test3 Jun 2014 18:12:25 -
 @@ -1,6 +1,6 @@
  $OpenBSD: patch-test_delete_test,v 1.2 

devel/quilt: maintainer update to v0.63

2014-06-03 Thread Kent R. Spillner
This diff updates devel/quilt to v0.63.  Our previous patches were
merged upstream; one goes away completly.  I also fed the new patches
upstream as well.

Passes portcheck.  Ok?


Index: Makefile
===
RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v
retrieving revision 1.5
diff -p -u -r1.5 Makefile
--- Makefile9 Jan 2014 14:55:42 -   1.5
+++ Makefile2 Jun 2014 21:09:53 -
@@ -2,7 +2,7 @@
 
 COMMENT=   manage large numbers of patches
 
-DISTNAME=  quilt-0.61
+DISTNAME=  quilt-0.63
 CATEGORIES=devel
 
 HOMEPAGE=  http://savannah.nongnu.org/projects/quilt/
Index: distinfo
===
RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v
retrieving revision 1.2
diff -p -u -r1.2 distinfo
--- distinfo9 Jan 2014 14:55:42 -   1.2
+++ distinfo2 Jun 2014 22:24:44 -
@@ -1,2 +1,2 @@
-SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M=
-SIZE (quilt-0.61.tar.gz) = 450552
+SHA256 (quilt-0.63.tar.gz) = KEZ4giGqiETFTxAjnHy8XogDGFkWK8woVElEbDz//lI=
+SIZE (quilt-0.63.tar.gz) = 389593
Index: patches/patch-Makefile_in
===
RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -p -u -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in   9 Jan 2014 14:55:42 -   1.2
+++ patches/patch-Makefile_in   3 Jun 2014 18:12:39 -
@@ -1,6 +1,6 @@
 $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.inMon Dec 30 18:40:55 2013
+--- Makefile.in.orig   Wed May  7 13:41:15 2014
 Makefile.inTue Jun  3 13:11:41 2014
 @@ -13,7 +13,7 @@ docdir :=@docdir@
  mandir := @mandir@
  localedir :=  $(datadir)/locale
@@ -10,12 +10,34 @@ $OpenBSD: patch-Makefile_in,v 1.2 2014/0
  
  INSTALL :=@INSTALL@
  POD2MAN :=@POD2MAN@
-@@ -42,6 +42,8 @@ MSGCAT :=@MSGCAT@
+@@ -42,7 +42,6 @@ MSGCAT :=@MSGCAT@
  DIFFSTAT :=   @DIFFSTAT@
  RPMBUILD :=   @RPMBUILD@
  SENDMAIL :=   @SENDMAIL@
-+CP := @CP@
-+MD5SUM := @MD5SUM@
+-CP := @CP@
+ MD5SUM := @MD5SUM@
  
  USE_NLS :=@USE_NLS@
- STAT_HARDLINK := @STAT_HARDLINK@
+@@ -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
+   $(INSTALL) -m 644 quilt/scripts/patchfns quilt/scripts/utilfns  \
+  $(BUILD_ROOT)$(datadir)/$(PACKAGE)/scripts
+ ifneq ($(PATCH_WRAPPER),)
++ifneq ($(PATCH_WRAPPER), no)
+   $(INSTALL) -d $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper
+   $(INSTALL) -m 755 bin/patch-wrapper \
+  $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch
++endif
+ endif
+ 
+   $(INSTALL) -d $(BUILD_ROOT)$(docdir)/
Index: patches/patch-configure_ac
===
RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-configure_ac,v
retrieving revision 1.1
diff -p -u -r1.1 patch-configure_ac
--- patches/patch-configure_ac  9 Jan 2014 14:55:42 -   1.1
+++ patches/patch-configure_ac  3 Jun 2014 18:01:51 -
@@ -1,13 +1,11 @@
-$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
+$OpenBSD$
+--- 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, gcp cp)
-+QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, gmd5sum md5sum)
-+
+-QUILT_COMPAT_PROG_PATH(CP, cp, [cp])
+ QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, [gmd5sum md5sum])
+ 
  AC_PATH_PROG(MSGMERGE, [msgmerge])
- AC_PATH_PROG(MSGFMT, [msgfmt])
- AC_PATH_PROG(XGETTEXT, [xgettext])
Index: patches/patch-test_delete_test
===
RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-test_delete_test,v
retrieving revision 1.2
diff -p -u -r1.2 patch-test_delete_test
--- patches/patch-test_delete_test  9 Jan 2014 14:55:42 -   1.2
+++ patches/patch-test_delete_test  3 Jun 2014 18:12:25 -
@@ -1,6 +1,6 @@
 $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
+---