6 files changed, 8 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index f7b3116..b85250f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,9 @@ PATH    := $(PREFIX)/bin:$(PATH)
 SHELL   := bash
 SED     := $(shell gsed --version >/dev/null 2>&1 && echo g)sed
 
+SHORT_PKG_VERSION = \
+    $(word 1,$(subst ., ,$($(1)_VERSION))).$(word 2,$(subst ., ,$($(1)_VERSION)))
+
 PKG_RULES := $(patsubst $(TOP_DIR)/src/%.mk,%,$(wildcard $(TOP_DIR)/src/*.mk))
 include $(TOP_DIR)/src/*.mk
 
diff --git a/src/atk.mk b/src/atk.mk
index 565405b..cf8af21 100644
--- a/src/atk.mk
+++ b/src/atk.mk
@@ -5,7 +5,7 @@ PKG            := atk
 $(PKG)_VERSION := 1.24.0
 $(PKG)_SUBDIR  := atk-$($(PKG)_VERSION)
 $(PKG)_FILE    := atk-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL     := http://ftp.gnome.org/pub/gnome/sources/atk/$(word 1,$(subst ., ,$($(PKG)_VERSION))).$(word 2,$(subst ., ,$($(PKG)_VERSION)))/$($(PKG)_FILE)
+$(PKG)_URL     := http://ftp.gnome.org/pub/gnome/sources/atk/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS    := gcc glib gettext
 
 define $(PKG)_UPDATE
diff --git a/src/glib.mk b/src/glib.mk
index 90d839c..fd8a795 100644
--- a/src/glib.mk
+++ b/src/glib.mk
@@ -5,7 +5,7 @@ PKG            := glib
 $(PKG)_VERSION := 2.18.4
 $(PKG)_SUBDIR  := glib-$($(PKG)_VERSION)
 $(PKG)_FILE    := glib-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL     := http://ftp.gnome.org/pub/gnome/sources/glib/$(word 1,$(subst ., ,$($(PKG)_VERSION))).$(word 2,$(subst ., ,$($(PKG)_VERSION)))/$($(PKG)_FILE)
+$(PKG)_URL     := http://ftp.gnome.org/pub/gnome/sources/glib/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS    := gcc gettext pcre libiconv pthreads
 
 define $(PKG)_UPDATE
diff --git a/src/gtk.mk b/src/gtk.mk
index 721825d..43b2b56 100644
--- a/src/gtk.mk
+++ b/src/gtk.mk
@@ -5,7 +5,7 @@ PKG            := gtk
 $(PKG)_VERSION := 2.14.7
 $(PKG)_SUBDIR  := gtk+-$($(PKG)_VERSION)
 $(PKG)_FILE    := gtk+-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL     := http://ftp.gnome.org/pub/gnome/sources/gtk+/$(word 1,$(subst ., ,$($(PKG)_VERSION))).$(word 2,$(subst ., ,$($(PKG)_VERSION)))/$($(PKG)_FILE)
+$(PKG)_URL     := http://ftp.gnome.org/pub/gnome/sources/gtk+/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS    := gcc gettext libpng jpeg tiff jasper glib atk pango cairo
 
 define $(PKG)_UPDATE
diff --git a/src/libgsf.mk b/src/libgsf.mk
index f6b7c88..215b061 100644
--- a/src/libgsf.mk
+++ b/src/libgsf.mk
@@ -5,7 +5,7 @@ PKG            := libgsf
 $(PKG)_VERSION := 1.14.11
 $(PKG)_SUBDIR  := libgsf-$($(PKG)_VERSION)
 $(PKG)_FILE    := libgsf-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL     := http://ftp.gnome.org/pub/gnome/sources/libgsf/$(word 1,$(subst ., ,$($(PKG)_VERSION))).$(word 2,$(subst ., ,$($(PKG)_VERSION)))/$($(PKG)_FILE)
+$(PKG)_URL     := http://ftp.gnome.org/pub/gnome/sources/libgsf/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS    := gcc zlib bzip2 glib libxml2
 
 define $(PKG)_UPDATE
diff --git a/src/pango.mk b/src/pango.mk
index 7e68282..6726ec6 100644
--- a/src/pango.mk
+++ b/src/pango.mk
@@ -5,7 +5,7 @@ PKG            := pango
 $(PKG)_VERSION := 1.22.4
 $(PKG)_SUBDIR  := pango-$($(PKG)_VERSION)
 $(PKG)_FILE    := pango-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL     := http://ftp.gnome.org/pub/gnome/sources/pango/$(word 1,$(subst ., ,$($(PKG)_VERSION))).$(word 2,$(subst ., ,$($(PKG)_VERSION)))/$($(PKG)_FILE)
+$(PKG)_URL     := http://ftp.gnome.org/pub/gnome/sources/pango/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS    := gcc fontconfig freetype cairo glib
 
 define $(PKG)_UPDATE