From cd7abd6cc1be6f4aa85638748344a2e664d8ad89 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Fri, 8 Nov 2013 23:04:33 +0100
Subject: [PATCH] grep: update to 2.15

---
 grep/build.sh                           |  7 +++++--
 grep/meta/ChangeLog                     |  3 +++
 grep/meta/pkgdef                        |  1 +
 grep/src/grep-2.5-symlink-destdir.patch | 13 -------------
 4 files changed, 9 insertions(+), 15 deletions(-)
 delete mode 100644 grep/src/grep-2.5-symlink-destdir.patch

diff --git a/grep/build.sh b/grep/build.sh
index e6ab135..6ee71cb 100755
--- a/grep/build.sh
+++ b/grep/build.sh
@@ -6,9 +6,9 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=grep
-version=2.6.3
+version=2.15
 pkgver=1
-source[0]=ftp://ftp.sunet.se/pub/gnu/grep/$topdir-$version.tar.gz
+source[0]=ftp://ftp.sunet.se/pub/gnu/grep/$topdir-$version.tar.xz
 # If there are no patches, simply comment this
 #patch[0]=
 
@@ -18,11 +18,14 @@ source[0]=ftp://ftp.sunet.se/pub/gnu/grep/$topdir-$version.tar.gz
 # Global settings
 export CPPFLAGS="-I$prefix/include"
 export LDFLAGS="-L$prefix/lib -R$prefix/lib"
+gnu_link grep
 
 reg prep
 prep()
 {
     generic_prep
+    setdir source
+    ${__gsed} -i 's/2.14.56-1e3d/2.15/g' configure
 }
 
 reg build
diff --git a/grep/meta/ChangeLog b/grep/meta/ChangeLog
index d11e35a..62ee23e 100644
--- a/grep/meta/ChangeLog
+++ b/grep/meta/ChangeLog
@@ -1,4 +1,7 @@
 CHANGELOG
 ---------
+* Fri Nov 08 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 2.15-1
+- Update to 2.15
+
 * Sun May 02 2010 Tom G. Christensen <swpkg@jupiterrise.com> - 2.6.3-1
 - Update to 2.6.3
diff --git a/grep/meta/pkgdef b/grep/meta/pkgdef
index f1498bb..7b4e742 100644
--- a/grep/meta/pkgdef
+++ b/grep/meta/pkgdef
@@ -8,6 +8,7 @@ pkgver="$pkgver"
 files(-,root,bin)
 default_docs
 $_bindir
+$_gnudir
 $_infodir
 $_mandir
 $_sharedir/locale
diff --git a/grep/src/grep-2.5-symlink-destdir.patch b/grep/src/grep-2.5-symlink-destdir.patch
deleted file mode 100644
index f977bef..0000000
--- a/grep/src/grep-2.5-symlink-destdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- grep-2.5/src/Makefile.in.orig	2004-01-26 14:31:58.850016000 +0100
-+++ grep-2.5/src/Makefile.in	2004-01-26 14:32:48.840007000 +0100
-@@ -354,8 +354,8 @@
- 
- 
- install-exec-local:
--	@SYMLINK@ @SYMLINKFROM@ $(bindir)/egrep
--	@SYMLINK@ @SYMLINKFROM@ $(bindir)/fgrep
-+	@SYMLINK@ @SYMLINKFROM@ $(DESTDIR)$(bindir)/egrep
-+	@SYMLINK@ @SYMLINKFROM@ $(DESTDIR)$(bindir)/fgrep
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT: