From fa3b687f85678dd2ee1e6ca932c9e64fd9406364 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 25 Mar 2018 16:49:47 +0200
Subject: fix some more update macros for sourceforge packages

---
 src/opencv.mk    | 2 +-
 src/pdcurses.mk  | 2 +-
 src/qwt.mk       | 2 +-
 src/sox.mk       | 2 +-
 src/tcl.mk       | 2 +-
 src/wxwidgets.mk | 5 +++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/opencv.mk b/src/opencv.mk
index 79fff94..b9eafff 100644
--- a/src/opencv.mk
+++ b/src/opencv.mk
@@ -15,7 +15,7 @@ $(PKG)_DEPS     := cc eigen ffmpeg jasper jpeg lcms1 libpng libwebp \
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://sourceforge.net/projects/opencvlibrary/files/opencv-unix/' | \
-    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    $(SED) -n 's,.*/projects/.*/\([0-9][^"]*\)/".*,\1,p' | \
     head -1
 endef
 
diff --git a/src/pdcurses.mk b/src/pdcurses.mk
index 92e1c37..95e4d80 100644
--- a/src/pdcurses.mk
+++ b/src/pdcurses.mk
@@ -13,7 +13,7 @@ $(PKG)_DEPS     := cc
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://sourceforge.net/projects/pdcurses/files/pdcurses/' | \
-    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    $(SED) -n 's,.*/projects/.*/\([0-9][^"]*\)/".*,\1,p' | \
     head -1
 endef
 
diff --git a/src/qwt.mk b/src/qwt.mk
index 620d01a..1ea0387 100644
--- a/src/qwt.mk
+++ b/src/qwt.mk
@@ -13,7 +13,7 @@ $(PKG)_DEPS     := cc qtbase qtsvg
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://sourceforge.net/projects/qwt/files/qwt/' | \
-    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    $(SED) -n 's,.*/projects/.*/\([0-9][^"]*\)/".*,\1,p' | \
     head -1
 endef
 
diff --git a/src/sox.mk b/src/sox.mk
index 7630bab..343bb3c 100644
--- a/src/sox.mk
+++ b/src/sox.mk
@@ -14,7 +14,7 @@ $(PKG)_DEPS     := cc file flac lame libltdl libmad libpng libsndfile \
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://sourceforge.net/projects/sox/files/sox/' | \
-    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    $(SED) -n 's,.*projects/.*/\([0-9][^"]*\)/".*,\1,p' | \
     head -1
 endef
 
diff --git a/src/tcl.mk b/src/tcl.mk
index b669a8c..84ab759 100644
--- a/src/tcl.mk
+++ b/src/tcl.mk
@@ -17,7 +17,7 @@ $(PKG)_CONFIGURE_OPTS = $(if $(findstring mingw,$(TARGET)),CFLAGS=-D__MINGW_EXCP
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://sourceforge.net/projects/tcl/files/Tcl/' | \
-    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    $(SED) -n 's,.*/projects/.*/\([0-9][^"]*\)/".*,\1,p' | \
     head -1
 endef
 
diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk
index 75996a8..16c75c7 100644
--- a/src/wxwidgets.mk
+++ b/src/wxwidgets.mk
@@ -13,8 +13,9 @@ $(PKG)_DEPS     := cc expat jpeg libiconv libpng sdl tiff zlib
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://sourceforge.net/projects/wxwindows/files/' | \
-    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
-    head -1
+    $(SED) -n 's,.*/projects/.*/\([0-9][^"]*\)/".*,\1,p' | \
+    sort -V | \
+    tail -1
 endef
 
 define $(PKG)_CONFIGURE_OPTS
-- 
cgit v0.12