Update to 0.17; changes not found.

Mostly from Jonathan Buschmann in PR 48327 with fixes for systems
with builtin xz and cleanups.

6 files changed, 19 insertions, 56 deletions

diff --git a/textproc/the_silver_searcher/Makefile b/textproc/the_silver_searcher/Makefile
index 98bea665d37..d893538d7c9 100644
--- a/textproc/the_silver_searcher/Makefile
+++ b/textproc/the_silver_searcher/Makefile
@@ -1,20 +1,27 @@
-# $NetBSD: Makefile,v 1.2 2012/10/25 06:57:04 asau Exp $
-#
+# $NetBSD: Makefile,v 1.3 2013/10/20 22:14:21 wiz Exp $
 
-DISTNAME=	the_silver_searcher-0.5
+DISTNAME=	0.17
+PKGNAME=	the_silver_searcher-${DISTNAME}
 CATEGORIES=	textproc
-MASTER_SITES=	http://cloud.github.com/downloads/ggreer/the_silver_searcher/
+MASTER_SITES=	https://github.com/ggreer/the_silver_searcher/archive/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/ggreer/the_silver_searcher
 COMMENT=	Attempt to improve on ack, which itself is better than grep
 LICENSE=	apache-2.0
 
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+
+DIST_SUBDIR=	the_silver_searcher
+
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	aclocal autoheader autoconf automake pkg-config
+CONFIGURE_ARGS+=	LZMA_CFLAGS=-I${BUILDLINK_PREFIX.xz}/include
+CONFIGURE_ARGS+=	LZMA_LIBS="-L${BUILDLINK_PREFIX.xz}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.xz}/lib -llzma"
+USE_TOOLS+=	aclocal autoheader autoconf automake autoreconf pkg-config
 
 pre-configure:
-	cd ${WRKSRC} && sh build.sh
+	cd ${WRKSRC} && autoreconf -fiv
 
 .include "../../devel/pcre/buildlink3.mk"
+.include "../../archivers/xz/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/the_silver_searcher/PLIST b/textproc/the_silver_searcher/PLIST
index 76a25c8ac28..f54c9fd9455 100644
--- a/textproc/the_silver_searcher/PLIST
+++ b/textproc/the_silver_searcher/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/04/13 11:32:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/10/20 22:14:21 wiz Exp $
 bin/ag
 man/man1/ag.1
+share/the_silver_searcher/completions/ag.bashcomp.sh
diff --git a/textproc/the_silver_searcher/distinfo b/textproc/the_silver_searcher/distinfo
index c1e677019c2..9c5de0b9cdf 100644
--- a/textproc/the_silver_searcher/distinfo
+++ b/textproc/the_silver_searcher/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/04/13 11:32:58 wiz Exp $
+$NetBSD: distinfo,v 1.2 2013/10/20 22:14:21 wiz Exp $
 
-SHA1 (the_silver_searcher-0.5.tar.gz) = 99afb1930016377caf7a3bd9ab5dc0fa59352c4d
-RMD160 (the_silver_searcher-0.5.tar.gz) = 869622925f9d8e7aff3d0c26db50204703b4300e
-Size (the_silver_searcher-0.5.tar.gz) = 20232 bytes
-SHA1 (patch-src_options.c) = c1b734ec9e38417e3a90395762aa4ab026205619
-SHA1 (patch-src_util.c) = 0f843fb6885a91a2eb0b9a5cde6b2ae372fcdb49
-SHA1 (patch-src_util.h) = d76314bc134bff918037764c18bf9581311572fd
+SHA1 (the_silver_searcher/0.17.tar.gz) = 88673329b320457c065a914ceb77ac878ca4f0c0
+RMD160 (the_silver_searcher/0.17.tar.gz) = 9fcfbe9b7b4996210d39feaaaf8217cd35fffe74
+Size (the_silver_searcher/0.17.tar.gz) = 46283 bytes
diff --git a/textproc/the_silver_searcher/patches/patch-src_options.c b/textproc/the_silver_searcher/patches/patch-src_options.c
deleted file mode 100644
index b5208afb68f..00000000000
--- a/textproc/the_silver_searcher/patches/patch-src_options.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_options.c,v 1.1.1.1 2012/04/13 11:32:58 wiz Exp $
-
-Remove header that doesn't exist on NetBSD (and is not missed).
-
---- src/options.c.orig	2012-04-11 04:05:42.000000000 +0000
-+++ src/options.c
-@@ -3,7 +3,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
--#include <xlocale.h>
- 
- #include "config.h"
- #include "options.h"
diff --git a/textproc/the_silver_searcher/patches/patch-src_util.c b/textproc/the_silver_searcher/patches/patch-src_util.c
deleted file mode 100644
index 3a0b5cdda72..00000000000
--- a/textproc/the_silver_searcher/patches/patch-src_util.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_util.c,v 1.1.1.1 2012/04/13 11:32:58 wiz Exp $
-
-Remove header that doesn't exist on NetBSD (and is not missed).
-
---- src/util.c.orig	2012-04-11 04:05:42.000000000 +0000
-+++ src/util.c
-@@ -1,7 +1,6 @@
- #include <ctype.h>
- #include <string.h>
- #include <stdio.h>
--#include <xlocale.h>
- #include <stdarg.h>
- #include <strings.h>
- #include <stdlib.h>
diff --git a/textproc/the_silver_searcher/patches/patch-src_util.h b/textproc/the_silver_searcher/patches/patch-src_util.h
deleted file mode 100644
index 5fd0bc74942..00000000000
--- a/textproc/the_silver_searcher/patches/patch-src_util.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_util.h,v 1.1.1.1 2012/04/13 11:32:58 wiz Exp $
-
-Add header for struct timeval.
-
---- src/util.h.orig	2012-04-11 04:05:42.000000000 +0000
-+++ src/util.h
-@@ -2,6 +2,7 @@
- #define UTIL_H
- 
- #include <string.h>
-+#include <sys/time.h>
- 
- #include "config.h"
-