From 6188de2ed34a0d00b3845e9b1fbd43bf9963a01b Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 22 May 2013 19:33:04 +1000
Subject: various packages: remove grep workarounds for version sorting

---
 src/binutils.mk   | 4 ++--
 src/cairomm.mk    | 4 ++--
 src/dbus.mk       | 4 ++--
 src/gcc.mk        | 4 ++--
 src/gdb.mk        | 5 ++---
 src/gmp.mk        | 4 ++--
 src/gtkglext.mk   | 4 ++--
 src/gtkglextmm.mk | 4 ++--
 src/harfbuzz.mk   | 4 ++--
 src/libgcrypt.mk  | 2 +-
 src/libpng.mk     | 4 ++--
 src/openssl.mk    | 4 ++--
 src/postgresql.mk | 4 ++--
 13 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/binutils.mk b/src/binutils.mk
index 1cbdf9f..51ecf94 100644
--- a/src/binutils.mk
+++ b/src/binutils.mk
@@ -13,8 +13,8 @@ $(PKG)_DEPS     :=
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://ftp.gnu.org/gnu/binutils/?C=M;O=D' | \
     $(SED) -n 's,.*<a href="binutils-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    grep -v '^2\.1' | \
-    head -1
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/cairomm.mk b/src/cairomm.mk
index 5461eaf..b78b650 100644
--- a/src/cairomm.mk
+++ b/src/cairomm.mk
@@ -12,8 +12,8 @@ $(PKG)_DEPS     := gcc cairo libsigc++
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://cairographics.org/releases/?C=M;O=D' | \
     $(SED) -n 's,.*"cairomm-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    grep -v '^1\.8\.' | \
-    head -1
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/dbus.mk b/src/dbus.mk
index 3ae2824..8c8b2c6 100644
--- a/src/dbus.mk
+++ b/src/dbus.mk
@@ -12,8 +12,8 @@ $(PKG)_DEPS     := gcc expat
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://cgit.freedesktop.org/dbus/dbus/refs/tags' | \
     $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \
-    grep -v '^1\.[01234]\.' | \
-    head -1
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/gcc.mk b/src/gcc.mk
index 43448dc..9435e44 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -13,8 +13,8 @@ $(PKG)_DEPS     := mingwrt w32api binutils gcc-gmp gcc-mpc gcc-mpfr
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://ftp.gnu.org/gnu/gcc/?C=M;O=D' | \
     $(SED) -n 's,.*<a href="gcc-\([0-9][^"]*\)/".*,\1,p' | \
-    grep -v '^4\.[76543]\.' | \
-    head -1
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/gdb.mk b/src/gdb.mk
index 9f114c0..798918c 100644
--- a/src/gdb.mk
+++ b/src/gdb.mk
@@ -12,9 +12,8 @@ $(PKG)_DEPS     := gcc expat libiconv ncurses zlib
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://ftp.gnu.org/gnu/gdb/?C=M;O=D' | \
     $(SED) -n 's,.*<a href="gdb-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    grep -v '^7\.3a' | \
-    sort -r | \
-    head -1
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/gmp.mk b/src/gmp.mk
index abbbe95..9c3bde5 100644
--- a/src/gmp.mk
+++ b/src/gmp.mk
@@ -14,8 +14,8 @@ define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.gmplib.org/' | \
     grep '<a href="' | \
     $(SED) -n 's,.*gmp-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    grep -v '^4\.' | \
-    head -1
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/gtkglext.mk b/src/gtkglext.mk
index 53e800b..1829460 100644
--- a/src/gtkglext.mk
+++ b/src/gtkglext.mk
@@ -13,8 +13,8 @@ define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://git.gnome.org/cgit/gtkglext/refs/tags' | \
     grep '<a href=' | \
     $(SED) -n "s,.*<a href='[^']*/tag/?id=\\([0-9][^']*\\)'.*,\\1,p" | \
-    grep -v '1\.1\.' | \
-    head -1
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/gtkglextmm.mk b/src/gtkglextmm.mk
index e76cca1..3e5a575 100644
--- a/src/gtkglextmm.mk
+++ b/src/gtkglextmm.mk
@@ -13,8 +13,8 @@ define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://git.gnome.org/cgit/gtkglextmm/refs/tags' | \
     grep '<a href=' | \
     $(SED) -n "s,.*<a href='[^']*/tag/?id=\\([0-9][^']*\\)'.*,\\1,p" | \
-    grep -v '1\.1\.' | \
-    head -1
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk
index cf7b5dd..23c8643 100644
--- a/src/harfbuzz.mk
+++ b/src/harfbuzz.mk
@@ -12,8 +12,8 @@ $(PKG)_DEPS     := gcc glib cairo freetype icu4c
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://cgit.freedesktop.org/harfbuzz/refs/tags' | \
     $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \
-    grep -v '^1\.[01234]\.' | \
-    head -1
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk
index 211cb37..6f95655 100644
--- a/src/libgcrypt.mk
+++ b/src/libgcrypt.mk
@@ -12,7 +12,7 @@ $(PKG)_DEPS     := gcc libgpg_error
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'ftp://ftp.gnupg.org/gcrypt/libgcrypt/' | \
     $(SED) -n 's,.*libgcrypt-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    grep -v '^1\.4\.' | \
+    $(SORT) -V | \
     tail -1
 endef
 
diff --git a/src/libpng.mk b/src/libpng.mk
index 39ef5ad..db45f80 100644
--- a/src/libpng.mk
+++ b/src/libpng.mk
@@ -16,8 +16,8 @@ define $(PKG)_UPDATE
     grep -v alpha | \
     grep -v beta | \
     grep -v rc | \
-    grep -v '^1\.[0-4]\.' | \
-    head -1
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/openssl.mk b/src/openssl.mk
index e0cff13..72c5187 100644
--- a/src/openssl.mk
+++ b/src/openssl.mk
@@ -13,8 +13,8 @@ $(PKG)_DEPS     := gcc zlib libgcrypt
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.openssl.org/source/' | \
     $(SED) -n 's,.*openssl-\([0-9][0-9a-z.]*\)\.tar.*,\1,p' | \
-    grep -v '^0\.9\.' | \
-    head -1
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
diff --git a/src/postgresql.mk b/src/postgresql.mk
index e0d2752..e2507f2 100644
--- a/src/postgresql.mk
+++ b/src/postgresql.mk
@@ -14,8 +14,8 @@ define $(PKG)_UPDATE
     grep 'refs/tags/REL9[0-9_]*"' | \
     $(SED) 's,.*refs/tags/REL\(.*\)".*,\1,g;' | \
     $(SED) 's,_,.,g' | \
-    grep -v '^9\.[01]' | \
-    head -1
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
-- 
cgit v0.12