From 760bff64edd3c16bed295fda0a2a3efb6e8f3db7 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Sun, 20 Apr 2014 12:36:23 +0100
Subject: [PATCH] ack: update to 2.12, generalise Makefile type

.. to use wildcards so that Qt style Makefile.Debug are
searched in.
---
 ...0-msys2.patch => 0001-ack-2.12-msys2.patch} | 18 +++++++++---------
 ...-match-makefiles-with-more-generality.patch | 14 ++++++++++++++
 perl-ack/PKGBUILD                              | 14 ++++++++------
 3 files changed, 31 insertions(+), 15 deletions(-)
 rename perl-ack/{ack-2.10-msys2.patch => 0001-ack-2.12-msys2.patch} (51%)
 create mode 100644 perl-ack/0002-ack-2.12-match-makefiles-with-more-generality.patch

diff --git a/perl-ack/ack-2.10-msys2.patch b/perl-ack/0001-ack-2.12-msys2.patch
similarity index 51%
rename from perl-ack/ack-2.10-msys2.patch
rename to perl-ack/0001-ack-2.12-msys2.patch
index d07a3249..e165d198 100644
--- a/perl-ack/ack-2.10-msys2.patch
+++ b/perl-ack/0001-ack-2.12-msys2.patch
@@ -1,7 +1,7 @@
-diff -Naur ack-2.10-orig/Ack.pm ack-2.10/Ack.pm
---- ack-2.10-orig/Ack.pm	2013-09-25 01:35:57.000000000 +0400
-+++ ack-2.10/Ack.pm	2013-11-17 19:55:43.793800000 +0400
-@@ -48,7 +48,7 @@
+diff -urN ack-2.12.orig/Ack.pm ack-2.12/Ack.pm
+--- ack-2.12.orig/Ack.pm	2013-12-03 13:05:35.000000000 +0000
++++ ack-2.12/Ack.pm	2014-04-20 12:24:27.100739600 +0100
+@@ -46,7 +46,7 @@
      $output_to_pipe  = not -t *STDOUT;
      $is_filter_mode = -p STDIN;
  
@@ -10,10 +10,10 @@ diff -Naur ack-2.10-orig/Ack.pm ack-2.10/Ack.pm
      $is_windows      = ($^O eq 'MSWin32');
      $dir_sep_chars   = $is_windows ? quotemeta( '\\/' ) : quotemeta( File::Spec->catfile( '', '' ) );
  }
-diff -Naur ack-2.10-orig/t/Util.pm ack-2.10/t/Util.pm
---- ack-2.10-orig/t/Util.pm	2013-09-25 01:35:57.000000000 +0400
-+++ ack-2.10/t/Util.pm	2013-11-17 19:56:15.040600000 +0400
-@@ -31,7 +31,7 @@
+diff -urN ack-2.12.orig/t/Util.pm ack-2.12/t/Util.pm
+--- ack-2.12.orig/t/Util.pm	2013-11-30 18:34:00.000000000 +0000
++++ ack-2.12/t/Util.pm	2014-04-20 12:24:27.104739800 +0100
+@@ -32,7 +32,7 @@
  }
  
  sub is_cygwin {
@@ -21,4 +21,4 @@ diff -Naur ack-2.10-orig/t/Util.pm ack-2.10/t/Util.pm
 +    return $^O eq 'cygwin' or $^O eq 'msys';
  }
  
- sub build_ack_invocation {
+ sub is_empty_array {
diff --git a/perl-ack/0002-ack-2.12-match-makefiles-with-more-generality.patch b/perl-ack/0002-ack-2.12-match-makefiles-with-more-generality.patch
new file mode 100644
index 00000000..dab755b0
--- /dev/null
+++ b/perl-ack/0002-ack-2.12-match-makefiles-with-more-generality.patch
@@ -0,0 +1,14 @@
+diff -urN ack-2.12.orig/ConfigDefault.pm ack-2.12/ConfigDefault.pm
+--- ack-2.12.orig/ConfigDefault.pm	2013-11-30 18:34:00.000000000 +0000
++++ ack-2.12/ConfigDefault.pm	2014-04-20 12:19:57.886341400 +0100
+@@ -132,9 +132,7 @@
+ # Makefiles http://www.gnu.org/s/make/
+ --type-add=make:ext:mk
+ --type-add=make:ext:mak
+---type-add=make:is:makefile
+---type-add=make:is:Makefile
+---type-add=make:is:GNUmakefile
++--type-add=make:match:.*(M|m)akefile.*
+ 
+ # Rakefiles http://rake.rubyforge.org/
+ --type-add=rake:is:Rakefile
diff --git a/perl-ack/PKGBUILD b/perl-ack/PKGBUILD
index b3fd86b5..89f8c576 100644
--- a/perl-ack/PKGBUILD
+++ b/perl-ack/PKGBUILD
@@ -2,7 +2,7 @@
 
 _realname=ack
 pkgname=perl-${_realname}
-pkgver=2.10
+pkgver=2.12
 pkgrel=1
 pkgdesc="A Perl-based grep replacement, aimed at programmers with large trees of heterogeneous source code"
 arch=('any')
@@ -12,13 +12,15 @@ depends=('perl-File-Next')
 groups=('perl-modules')
 options=(!emptydirs)
 source=("http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/${_realname}-${pkgver}.tar.gz"
-        'ack-2.10-msys2.patch')
-md5sums=('4581d79ecb12b544f363f0f162aaaeb5'
-         'd90248c7cebca315007c886dc44b2379')
-
+        '0001-ack-2.12-msys2.patch'
+        '0002-ack-2.12-match-makefiles-with-more-generality.patch')
+md5sums=('11e886ab0ec72173869a82e59227ddf2'
+         'd52eb2e82c44765dc5242ed00d95b890'
+         '808c0d546c767299f5c1aa1ff0af7dbd')
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  patch -p1 -i ${srcdir}/ack-2.10-msys2.patch
+  patch -p1 -i ${srcdir}/0001-ack-2.12-msys2.patch
+  patch -p1 -i ${srcdir}/0002-ack-2.12-match-makefiles-with-more-generality.patch
 }
 
 build() {