From 1fab800bc5d7beb77b4b895ecad1063b82936f58 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sun, 20 Apr 2008 10:05:38 +0000
Subject: [PATCH] Update to 2.5.3

---
 grep/build.sh      | 67 ++++++++++++----------------------------------
 grep/meta/pkgdef   |  6 +++--
 grep/meta/relnotes | 27 +++++++++++++++++++
 3 files changed, 48 insertions(+), 52 deletions(-)
 create mode 100644 grep/meta/relnotes

diff --git a/grep/build.sh b/grep/build.sh
index 2e0cd93..e1dd2ef 100755
--- a/grep/build.sh
+++ b/grep/build.sh
@@ -3,25 +3,24 @@
 # This is a generic build.sh script
 # It can be used nearly unmodified with many packages
 # 
-# The concept of "method" registering and the logic that implements it was shamelessly
-# stolen from jhlj's Compile.sh script :)
+# build.sh helper functions
+. ${BUILDPKG_BASE}/scripts/build.sh.functions
 #
+###########################################################
 # Check the following 4 variables before running the script
 topdir=grep
-version=2.5
-pkgver=2
+version=2.5.3
+pkgver=1
 source[0]=$topdir-$version.tar.bz2
 # If there are no patches, simply comment this
-patch[0]=grep-2.5-symlink-destdir.patch
+#patch[0]=
 
 # Source function library
 . ${BUILDPKG_BASE}/scripts/buildpkg.functions
 
-# Define script functions and register them
-METHODS=""
-reg() {
-    METHODS="$METHODS $1"
-}
+# Global settings
+export CPPFLAGS="-I$prefix/include"
+export LDFLAGS="-L$prefix/lib -R$prefix/lib"
 
 reg prep
 prep()
@@ -35,11 +34,17 @@ build()
     generic_build
 }
 
+reg check
+check()
+{
+    generic_check
+}
+
 reg install
 install()
 {
     generic_install DESTDIR
-    $RM -f $stagedir$prefix/$_infodir/dir
+    doc NEWS COPYING AUTHORS THANKS
 }
 
 reg pack
@@ -57,42 +62,4 @@ distclean()
 ###################################################
 # No need to look below here
 ###################################################
-
-reg all
-all()
-{
-    for METHOD in $METHODS 
-    do
-	case $METHOD in
-	     all*|*clean) ;;
-	     *) $METHOD
-		;;
-	esac
-    done
-
-}
-
-reg
-usage() {
-    echo Usage $0 "{"$(echo $METHODS | tr " " "|")"}"
-    exit 1
-}
-
-OK=0
-for METHOD in $*
-do
-    METHOD=" $METHOD *"
-    if [ "${METHODS%$METHOD}" == "$METHODS" ] ; then
-	usage
-    fi
-    OK=1
-done
-
-if [ $OK = 0 ] ; then
-    usage;
-fi
-
-for METHOD in $*
-do
-    ( $METHOD )
-done
+build_sh $*
diff --git a/grep/meta/pkgdef b/grep/meta/pkgdef
index fd6e033..f1498bb 100644
--- a/grep/meta/pkgdef
+++ b/grep/meta/pkgdef
@@ -1,11 +1,13 @@
 [grep]
 pkgname="$pkgprefix""$topdir"
-name="GNU grep"
+name="grep - GNU grep"
 pkgcat="application"
-pkgvendor="http://www.gnu.org"
+pkgvendor="http://www.gnu.org/software/grep/grep.html"
 pkgdesc="Find lines that match entered patterns"
 pkgver="$pkgver"
 files(-,root,bin)
+default_docs
 $_bindir
 $_infodir
 $_mandir
+$_sharedir/locale
diff --git a/grep/meta/relnotes b/grep/meta/relnotes
new file mode 100644
index 0000000..bd83629
--- /dev/null
+++ b/grep/meta/relnotes
@@ -0,0 +1,27 @@
+PACKAGE DETAILS
+---------------
+Name:	    %%PKGNAME%%
+Version:    %%SOURCE_AND_VER%%
+Vendor:	    %%VENDOR%%
+Packager:   %%PKGEDBY%%
+
+Source (sha1sum):
+%%SOURCE_SHA1SUM%%
+
+BUILD DETAILS
+-------------
+Compiler:
+%%COMPILER%%
+
+Environment:
+%%ENVIRONMENT%%
+
+Configure:
+%%CONFIGURE%%
+
+KNOWN DEPENDENCIES
+------------------
+%%DEPENDENCIES%%
+
+ERRORS/MISCELLANEOUS
+--------------------