From 65647cc74a24b701c9d21a584e401ba7320dd44e Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 19 Sep 2010 10:27:02 +0200
Subject: bugfixes for packages: atkmm cairomm glibmm gtkmm libsigc++ pangomm

---
 src/atkmm.mk     | 7 +++----
 src/cairomm.mk   | 6 +++---
 src/glibmm.mk    | 7 +++----
 src/gtkmm.mk     | 4 ++--
 src/libsigc++.mk | 9 ++++-----
 src/pangomm.mk   | 2 +-
 6 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/atkmm.mk b/src/atkmm.mk
index 9dd6065..d0b49ec 100644
--- a/src/atkmm.mk
+++ b/src/atkmm.mk
@@ -8,15 +8,14 @@ $(PKG)_VERSION  := 2.21.2
 $(PKG)_CHECKSUM := 5aa7ef7733bd614e5ef922d300a2559c59a5d9dc
 $(PKG)_SUBDIR   := atkmm-$($(PKG)_VERSION)
 $(PKG)_FILE     := atkmm-$($(PKG)_VERSION).tar.bz2
-$(PKG)_WEBSITE  := http://www.gtk.org/
+$(PKG)_WEBSITE  := http://www.gtkmm.org
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/atkmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     := atk glibmm
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://git.gnome.org/browse/atkmm/refs/tags' | \
     grep '<a href=' | \
-    $(SED) -n "s,.*<a href='[^']*/tag/?id=ATKMM_\\([0-9]*_[0-9]*[02468]_[^<]*\\)'.*,\\1,p" | \
-    $(SED) 's,_,.,g' | \
+    $(SED) -n 's,.*<a[^>]*>\([0-9][^<]*\)<.*,\1,p' | \
     head -1
 endef
 
@@ -25,7 +24,7 @@ define $(PKG)_BUILD
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
-	     MAKE=$(MAKE)
+        MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
diff --git a/src/cairomm.mk b/src/cairomm.mk
index 7e6749a..597db6f 100644
--- a/src/cairomm.mk
+++ b/src/cairomm.mk
@@ -8,7 +8,7 @@ $(PKG)_VERSION  := 1.8.4
 $(PKG)_CHECKSUM := fdea579f406261881a0f4f6242a3980aecef382d
 $(PKG)_SUBDIR   := cairomm-$($(PKG)_VERSION)
 $(PKG)_FILE     := cairomm-$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE  := http://cairographics.org/
+$(PKG)_WEBSITE  := http://cairographics.org/cairomm/
 $(PKG)_URL      := http://cairographics.org/releases/$($(PKG)_FILE)
 $(PKG)_DEPS     := cairo libsigc++
 
@@ -24,6 +24,6 @@ define $(PKG)_BUILD
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
-	     MAKE=$(MAKE)
+        MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-endef
\ No newline at end of file
+endef
diff --git a/src/glibmm.mk b/src/glibmm.mk
index dc4a675..d944bf2 100644
--- a/src/glibmm.mk
+++ b/src/glibmm.mk
@@ -8,15 +8,14 @@ $(PKG)_VERSION  := 2.24.2
 $(PKG)_CHECKSUM := df5f22d2c40ebdf097ecdb4a7dfeef70d1ca24e7
 $(PKG)_SUBDIR   := glibmm-$($(PKG)_VERSION)
 $(PKG)_FILE     := glibmm-$($(PKG)_VERSION).tar.bz2
-$(PKG)_WEBSITE  := http://www.gtk.org/
+$(PKG)_WEBSITE  := http://www.gtkmm.org/
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/glibmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     := glib libsigc++
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://git.gnome.org/browse/glibmm/refs/tags' | \
     grep '<a href=' | \
-    $(SED) -n 's,.*<a[^>]*>glibmm-*\([0-9][^<]*\)<.*,\1,p' | \
-    grep -v '^2\.24\.' | \
+    $(SED) -n 's,.*<a[^>]*>\([0-9]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \
     head -1
 endef
 
@@ -30,7 +29,7 @@ define $(PKG)_BUILD
         --prefix='$(PREFIX)/$(TARGET)' \
         CXX='$(TARGET)-c++' \
         PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
-	     MAKE=$(MAKE)
+        MAKE=$(MAKE)
     $(MAKE) -C '$(1)/gio/src' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= MISC_STUFF=
     $(MAKE) -C '$(1)'         -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
diff --git a/src/gtkmm.mk b/src/gtkmm.mk
index 9ecf0e7..7f17250 100644
--- a/src/gtkmm.mk
+++ b/src/gtkmm.mk
@@ -8,7 +8,7 @@ $(PKG)_VERSION  := 2.20.3
 $(PKG)_CHECKSUM := ad53f52f18cc3021b7fd6cd06f965471039d5333
 $(PKG)_SUBDIR   := gtkmm-$($(PKG)_VERSION)
 $(PKG)_FILE     := gtkmm-$($(PKG)_VERSION).tar.bz2
-$(PKG)_WEBSITE  := http://www.gtk.org/
+$(PKG)_WEBSITE  := http://www.gtkmm.org/
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/gtkmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     := gtk libsigc++ pangomm cairomm atkmm
 
@@ -27,6 +27,6 @@ define $(PKG)_BUILD
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
-	     MAKE=$(MAKE)
+        MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
diff --git a/src/libsigc++.mk b/src/libsigc++.mk
index 636e7db..cd3ec26 100644
--- a/src/libsigc++.mk
+++ b/src/libsigc++.mk
@@ -8,15 +8,14 @@ $(PKG)_VERSION  := 2.2.8
 $(PKG)_CHECKSUM := c26f57110629c16c0b5a873346b7c1cf0edc9c5e
 $(PKG)_SUBDIR   := libsigc++-$($(PKG)_VERSION)
 $(PKG)_FILE     := libsigc++-$($(PKG)_VERSION).tar.bz2
-$(PKG)_WEBSITE  := http://www.gtk.org/
+$(PKG)_WEBSITE  := http://libsigc.sourceforge.net/
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/libsigc++/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
 define $(PKG)_UPDATE
-    wget -q -O- 'http://git.gnome.org/browse/libsigc++/refs/tags' | \
+    wget -q -O- 'http://git.gnome.org/browse/libsigc++2/refs/tags' | \
     grep '<a href=' | \
-    $(SED) -n 's,.*<a[^>]*>libsigc++-*\([0-9][^<]*\)<.*,\1,p' | \
-    grep -v '^2\.24\.' | \
+    $(SED) -n 's,.*<a[^>]*>\([0-9][^<]*\)<.*,\1,p' | \
     head -1
 endef
 
@@ -30,6 +29,6 @@ define $(PKG)_BUILD
         --prefix='$(PREFIX)/$(TARGET)' \
         CXX='$(TARGET)-c++' \
         PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
-	     MAKE=$(MAKE)
+        MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
diff --git a/src/pangomm.mk b/src/pangomm.mk
index aef5bdd..b32a0d5 100644
--- a/src/pangomm.mk
+++ b/src/pangomm.mk
@@ -26,6 +26,6 @@ define $(PKG)_BUILD
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
-	     MAKE=$(MAKE)
+        MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
-- 
cgit v0.12