From c5aa156b4821fe296f0833b729d78570d49d2c77 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 15 Dec 2012 17:14:00 +1100
Subject: ocaml packages: fix update scripts

---
 src/ocaml-cairo.mk      | 4 ++--
 src/ocaml-camlimages.mk | 4 ++--
 src/ocaml-findlib.mk    | 2 +-
 src/ocaml-flexdll.mk    | 2 +-
 src/ocaml-lablgl.mk     | 2 +-
 src/ocaml-lablgtk2.mk   | 4 ++--
 src/ocaml-native.mk     | 2 +-
 src/ocaml-xml-light.mk  | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/ocaml-cairo.mk b/src/ocaml-cairo.mk
index 125e3fb..7a59762 100644
--- a/src/ocaml-cairo.mk
+++ b/src/ocaml-cairo.mk
@@ -10,8 +10,8 @@ $(PKG)_URL      := http://ftp.de.debian.org/debian/pool/main/c/cairo-ocaml/$($(P
 $(PKG)_DEPS     := ocaml-core ocaml-findlib ocaml-lablgtk2
 
 define $(PKG)_UPDATE
-    wget -q -O- 'http://ftp.de.debian.org/debian/pool/main/c/cairo-ocaml' | \
-    $(SED) -n 's,.*cairo-ocaml-\([0-9][^>]*\)\.orig\.tar.*,\1,ip' | \
+    $(WGET) -q -O- 'http://ftp.de.debian.org/debian/pool/main/c/cairo-ocaml/?C=M;O=D' | \
+    $(SED) -n 's,.*cairo-ocaml_\([0-9][^>]*\)\.orig\.tar.*,\1,ip' | \
     head -1
 endef
 
diff --git a/src/ocaml-camlimages.mk b/src/ocaml-camlimages.mk
index f4d8487..6723268 100644
--- a/src/ocaml-camlimages.mk
+++ b/src/ocaml-camlimages.mk
@@ -10,8 +10,8 @@ $(PKG)_URL      := https://bitbucket.org/camlspotter/camlimages/get/v$($(PKG)_VE
 $(PKG)_DEPS     := ocaml-findlib freetype libpng giflib tiff ocaml-lablgtk2
 
 define $(PKG)_UPDATE
-    wget -q -O- 'https://bitbucket.org/camlspotter/camlimages/downloads' | \
-    $(SED) -n 's,.*camlimages-\([0-9][^>]*\)\.tar.*,\1,ip' | \
+    $(WGET) -q -O- 'https://bitbucket.org/camlspotter/camlimages/downloads' | \
+    $(SED) -n 's,.*get/v\([0-9][^>]*\)\.tar.*,\1,ip' | \
     head -1
 endef
 
diff --git a/src/ocaml-findlib.mk b/src/ocaml-findlib.mk
index 3ef1bdf..a7c84b5 100644
--- a/src/ocaml-findlib.mk
+++ b/src/ocaml-findlib.mk
@@ -10,7 +10,7 @@ $(PKG)_URL      := http://download.camlcity.org/download/$($(PKG)_FILE)
 $(PKG)_DEPS     := ocaml-core
 
 define $(PKG)_UPDATE
-    wget -q -O- 'http://download.camlcity.org/download' | \
+    $(WGET) -q -O- 'http://download.camlcity.org/download' | \
     $(SED) -n 's,.*findlib-\([0-9][^>]*\)\.tar.*,\1,ip' | \
     sort | \
     tail -1
diff --git a/src/ocaml-flexdll.mk b/src/ocaml-flexdll.mk
index 922a302..d0b43ae 100644
--- a/src/ocaml-flexdll.mk
+++ b/src/ocaml-flexdll.mk
@@ -10,7 +10,7 @@ $(PKG)_URL      := http://alain.frisch.fr/flexdll/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc ocaml-native
 
 define $(PKG)_UPDATE
-    wget -q -O- 'http://alain.frisch.fr/flexdll/?C=M;O=D' | \
+    $(WGET) -q -O- 'http://alain.frisch.fr/flexdll/?C=M;O=D' | \
     $(SED) -n 's,.*flexdll-\([0-9][^>]*\)\.tar.gz.*,\1,ip' | \
     head -1
 endef
diff --git a/src/ocaml-lablgl.mk b/src/ocaml-lablgl.mk
index 33b536c..c27e2cb 100644
--- a/src/ocaml-lablgl.mk
+++ b/src/ocaml-lablgl.mk
@@ -10,7 +10,7 @@ $(PKG)_URL      := http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/$($(PKG)_F
 $(PKG)_DEPS     := ocaml-findlib gtkglarea
 
 define $(PKG)_UPDATE
-    wget -q -O- 'http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html' | \
+    $(WGET) -q -O- 'http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html' | \
     $(SED) -n 's,.*lablgl-\([^>]*\)\.tar.*,\1,ip' | \
     head -1
 endef
diff --git a/src/ocaml-lablgtk2.mk b/src/ocaml-lablgtk2.mk
index e3beb31..f0a0873 100644
--- a/src/ocaml-lablgtk2.mk
+++ b/src/ocaml-lablgtk2.mk
@@ -10,8 +10,8 @@ $(PKG)_URL      := https://forge.ocamlcore.org/frs/download.php/979/$($(PKG)_FIL
 $(PKG)_DEPS     := ocaml-findlib libglade gtkglarea ocaml-lablgl gtk2
 
 define $(PKG)_UPDATE
-    wget -q -O- 'http://forge.ocamlcore.org/frs/?group_id=220' | \
-    sed -n 's,.*lablgtk-\(2[^>]*\)\.tar.*,\1,ip' | \
+    $(WGET) -q -O- 'http://forge.ocamlcore.org/frs/?group_id=220' | \
+    $(SED) -n 's,.*lablgtk-\(2[^>]*\)\.tar.*,\1,ip' | \
     sort | \
     tail -1
 endef
diff --git a/src/ocaml-native.mk b/src/ocaml-native.mk
index 8821e84..ffd3065 100644
--- a/src/ocaml-native.mk
+++ b/src/ocaml-native.mk
@@ -10,7 +10,7 @@ $(PKG)_URL      := http://caml.inria.fr/pub/distrib/ocaml-$(call SHORT_PKG_VERSI
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    wget -q -O- 'http://caml.inria.fr/download.en.html' | \
+    $(WGET) -q -O- 'http://caml.inria.fr/download.en.html' | \
     $(SED) -n 's,.*ocaml-\([0-9][^>]*\)\.tar.*,\1,p' | \
     head -1
 endef
diff --git a/src/ocaml-xml-light.mk b/src/ocaml-xml-light.mk
index b02c927..44c8992 100644
--- a/src/ocaml-xml-light.mk
+++ b/src/ocaml-xml-light.mk
@@ -10,7 +10,7 @@ $(PKG)_URL      := http://tech.motion-twin.com/zip/$($(PKG)_FILE)
 $(PKG)_DEPS     := ocaml-findlib
 
 define $(PKG)_UPDATE
-    wget -q -O- 'http://tech.motion-twin.com/xmllight' | \
+    $(WGET) -q -O- 'http://tech.motion-twin.com/xmllight' | \
     $(SED) -n 's,.*xml-light-\(.*\)\.zip.*,\1,ip' | \
     head -1
 endef
-- 
cgit v0.12