Packages: massively convert to use generic macros and implicit rules

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

53 files changed, 516 insertions, 1328 deletions

diff --git a/packages/compression/lzo/lzo.mk b/packages/compression/lzo/lzo.mk
index cdfff1d..c4edc36 100644
--- a/packages/compression/lzo/lzo.mk
+++ b/packages/compression/lzo/lzo.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 LZO_NAME		:= lzo
-LZO_VERSION		:= $(call embtk_get_pkgversion,LZO)
+LZO_VERSION		:= $(call embtk_get_pkgversion,lzo)
 LZO_SITE		:= http://www.oberhumer.com/opensource/lzo/download
 LZO_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 LZO_PATCH_SITE		:= ftp://ftp.embtoolkit.org/embtoolkit.org/lzo/$(LZO_VERSION)
@@ -32,30 +32,12 @@ LZO_PACKAGE		:= lzo-$(LZO_VERSION).tar.gz
 LZO_SRC_DIR		:= $(PACKAGES_BUILD)/lzo-$(LZO_VERSION)
 LZO_BUILD_DIR		:= $(PACKAGES_BUILD)/lzo-$(LZO_VERSION)
 
-LZO_BINS =
-LZO_SBINS =
-LZO_INCLUDES = lzo
-LZO_LIBS = liblzo2.*
-LZO_LIBEXECS =
-LZO_PKGCONFIGS =
-
-LZO_CONFIGURE_ENV :=
-LZO_CONFIGURE_OPTS :=
-
-LZO_DEPS :=
-
-lzo_install:
-	$(call embtk_install_pkg,LZO)
-
-lzo_clean:
-	$(call embtk_cleanup_pkg,LZO)
-
-#
-# lzo common targets
-#
-
-download_lzo download_lzo_host:
-	$(call embtk_download_pkg,LZO)
+LZO_BINS	=
+LZO_SBINS	=
+LZO_INCLUDES	= lzo
+LZO_LIBS	= liblzo2.*
+LZO_LIBEXECS	=
+LZO_PKGCONFIGS	=
 
 #
 # LZO for host development machine
@@ -66,10 +48,7 @@ LZO_HOST_SITE		:= $(LZO_SITE)
 LZO_HOST_SITE_MIRROR1	:= $(LZO_SITE_MIRROR1)
 LZO_HOST_SITE_MIRROR2	:= $(LZO_SITE_MIRROR2)
 LZO_HOST_SITE_MIRROR3	:= $(LZO_SITE_MIRROR3)
-LZO_HOST_PATCH_SITE	:= $(LZO_PATCH_SITE)
 LZO_HOST_PACKAGE	:= $(LZO_PACKAGE)
 LZO_HOST_SRC_DIR	:= $(TOOLS_BUILD)/lzo-$(LZO_VERSION)
 LZO_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/lzo-$(LZO_VERSION)
 
-lzo_host_install:
-	$(call embtk_install_hostpkg,LZO_HOST)
diff --git a/packages/database/sqlite/sqlite.mk b/packages/database/sqlite/sqlite.mk
index 8939f6e..899e6bc 100644
--- a/packages/database/sqlite/sqlite.mk
+++ b/packages/database/sqlite/sqlite.mk
@@ -27,7 +27,6 @@ SQLITE_NAME		:= sqlite
 SQLITE_VERSION		:= $(call embtk_get_pkgversion,sqlite)
 SQLITE_SITE		:= http://www.sqlite.org
 SQLITE_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-SQLITE_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/sqlite/$(SQLITE_VERSION)
 # Please sqlite people stop changing the way packages are named and packaged
 SQLITE_PACKAGE		:= $(if $(CONFIG_EMBTK_SQLITE_VERSION_3_7_3),		\
 				sqlite-amalgamation-$(SQLITE_VERSION).tar.gz,	\
@@ -48,11 +47,3 @@ SQLITE_PKGCONFIGS	= sqlite3.pc
 SQLITE_CONFIGURE_OPTS	:= --enable-threadsafe --enable-readline 		\
 			--enable-dynamic-extensions
 
-sqlite_install:
-	$(call embtk_install_pkg,sqlite)
-
-download_sqlite:
-	$(call embtk_download_pkg,sqlite)
-
-sqlite_clean:
-	$(call embtk_cleanup_pkg,sqlite)
diff --git a/packages/development/gdb/gdb.mk b/packages/development/gdb/gdb.mk
index 7dc08c6..130891e 100644
--- a/packages/development/gdb/gdb.mk
+++ b/packages/development/gdb/gdb.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 GDB_NAME		:= gdb
-GDB_VERSION		:= $(call embtk_get_pkgversion,GDB)
+GDB_VERSION		:= $(call embtk_get_pkgversion,gdb)
 GDB_SITE		:= http://ftp.gnu.org/gnu/gdb
 GDB_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 GDB_PATCH_SITE		:= ftp://ftp.embtoolkit.org/embtoolkit.org/gdb/$(GDB_VERSION)
@@ -56,32 +56,32 @@ GDB_DEPS := ncurses_install
 # GDB for target
 #
 gdbfull_install:
-	$(call embtk_install_pkg,GDB)
+	$(call embtk_install_pkg,gdb)
 
 gdbserver_install:
-	@test -e $(GDB_BUILD_DIR)/.gdbserver_installed ||		\
+	@test -e $(GDB_BUILD_DIR)/.gdbserver_installed ||			\
 	$(MAKE) $(GDB_BUILD_DIR)/.gdbserver_installed
 
-$(GDB_BUILD_DIR)/.gdbserver_installed: $(GDB_DEPS)			\
+$(GDB_BUILD_DIR)/.gdbserver_installed: $(GDB_DEPS)				\
 		download_gdbfull						\
-		$(GDB_BUILD_DIR)/.gdbserver_decompressed		\
+		$(GDB_BUILD_DIR)/.gdbserver_decompressed			\
 		$(GDB_BUILD_DIR)/.gdbserver_configured
 	$(Q)$(MAKE) -C $(GDB_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(GDB_BUILD_DIR)/gdb/gdbserver			\
+	$(Q)$(MAKE) -C $(GDB_BUILD_DIR)/gdb/gdbserver				\
 		DESTDIR=$(SYSROOT)/$(GDB_SYSROOT_SUFFIX) install
 	$(Q)$(MAKE) libtool_files_adapt
 	@touch $@
 
 $(GDB_BUILD_DIR)/.gdbserver_configured:
-	$(call embtk_configure_pkg,GDB)
+	$(call embtk_configure_pkg,gdb)
 	@touch $@
 
 $(GDB_BUILD_DIR)/.gdbserver_decompressed:
-	$(call embtk_decompress_pkg,GDB)
+	$(call embtk_decompress_pkg,gdb)
 	@touch $@
 
 gdbserver_clean gdbfull_clean:
-	$(call embtk_cleanup_pkg,GDB)
+	$(call embtk_cleanup_pkg,gdb)
 
 #
 # GDB for host development machine
@@ -90,7 +90,6 @@ GDB_HOST_NAME		:= gdb
 GDB_HOST_VERSION	:= $(GDB_VERSION)
 GDB_HOST_SITE		:= $(GDB_SITE)
 GDB_HOST_SITE_MIRROR3	:= $(GDB_SITE_MIRROR3)
-GDB_HOST_PATCH_SITE	:= $(GDB_PATCH_SITE)
 GDB_HOST_PACKAGE	:= $(GDB_PACKAGE)
 GDB_HOST_SRC_DIR	:= $(TOOLS_BUILD)/gdb-$(GDB_VERSION)
 GDB_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/gdb-$(GDB_VERSION)
@@ -110,16 +109,10 @@ GDB_HOST_CONFIGURE_OPTS	:= --disable-werror --disable-sim		\
 			--with-bugurl="$(EMBTK_BUGURL)"			\
 			--with-pkgversion="embtk-$(EMBTK_VERSION)"	\
 			--target=$(STRICT_GNU_TARGET)
-GDB_HOST_PREFIX := $(TOOLS)
-
-gdb_host_install:
-	$(call embtk_install_hostpkg,GDB_HOST)
-
-gdb_host_clean:
-	$(call embtk_generic_msg,"Clean up gdb host")
+GDB_HOST_PREFIX		:= $(TOOLS)
 
 #
 # Common for target and host development machine
 #
 download_gdbfull download_gdb_host download_gdbserver:
-	$(call embtk_download_pkg,GDB)
+	$(call embtk_download_pkg,gdb)
diff --git a/packages/development/libevent/libevent.mk b/packages/development/libevent/libevent.mk
index 379fd95..51e53bf 100644
--- a/packages/development/libevent/libevent.mk
+++ b/packages/development/libevent/libevent.mk
@@ -23,28 +23,16 @@
 # \date         December 2009
 ################################################################################
 
-LIBEVENT_NAME := libevent
-LIBEVENT_VERSION := $(call embtk_get_pkgversion,LIBEVENT)
-LIBEVENT_SITE := http://www.monkey.org/~provos
-LIBEVENT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBEVENT_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libevent/$(LIBEVENT_VERSION)
-LIBEVENT_PACKAGE := libevent-$(LIBEVENT_VERSION).tar.gz
-LIBEVENT_SRC_DIR := $(PACKAGES_BUILD)/libevent-$(LIBEVENT_VERSION)
-LIBEVENT_BUILD_DIR := $(PACKAGES_BUILD)/libevent-$(LIBEVENT_VERSION)
+LIBEVENT_NAME		:= libevent
+LIBEVENT_VERSION	:= $(call embtk_get_pkgversion,LIBEVENT)
+LIBEVENT_SITE		:= http://www.monkey.org/~provos
+LIBEVENT_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBEVENT_PACKAGE	:= libevent-$(LIBEVENT_VERSION).tar.gz
+LIBEVENT_SRC_DIR	:= $(PACKAGES_BUILD)/libevent-$(LIBEVENT_VERSION)
+LIBEVENT_BUILD_DIR	:= $(PACKAGES_BUILD)/libevent-$(LIBEVENT_VERSION)
 
-LIBEVENT_BINS = event_rpcgen.py
-LIBEVENT_SBINS =
-LIBEVENT_INCLUDES = evdns.h event-config.h event.h evhttp.h evrpc.h evutil.h
-LIBEVENT_LIBS = libevent*
-LIBEVENT_PKGCONFIGS =
-
-LIBEVENT_DEPS :=
-
-libevent_install:
-	$(call embtk_install_pkg,LIBEVENT)
-
-download_libevent:
-	$(call embtk_download_pkg,LIBEVENT)
-
-libevent_clean:
-	$(call embtk_cleanup_pkg,LIBEVENT)
+LIBEVENT_BINS		= event_rpcgen.py
+LIBEVENT_SBINS		=
+LIBEVENT_INCLUDES	= evdns.h event-config.h event.h evhttp.h evrpc.h evutil.h
+LIBEVENT_LIBS		= libevent*
+LIBEVENT_PKGCONFIGS	=
diff --git a/packages/development/libnih/libnih.mk b/packages/development/libnih/libnih.mk
index 94c39d8..cf22889 100644
--- a/packages/development/libnih/libnih.mk
+++ b/packages/development/libnih/libnih.mk
@@ -23,46 +23,20 @@
 # \date         December 2009
 ################################################################################
 
-LIBNIH_NAME := libnih
-LIBNIH_VERSION := $(call embtk_get_pkgversion,LIBNIH)
-LIBNIH_MAJOR_VERSION := $(call embtk_get_pkgversion,LIBNIH_MAJOR)
-LIBNIH_SITE := http://launchpad.net/libnih/$(LIBNIH_MAJOR_VERSION)/$(LIBNIH_VERSION)/+download
-LIBNIH_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBNIH_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libnih/$(LIBNIH_VERSION)
-LIBNIH_PACKAGE := libnih-$(LIBNIH_VERSION).tar.gz
-LIBNIH_SRC_DIR := $(PACKAGES_BUILD)/libnih-$(LIBNIH_VERSION)
-LIBNIH_BUILD_DIR := $(PACKAGES_BUILD)/libnih-$(LIBNIH_VERSION)
+LIBNIH_NAME		:= libnih
+LIBNIH_VERSION		:= $(call embtk_get_pkgversion,libnih)
+LIBNIH_MAJOR_VERSION	:= $(call embtk_get_pkgversion,libnih_major)
+LIBNIH_SITE		:= http://launchpad.net/libnih/$(LIBNIH_MAJOR_VERSION)/$(LIBNIH_VERSION)/+download
+LIBNIH_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBNIH_PACKAGE		:= libnih-$(LIBNIH_VERSION).tar.gz
+LIBNIH_SRC_DIR		:= $(PACKAGES_BUILD)/libnih-$(LIBNIH_VERSION)
+LIBNIH_BUILD_DIR	:= $(PACKAGES_BUILD)/libnih-$(LIBNIH_VERSION)
+
+LIBNIH_BINS		= nih-dbus-tool
+LIBNIH_SBINS		=
+LIBNIH_INCLUDES		= libnih-dbus.h libnih.h nih nih-dbus
+LIBNIH_LIBS		= libnih*
+LIBNIH_PKGCONFIGS	= libnih-dbus.pc libnih.pc
+
+LIBNIH_DEPS		:= dbus_install
 
-LIBNIH_BINS = nih-dbus-tool
-LIBNIH_SBINS =
-LIBNIH_INCLUDES = libnih-dbus.h libnih.h nih nih-dbus
-LIBNIH_LIBS = libnih*
-LIBNIH_PKGCONFIGS = libnih-dbus.pc libnih.pc
-
-LIBNIH_DEPS := dbus_install
-
-libnih_install:
-	@test -e $(LIBNIH_BUILD_DIR)/.installed || \
-	$(MAKE) $(LIBNIH_BUILD_DIR)/.installed
-
-$(LIBNIH_BUILD_DIR)/.installed: $(LIBNIH_DEPS) download_libnih \
-	$(LIBNIH_BUILD_DIR)/.decompressed $(LIBNIH_BUILD_DIR)/.configured
-	$(call embtk_generic_message,"Compiling and installing \
-	libnih-$(LIBNIH_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(LIBNIH_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBNIH_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
-
-download_libnih:
-	$(call embtk_download_pkg,LIBNIH)
-
-$(LIBNIH_BUILD_DIR)/.decompressed:
-	$(call embtk_decompress_pkg,LIBNIH)
-
-$(LIBNIH_BUILD_DIR)/.configured:
-	$(call embtk_configure_pkg,LIBNIH)
-
-libnih_clean:
-	$(call embtk_cleanup_pkg,LIBNIH)
diff --git a/packages/development/libsigsegv/libsigsegv.mk b/packages/development/libsigsegv/libsigsegv.mk
index 0eb7c44..aa80236 100644
--- a/packages/development/libsigsegv/libsigsegv.mk
+++ b/packages/development/libsigsegv/libsigsegv.mk
@@ -24,32 +24,17 @@
 ################################################################################
 
 LIBSIGSEGV_NAME		:= libsigsegv
-LIBSIGSEGV_VERSION	:= $(call embtk_get_pkgversion,LIBSIGSEGV)
+LIBSIGSEGV_VERSION	:= $(call embtk_get_pkgversion,libsigsegv)
 LIBSIGSEGV_SITE		:= ftp://ftp.gnu.org/pub/gnu/libsigsegv
-LIBSIGSEGV_SITE_MIRROR3	:= http://ftp.gnu.org/gnu/libsigsegv
+LIBSIGSEGV_SITE_MIRROR1	:= http://ftp.gnu.org/gnu/libsigsegv
 LIBSIGSEGV_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBSIGSEGV_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/libsigsegv/$(LIBSIGSEGV_VERSION)
 LIBSIGSEGV_PACKAGE	:= libsigsegv-$(LIBSIGSEGV_VERSION).tar.gz
 LIBSIGSEGV_SRC_DIR	:= $(PACKAGES_BUILD)/libsigsegv-$(LIBSIGSEGV_VERSION)
 LIBSIGSEGV_BUILD_DIR	:= $(PACKAGES_BUILD)/libsigsegv-$(LIBSIGSEGV_VERSION)
 
-LIBSIGSEGV_BINS =
-LIBSIGSEGV_SBINS =
-LIBSIGSEGV_INCLUDES = sigsegv.h
-LIBSIGSEGV_LIBS = libsigsegv.*
-LIBSIGSEGV_LIBEXECS =
-LIBSIGSEGV_PKGCONFIGS =
-
-LIBSIGSEGV_CONFIGURE_ENV :=
-LIBSIGSEGV_CONFIGURE_OPTS :=
-
-LIBSIGSEGV_DEPS :=
-
-libsigsegv_install:
-	$(call embtk_install_pkg,LIBSIGSEGV)
-
-download_libsigsegv:
-	$(call embtk_download_pkg,LIBSIGSEGV)
-
-libsigsegv_clean:
-	$(call embtk_cleanup_pkg,LIBSIGSEGV)
+LIBSIGSEGV_BINS		=
+LIBSIGSEGV_SBINS	=
+LIBSIGSEGV_INCLUDES	= sigsegv.h
+LIBSIGSEGV_LIBS		= libsigsegv.*
+LIBSIGSEGV_LIBEXECS	=
+LIBSIGSEGV_PKGCONFIGS	=
diff --git a/packages/graphics/atk/atk.mk b/packages/graphics/atk/atk.mk
index ed38cb0..c05ed41 100644
--- a/packages/graphics/atk/atk.mk
+++ b/packages/graphics/atk/atk.mk
@@ -23,30 +23,21 @@
 # \date         December 2009
 ################################################################################
 
-ATK_NAME := atk
-ATK_VERSION := $(call embtk_get_pkgversion,ATK)
-ATK_MAJOR_VERSION := $(call embtk_get_pkgversion,ATK_MAJOR)
-ATK_SITE := http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_MAJOR_VERSION)
-ATK_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-ATK_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/atk/$(ATK_VERSION)
-ATK_PACKAGE := atk-$(ATK_VERSION).tar.bz2
-ATK_SRC_DIR := $(PACKAGES_BUILD)/atk-$(ATK_VERSION)
-ATK_BUILD_DIR := $(PACKAGES_BUILD)/atk-$(ATK_VERSION)
+ATK_NAME		:= atk
+ATK_VERSION		:= $(call embtk_get_pkgversion,atk)
+ATK_MAJOR_VERSION	:= $(call embtk_get_pkgversion,atk_major)
+ATK_SITE		:= http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_MAJOR_VERSION)
+ATK_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+ATK_PACKAGE		:= atk-$(ATK_VERSION).tar.bz2
+ATK_SRC_DIR		:= $(PACKAGES_BUILD)/atk-$(ATK_VERSION)
+ATK_BUILD_DIR		:= $(PACKAGES_BUILD)/atk-$(ATK_VERSION)
 
-ATK_BINS =
-ATK_SBINS =
-ATK_INCLUDES = atk-*
-ATK_LIBS = libatk-*
-ATK_PKGCONFIGS = atk.pc
+ATK_BINS	=
+ATK_SBINS	=
+ATK_INCLUDES	= atk-*
+ATK_LIBS	= libatk-*
+ATK_PKGCONFIGS	= atk.pc
 
-ATK_CONFIGURE_OPTS := --disable-glibtest
-ATK_DEPS := glib_install
+ATK_CONFIGURE_OPTS	:= --disable-glibtest
+ATK_DEPS		:= glib_install
 
-atk_install:
-	$(call embtk_install_pkg,ATK)
-
-download_atk:
-	$(call embtk_download_pkg,ATK)
-
-atk_clean:
-	$(call embtk_cleanup_pkg,ATK)
diff --git a/packages/graphics/cairo/cairo.mk b/packages/graphics/cairo/cairo.mk
index 226eaa5..37387ce 100644
--- a/packages/graphics/cairo/cairo.mk
+++ b/packages/graphics/cairo/cairo.mk
@@ -24,23 +24,23 @@
 ################################################################################
 
 CAIRO_NAME		:= cairo
-CAIRO_VERSION		:= $(call embtk_get_pkgversion,CAIRO)
+CAIRO_VERSION		:= $(call embtk_get_pkgversion,cairo)
 CAIRO_SITE		:= http://www.cairographics.org/releases
 CAIRO_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-CAIRO_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/cairo/$(CAIRO_VERSION)
 CAIRO_PACKAGE		:= cairo-$(CAIRO_VERSION).tar.gz
 CAIRO_SRC_DIR		:= $(PACKAGES_BUILD)/cairo-$(CAIRO_VERSION)
 CAIRO_BUILD_DIR		:= $(PACKAGES_BUILD)/cairo-$(CAIRO_VERSION)
 
-CAIRO_BINS =
-CAIRO_SBINS =
-CAIRO_INCLUDES = cairo
-CAIRO_LIBS = libcairo*
-CAIRO_PKGCONFIGS = cairo*.pc
+CAIRO_BINS		=
+CAIRO_SBINS		=
+CAIRO_INCLUDES		= cairo
+CAIRO_LIBS		= libcairo*
+CAIRO_PKGCONFIGS	= cairo*.pc
 
-CAIRO_CONFIG_OPTS-y :=
-CAIRO_CONFIG_OPTS-n :=
-CAIRO_DEPS := pixman_install libpng_install freetype_install fontconfig_install
+CAIRO_CONFIG_OPTS-y	:=
+CAIRO_CONFIG_OPTS-n	:=
+CAIRO_DEPS		:= pixman_install libpng_install freetype_install	\
+			fontconfig_install
 
 ifeq ($(CONFIG_EMBTK_HAVE_CAIRO_WITH_DIRECTFB),y)
 CAIRO_DEPS += directfb_install
@@ -68,11 +68,3 @@ CAIRO_CONFIGURE_ENV	:= png_CFLAGS=`$(PKGCONFIG_BIN) libpng --cflags`
 CAIRO_CONFIGURE_ENV	+= png_LIBS=`$(PKGCONFIG_BIN) libpng --libs`
 CAIRO_CONFIGURE_ENV	+= png_REQUIRES=libpng
 
-cairo_install:
-	$(call embtk_install_pkg,CAIRO)
-
-download_cairo:
-	$(call embtk_download_pkg,CAIRO)
-
-cairo_clean:
-	$(call embtk_cleanup_pkg,CAIRO)
diff --git a/packages/graphics/fontconfig/fontconfig.mk b/packages/graphics/fontconfig/fontconfig.mk
index f7270be..15e4a28 100644
--- a/packages/graphics/fontconfig/fontconfig.mk
+++ b/packages/graphics/fontconfig/fontconfig.mk
@@ -27,7 +27,6 @@ FONTCONFIG_NAME		:= fontconfig
 FONTCONFIG_VERSION	:= $(call embtk_get_pkgversion,fontconfig)
 FONTCONFIG_SITE		:= http://fontconfig.org/release
 FONTCONFIG_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-FONTCONFIG_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/fontconfig/$(FONTCONFIG_VERSION)
 FONTCONFIG_PACKAGE	:= fontconfig-$(FONTCONFIG_VERSION).tar.gz
 FONTCONFIG_SRC_DIR	:= $(PACKAGES_BUILD)/fontconfig-$(FONTCONFIG_VERSION)
 FONTCONFIG_BUILD_DIR	:= $(PACKAGES_BUILD)/fontconfig-$(FONTCONFIG_VERSION)
@@ -66,19 +65,6 @@ FONTCONFIG_MAKE_OPTS		+= FREETYPE_LIBS="$(FREETYPE_LIBS-y)"
 
 FONTCONFIG_DEPS			:= libxml2_install freetype_install
 
-fontconfig_install:
-	$(call embtk_install_pkg,fontconfig)
-	$(MAKE) $(FONTCONFIG_BUILD_DIR)/.special
-
-download_fontconfig:
-	$(call embtk_download_pkg,fontconfig)
-
-.PHONY: $(FONTCONFIG_BUILD_DIR)/.special fontconfig_clean
-
-fontconfig_clean:
-	$(call embtk_cleanup_pkg,fontconfig)
-
-$(FONTCONFIG_BUILD_DIR)/.special:
+define embtk_postinstall_fontconfig
 	$(Q)-cp -R $(SYSROOT)/usr/etc/fonts $(ROOTFS)/etc/
-	@touch $@
-
+endef
diff --git a/packages/graphics/freetype/freetype.mk b/packages/graphics/freetype/freetype.mk
index fced3ca..9aed9b1 100644
--- a/packages/graphics/freetype/freetype.mk
+++ b/packages/graphics/freetype/freetype.mk
@@ -24,10 +24,9 @@
 ################################################################################
 
 FREETYPE_NAME		:= freetype
-FREETYPE_VERSION	:= $(call embtk_get_pkgversion,FREETYPE)
+FREETYPE_VERSION	:= $(call embtk_get_pkgversion,freetype)
 FREETYPE_SITE		:= http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
 FREETYPE_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-FREETYPE_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/freetype/$(FREETYPE_VERSION)
 FREETYPE_PACKAGE	:= freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_SRC_DIR	:= $(PACKAGES_BUILD)/freetype-$(FREETYPE_VERSION)
 FREETYPE_BUILD_DIR	:= $(PACKAGES_BUILD)/freetype-$(FREETYPE_VERSION)
@@ -41,11 +40,3 @@ FREETYPE_PKGCONFIGS	= freetype*.pc
 FREETYPE_DEPS		:= zlib_install
 FREETYPE_MAKE_OPTS	:= LIBTOOL=$(FREETYPE_BUILD_DIR)/builds/unix/libtool
 
-freetype_install:
-	$(call embtk_install_pkg,FREETYPE)
-
-download_freetype:
-	$(call embtk_download_pkg,FREETYPE)
-
-freetype_clean:
-	$(call embtk_cleanup_pkg,FREETYPE)
diff --git a/packages/graphics/gdk-pixbuf/gdk-pixbuf.mk b/packages/graphics/gdk-pixbuf/gdk-pixbuf.mk
index b0556c7..0fec257 100644
--- a/packages/graphics/gdk-pixbuf/gdk-pixbuf.mk
+++ b/packages/graphics/gdk-pixbuf/gdk-pixbuf.mk
@@ -28,7 +28,6 @@ GDKPIXBUF_MAJOR_VERSION	:= $(call embtk_get_pkgversion,gdkpixbuf_major)
 GDKPIXBUF_VERSION	:= $(call embtk_get_pkgversion,gdkpixbuf)
 GDKPIXBUF_SITE		:= http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/$(GDKPIXBUF_MAJOR_VERSION)
 GDKPIXBUF_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-GDKPIXBUF_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/gdk-pixbuf/$(GDKPIXBUF_VERSION)
 GDKPIXBUF_PACKAGE	:= gdk-pixbuf-$(GDKPIXBUF_VERSION).tar.bz2
 GDKPIXBUF_SRC_DIR	:= $(PACKAGES_BUILD)/gdk-pixbuf-$(GDKPIXBUF_VERSION)
 GDKPIXBUF_BUILD_DIR	:= $(PACKAGES_BUILD)/gdk-pixbuf-$(GDKPIXBUF_VERSION)
@@ -46,12 +45,6 @@ GDKPIXBUF_CONFIGURE_OPTS	:= --without-gdiplus --without-libjasper
 GDKPIXBUF_DEPS			:= libpng_install libjpeg_install		\
 				libtiff_install glib_install
 
-gdkpixbuf_install:
-	$(call embtk_install_pkg,gdkpixbuf)
-
-gdkpixbuf_clean:
-	$(call embtk_cleanup_pkg,gdkpixbuf)
-
 #
 # gdk-pixbuf for host development machine.
 #
@@ -62,7 +55,6 @@ GDKPIXBUF_HOST_SITE		:= $(GDKPIXBUF_SITE)
 GDKPIXBUF_HOST_SITE_MIRROR1	:= $(GDKPIXBUF_SITE_MIRROR1)
 GDKPIXBUF_HOST_SITE_MIRROR2	:= $(GDKPIXBUF_SITE_MIRROR2)
 GDKPIXBUF_HOST_SITE_MIRROR3	:= $(GDKPIXBUF_SITE_MIRROR3)
-GDKPIXBUF_HOST_PATCH_SITE	:= $(GDKPIXBUF_PATCH_SITE)
 GDKPIXBUF_HOST_PACKAGE		:= $(GDKPIXBUF_PACKAGE)
 GDKPIXBUF_HOST_SRC_DIR		:= $(TOOLS_BUILD)/gdk-pixbuf-$(GDKPIXBUF_VERSION)
 GDKPIXBUF_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/gdk-pixbuf-$(GDKPIXBUF_VERSION)
@@ -73,11 +65,3 @@ GDKPIXBUF_HOST_CONFIGURE_OPTS	:= --without-gdiplus --without-libjasper
 GDKPIXBUF_HOST_DEPS		:= libpng_host_install libjpeg_host_install	\
 				libtiff_host_install glib_host_install
 
-gdkpixbuf_host_install:
-	$(call embtk_install_hostpkg,gdkpixbuf_host)
-
-#
-# Common targets
-#
-download_gdkpixbuf download_gdkpixbuf_host:
-	$(call embtk_download_pkg,gdkpixbuf)
diff --git a/packages/graphics/gtk/gtk.mk b/packages/graphics/gtk/gtk.mk
index ce873c2..c3b5969 100644
--- a/packages/graphics/gtk/gtk.mk
+++ b/packages/graphics/gtk/gtk.mk
@@ -28,7 +28,6 @@ GTK_MAJOR_VERSION	:= $(call embtk_get_pkgversion,gtk_major)
 GTK_VERSION		:= $(call embtk_get_pkgversion,gtk)
 GTK_SITE		:= http://ftp.gnome.org/pub/gnome/sources/gtk+/$(GTK_MAJOR_VERSION)
 GTK_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-GTK_PATCH_SITE		:= ftp://ftp.embtoolkit.org/embtoolkit.org/gtk/$(GTK_VERSION)
 GTK_PACKAGE		:= gtk+-$(GTK_VERSION).tar.bz2
 GTK_SRC_DIR		:= $(PACKAGES_BUILD)/gtk+-$(GTK_VERSION)
 GTK_BUILD_DIR		:= $(PACKAGES_BUILD)/gtk+-$(GTK_VERSION)
@@ -56,17 +55,11 @@ GTK_CONFIGURE_OPTS	:= $(GTK_BACKEND)
 GTK_CONFIGURE_OPTS	+= --disable-cups --disable-gtk-doc --disable-glibtest
 GTK_CONFIGURE_OPTS	+= LIBPNG=-lpng
 
-gtk_install:
-	$(call embtk_install_pkg,gtk)
+define embtk_postinstall_gtk
 	$(Q)test -e $(GTK_BUILD_DIR)/.patchlibtool || \
 	$(MAKE) $(GTK_BUILD_DIR)/.patchlibtool
-	$(Q)$(MAKE) $(GTK_BUILD_DIR)/.special
-
-download_gtk:
-	$(call embtk_download_pkg,gtk)
-
-gtk_clean:
-	$(call embtk_cleanup_pkg,gtk)
+	$(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/gtk-* $(ROOTFS)/usr/$(LIBDIR)/
+endef
 
 $(GTK_BUILD_DIR)/.patchlibtool:
 ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
@@ -96,10 +89,3 @@ else
 	mv $$i.new $$i; \
 	done
 endif
-
-
-.PHONY: gtk_clean $(GTK_BUILD_DIR)/.special
-
-$(GTK_BUILD_DIR)/.special:
-	$(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/gtk-* $(ROOTFS)/usr/$(LIBDIR)/
-	@touch $@
diff --git a/packages/graphics/imlib2/imlib2.mk b/packages/graphics/imlib2/imlib2.mk
index f79238a..b3cb0e6 100644
--- a/packages/graphics/imlib2/imlib2.mk
+++ b/packages/graphics/imlib2/imlib2.mk
@@ -27,7 +27,6 @@ IMLIB2_NAME		:= imlib2
 IMLIB2_VERSION		:= $(call embtk_get_pkgversion,imlib2)
 IMLIB2_SITE		:= http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)
 IMLIB2_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-IMLIB2_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/imlib2/$(IMLIB2_VERSION)
 IMLIB2_PACKAGE		:= imlib2-$(IMLIB2_VERSION).tar.gz
 IMLIB2_SRC_DIR		:= $(PACKAGES_BUILD)/imlib2-$(IMLIB2_VERSION)
 IMLIB2_BUILD_DIR	:= $(PACKAGES_BUILD)/imlib2-$(IMLIB2_VERSION)
@@ -42,21 +41,9 @@ IMLIB2_PKGCONFIGS	= imlib2.pc
 
 IMLIB2_DEPS		:= libpng_install freetype_install libjpeg_install
 
-imlib2_install:
-	$(call embtk_install_pkg,imlib2)
-	$(Q)$(MAKE) $(IMLIB2_BUILD_DIR)/.special
-
-download_imlib2:
-	$(call embtk_download_pkg,imlib2)
-
-imlib2_clean:
-	$(call embtk_cleanup_pkg,imlib2)
-
-.PHONY: $(IMLIB2_BUILD_DIR)/.special
-
-$(IMLIB2_BUILD_DIR)/.special:
+define embtk_postinstall_imlib2
 	$(Q)mkdir -p $(ROOTFS)/usr/$(LIBDIR)
 	$(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/imlib2 $(ROOTFS)/usr/$(LIBDIR)
 	$(Q)-mkdir -p $(ROOTFS)/usr/share
 	$(Q)-cp -R $(SYSROOT)/usr/share/imlib2 $(ROOTFS)/usr/share
-	@touch $@
+endef
diff --git a/packages/graphics/libjpeg/libjpeg.mk b/packages/graphics/libjpeg/libjpeg.mk
index fab3f54..fba19b0 100644
--- a/packages/graphics/libjpeg/libjpeg.mk
+++ b/packages/graphics/libjpeg/libjpeg.mk
@@ -27,7 +27,6 @@ LIBJPEG_NAME		:= jpeg
 LIBJPEG_VERSION		:= $(call embtk_get_pkgversion,libjpeg)
 LIBJPEG_SITE		:= http://www.ijg.org/files
 LIBJPEG_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBJPEG_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/jpeg/$(LIBJPEG_VERSION)
 LIBJPEG_PACKAGE		:= jpegsrc.v$(LIBJPEG_VERSION).tar.gz
 LIBJPEG_SRC_DIR		:= $(PACKAGES_BUILD)/jpeg-$(LIBJPEG_VERSION)
 LIBJPEG_BUILD_DIR	:= $(PACKAGES_BUILD)/jpeg-$(LIBJPEG_VERSION)
@@ -39,12 +38,6 @@ LIBJPEG_INCLUDES	:= jconfig.h jerror.h jmorecfg.h jpeglib.h
 
 LIBJPEG_CONFIGURE_OPTS := --program-suffix=""
 
-libjpeg_install:
-	$(call embtk_install_pkg,libjpeg)
-
-libjpeg_clean:
-	$(call embtk_cleanup_pkg,libjpeg)
-
 #
 # libjpeg for host development machine
 #
@@ -54,18 +47,9 @@ LIBJPEG_HOST_SITE		:= $(LIBJPEG_SITE)
 LIBJPEG_HOST_SITE_MIRROR1	:= $(LIBJPEG_SITE_MIRROR1)
 LIBJPEG_HOST_SITE_MIRROR2	:= $(LIBJPEG_SITE_MIRROR2)
 LIBJPEG_HOST_SITE_MIRROR3	:= $(LIBJPEG_SITE_MIRROR3)
-LIBJPEG_HOST_PATCH_SITE		:= $(LIBJPEG_PATCH_SITE)
 LIBJPEG_HOST_PACKAGE		:= $(LIBJPEG_PACKAGE)
 LIBJPEG_HOST_SRC_DIR		:= $(TOOLS_BUILD)/jpeg-$(LIBJPEG_VERSION)
 LIBJPEG_HOST_BUILD_DIR		:= $(TOOLS_BUILD)/jpeg-$(LIBJPEG_VERSION)
 
 LIBJPEG_HOST_CONFIGURE_OPTS	:= --program-suffix=""
 
-libjpeg_host_install:
-	$(call embtk_install_hostpkg,libjpeg_host)
-
-#
-# Common for host and target
-#
-download_libjpeg download_libjpeg_host:
-	$(call embtk_download_pkg,libjpeg)
diff --git a/packages/graphics/libpng/libpng.mk b/packages/graphics/libpng/libpng.mk
index 93e45df..5f920c1 100644
--- a/packages/graphics/libpng/libpng.mk
+++ b/packages/graphics/libpng/libpng.mk
@@ -28,7 +28,6 @@ LIBPNG_VERSION		:= $(call embtk_get_pkgversion,libpng)
 LIBPNG_SITE		:= http://download.sourceforge.net/libpng
 LIBPNG_PACKAGE		:= libpng-$(LIBPNG_VERSION).tar.gz
 LIBPNG_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBPNG_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/libpng/$(LIBPNG_VERSION)
 LIBPNG_SRC_DIR		:= $(PACKAGES_BUILD)/libpng-$(LIBPNG_VERSION)
 LIBPNG_BUILD_DIR	:= $(PACKAGES_BUILD)/libpng-$(LIBPNG_VERSION)
 
@@ -41,12 +40,6 @@ LIBPNG_PKGCONFIGS	= libpng*
 LIBPNG_CONFIGURE_OPTS	:= --with-libpng-compat=no
 LIBPNG_DEPS		:= zlib_install
 
-libpng_install:
-	$(call embtk_install_pkg,libpng)
-
-libpng_clean:
-	$(call embtk_cleanup_pkg,libpng)
-
 #
 # libpng for host development machine
 #
@@ -58,18 +51,9 @@ LIBPNG_HOST_PACKAGE		:= $(LIBPNG_PACKAGE)
 LIBPNG_HOST_SITE_MIRROR1	:= $(LIBPNG_SITE_MIRROR1)
 LIBPNG_HOST_SITE_MIRROR2	:= $(LIBPNG_SITE_MIRROR2)
 LIBPNG_HOST_SITE_MIRROR3	:= $(LIBPNG_SITE_MIRROR3)
-LIBPNG_HOST_PATCH_SITE		:= $(LIBPNG_PATCH_SITE)
 LIBPNG_HOST_SRC_DIR		:= $(TOOLS_BUILD)/libpng-$(LIBPNG_VERSION)
 LIBPNG_HOST_BUILD_DIR		:= $(TOOLS_BUILD)/libpng-$(LIBPNG_VERSION)
 
 LIBPNG_HOST_CONFIGURE_OPTS	:= --with-libpng-compat=no
 LIBPNG_HOST_DEPS		:= zlib_host_install
 
-libpng_host_install:
-	$(call embtk_install_hostpkg,libpng_host)
-
-#
-# Common for target and host
-#
-download_libpng download_libpng_host:
-	$(call embtk_download_pkg,libpng)
diff --git a/packages/graphics/libtiff/libtiff.mk b/packages/graphics/libtiff/libtiff.mk
index 2457cfa..2c2d63d 100644
--- a/packages/graphics/libtiff/libtiff.mk
+++ b/packages/graphics/libtiff/libtiff.mk
@@ -27,14 +27,13 @@ LIBTIFF_NAME		:= libtiff
 LIBTIFF_VERSION		:= $(call embtk_get_pkgversion,libtiff)
 LIBTIFF_SITE		:= ftp://ftp.remotesensing.org/pub/libtiff
 LIBTIFF_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBTIFF_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/libtiff/$(LIBTIFF_VERSION)
 LIBTIFF_PACKAGE		:= tiff-$(LIBTIFF_VERSION).tar.gz
 LIBTIFF_SRC_DIR		:= $(PACKAGES_BUILD)/tiff-$(LIBTIFF_VERSION)
 LIBTIFF_BUILD_DIR	:= $(PACKAGES_BUILD)/tiff-$(LIBTIFF_VERSION)
 
-LIBTIFF_BINS =	vbmp2tiff fax2tiff pal2rgb  ras2tiff rgb2ycbcr tiff2bw tiff2ps \
-		tiffcmp tiffcrop tiffdump tiffmedian tiffsplit fax2ps gif2tiff \
-		ppm2tiff raw2tiff thumbnail tiff2pdf tiff2rgba tiffcp \
+LIBTIFF_BINS =	vbmp2tiff fax2tiff pal2rgb  ras2tiff rgb2ycbcr tiff2bw tiff2ps	\
+		tiffcmp tiffcrop tiffdump tiffmedian tiffsplit fax2ps gif2tiff	\
+		ppm2tiff raw2tiff thumbnail tiff2pdf tiff2rgba tiffcp		\
 		tiffdither tiffinfo tiffset bmp2tiff
 LIBTIFF_SBINS		=
 LIBTIFF_INCLUDES	= tiffconf.h tiff.h tiffio.h tiffio.hxx tiffvers.h
@@ -43,12 +42,6 @@ LIBTIFF_PKGCONFIGS	=
 
 LIBTIFF_CONFIGURE_OPTS	:= --disable-cxx --program-prefix=""
 
-libtiff_install:
-	$(call embtk_install_pkg,libtiff)
-
-libtiff_clean:
-	$(call embtk_cleanup_pkg,libtiff)
-
 #
 # libtiff for host development machine
 #
@@ -58,18 +51,9 @@ LIBTIFF_HOST_SITE		:= $(LIBTIFF_SITE)
 LIBTIFF_HOST_SITE_MIRROR1	:= $(LIBTIFF_SITE_MIRROR1)
 LIBTIFF_HOST_SITE_MIRROR2	:= $(LIBTIFF_SITE_MIRROR2)
 LIBTIFF_HOST_SITE_MIRROR3	:= $(LIBTIFF_SITE_MIRROR3)
-LIBTIFF_HOST_PATCH_SITE		:= $(LIBTIFF_PATCH_SITE)
 LIBTIFF_HOST_PACKAGE		:= $(LIBTIFF_PACKAGE)
 LIBTIFF_HOST_SRC_DIR		:= $(TOOLS_BUILD)/tiff-$(LIBTIFF_VERSION)
 LIBTIFF_HOST_BUILD_DIR		:= $(TOOLS_BUILD)/tiff-$(LIBTIFF_VERSION)
 
 LIBTIFF_HOST_CONFIGURE_OPTS	:= --disable-cxx --program-prefix=""
 
-libtiff_host_install:
-	$(call embtk_install_hostpkg,libtiff_host)
-
-#
-# Common for host and target
-#
-download_libtiff download_libtiff_host:
-	$(call embtk_download_pkg,libtiff)
diff --git a/packages/graphics/pango/pango.mk b/packages/graphics/pango/pango.mk
index 3b74fa1..0b2632c 100644
--- a/packages/graphics/pango/pango.mk
+++ b/packages/graphics/pango/pango.mk
@@ -28,7 +28,6 @@ PANGO_MAJOR_VERSION	:= $(call embtk_get_pkgversion,pango_major)
 PANGO_VERSION		:= $(call embtk_get_pkgversion,pango)
 PANGO_SITE		:= http://ftp.gnome.org/pub/gnome/sources/pango/$(PANGO_MAJOR_VERSION)
 PANGO_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-PANGO_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/pango/$(PANGO_VERSION)
 PANGO_PACKAGE		:= pango-$(PANGO_VERSION).tar.bz2
 PANGO_SRC_DIR		:= $(PACKAGES_BUILD)/pango-$(PANGO_VERSION)
 PANGO_BUILD_DIR		:= $(PACKAGES_BUILD)/pango-$(PANGO_VERSION)
@@ -49,17 +48,11 @@ PANGO_CONFIGURE_OPTS	:= $(PANGO_CONFIGURE_OPTS-y)
 PANGO_DEPS		:= glib_install fontconfig_install $(PANGO_DEPS-y)	\
 			cairo_install
 
-pango_install:
-	$(call embtk_install_pkg,pango)
+define embtk_postinstall_pango
 	$(Q)test -e $(PANGO_BUILD_DIR)/.patchlibtool || \
 	$(MAKE) $(PANGO_BUILD_DIR)/.patchlibtool
-	$(Q)$(MAKE) $(PANGO_BUILD_DIR)/.special
-
-download_pango:
-	$(call embtk_download_pkg,pango)
-
-pango_clean:
-	$(call embtk_cleanup_pkg,pango)
+	$(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/pango $(ROOTFS)/usr/$(LIBDIR)/
+endef
 
 $(PANGO_BUILD_DIR)/.patchlibtool:
 	$(Q)PANGO_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/* -type f -name *.la`; \
@@ -72,9 +65,3 @@ $(PANGO_BUILD_DIR)/.patchlibtool:
 	mv $$i.new $$i; \
 	done
 	@touch $@
-
-.PHONY: pango_clean $(PANGO_BUILD_DIR)/.special
-
-$(PANGO_BUILD_DIR)/.special:
-	$(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/pango $(ROOTFS)/usr/$(LIBDIR)/
-	@touch $@
diff --git a/packages/graphics/pixman/pixman.mk b/packages/graphics/pixman/pixman.mk
index bcceb7b..8f4d1f1 100644
--- a/packages/graphics/pixman/pixman.mk
+++ b/packages/graphics/pixman/pixman.mk
@@ -23,26 +23,16 @@
 # \date         December 2009
 ################################################################################
 
-PIXMAN_NAME := pixman
-PIXMAN_VERSION := $(call embtk_get_pkgversion,PIXMAN)
-PIXMAN_SITE := http://www.cairographics.org/releases
-PIXMAN_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-PIXMAN_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/pixman/$(PIXMAN_VERSION)
-PIXMAN_PACKAGE := pixman-$(PIXMAN_VERSION).tar.gz
-PIXMAN_SRC_DIR := $(PACKAGES_BUILD)/pixman-$(PIXMAN_VERSION)
-PIXMAN_BUILD_DIR := $(PACKAGES_BUILD)/pixman-$(PIXMAN_VERSION)
+PIXMAN_NAME		:= pixman
+PIXMAN_VERSION		:= $(call embtk_get_pkgversion,pixman)
+PIXMAN_SITE		:= http://www.cairographics.org/releases
+PIXMAN_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+PIXMAN_PACKAGE		:= pixman-$(PIXMAN_VERSION).tar.gz
+PIXMAN_SRC_DIR		:= $(PACKAGES_BUILD)/pixman-$(PIXMAN_VERSION)
+PIXMAN_BUILD_DIR	:= $(PACKAGES_BUILD)/pixman-$(PIXMAN_VERSION)
 
-PIXMAN_BINS =
-PIXMAN_SBINS =
-PIXMAN_INCLUDES = pixman-*
-PIXMAN_LIBS = libpixman-*
-PIXMAN_PKGCONFIGS = pixman-*.pc
-
-pixman_install:
-	$(call embtk_install_pkg,PIXMAN)
-
-download_pixman:
-	$(call embtk_download_pkg,PIXMAN)
-
-pixman_clean:
-	$(call embtk_cleanup_pkg,PIXMAN)
+PIXMAN_BINS		=
+PIXMAN_SBINS		=
+PIXMAN_INCLUDES		= pixman-*
+PIXMAN_LIBS		= libpixman-*
+PIXMAN_PKGCONFIGS	= pixman-*.pc
diff --git a/packages/misc/expat/expat.mk b/packages/misc/expat/expat.mk
index 51468d2..ecbe098 100644
--- a/packages/misc/expat/expat.mk
+++ b/packages/misc/expat/expat.mk
@@ -23,28 +23,16 @@
 # \date         July 2010
 ################################################################################
 
-EXPAT_NAME := expat
-EXPAT_VERSION := $(call embtk_get_pkgversion,EXPAT)
-EXPAT_SITE := http://downloads.sourceforge.net/expat
-EXPAT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-EXPAT_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/expat/$(EXPAT_VERSION)
-EXPAT_PACKAGE := expat-$(EXPAT_VERSION).tar.gz
-EXPAT_SRC_DIR := $(PACKAGES_BUILD)/expat-$(EXPAT_VERSION)
-EXPAT_BUILD_DIR := $(PACKAGES_BUILD)/expat-$(EXPAT_VERSION)
+EXPAT_NAME		:= expat
+EXPAT_VERSION		:= $(call embtk_get_pkgversion,expat)
+EXPAT_SITE		:= http://downloads.sourceforge.net/expat
+EXPAT_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+EXPAT_PACKAGE		:= expat-$(EXPAT_VERSION).tar.gz
+EXPAT_SRC_DIR		:= $(PACKAGES_BUILD)/expat-$(EXPAT_VERSION)
+EXPAT_BUILD_DIR		:= $(PACKAGES_BUILD)/expat-$(EXPAT_VERSION)
 
-EXPAT_BINS = xmlwf
-EXPAT_SBINS =
-EXPAT_INCLUDES = expat_external.h expat.h
-EXPAT_LIBS = libexpat.*
-EXPAT_PKGCONFIGS =
-
-EXPAT_DEPS =
-
-expat_install:
-	$(call embtk_install_pkg,EXPAT)
-
-download_expat:
-	$(call embtk_download_pkg,EXPAT)
-
-expat_clean:
-	$(call embtk_cleanup_pkg,EXPAT)
+EXPAT_BINS		= xmlwf
+EXPAT_SBINS		=
+EXPAT_INCLUDES		= expat_external.h expat.h
+EXPAT_LIBS		= libexpat.*
+EXPAT_PKGCONFIGS	=
diff --git a/packages/misc/gettext/gettext.mk b/packages/misc/gettext/gettext.mk
index a189895..5ccdac6 100644
--- a/packages/misc/gettext/gettext.mk
+++ b/packages/misc/gettext/gettext.mk
@@ -27,7 +27,6 @@ GETTEXT_NAME		:= gettext
 GETTEXT_VERSION		:= $(call embtk_get_pkgversion,gettext)
 GETTEXT_SITE		:= http://ftp.gnu.org/pub/gnu/gettext
 GETTEXT_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-GETTEXT_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/gettext/$(GETTEXT_VERSION)
 GETTEXT_PACKAGE		:= gettext-$(GETTEXT_VERSION).tar.gz
 GETTEXT_SRC_DIR		:= $(PACKAGES_BUILD)/gettext-$(GETTEXT_VERSION)
 GETTEXT_BUILD_DIR	:= $(PACKAGES_BUILD)/gettext-$(GETTEXT_VERSION)
@@ -53,13 +52,11 @@ GETTEXT_CONFIGURE_OPTS	:= --enable-relocatable --with-included-gettext	\
 
 GETTEXT_DEPS = ncurses_install libxml2_install
 
-gettext_install:
-	$(call embtk_install_pkg,gettext)
-	@test -e $(GETTEXT_BUILD_DIR)/.patchlibtool || \
-	$(MAKE) $(GETTEXT_BUILD_DIR)/.patchlibtool
 
-gettext_clean:
-	$(call embtk_cleanup_pkg,gettext)
+define embtk_postinstall_gettext
+	$(Q)test -e $(GETTEXT_BUILD_DIR)/.patchlibtool || \
+	$(MAKE) $(GETTEXT_BUILD_DIR)/.patchlibtool
+endef
 
 #FIXME: this should be fixed in gettext project
 $(GETTEXT_BUILD_DIR)/.patchlibtool:
@@ -89,9 +86,3 @@ GETTEXT_HOST_CONFIGURE_OPTS	:= --disable-java --disable-native-java	\
 	--disable-openmp --with-included-gettext --with-included-glib	\
 	--with-included-libcroco --with-included-libxml
 
-gettext_host_install:
-	$(call embtk_install_hostpkg,gettext_host)
-
-# common tagets
-download_gettext download_gettext_host:
-	$(call embtk_download_pkg,gettext)
diff --git a/packages/misc/glib/glib.mk b/packages/misc/glib/glib.mk
index 58f5555..8e1b002 100644
--- a/packages/misc/glib/glib.mk
+++ b/packages/misc/glib/glib.mk
@@ -47,15 +47,14 @@ GLIB_CONFIGURE_ENV	:= glib_cv_stack_grows=no			\
 			ac_cv_func_posix_getpwuid_r=yes			\
 			ac_cv_func_nonposix_getpwuid_r=no		\
 			ac_cv_func_posix_getgrgid_r=yes
-
 GLIB_CONFIGURE_OPTS	:= --disable-fam
 
 GLIB_DEPS		:= zlib_install gettext_install glib_host_install
 
-glib_install:
-	$(call embtk_install_pkg,glib)
-	@test -e $(GLIB_BUILD_DIR)/.patchlibtool || \
+define embtk_postinstall_glib
+	$(Q)test -e $(GLIB_BUILD_DIR)/.patchlibtool || \
 	$(MAKE) $(GLIB_BUILD_DIR)/.patchlibtool
+endef
 
 #FIXME: this should be fixed in glib2 project
 $(GLIB_BUILD_DIR)/.patchlibtool:
@@ -81,9 +80,6 @@ $(GLIB_BUILD_DIR)/.patchlibtool:
 	mv libgthread-2.0.la.new $(SYSROOT)/usr/$(LIBDIR)/libgthread-2.0.la
 	@touch $@
 
-glib_clean:
-	$(call embtk_cleanup_pkg,glib)
-
 #
 # glib for host
 #
@@ -103,11 +99,3 @@ GLIB_HOST_SET_RPATH		:= y
 GLIB_HOST_CONFIGURE_OPTS	:= --disable-fam
 GLIB_HOST_DEPS			:= gettext_host_install
 
-glib_host_install:
-	$(call embtk_install_hostpkg,glib_host)
-
-#
-# Common for target and host
-#
-download_glib download_glib_host:
-	$(call embtk_download_pkg,glib)
diff --git a/packages/misc/gperf/gperf.mk b/packages/misc/gperf/gperf.mk
index 2d98b3f..9c68cbd 100644
--- a/packages/misc/gperf/gperf.mk
+++ b/packages/misc/gperf/gperf.mk
@@ -24,10 +24,9 @@
 ################################################################################
 
 GPERF_NAME		:= gperf
-GPERF_VERSION		:= $(call embtk_get_pkgversion,GPERF)
+GPERF_VERSION		:= $(call embtk_get_pkgversion,gperf)
 GPERF_SITE		:= http://ftp.gnu.org/gnu/gperf
 GPERF_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-GPERF_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/gperf/$(GPERF_VERSION)
 GPERF_PACKAGE		:= gperf-$(GPERF_VERSION).tar.gz
 GPERF_SRC_DIR		:= $(PACKAGES_BUILD)/gperf-$(GPERF_VERSION)
 GPERF_BUILD_DIR		:= $(PACKAGES_BUILD)/gperf-$(GPERF_VERSION)
@@ -47,12 +46,6 @@ GPERF_CONFIGURE_OPTS	:=
 
 GPERF_DEPS :=
 
-gperf_install:
-	$(call embtk_install_pkg,GPERF)
-
-gperf_clean:
-	$(call embtk_cleanup_pkg,GPERF)
-
 #
 # gperf for for host
 #
@@ -62,16 +55,7 @@ GPERF_HOST_SITE		:= $(GPERF_SITE)
 GPERF_HOST_SITE_MIRROR1	:= $(GPERF_SITE_MIRROR1)
 GPERF_HOST_SITE_MIRROR2	:= $(GPERF_SITE_MIRROR2)
 GPERF_HOST_SITE_MIRROR3	:= $(GPERF_SITE_MIRROR3)
-GPERF_HOST_PATCH_SITE	:= $(GPERF_PATCH_SITE)
 GPERF_HOST_PACKAGE	:= $(GPERF_PACKAGE)
 GPERF_HOST_SRC_DIR	:= $(TOOLS_BUILD)/gperf-$(GPERF_VERSION)
 GPERF_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/gperf-$(GPERF_VERSION)
 
-#
-# common targets
-#
-gperf_host_install:
-	$(call embtk_install_hostpkg,GPERF_HOST)
-
-download_gperf download_gperf_host:
-	$(call embtk_download_pkg,GPERF)
diff --git a/packages/misc/intltool/intltool.mk b/packages/misc/intltool/intltool.mk
index 6b54fdd..27e0b39 100644
--- a/packages/misc/intltool/intltool.mk
+++ b/packages/misc/intltool/intltool.mk
@@ -24,11 +24,10 @@
 ################################################################################
 
 INTLTOOL_NAME		:= intltool
-INTLTOOL_MAJOR_VERSION	:= $(call embtk_get_pkgversion,INTLTOOL_MAJOR)
-INTLTOOL_VERSION	:= $(call embtk_get_pkgversion,INTLTOOL)
+INTLTOOL_MAJOR_VERSION	:= $(call embtk_get_pkgversion,intltool_major)
+INTLTOOL_VERSION	:= $(call embtk_get_pkgversion,intltool)
 INTLTOOL_SITE		:= http://ftp.gnome.org/pub/gnome/sources/intltool/$(INTLTOOL_MAJOR_VERSION)
 INTLTOOL_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-INTLTOOL_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/intltool/$(INTLTOOL_VERSION)
 INTLTOOL_PACKAGE	:= intltool-$(INTLTOOL_VERSION).tar.bz2
 INTLTOOL_SRC_DIR	:= $(PACKAGES_BUILD)/intltool-$(INTLTOOL_VERSION)
 INTLTOOL_BUILD_DIR	:= $(PACKAGES_BUILD)/intltool-$(INTLTOOL_VERSION)
@@ -48,12 +47,6 @@ INTLTOOL_CONFIGURE_OPTS	:=
 
 INTLTOOL_DEPS :=
 
-intltool_install:
-	$(call embtk_install_pkg,INTLTOOL)
-
-intltool_clean:
-	$(call embtk_cleanup_pkg,INTLTOOL)
-
 #
 # intltool for host
 #
@@ -66,11 +59,3 @@ INTLTOOL_HOST_PACKAGE		:= $(INTLTOOL_PACKAGE)
 INTLTOOL_HOST_SRC_DIR		:= $(TOOLS_BUILD)/intltool-$(INTLTOOL_VERSION)
 INTLTOOL_HOST_BUILD_DIR		:= $(TOOLS_BUILD)/intltool-$(INTLTOOL_VERSION)
 
-intltool_host_install:
-	$(call embtk_install_hostpkg,INTLTOOL_HOST)
-
-#
-# common targets
-#
-download_intltool download_intltool_host:
-	$(call embtk_download_pkg,INTLTOOL)
diff --git a/packages/misc/libxml/libxml.mk b/packages/misc/libxml/libxml.mk
index f8a38de..640ab15 100644
--- a/packages/misc/libxml/libxml.mk
+++ b/packages/misc/libxml/libxml.mk
@@ -24,10 +24,9 @@
 ################################################################################
 
 LIBXML2_NAME		:= libxml2
-LIBXML2_VERSION		:= $(call embtk_get_pkgversion,LIBXML2)
+LIBXML2_VERSION		:= $(call embtk_get_pkgversion,libxml2)
 LIBXML2_SITE		:= ftp://xmlsoft.org/libxml2
 LIBXML2_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBXML2_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/libxml2/$(LIBXML2_VERSION)
 LIBXML2_PACKAGE		:= libxml2-$(LIBXML2_VERSION).tar.gz
 LIBXML2_SRC_DIR		:= $(PACKAGES_BUILD)/libxml2-$(LIBXML2_VERSION)
 LIBXML2_BUILD_DIR	:= $(PACKAGES_BUILD)/libxml2-$(LIBXML2_VERSION)
@@ -40,11 +39,3 @@ LIBXML2_PKGCONFIGS	= libxml*.pc
 
 LIBXML2_CONFIGURE_OPTS	:= --without-python
 
-libxml2_install:
-	$(call embtk_install_pkg,LIBXML2)
-
-download_libxml2:
-	$(call embtk_download_pkg,LIBXML2)
-
-libxml2_clean:
-	$(call embtk_cleanup_pkg,LIBXML2)
diff --git a/packages/misc/ncurses/ncurses.mk b/packages/misc/ncurses/ncurses.mk
index e65507b..eb961cf 100644
--- a/packages/misc/ncurses/ncurses.mk
+++ b/packages/misc/ncurses/ncurses.mk
@@ -23,14 +23,13 @@
 # \date         January 2010
 ################################################################################
 
-NCURSES_NAME := ncurses
-NCURSES_VERSION := $(call embtk_get_pkgversion,NCURSES)
-NCURSES_SITE := http://ftp.gnu.org/pub/gnu/ncurses
-NCURSES_PACKAGE := ncurses-$(NCURSES_VERSION).tar.gz
-NCURSES_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-NCURSES_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/ncurses/$(NCURSES_VERSION)
-NCURSES_SRC_DIR := $(PACKAGES_BUILD)/ncurses-$(NCURSES_VERSION)
-NCURSES_BUILD_DIR := $(PACKAGES_BUILD)/ncurses-$(NCURSES_VERSION)
+NCURSES_NAME		:= ncurses
+NCURSES_VERSION		:= $(call embtk_get_pkgversion,ncurses)
+NCURSES_SITE		:= http://ftp.gnu.org/pub/gnu/ncurses
+NCURSES_PACKAGE		:= ncurses-$(NCURSES_VERSION).tar.gz
+NCURSES_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+NCURSES_SRC_DIR		:= $(PACKAGES_BUILD)/ncurses-$(NCURSES_VERSION)
+NCURSES_BUILD_DIR	:= $(PACKAGES_BUILD)/ncurses-$(NCURSES_VERSION)
 
 NCURSES_BINS = captoinfo clear infocmp infotocap ncurses5-config reset tic toe \
 		tput tset
@@ -50,19 +49,7 @@ NCURSES_CONFIGURE_OPTS	:= --disable-rpath --without-cxx-binding	\
 			--enable-termcap --without-progs		\
 			--program-prefix=""
 
-ncurses_install:
-	$(call embtk_install_pkg,NCURSES)
-	$(Q)$(MAKE) $(NCURSES_BUILD_DIR)/.special
-
-download_ncurses:
-	$(call embtk_download_pkg,NCURSES)
-
-ncurses_clean:
-	$(call embtk_cleanup_pkg,NCURSES)
-
-.PHONY: $(NCURSES_BUILD_DIR)/.special ncurses_clean
-
-$(NCURSES_BUILD_DIR)/.special:
+define embtk_postinstall_ncurses
 	$(Q)mkdir -p $(ROOTFS)/usr/share
 	$(Q)-cp -R $(SYSROOT)/usr/share/tabset $(ROOTFS)/usr/share/
-	@touch $@
+endef
diff --git a/packages/misc/tslib/tslib.mk b/packages/misc/tslib/tslib.mk
index 970a89b..b8727ad 100644
--- a/packages/misc/tslib/tslib.mk
+++ b/packages/misc/tslib/tslib.mk
@@ -24,10 +24,9 @@
 ################################################################################
 
 TSLIB_NAME		:= tslib
-TSLIB_VERSION		:= $(call embtk_get_pkgversion,TSLIB)
+TSLIB_VERSION		:= $(call embtk_get_pkgversion,tslib)
 TSLIB_SITE		:= http://download.berlios.de/tslib
 TSLIB_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-TSLIB_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/tslib/$(TSLIB_VERSION)
 TSLIB_PACKAGE		:= tslib-$(TSLIB_VERSION).tar.bz2
 TSLIB_SRC_DIR		:= $(PACKAGES_BUILD)/tslib-$(TSLIB_VERSION)
 TSLIB_BUILD_DIR		:= $(PACKAGES_BUILD)/tslib-$(TSLIB_VERSION)
@@ -40,18 +39,6 @@ TSLIB_PKGCONFIGS	= tslib*.pc
 
 TSLIB_DEPS =
 
-tslib_install:
-	$(call embtk_install_pkg,TSLIB)
-	$(Q)$(MAKE) $(TSLIB_BUILD_DIR)/.special
-
-download_tslib:
-	$(call embtk_download_pkg,TSLIB)
-
-tslib_clean:
-	$(call embtk_cleanup_pkg,TSLIB)
-
-.PHONY: $(TSLIB_BUILD_DIR)/.special
-
-$(TSLIB_BUILD_DIR)/.special:
+define embtk_postinstall_tslib
 	$(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/ts $(ROOTFS)/usr/$(LIBDIR)/
-	@touch $@
+endef
diff --git a/packages/system/dbus/dbus.mk b/packages/system/dbus/dbus.mk
index 51638dd..fc68e9a 100644
--- a/packages/system/dbus/dbus.mk
+++ b/packages/system/dbus/dbus.mk
@@ -23,40 +23,27 @@
 # \date         July 2010
 ################################################################################
 
-DBUS_NAME := dbus
-DBUS_VERSION := $(call embtk_get_pkgversion,DBUS)
-DBUS_SITE := http://dbus.freedesktop.org/releases/dbus
-DBUS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-DBUS_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/dbus/$(DBUS_VERSION)
-DBUS_PACKAGE := dbus-$(DBUS_VERSION).tar.gz
-DBUS_SRC_DIR := $(PACKAGES_BUILD)/dbus-$(DBUS_VERSION)
-DBUS_BUILD_DIR := $(PACKAGES_BUILD)/dbus-$(DBUS_VERSION)
-
-DBUS_BINS = dbus-cleanup-sockets dbus-daemon dbus-launch dbus-monitor \
-		dbus-send dbus-uuidgen
-DBUS_SBINS =
-DBUS_INCLUDES = dbus-*
-DBUS_LIBS = dbus-* libdbus*
-DBUS_PKGCONFIGS = dbus*.pc
-
-DBUS_DEPS = expat_install \
-	$(if $(CONFIG_EMBTK_HAVE_LIBX11),libx11_install,)
+DBUS_NAME		:= dbus
+DBUS_VERSION		:= $(call embtk_get_pkgversion,dbus)
+DBUS_SITE		:= http://dbus.freedesktop.org/releases/dbus
+DBUS_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+DBUS_PACKAGE		:= dbus-$(DBUS_VERSION).tar.gz
+DBUS_SRC_DIR		:= $(PACKAGES_BUILD)/dbus-$(DBUS_VERSION)
+DBUS_BUILD_DIR		:= $(PACKAGES_BUILD)/dbus-$(DBUS_VERSION)
+
+DBUS_BINS		= dbus-cleanup-sockets dbus-daemon dbus-launch		\
+			dbus-monitor dbus-send dbus-uuidgen
+DBUS_SBINS		=
+DBUS_INCLUDES		= dbus-*
+DBUS_LIBS		= dbus-* libdbus*
+DBUS_PKGCONFIGS		= dbus*.pc
+
+DBUS_DEPS = expat_install $(if $(CONFIG_EMBTK_HAVE_LIBX11),libx11_install)
 
 DBUS_CONFIGURE_OPTS := --enable-abstract-sockets \
 	$(if $(CONFIG_EMBTK_HAVE_LIBX11),--with-x,--without-x)
 
-dbus_install:
-	$(call embtk_install_pkg,DBUS)
-	$(Q)$(MAKE) $(DBUS_BUILD_DIR)/.special
-
-download_dbus:
-	$(call embtk_download_pkg,DBUS)
-
-dbus_clean:
-	$(call embtk_cleanup_pkg,DBUS)
-
-.PHONY: $(DBUS_BUILD_DIR)/.special dbus_clean
-
-$(DBUS_BUILD_DIR)/.special:
+define embtk_postinstall_dbus
 	$(Q)-mkdir -p $(ROOTFS)/usr/libexec
 	$(Q)-cp -R $(SYSROOT)/usr/libexec/dbus* $(ROOTFS)/usr/libexec/
+endef
diff --git a/packages/system/e2fsprogs/e2fsprogs.mk b/packages/system/e2fsprogs/e2fsprogs.mk
index d5f753b..8e8ffce 100644
--- a/packages/system/e2fsprogs/e2fsprogs.mk
+++ b/packages/system/e2fsprogs/e2fsprogs.mk
@@ -24,10 +24,9 @@
 ################################################################################
 
 E2FSPROGS_NAME		:= e2fsprogs
-E2FSPROGS_VERSION	:= $(call embtk_get_pkgversion,E2FSPROGS)
+E2FSPROGS_VERSION	:= $(call embtk_get_pkgversion,e2fsprogs)
 E2FSPROGS_SITE		:= http://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/$(E2FSPROGS_VERSION)
 E2FSPROGS_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-E2FSPROGS_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/e2fsprogs/$(E2FSPROGS_VERSION)
 E2FSPROGS_PACKAGE	:= e2fsprogs-$(E2FSPROGS_VERSION).tar.gz
 E2FSPROGS_SRC_DIR	:= $(PACKAGES_BUILD)/e2fsprogs-$(E2FSPROGS_VERSION)
 E2FSPROGS_BUILD_DIR	:= $(PACKAGES_BUILD)/e2fsprogs-$(E2FSPROGS_VERSION)
@@ -48,17 +47,8 @@ E2FSPROGS_CONFIGURE_OPTS := --disable-compression --disable-htree	\
 		--disable-blkid-debug --disable-testio-debug		\
 		--enable-libuuid --enable-libblkid --disable-debugfs	\
 		--disable-imager --disable-resizer --disable-fsck	\
-		--disable-e2initrd-helper --disable-tls --disable-tls	\
-		--disable-nls --disable-rpath --with-included-gettext
-
-e2fsprogs_install:
-	$(call embtk_install_pkg,E2FSPROGS)
-
-download_e2fsprogs:
-	$(call embtk_download_pkg,E2FSPROGS)
-
-e2fsprogs_clean:
-	$(call embtk_cleanup_pkg,E2FSPROGS)
+		--disable-e2initrd-helper --disable-tls --disable-nls	\
+		--disable-rpath --with-included-gettext
 
 #
 # E2FSPROGS for host development machine
@@ -67,19 +57,11 @@ E2FSPROGS_HOST_NAME		:= $(E2FSPROGS_NAME)
 E2FSPROGS_HOST_VERSION		:= $(E2FSPROGS_VERSION)
 E2FSPROGS_HOST_SITE		:= $(E2FSPROGS_SITE)
 E2FSPROGS_HOST_SITE_MIRROR3	:= $(E2FSPROGS_SITE_MIRROR3)
-E2FSPROGS_HOST_PATCH_SITE	:= $(E2FSPROGS_PATCH_SITE)
 E2FSPROGS_HOST_PACKAGE		:= $(E2FSPROGS_PACKAGE)
 E2FSPROGS_HOST_SRC_DIR		:= $(TOOLS_BUILD)/e2fsprogs-$(E2FSPROGS_VERSION)
 E2FSPROGS_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/e2fsprogs-$(E2FSPROGS_VERSION)
 
-E2FSPROGS_HOST_MAKE_OPTS := LDCONFIG=true
-E2FSPROGS_HOST_MAKE_DIRS := $(E2FSPROGS_MAKE_DIRS)
-E2FSPROGS_CONFIGURE_OPTS := $(E2FSPROGS_CONFIGURE_OPTS)
-
-e2fsprogs_host_install:
-	$(call embtk_install_hostpkg,E2FSPROGS_HOST)
-
-download_e2fsprogs_host:
-	$(call embtk_download_pkg,E2FSPROGS_HOST)
+E2FSPROGS_HOST_MAKE_OPTS	:= LDCONFIG=true
+E2FSPROGS_HOST_MAKE_DIRS	:= $(E2FSPROGS_MAKE_DIRS)
+E2FSPROGS_HOST_CONFIGURE_OPTS	:= $(E2FSPROGS_CONFIGURE_OPTS)
 
-e2fsprogs_host_clean:
diff --git a/packages/x11/bigreqsproto/bigreqsproto.mk b/packages/x11/bigreqsproto/bigreqsproto.mk
index f1f1734..929ef0e 100644
--- a/packages/x11/bigreqsproto/bigreqsproto.mk
+++ b/packages/x11/bigreqsproto/bigreqsproto.mk
@@ -23,26 +23,16 @@
 # \date         February 2010
 ################################################################################
 
-BIGREQSPROTO_NAME := bigreqsproto
-BIGREQSPROTO_VERSION := $(call embtk_get_pkgversion,BIGREQSPROTO)
-BIGREQSPROTO_SITE := http://xorg.freedesktop.org/archive/individual/proto
-BIGREQSPROTO_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-BIGREQSPROTO_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/bigreqsprot/$(BIGREQSPROTO_VERSION)
-BIGREQSPROTO_PACKAGE := bigreqsproto-$(BIGREQSPROTO_VERSION).tar.bz2
-BIGREQSPROTO_SRC_DIR := $(PACKAGES_BUILD)/bigreqsproto-$(BIGREQSPROTO_VERSION)
-BIGREQSPROTO_BUILD_DIR := $(PACKAGES_BUILD)/bigreqsproto-$(BIGREQSPROTO_VERSION)
+BIGREQSPROTO_NAME		:= bigreqsproto
+BIGREQSPROTO_VERSION		:= $(call embtk_get_pkgversion,BIGREQSPROTO)
+BIGREQSPROTO_SITE		:= http://xorg.freedesktop.org/archive/individual/proto
+BIGREQSPROTO_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+BIGREQSPROTO_PACKAGE		:= bigreqsproto-$(BIGREQSPROTO_VERSION).tar.bz2
+BIGREQSPROTO_SRC_DIR		:= $(PACKAGES_BUILD)/bigreqsproto-$(BIGREQSPROTO_VERSION)
+BIGREQSPROTO_BUILD_DIR		:= $(PACKAGES_BUILD)/bigreqsproto-$(BIGREQSPROTO_VERSION)
 
-BIGREQSPROTO_BINS =
-BIGREQSPROTO_SBINS =
-BIGREQSPROTO_INCLUDES = X11/extensions/bigreqsproto.h X11/extensions/bigreqstr.h
-BIGREQSPROTO_LIBS =
-BIGREQSPROTO_PKGCONFIGS = bigreqsproto.pc
-
-bigreqsproto_install:
-	$(call embtk_install_pkg,BIGREQSPROTO)
-
-download_bigreqsproto:
-	$(call embtk_download_pkg,BIGREQSPROTO)
-
-bigreqsproto_clean:
-	$(call embtk_cleanup_pkg,BIGREQSPROTO)
+BIGREQSPROTO_BINS	=
+BIGREQSPROTO_SBINS	=
+BIGREQSPROTO_INCLUDES	= X11/extensions/bigreqsproto.h X11/extensions/bigreqstr.h
+BIGREQSPROTO_LIBS	=
+BIGREQSPROTO_PKGCONFIGS	= bigreqsproto.pc
diff --git a/packages/x11/libfontenc/libfontenc.mk b/packages/x11/libfontenc/libfontenc.mk
index eec6ef3..a728d2a 100644
--- a/packages/x11/libfontenc/libfontenc.mk
+++ b/packages/x11/libfontenc/libfontenc.mk
@@ -23,14 +23,13 @@
 # \date         March 2010
 ################################################################################
 
-LIBFONTENC_NAME := libfontenc
-LIBFONTENC_VERSION := $(call embtk_get_pkgversion,LIBFONTENC)
-LIBFONTENC_SITE := http://xorg.freedesktop.org/archive/individual/lib
-LIBFONTENC_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBFONTENC_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libfontenc/$(LIBFONTENC_VERSION)
-LIBFONTENC_PACKAGE := libfontenc-$(LIBFONTENC_VERSION).tar.bz2
-LIBFONTENC_SRC_DIR := $(PACKAGES_BUILD)/libfontenc-$(LIBFONTENC_VERSION)
-LIBFONTENC_BUILD_DIR := $(PACKAGES_BUILD)/libfontenc-$(LIBFONTENC_VERSION)
+LIBFONTENC_NAME		:= libfontenc
+LIBFONTENC_VERSION	:= $(call embtk_get_pkgversion,libfontenc)
+LIBFONTENC_SITE		:= http://xorg.freedesktop.org/archive/individual/lib
+LIBFONTENC_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBFONTENC_PACKAGE	:= libfontenc-$(LIBFONTENC_VERSION).tar.bz2
+LIBFONTENC_SRC_DIR	:= $(PACKAGES_BUILD)/libfontenc-$(LIBFONTENC_VERSION)
+LIBFONTENC_BUILD_DIR	:= $(PACKAGES_BUILD)/libfontenc-$(LIBFONTENC_VERSION)
 
 LIBFONTENC_BINS =
 LIBFONTENC_SBINS =
@@ -38,32 +37,6 @@ LIBFONTENC_INCLUDES = X11/fonts/fontenc.h
 LIBFONTENC_LIBS = libfontenc.*
 LIBFONTENC_PKGCONFIGS = libfontenc.pc
 
-LIBFONTENC_CONFIGURE_OPTS := --disable-malloc0returnsnull
+LIBFONTENC_CONFIGURE_OPTS	:= --disable-malloc0returnsnull
+LIBFONTENC_DEPS			:= zlib_install
 
-LIBFONTENC_DEPS := zlib_install
-
-libfontenc_install:
-	@test -e $(LIBFONTENC_BUILD_DIR)/.installed || \
-	$(MAKE) $(LIBFONTENC_BUILD_DIR)/.installed
-
-$(LIBFONTENC_BUILD_DIR)/.installed: $(LIBFONTENC_DEPS) download_libfontenc \
-	$(LIBFONTENC_BUILD_DIR)/.decompressed $(LIBFONTENC_BUILD_DIR)/.configured
-	$(call embtk_generic_message,"Compiling and installing \
-	libfontenc-$(LIBFONTENC_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(LIBFONTENC_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBFONTENC_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
-
-download_libfontenc:
-	$(call embtk_download_pkg,LIBFONTENC)
-
-$(LIBFONTENC_BUILD_DIR)/.decompressed:
-	$(call embtk_decompress_pkg,LIBFONTENC)
-
-$(LIBFONTENC_BUILD_DIR)/.configured:
-	$(call embtk_configure_pkg,LIBFONTENC)
-
-libfontenc_clean:
-	$(call embtk_cleanup_pkg,LIBFONTENC)
diff --git a/packages/x11/libpciaccess/libpciaccess.mk b/packages/x11/libpciaccess/libpciaccess.mk
index 397f193..0fe391c 100644
--- a/packages/x11/libpciaccess/libpciaccess.mk
+++ b/packages/x11/libpciaccess/libpciaccess.mk
@@ -23,46 +23,17 @@
 # \date         March 2010
 ################################################################################
 
-LIBPCIACCESS_NAME := libpciaccess
-LIBPCIACCESS_VERSION := $(call embtk_get_pkgversion,LIBPCIACCESS)
-LIBPCIACCESS_SITE := http://xorg.freedesktop.org/archive/individual/lib
-LIBPCIACCESS_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libpciaccess/$(LIBPCIACCESS_VERSION)
-LIBPCIACCESS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBPCIACCESS_PACKAGE := libpciaccess-$(LIBPCIACCESS_VERSION).tar.gz
-LIBPCIACCESS_SRC_DIR := $(PACKAGES_BUILD)/libpciaccess-$(LIBPCIACCESS_VERSION)
-LIBPCIACCESS_BUILD_DIR := $(PACKAGES_BUILD)/libpciaccess-$(LIBPCIACCESS_VERSION)
+LIBPCIACCESS_NAME		:= libpciaccess
+LIBPCIACCESS_VERSION		:= $(call embtk_get_pkgversion,libpciaccess)
+LIBPCIACCESS_SITE		:= http://xorg.freedesktop.org/archive/individual/lib
+LIBPCIACCESS_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBPCIACCESS_PACKAGE		:= libpciaccess-$(LIBPCIACCESS_VERSION).tar.gz
+LIBPCIACCESS_SRC_DIR		:= $(PACKAGES_BUILD)/libpciaccess-$(LIBPCIACCESS_VERSION)
+LIBPCIACCESS_BUILD_DIR		:= $(PACKAGES_BUILD)/libpciaccess-$(LIBPCIACCESS_VERSION)
+
+LIBPCIACCESS_BINS	=
+LIBPCIACCESS_SBINS	=
+LIBPCIACCESS_INCLUDES	= pciaccess.h
+LIBPCIACCESS_LIBS	= libpciaccess.*
+LIBPCIACCESS_PKGCONFIGS	= pciaccess.pc
 
-LIBPCIACCESS_BINS =
-LIBPCIACCESS_SBINS =
-LIBPCIACCESS_INCLUDES = pciaccess.h
-LIBPCIACCESS_LIBS = libpciaccess.*
-LIBPCIACCESS_PKGCONFIGS = pciaccess.pc
-
-LIBPCIACCESS_DEPS =
-
-libpciaccess_install:
-	@test -e $(LIBPCIACCESS_BUILD_DIR)/.installed || \
-	$(MAKE) $(LIBPCIACCESS_BUILD_DIR)/.installed
-
-$(LIBPCIACCESS_BUILD_DIR)/.installed: $(LIBPCIACCESS_DEPS) \
-	download_libpciaccess $(LIBPCIACCESS_BUILD_DIR)/.decompressed \
-	$(LIBPCIACCESS_BUILD_DIR)/.configured
-	$(call embtk_generic_message,"Compiling and installing \
-	libpciaccess-$(LIBPCIACCESS_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(LIBPCIACCESS_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBPCIACCESS_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
-
-download_libpciaccess:
-	$(call embtk_download_pkg,LIBPCIACCESS)
-
-$(LIBPCIACCESS_BUILD_DIR)/.decompressed:
-	$(call embtk_decompress_pkg,LIBPCIACCESS)
-
-$(LIBPCIACCESS_BUILD_DIR)/.configured:
-	$(call embtk_configure_pkg,LIBPCIACCESS)
-
-libpciaccess_clean:
-	$(call embtk_cleanup_pkg,LIBPCIACCESS)
diff --git a/packages/x11/libpthreadstubs/libpthreadstubs.mk b/packages/x11/libpthreadstubs/libpthreadstubs.mk
index 7049994..0e9b987 100644
--- a/packages/x11/libpthreadstubs/libpthreadstubs.mk
+++ b/packages/x11/libpthreadstubs/libpthreadstubs.mk
@@ -23,43 +23,16 @@
 # \date         March 2010
 ################################################################################
 
-LIBPTHREADSTUBS_NAME := libpthread-stubs
-LIBPTHREADSTUBS_VERSION := $(call embtk_get_pkgversion,LIBPTHREADSTUBS)
-LIBPTHREADSTUBS_SITE := http://xcb.freedesktop.org/dist
-LIBPTHREADSTUBS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBPTHREADSTUBS_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libpthreadstubs/$(LIBPTHREADSTUBS_VERSION)
-LIBPTHREADSTUBS_PACKAGE := libpthread-stubs-$(LIBPTHREADSTUBS_VERSION).tar.bz2
-LIBPTHREADSTUBS_SRC_DIR := $(PACKAGES_BUILD)/libpthread-stubs-$(LIBPTHREADSTUBS_VERSION)
-LIBPTHREADSTUBS_BUILD_DIR := $(PACKAGES_BUILD)/libpthread-stubs-$(LIBPTHREADSTUBS_VERSION)
-
-LIBPTHREADSTUBS_BINS =
-LIBPTHREADSTUBS_SBINS =
-LIBPTHREADSTUBS_INCLUDES =
-LIBPTHREADSTUBS_LIBS =
-LIBPTHREADSTUBS_PKGCONFIGS = pthread-stubs.pc
-
-libpthreadstubs_install:
-	@test -e $(LIBPTHREADSTUBS_BUILD_DIR)/.installed || \
-	$(MAKE) $(LIBPTHREADSTUBS_BUILD_DIR)/.installed
-
-$(LIBPTHREADSTUBS_BUILD_DIR)/.installed: download_libpthreadstubs \
-	$(LIBPTHREADSTUBS_BUILD_DIR)/.decompressed $(LIBPTHREADSTUBS_BUILD_DIR)/.configured
-	$(call embtk_generic_message,"Compiling and installing \
-	libpthreadstubs-$(LIBPTHREADSTUBS_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(LIBPTHREADSTUBS_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBPTHREADSTUBS_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
-
-download_libpthreadstubs:
-	$(call embtk_download_pkg,LIBPTHREADSTUBS)
-
-$(LIBPTHREADSTUBS_BUILD_DIR)/.decompressed:
-	$(call embtk_decompress_pkg,LIBPTHREADSTUBS)
-
-$(LIBPTHREADSTUBS_BUILD_DIR)/.configured:
-	$(call embtk_configure_pkg,LIBPTHREADSTUBS)
-
-libpthreadstubs_clean:
-	$(call embtk_cleanup_pkg,LIBPTHREADSTUBS)
+LIBPTHREADSTUBS_NAME		:= libpthread-stubs
+LIBPTHREADSTUBS_VERSION		:= $(call embtk_get_pkgversion,libpthreadstubs)
+LIBPTHREADSTUBS_SITE		:= http://xcb.freedesktop.org/dist
+LIBPTHREADSTUBS_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBPTHREADSTUBS_PACKAGE		:= libpthread-stubs-$(LIBPTHREADSTUBS_VERSION).tar.bz2
+LIBPTHREADSTUBS_SRC_DIR		:= $(PACKAGES_BUILD)/libpthread-stubs-$(LIBPTHREADSTUBS_VERSION)
+LIBPTHREADSTUBS_BUILD_DIR	:= $(PACKAGES_BUILD)/libpthread-stubs-$(LIBPTHREADSTUBS_VERSION)
+
+LIBPTHREADSTUBS_BINS		=
+LIBPTHREADSTUBS_SBINS		=
+LIBPTHREADSTUBS_INCLUDES	=
+LIBPTHREADSTUBS_LIBS		=
+LIBPTHREADSTUBS_PKGCONFIGS	= pthread-stubs.pc
diff --git a/packages/x11/libx11/libx11.mk b/packages/x11/libx11/libx11.mk
index c50392c..b24aa6d 100644
--- a/packages/x11/libx11/libx11.mk
+++ b/packages/x11/libx11/libx11.mk
@@ -23,58 +23,43 @@
 # \date         March 2010
 ################################################################################
 
-LIBX11_NAME := libX11
-LIBX11_VERSION := $(call embtk_get_pkgversion,LIBX11)
-LIBX11_SITE := http://xorg.freedesktop.org/archive/individual/lib
-LIBX11_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBX11_PACKAGE := libX11-$(LIBX11_VERSION).tar.bz2
-LIBX11_SRC_DIR := $(PACKAGES_BUILD)/libX11-$(LIBX11_VERSION)
-LIBX11_BUILD_DIR := $(PACKAGES_BUILD)/libX11-$(LIBX11_VERSION)
+LIBX11_NAME		:= libX11
+LIBX11_VERSION		:= $(call embtk_get_pkgversion,libx11)
+LIBX11_SITE		:= http://xorg.freedesktop.org/archive/individual/lib
+LIBX11_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBX11_PACKAGE		:= libX11-$(LIBX11_VERSION).tar.bz2
+LIBX11_SRC_DIR		:= $(PACKAGES_BUILD)/libX11-$(LIBX11_VERSION)
+LIBX11_BUILD_DIR	:= $(PACKAGES_BUILD)/libX11-$(LIBX11_VERSION)
 
-LIBX11_BINS =
-LIBX11_SBINS =
-LIBX11_INCLUDES = X11/cursorfont.h X11/ImUtil.h X11/Xcms.h X11/XKBlib.h \
-		X11/XlibConf.h X11/Xlib.h X11/Xlibint.h X11/Xlib-xcb.h \
-		X11/Xlocale.h X11/Xregion.h X11/Xresource.h X11/Xutil.h
-LIBX11_LIBS = libX11* X11/Xcms.txt
-LIBX11_PKGCONFIGS = x11.pc x11-xcb.pc
+LIBX11_BINS		=
+LIBX11_SBINS		=
+LIBX11_INCLUDES		= X11/cursorfont.h X11/ImUtil.h X11/Xcms.h X11/XKBlib.h	\
+			X11/XlibConf.h X11/Xlib.h X11/Xlibint.h X11/Xlib-xcb.h	\
+			X11/Xlocale.h X11/Xregion.h X11/Xresource.h X11/Xutil.h
+LIBX11_LIBS		= libX11* X11/Xcms.txt
+LIBX11_PKGCONFIGS	= x11.pc x11-xcb.pc
 
-LIBX11_CONFIGURE_OPTS := --with-xcb --without-xmlto --without-ps2pdf \
-	--without-groff --disable-malloc0returnsnull \
-	--disable-loadable-xcursor
+LIBX11_CONFIGURE_OPTS	:= --with-xcb --without-xmlto --without-ps2pdf		\
+			--without-groff --disable-malloc0returnsnull		\
+			--disable-loadable-xcursor
 
-LIBX11_DEPS = utilmacros_install inputproto_install kbproto_install \
+LIBX11_DEPS	= utilmacros_install inputproto_install kbproto_install		\
 		xextproto_install xproto_install libxcb_install xtrans_install
 
-libx11_install:
-	@test -e $(LIBX11_BUILD_DIR)/.installed || \
-	$(MAKE) $(LIBX11_BUILD_DIR)/.installed
-	$(Q)$(MAKE) $(LIBX11_BUILD_DIR)/.special
+define embtk_beforeinstall_libx11
+	$(Q)cd $(LIBX11_BUILD_DIR)/src/util;					\
+	$(HOSTCC_CACHED) makekeys.c -c -o makekeys-makekeys.o;			\
+	$(HOSTCC_CACHED) makekeys.c -o makekeys
+endef
 
-$(LIBX11_BUILD_DIR)/.installed: $(LIBX11_DEPS) download_libx11 \
-	$(LIBX11_BUILD_DIR)/.decompressed $(LIBX11_BUILD_DIR)/.configured
-	$(call embtk_generic_message,"Compiling and installing \
-	libx11-$(LIBX11_VERSION) in your root filesystem...")
-	@cd $(LIBX11_BUILD_DIR)/src/util; \
-	gcc makekeys.c -c -o makekeys-makekeys.o; gcc makekeys.c -o makekeys
-	$(Q)$(MAKE) -C $(LIBX11_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBX11_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	$(Q)$(MAKE) $(LIBX11_BUILD_DIR)/.patchlibtool
-	@touch $@
-
-download_libx11:
-	$(call embtk_download_pkg,LIBX11)
-
-$(LIBX11_BUILD_DIR)/.decompressed:
-	$(call embtk_decompress_pkg,LIBX11)
-
-$(LIBX11_BUILD_DIR)/.configured:
-	$(call embtk_configure_pkg,LIBX11)
-
-libx11_clean:
-	$(call embtk_cleanup_pkg,LIBX11)
+define embtk_postinstall_libx11
+	$(Q)test -e $(LIBX11_BUILD_DIR)/.patchlibtool ||			\
+	$(MAKE) $(LIBX11_BUILD_DIR)/.patchlibtool
+	$(Q)-mkdir -p $(ROOTFS)/usr/share
+	$(Q)-mkdir -p $(ROOTFS)/usr/share/X11
+	$(Q)-cp $(SYSROOT)/usr/share/X11/XErrorDB $(ROOTFS)/usr/share/X11/
+	$(Q)-cp $(SYSROOT)/usr/share/X11/XKeysymDB $(ROOTFS)/usr/share/X11/
+endef
 
 $(LIBX11_BUILD_DIR)/.patchlibtool:
 	@LIBX11_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libX11-* -type f -name *.la`; \
@@ -83,12 +68,3 @@ $(LIBX11_BUILD_DIR)/.patchlibtool:
 	sed \
 	-i "s; /usr/$(LIBDIR)/libX11.la ; $(SYSROOT)/usr/$(LIBDIR)/libX11.la ;" $$i; \
 	done
-
-.PHONY: $(LIBX11_BUILD_DIR)/.special
-
-$(LIBX11_BUILD_DIR)/.special:
-	$(Q)-mkdir -p $(ROOTFS)/usr/share
-	$(Q)-mkdir -p $(ROOTFS)/usr/share/X11
-	$(Q)-cp $(SYSROOT)/usr/share/X11/XErrorDB $(ROOTFS)/usr/share/X11/
-	$(Q)-cp $(SYSROOT)/usr/share/X11/XKeysymDB $(ROOTFS)/usr/share/X11/
-	@touch $@
diff --git a/packages/x11/libxau/libxau.mk b/packages/x11/libxau/libxau.mk
index 9084030..8bfd64f 100644
--- a/packages/x11/libxau/libxau.mk
+++ b/packages/x11/libxau/libxau.mk
@@ -23,45 +23,18 @@
 # \date         February 2010
 ################################################################################
 
-LIBXAU_NAME := libXau
-LIBXAU_VERSION := $(call embtk_get_pkgversion,LIBXAU)
-LIBXAU_SITE := http://xorg.freedesktop.org/archive/individual/lib
-LIBXAU_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBXAU_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxau/$(LIBXAU_VERSION)
-LIBXAU_PACKAGE := libXau-$(LIBXAU_VERSION).tar.bz2
-LIBXAU_SRC_DIR := $(PACKAGES_BUILD)/libXau-$(LIBXAU_VERSION)
-LIBXAU_BUILD_DIR := $(PACKAGES_BUILD)/libXau-$(LIBXAU_VERSION)
-
-LIBXAU_BINS =
-LIBXAU_SBINS =
-LIBXAU_INCLUDES = X11/Xauth.h
-LIBXAU_LIBS = libXau.*
-LIBXAU_PKGCONFIGS = xau.pc
+LIBXAU_NAME		:= libXau
+LIBXAU_VERSION		:= $(call embtk_get_pkgversion,libxau)
+LIBXAU_SITE		:= http://xorg.freedesktop.org/archive/individual/lib
+LIBXAU_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBXAU_PACKAGE		:= libXau-$(LIBXAU_VERSION).tar.bz2
+LIBXAU_SRC_DIR		:= $(PACKAGES_BUILD)/libXau-$(LIBXAU_VERSION)
+LIBXAU_BUILD_DIR	:= $(PACKAGES_BUILD)/libXau-$(LIBXAU_VERSION)
+
+LIBXAU_BINS		=
+LIBXAU_SBINS		=
+LIBXAU_INCLUDES		= X11/Xauth.h
+LIBXAU_LIBS		= libXau.*
+LIBXAU_PKGCONFIGS	= xau.pc
 
 LIBXAU_DEPS = xproto_install
-
-libxau_install:
-	@test -e $(LIBXAU_BUILD_DIR)/.installed || \
-	$(MAKE) $(LIBXAU_BUILD_DIR)/.installed
-
-$(LIBXAU_BUILD_DIR)/.installed: $(LIBXAU_DEPS) download_libxau \
-	$(LIBXAU_BUILD_DIR)/.decompressed $(LIBXAU_BUILD_DIR)/.configured
-	$(call embtk_generic_message,"Compiling and installing \
-	libxau-$(LIBXAU_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(LIBXAU_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBXAU_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
-
-download_libxau:
-	$(call embtk_download_pkg,LIBXAU)
-
-$(LIBXAU_BUILD_DIR)/.decompressed:
-	$(call embtk_decompress_pkg,LIBXAU)
-
-$(LIBXAU_BUILD_DIR)/.configured:
-	$(call embtk_configure_pkg,LIBXAU)
-
-libxau_clean:
-	$(call embtk_cleanup_pkg,LIBXAU)
diff --git a/packages/x11/libxcb/libxcb.mk b/packages/x11/libxcb/libxcb.mk
index ef87b4e..a5d1761 100644
--- a/packages/x11/libxcb/libxcb.mk
+++ b/packages/x11/libxcb/libxcb.mk
@@ -23,54 +23,32 @@
 # \date         March 2010
 ################################################################################
 
-LIBXCB_NAME := libxcb
-LIBXCB_VERSION := $(call embtk_get_pkgversion,LIBXCB)
-LIBXCB_SITE := http://xcb.freedesktop.org/dist
-LIBXCB_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBXCB_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxcb/$(LIBXCB_VERSION)
-LIBXCB_PACKAGE := libxcb-$(LIBXCB_VERSION).tar.gz
-LIBXCB_SRC_DIR := $(PACKAGES_BUILD)/libxcb-$(LIBXCB_VERSION)
-LIBXCB_BUILD_DIR := $(PACKAGES_BUILD)/libxcb-$(LIBXCB_VERSION)
+LIBXCB_NAME		:= libxcb
+LIBXCB_VERSION		:= $(call embtk_get_pkgversion,libxcb)
+LIBXCB_SITE		:= http://xcb.freedesktop.org/dist
+LIBXCB_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBXCB_PACKAGE		:= libxcb-$(LIBXCB_VERSION).tar.gz
+LIBXCB_SRC_DIR		:= $(PACKAGES_BUILD)/libxcb-$(LIBXCB_VERSION)
+LIBXCB_BUILD_DIR	:= $(PACKAGES_BUILD)/libxcb-$(LIBXCB_VERSION)
 
-LIBXCB_BINS =
-LIBXCB_SBINS =
-LIBXCB_INCLUDES = xcb
-LIBXCB_LIBS = libxcb*
-LIBXCB_PKGCONFIGS = xcb*.pc
+LIBXCB_BINS		=
+LIBXCB_SBINS		=
+LIBXCB_INCLUDES 	= xcb
+LIBXCB_LIBS		= libxcb*
+LIBXCB_PKGCONFIGS	= xcb*.pc
 
-LIBXCB_CONFIGURE_OPTS := --enable-xinput
+LIBXCB_CONFIGURE_OPTS	:= --enable-xinput
 
-LIBXCB_DEPS = xcbproto_install libpthreadstubs_install libxau_install
+LIBXCB_DEPS		:= xcbproto_install libpthreadstubs_install libxau_install
 
-libxcb_install:
-	@test -e $(LIBXCB_BUILD_DIR)/.installed || \
-	$(MAKE) $(LIBXCB_BUILD_DIR)/.installed
+define embtk_postinstall_libxcb
+	$(Q)test -e $(LIBXCB_BUILD_DIR)/.patchlibtool ||			\
+	$(MAKE) $(LIBXCB_BUILD_DIR)/.patchlibtool
+endef
 
-$(LIBXCB_BUILD_DIR)/.installed: $(LIBXCB_DEPS) download_libxcb \
-	$(LIBXCB_BUILD_DIR)/.decompressed $(LIBXCB_BUILD_DIR)/.configured
-	$(call embtk_generic_message,"Compiling and installing \
-	libxcb-$(LIBXCB_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(LIBXCB_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBXCB_BUILD_DIR) DESTDIR=$(SYSROOT)/ install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	$(Q)$(MAKE) $(LIBXCB_BUILD_DIR)/.patchlibtool
-	@touch $@
-
-download_libxcb:
-	$(call embtk_download_pkg,LIBXCB)
-
-$(LIBXCB_BUILD_DIR)/.decompressed:
-	$(call embtk_decompress_pkg,LIBXCB)
-
-$(LIBXCB_BUILD_DIR)/.configured:
-	$(call embtk_configure_pkg,LIBXCB)
-
-libxcb_clean:
-	$(call embtk_cleanup_pkg,LIBXCB)
 
 $(LIBXCB_BUILD_DIR)/.patchlibtool:
-	@LIBXCB_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \
+	$(Q)LIBXCB_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \
 	for i in $$LIBXCB_LT_FILES; \
 	do \
 	sed \
diff --git a/packages/x11/libxcomposite/libxcomposite.mk b/packages/x11/libxcomposite/libxcomposite.mk
index 46adb99..20c38ff 100644
--- a/packages/x11/libxcomposite/libxcomposite.mk
+++ b/packages/x11/libxcomposite/libxcomposite.mk
@@ -23,45 +23,18 @@
 # \date         June 2010
 ################################################################################
 
-LIBXCOMPOSITE_NAME := libXcomposite
-LIBXCOMPOSITE_VERSION := $(call embtk_get_pkgversion,LIBXCOMPOSITE)
-LIBXCOMPOSITE_SITE := http://xorg.freedesktop.org/archive/individual/lib
-LIBXCOMPOSITE_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxcomposite/$(LIBXCOMPOSITE_VERSION)
-LIBXCOMPOSITE_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBXCOMPOSITE_PACKAGE := libXcomposite-$(LIBXCOMPOSITE_VERSION).tar.bz2
-LIBXCOMPOSITE_SRC_DIR := $(PACKAGES_BUILD)/libXcomposite-$(LIBXCOMPOSITE_VERSION)
-LIBXCOMPOSITE_BUILD_DIR := $(PACKAGES_BUILD)/libXcomposite-$(LIBXCOMPOSITE_VERSION)
-
-LIBXCOMPOSITE_BINS =
-LIBXCOMPOSITE_SBINS =
-LIBXCOMPOSITE_INCLUDES = X11/extensions/Xcomposite.h
-LIBXCOMPOSITE_LIBS = libXcomposite.*
-LIBXCOMPOSITE_PKGCONFIGS = xcomposite.pc
+LIBXCOMPOSITE_NAME		:= libXcomposite
+LIBXCOMPOSITE_VERSION		:= $(call embtk_get_pkgversion,libxcomposite)
+LIBXCOMPOSITE_SITE		:= http://xorg.freedesktop.org/archive/individual/lib
+LIBXCOMPOSITE_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBXCOMPOSITE_PACKAGE		:= libXcomposite-$(LIBXCOMPOSITE_VERSION).tar.bz2
+LIBXCOMPOSITE_SRC_DIR		:= $(PACKAGES_BUILD)/libXcomposite-$(LIBXCOMPOSITE_VERSION)
+LIBXCOMPOSITE_BUILD_DIR		:= $(PACKAGES_BUILD)/libXcomposite-$(LIBXCOMPOSITE_VERSION)
+
+LIBXCOMPOSITE_BINS		=
+LIBXCOMPOSITE_SBINS		=
+LIBXCOMPOSITE_INCLUDES		= X11/extensions/Xcomposite.h
+LIBXCOMPOSITE_LIBS		= libXcomposite.*
+LIBXCOMPOSITE_PKGCONFIGS	= xcomposite.pc
 
 LIBXCOMPOSITE_DEPS = xproto_install libxfixes_install compositeproto_install
-
-libxcomposite_install:
-	@test -e $(LIBXCOMPOSITE_BUILD_DIR)/.installed || \
-	$(MAKE) $(LIBXCOMPOSITE_BUILD_DIR)/.installed
-
-$(LIBXCOMPOSITE_BUILD_DIR)/.installed: $(LIBXCOMPOSITE_DEPS) download_libxcomposite \
-	$(LIBXCOMPOSITE_BUILD_DIR)/.decompressed $(LIBXCOMPOSITE_BUILD_DIR)/.configured
-	$(call embtk_generic_message,"Compiling and installing \
-	libxcomposite-$(LIBXCOMPOSITE_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(LIBXCOMPOSITE_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBXCOMPOSITE_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
-
-download_libxcomposite:
-	$(call embtk_download_pkg,LIBXCOMPOSITE)
-
-$(LIBXCOMPOSITE_BUILD_DIR)/.decompressed:
-	$(call embtk_decompress_pkg,LIBXCOMPOSITE)
-
-$(LIBXCOMPOSITE_BUILD_DIR)/.configured:
-	$(call embtk_configure_pkg,LIBXCOMPOSITE)
-
-libxcomposite_clean:
-	$(call embtk_cleanup_pkg,LIBXCOMPOSITE)
diff --git a/packages/x11/libxext/libxext.mk b/packages/x11/libxext/libxext.mk
index 1ec522f..d53701c 100644
--- a/packages/x11/libxext/libxext.mk
+++ b/packages/x11/libxext/libxext.mk
@@ -23,14 +23,13 @@
 # \date         March 2010
 ################################################################################
 
-LIBXEXT_NAME := libXext
-LIBXEXT_VERSION := $(call embtk_get_pkgversion,LIBXEXT)
-LIBXEXT_SITE := http://xorg.freedesktop.org/archive/individual/lib
-LIBXEXT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBXEXT_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/expat/$(LIBXEXT_VERSION)
-LIBXEXT_PACKAGE := libXext-$(LIBXEXT_VERSION).tar.bz2
-LIBXEXT_SRC_DIR := $(PACKAGES_BUILD)/libXext-$(LIBXEXT_VERSION)
-LIBXEXT_BUILD_DIR := $(PACKAGES_BUILD)/libXext-$(LIBXEXT_VERSION)
+LIBXEXT_NAME		:= libXext
+LIBXEXT_VERSION		:= $(call embtk_get_pkgversion,libxext)
+LIBXEXT_SITE		:= http://xorg.freedesktop.org/archive/individual/lib
+LIBXEXT_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBXEXT_PACKAGE		:= libXext-$(LIBXEXT_VERSION).tar.bz2
+LIBXEXT_SRC_DIR		:= $(PACKAGES_BUILD)/libXext-$(LIBXEXT_VERSION)
+LIBXEXT_BUILD_DIR	:= $(PACKAGES_BUILD)/libXext-$(LIBXEXT_VERSION)
 
 LIBXEXT_BINS =
 LIBXEXT_SBINS =
@@ -49,29 +48,3 @@ LIBXEXT_PKGCONFIGS =
 LIBXEXT_CONFIGURE_OPTS := --disable-malloc0returnsnull
 
 LIBXEXT_DEPS = libx11_install
-
-libxext_install:
-	@test -e $(LIBXEXT_BUILD_DIR)/.installed || \
-	$(MAKE) $(LIBXEXT_BUILD_DIR)/.installed
-
-$(LIBXEXT_BUILD_DIR)/.installed: $(LIBXEXT_DEPS) download_libxext \
-	$(LIBXEXT_BUILD_DIR)/.decompressed $(LIBXEXT_BUILD_DIR)/.configured
-	$(call embtk_generic_message,"Compiling and installing \
-	libxext-$(LIBXEXT_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(LIBXEXT_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBXEXT_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
-
-download_libxext:
-	$(call embtk_download_pkg,LIBXEXT)
-
-$(LIBXEXT_BUILD_DIR)/.decompressed:
-	$(call embtk_decompress_pkg,LIBXEXT)
-
-$(LIBXEXT_BUILD_DIR)/.configured:
-	$(call embtk_configure_pkg,LIBXEXT)
-
-libxext_clean:
-	$(call embtk_cleanup_pkg,LIBXEXT)
diff --git a/packages/x11/libxfixes/libxfixes.mk b/packages/x11/libxfixes/libxfixes.mk
index e9f06fd..48f73d0 100644
--- a/packages/x11/libxfixes/libxfixes.mk
+++ b/packages/x11/libxfixes/libxfixes.mk
@@ -23,45 +23,18 @@
 # \date         June 2010
 ################################################################################
 
-LIBXFIXES_NAME := libXfixes
-LIBXFIXES_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_LIBXFIXES_VERSION_STRING)))
-LIBXFIXES_SITE := http://xorg.freedesktop.org/archive/individual/lib
-LIBXFIXES_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBXFIXES_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxfixes/$(LIBXFIXES_VERSION)
-LIBXFIXES_PACKAGE := libXfixes-$(LIBXFIXES_VERSION).tar.bz2
-LIBXFIXES_SRC_DIR := $(PACKAGES_BUILD)/libXfixes-$(LIBXFIXES_VERSION)
-LIBXFIXES_BUILD_DIR := $(PACKAGES_BUILD)/libXfixes-$(LIBXFIXES_VERSION)
-
-LIBXFIXES_BINS =
-LIBXFIXES_SBINS =
-LIBXFIXES_INCLUDES = X11/extensions/Xfixes.h
-LIBXFIXES_LIBS = libXfixes.*
-LIBXFIXES_PKGCONFIGS =xfixes.pc
-
-LIBXFIXES_DEPS = xproto_install fixesproto_install
-
-libxfixes_install:
-	@test -e $(LIBXFIXES_BUILD_DIR)/.installed || \
-	$(MAKE) $(LIBXFIXES_BUILD_DIR)/.installed
-
-$(LIBXFIXES_BUILD_DIR)/.installed: $(LIBXFIXES_DEPS) download_libxfixes \
-	$(LIBXFIXES_BUILD_DIR)/.decompressed $(LIBXFIXES_BUILD_DIR)/.configured
-	$(call embtk_generic_message,"Compiling and installing \
-	libxfixes-$(LIBXFIXES_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(LIBXFIXES_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBXFIXES_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
-
-download_libxfixes:
-	$(call embtk_download_pkg,LIBXFIXES)
-
-$(LIBXFIXES_BUILD_DIR)/.decompressed:
-	$(call embtk_decompress_pkg,LIBXFIXES)
-
-$(LIBXFIXES_BUILD_DIR)/.configured:
-	$(call embtk_configure_pkg,LIBXFIXES)
-
-libxfixes_clean:
-	$(call embtk_cleanup_pkg,LIBXFIXES)
+LIBXFIXES_NAME		:= libXfixes
+LIBXFIXES_VERSION	:= $(call embtk_get_pkgversion,libxfixes)
+LIBXFIXES_SITE		:= http://xorg.freedesktop.org/archive/individual/lib
+LIBXFIXES_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBXFIXES_PACKAGE	:= libXfixes-$(LIBXFIXES_VERSION).tar.bz2
+LIBXFIXES_SRC_DIR	:= $(PACKAGES_BUILD)/libXfixes-$(LIBXFIXES_VERSION)
+LIBXFIXES_BUILD_DIR	:= $(PACKAGES_BUILD)/libXfixes-$(LIBXFIXES_VERSION)
+
+LIBXFIXES_BINS		=
+LIBXFIXES_SBINS		=
+LIBXFIXES_INCLUDES	= X11/extensions/Xfixes.h
+LIBXFIXES_LIBS		= libXfixes.*
+LIBXFIXES_PKGCONFIGS	=xfixes.pc
+
+LIBXFIXES_DEPS		= xproto_install fixesproto_install
diff --git a/packages/x11/libxfont/libxfont.mk b/packages/x11/libxfont/libxfont.mk
index a16c88a..a4139b8 100644
--- a/packages/x11/libxfont/libxfont.mk
+++ b/packages/x11/libxfont/libxfont.mk
@@ -23,14 +23,13 @@
 # \date         March 2010
 ################################################################################
 
-LIBXFONT_NAME := libXfont
-LIBXFONT_VERSION := $(call embtk_get_pkgversion,LIBXFONT)
-LIBXFONT_SITE := http://xorg.freedesktop.org/archive/individual/lib
-LIBXFONT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBXFONT_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxfont/$(LIBXFONT_VERSION)
-LIBXFONT_PACKAGE := libXfont-$(LIBXFONT_VERSION).tar.bz2
-LIBXFONT_SRC_DIR := $(PACKAGES_BUILD)/libXfont-$(LIBXFONT_VERSION)
-LIBXFONT_BUILD_DIR := $(PACKAGES_BUILD)/libXfont-$(LIBXFONT_VERSION)
+LIBXFONT_NAME		:= libXfont
+LIBXFONT_VERSION	:= $(call embtk_get_pkgversion,libxfont)
+LIBXFONT_SITE		:= http://xorg.freedesktop.org/archive/individual/lib
+LIBXFONT_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBXFONT_PACKAGE	:= libXfont-$(LIBXFONT_VERSION).tar.bz2
+LIBXFONT_SRC_DIR	:= $(PACKAGES_BUILD)/libXfont-$(LIBXFONT_VERSION)
+LIBXFONT_BUILD_DIR	:= $(PACKAGES_BUILD)/libXfont-$(LIBXFONT_VERSION)
 
 LIBXFONT_BINS =
 LIBXFONT_SBINS =
@@ -45,12 +44,3 @@ LIBXFONT_PKGCONFIGS = xfont.pc
 LIBXFONT_CONFIGURE_OPTS := --disable-malloc0returnsnull
 
 LIBXFONT_DEPS = libfontenc_install freetype_install
-
-libxfont_install:
-	$(call embtk_install_pkg,LIBXFONT)
-
-download_libxfont:
-	$(call embtk_download_pkg,LIBXFONT)
-
-libxfont_clean:
-	$(call embtk_cleanup_pkg,LIBXFONT)
diff --git a/packages/x11/libxft/libxft.mk b/packages/x11/libxft/libxft.mk
index 3169eff..0df1dfb 100644
--- a/packages/x11/libxft/libxft.mk
+++ b/packages/x11/libxft/libxft.mk
@@ -23,30 +23,20 @@
 # \date         June 2010
 ################################################################################
 
-LIBXFT_NAME := libXft
-LIBXFT_VERSION := $(call embtk_get_pkgversion,LIBXFT)
-LIBXFT_SITE := http://xorg.freedesktop.org/archive/individual/lib
-LIBXFT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBXFT_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxft/$(LIBXFT_VERSION)
-LIBXFT_PACKAGE := libXft-$(LIBXFT_VERSION).tar.bz2
-LIBXFT_SRC_DIR := $(PACKAGES_BUILD)/libXft-$(LIBXFT_VERSION)
-LIBXFT_BUILD_DIR := $(PACKAGES_BUILD)/libXft-$(LIBXFT_VERSION)
+LIBXFT_NAME		:= libXft
+LIBXFT_VERSION		:= $(call embtk_get_pkgversion,libxft)
+LIBXFT_SITE		:= http://xorg.freedesktop.org/archive/individual/lib
+LIBXFT_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBXFT_PACKAGE		:= libXft-$(LIBXFT_VERSION).tar.bz2
+LIBXFT_SRC_DIR		:= $(PACKAGES_BUILD)/libXft-$(LIBXFT_VERSION)
+LIBXFT_BUILD_DIR	:= $(PACKAGES_BUILD)/libXft-$(LIBXFT_VERSION)
 
-LIBXFT_BINS = xft-config
-LIBXFT_SBINS =
-LIBXFT_INCLUDES = X11/xft
-LIBXFT_LIBS = libXft.*
-LIBXFT_PKGCONFIGS = xft.pc
+LIBXFT_BINS		= xft-config
+LIBXFT_SBINS		=
+LIBXFT_INCLUDES		= X11/xft
+LIBXFT_LIBS		= libXft.*
+LIBXFT_PKGCONFIGS	= xft.pc
 
-LIBXFT_CONFIGURE_OPTS := --disable-malloc0returnsnull
+LIBXFT_CONFIGURE_OPTS	:= --disable-malloc0returnsnull
 
 LIBXFT_DEPS = freetype_install fontconfig_install libxrender_install
-
-libxft_install:
-	$(call embtk_install_pkg,LIBXFT)
-
-download_libxft:
-	$(call embtk_download_pkg,LIBXFT)
-
-libxft_clean:
-	$(call embtk_cleanup_pkg,LIBXFT)
diff --git a/packages/x11/libxi/libxi.mk b/packages/x11/libxi/libxi.mk
index e519531..b524925 100644
--- a/packages/x11/libxi/libxi.mk
+++ b/packages/x11/libxi/libxi.mk
@@ -23,31 +23,21 @@
 # \date         September 2010
 ################################################################################
 
-LIBXI_NAME := libXi
-LIBXI_VERSION := $(call embtk_get_pkgversion,LIBXI)
-LIBXI_SITE := http://xorg.freedesktop.org/archive/individual/lib
-LIBXI_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBXI_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxi/$(LIBXI_VERSION)
-LIBXI_PACKAGE := libXi-$(LIBXI_VERSION).tar.bz2
-LIBXI_SRC_DIR := $(PACKAGES_BUILD)/libXi-$(LIBXI_VERSION)
-LIBXI_BUILD_DIR := $(PACKAGES_BUILD)/libXi-$(LIBXI_VERSION)
+LIBXI_NAME		:= libXi
+LIBXI_VERSION		:= $(call embtk_get_pkgversion,libxi)
+LIBXI_SITE		:= http://xorg.freedesktop.org/archive/individual/lib
+LIBXI_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBXI_PACKAGE		:= libXi-$(LIBXI_VERSION).tar.bz2
+LIBXI_SRC_DIR		:= $(PACKAGES_BUILD)/libXi-$(LIBXI_VERSION)
+LIBXI_BUILD_DIR		:= $(PACKAGES_BUILD)/libXi-$(LIBXI_VERSION)
 
-LIBXI_BINS =
-LIBXI_SBINS =
-LIBXI_INCLUDES = X11/extensions/XInput.h X11/extensions/XInput2.h
-LIBXI_LIBS = libXi.*
-LIBXI_PKGCONFIGS = xi.pc
+LIBXI_BINS		=
+LIBXI_SBINS		=
+LIBXI_INCLUDES		= X11/extensions/XInput.h X11/extensions/XInput2.h
+LIBXI_LIBS		= libXi.*
+LIBXI_PKGCONFIGS	= xi.pc
 
-LIBXI_CONFIGURE_OPTS := --disable-malloc0returnsnull
+LIBXI_CONFIGURE_OPTS	:= --disable-malloc0returnsnull
 
-LIBXI_DEPS := xproto_install xextproto_install inputproto_install \
-	libx11_install libxext_install
-
-libxi_install:
-	$(call embtk_install_pkg,LIBXI)
-
-download_libxi:
-	$(call embtk_download_pkg,LIBXI)
-
-libxi_clean:
-	$(call embtk_cleanup_pkg,LIBXI)
+LIBXI_DEPS		:= xproto_install xextproto_install inputproto_install	\
+			libx11_install libxext_install
diff --git a/packages/x11/libxkbfile/libxkbfile.mk b/packages/x11/libxkbfile/libxkbfile.mk
index f56ab8b..71bffb5 100644
--- a/packages/x11/libxkbfile/libxkbfile.mk
+++ b/packages/x11/libxkbfile/libxkbfile.mk
@@ -23,14 +23,13 @@
 # \date         February 2010
 ################################################################################
 
-LIBXKBFILE_NAME := libxkbfile
-LIBXKBFILE_VERSION := $(call embtk_get_pkgversion,LIBXKBFILE)
-LIBXKBFILE_SITE := http://xorg.freedesktop.org/archive/individual/lib
-LIBXKBFILE_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBXKBFILE_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxkbfile/$(LIBXKBFILE_VERSION)
-LIBXKBFILE_PACKAGE := libxkbfile-$(LIBXKBFILE_VERSION).tar.bz2
-LIBXKBFILE_SRC_DIR := $(PACKAGES_BUILD)/libxkbfile-$(LIBXKBFILE_VERSION)
-LIBXKBFILE_BUILD_DIR := $(PACKAGES_BUILD)/libxkbfile-$(LIBXKBFILE_VERSION)
+LIBXKBFILE_NAME		:= libxkbfile
+LIBXKBFILE_VERSION	:= $(call embtk_get_pkgversion,libxkbfile)
+LIBXKBFILE_SITE		:= http://xorg.freedesktop.org/archive/individual/lib
+LIBXKBFILE_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBXKBFILE_PACKAGE	:= libxkbfile-$(LIBXKBFILE_VERSION).tar.bz2
+LIBXKBFILE_SRC_DIR	:= $(PACKAGES_BUILD)/libxkbfile-$(LIBXKBFILE_VERSION)
+LIBXKBFILE_BUILD_DIR	:= $(PACKAGES_BUILD)/libxkbfile-$(LIBXKBFILE_VERSION)
 
 LIBXKBFILE_BINS =
 LIBXKBFILE_SBINS =
@@ -41,12 +40,3 @@ LIBXKBFILE_LIBS = libxkbfile.*
 LIBXKBFILE_PKGCONFIGS =
 
 LIBXKBFILE_DEPS = kbproto_install libx11_install
-
-libxkbfile_install:
-	$(call embtk_install_pkg,LIBXKBFILE)
-
-download_libxkbfile:
-	$(call embtk_download_pkg,LIBXKBFILE)
-
-libxkbfile_clean:
-	$(call embtk_cleanup_pkg,LIBXKBFILE)
diff --git a/packages/x11/libxrandr/libxrandr.mk b/packages/x11/libxrandr/libxrandr.mk
index d76a558..fb2cef9 100644
--- a/packages/x11/libxrandr/libxrandr.mk
+++ b/packages/x11/libxrandr/libxrandr.mk
@@ -23,30 +23,20 @@
 # \date         June 2010
 ################################################################################
 
-LIBXRANDR_NAME := libXrandr
-LIBXRANDR_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_LIBXRANDR_VERSION_STRING)))
-LIBXRANDR_SITE := http://xorg.freedesktop.org/archive/individual/lib
-LIBXRANDR_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBXRANDR_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxrandr/$(LIBXRANDR_VERSION)
-LIBXRANDR_PACKAGE := libXrandr-$(LIBXRANDR_VERSION).tar.bz2
-LIBXRANDR_SRC_DIR := $(PACKAGES_BUILD)/libXrandr-$(LIBXRANDR_VERSION)
-LIBXRANDR_BUILD_DIR := $(PACKAGES_BUILD)/libXrandr-$(LIBXRANDR_VERSION)
+LIBXRANDR_NAME		:= libXrandr
+LIBXRANDR_VERSION	:= $(call embtk_get_pkgversion,libxrandr)
+LIBXRANDR_SITE		:= http://xorg.freedesktop.org/archive/individual/lib
+LIBXRANDR_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBXRANDR_PACKAGE	:= libXrandr-$(LIBXRANDR_VERSION).tar.bz2
+LIBXRANDR_SRC_DIR	:= $(PACKAGES_BUILD)/libXrandr-$(LIBXRANDR_VERSION)
+LIBXRANDR_BUILD_DIR	:= $(PACKAGES_BUILD)/libXrandr-$(LIBXRANDR_VERSION)
 
-LIBXRANDR_BINS =
-LIBXRANDR_SBINS =
-LIBXRANDR_INCLUDES = X11/extensions/Xrandr.h
-LIBXRANDR_LIBS = libXrandr.*
-LIBXRANDR_PKGCONFIGS = xrandr.pc
+LIBXRANDR_BINS		=
+LIBXRANDR_SBINS		=
+LIBXRANDR_INCLUDES	= X11/extensions/Xrandr.h
+LIBXRANDR_LIBS		= libXrandr.*
+LIBXRANDR_PKGCONFIGS	= xrandr.pc
 
 LIBXRANDR_CONFIGURE_OPTS := --disable-malloc0returnsnull
 
 LIBXRANDR_DEPS = xproto_install randrproto_install
-
-libxrandr_install:
-	$(call embtk_install_pkg,LIBXRANDR)
-
-download_libxrandr:
-	$(call embtk_download_pkg,LIBXRANDR)
-
-libxrandr_clean:
-	$(call embtk_cleanup_pkg,LIBXRANDR)
diff --git a/packages/x11/libxrender/libxrender.mk b/packages/x11/libxrender/libxrender.mk
index acdaa51..a1b07b8 100644
--- a/packages/x11/libxrender/libxrender.mk
+++ b/packages/x11/libxrender/libxrender.mk
@@ -23,30 +23,20 @@
 # \date         March 2010
 ################################################################################
 
-LIBXRENDER_NAME := libXrender
-LIBXRENDER_VERSION := $(call embtk_get_pkgversion,LIBXRENDER)
-LIBXRENDER_SITE := http://xorg.freedesktop.org/archive/individual/lib
-LIBXRENDER_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBXRENDER_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libxrender/$(LIBXI_VERSION)
-LIBXRENDER_PACKAGE := libXrender-$(LIBXRENDER_VERSION).tar.bz2
-LIBXRENDER_SRC_DIR := $(PACKAGES_BUILD)/libXrender-$(LIBXRENDER_VERSION)
-LIBXRENDER_BUILD_DIR := $(PACKAGES_BUILD)/libXrender-$(LIBXRENDER_VERSION)
+LIBXRENDER_NAME		:= libXrender
+LIBXRENDER_VERSION	:= $(call embtk_get_pkgversion,libxrender)
+LIBXRENDER_SITE		:= http://xorg.freedesktop.org/archive/individual/lib
+LIBXRENDER_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBXRENDER_PACKAGE	:= libXrender-$(LIBXRENDER_VERSION).tar.bz2
+LIBXRENDER_SRC_DIR	:= $(PACKAGES_BUILD)/libXrender-$(LIBXRENDER_VERSION)
+LIBXRENDER_BUILD_DIR	:= $(PACKAGES_BUILD)/libXrender-$(LIBXRENDER_VERSION)
 
-LIBXRENDER_BINS =
-LIBXRENDER_SBINS =
-LIBXRENDER_INCLUDES = X11/extensions/Xrender.h
-LIBXRENDER_LIBS = libXrender.*
-LIBXRENDER_PKGCONFIGS = xrender.pc
+LIBXRENDER_BINS		=
+LIBXRENDER_SBINS	=
+LIBXRENDER_INCLUDES	= X11/extensions/Xrender.h
+LIBXRENDER_LIBS		= libXrender.*
+LIBXRENDER_PKGCONFIGS	= xrender.pc
 
 LIBXRENDER_CONFIGURE_OPTS := --disable-malloc0returnsnull
 
 LIBXRENDER_DEPS = renderproto_install libx11_install
-
-libxrender_install:
-	$(call embtk_install_pkg,LIBXRENDER)
-
-download_libxrender:
-	$(call embtk_download_pkg,LIBXRENDER)
-
-libxrender_clean:
-	$(call embtk_cleanup_pkg,LIBXRENDER)
diff --git a/packages/x11/utilmacros/utilmacros.mk b/packages/x11/utilmacros/utilmacros.mk
index 04a3d6c..12b1dde 100644
--- a/packages/x11/utilmacros/utilmacros.mk
+++ b/packages/x11/utilmacros/utilmacros.mk
@@ -23,30 +23,26 @@
 # \date         March 2010
 ################################################################################
 
-UTILMACROS_NAME := util-macro
-UTILMACROS_VERSION := $(call embtk_get_pkgversion,UTILMACROS)
-UTILMACROS_SITE := http://xorg.freedesktop.org/archive/individual/util
-UTILMACROS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-UTILMACROS_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/util-macro/$(UTILMACROS_VERSION)
-UTILMACROS_PACKAGE := util-macros-$(UTILMACROS_VERSION).tar.bz2
-UTILMACROS_SRC_DIR := $(PACKAGES_BUILD)/util-macros-$(UTILMACROS_VERSION)
-UTILMACROS_BUILD_DIR := $(PACKAGES_BUILD)/util-macros-$(UTILMACROS_VERSION)
+UTILMACROS_NAME		:= util-macro
+UTILMACROS_VERSION	:= $(call embtk_get_pkgversion,utilmacros)
+UTILMACROS_SITE		:= http://xorg.freedesktop.org/archive/individual/util
+UTILMACROS_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+UTILMACROS_PACKAGE	:= util-macros-$(UTILMACROS_VERSION).tar.bz2
+UTILMACROS_SRC_DIR	:= $(PACKAGES_BUILD)/util-macros-$(UTILMACROS_VERSION)
+UTILMACROS_BUILD_DIR	:= $(PACKAGES_BUILD)/util-macros-$(UTILMACROS_VERSION)
 
-UTILMACROS_BINS =
-UTILMACROS_SBINS =
-UTILMACROS_INCLUDES =
-UTILMACROS_LIBS =
-UTILMACROS_PKGCONFIGS = xorg-macros.pc
+UTILMACROS_BINS		=
+UTILMACROS_SBINS	=
+UTILMACROS_INCLUDES	=
+UTILMACROS_LIBS		=
+UTILMACROS_PKGCONFIGS	= xorg-macros.pc
 
 UTILMACROS_CONFIGURE_OPTS := --disable-malloc0returnsnull
 
-utilmacros_install:
-	$(call embtk_install_pkg,UTILMACROS) && \
-	cp $(SYSROOT)/usr/share/pkgconfig/xorg-macros.pc $(EMBTK_PKG_CONFIG_PATH) \
-	&& $(MAKE) pkgconfig_files_adapt
-
-download_utilmacros:
-	$(call embtk_download_pkg,UTILMACROS)
-
-utilmacros_clean:
-	$(call embtk_cleanup_pkg,UTILMACROS)
+define embtk_postinstall_utilmacros
+	$(Q)if [ ! -e $(UTILMACROS_BUILD_DIR)/.installed]; then			\
+		cp $(SYSROOT)/usr/share/pkgconfig/xorg-macros.pc		\
+						$(EMBTK_PKG_CONFIG_PATH);	\
+		$(MAKE) pkgconfig_files_adapt;					\
+	fi
+endef
diff --git a/packages/x11/xcbutil/xcbutil.mk b/packages/x11/xcbutil/xcbutil.mk
index 8154670..e23dffc 100644
--- a/packages/x11/xcbutil/xcbutil.mk
+++ b/packages/x11/xcbutil/xcbutil.mk
@@ -23,14 +23,13 @@
 # \date         March 2009
 ################################################################################
 
-XCBUTIL_NAME := xcb-util
-XCBUTIL_VERSION := $(call embtk_get_pkgversion,XCBUTIL)
-XCBUTIL_SITE := http://xcb.freedesktop.org/dist
-XCBUTIL_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-XCBUTIL_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/xcb-util/$(XCBUTIL_VERSION)
-XCBUTIL_PACKAGE := xcb-util-$(XCBUTIL_VERSION).tar.bz2
-XCBUTIL_SRC_DIR := $(PACKAGES_BUILD)/xcb-util-$(XCBUTIL_VERSION)
-XCBUTIL_BUILD_DIR := $(PACKAGES_BUILD)/xcb-util-$(XCBUTIL_VERSION)
+XCBUTIL_NAME		:= xcb-util
+XCBUTIL_VERSION		:= $(call embtk_get_pkgversion,xcbutil)
+XCBUTIL_SITE		:= http://xcb.freedesktop.org/dist
+XCBUTIL_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+XCBUTIL_PACKAGE		:= xcb-util-$(XCBUTIL_VERSION).tar.bz2
+XCBUTIL_SRC_DIR		:= $(PACKAGES_BUILD)/xcb-util-$(XCBUTIL_VERSION)
+XCBUTIL_BUILD_DIR	:= $(PACKAGES_BUILD)/xcb-util-$(XCBUTIL_VERSION)
 
 XCBUTIL_BINS =
 XCBUTIL_SBINS =
@@ -47,18 +46,13 @@ XCBUTIL_PKGCONFIGS = xcb-atom.pc xcb-aux.pc xcb-event.pc xcb-icccm.pc \
 
 XCBUTIL_DEPS = gperf_host_install libxcb_install
 
-xcbutil_install:
-	$(call embtk_install_pkg,XCBUTIL)
-	$(Q)$(MAKE) $(XCBUTIL_BUILD_DIR)/.patchlibtool
-
-download_xcbutil:
-	$(call embtk_download_pkg,XCBUTIL)
-
-xcbutil_clean:
-	$(call embtk_cleanup_pkg,XCBUTIL)
+define embtk_postinstall_xcbutil
+	$(Q)test -e $(XCBUTIL_BUILD_DIR)/.patchlibtool ||			\
+	$(MAKE) $(XCBUTIL_BUILD_DIR)/.patchlibtool
+endef
 
 $(XCBUTIL_BUILD_DIR)/.patchlibtool:
-	@XCBUTIL_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \
+	$(Q)XCBUTIL_LT_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/libxcb-* -type f -name *.la`; \
 	for i in $$XCBUTIL_LT_FILES; \
 	do \
 	sed \
@@ -70,3 +64,4 @@ $(XCBUTIL_BUILD_DIR)/.patchlibtool:
 	sed \
 	-i "s; /usr/$(LIBDIR)/libxcb-atom.la ; $(SYSROOT)/usr/$(LIBDIR)/libxcb-atom.la ;" $$i; \
 	done
+	$(Q)touch $@
diff --git a/packages/x11/xf86inputevdev/xf86inputevdev.mk b/packages/x11/xf86inputevdev/xf86inputevdev.mk
index 874aecc..1936680 100644
--- a/packages/x11/xf86inputevdev/xf86inputevdev.mk
+++ b/packages/x11/xf86inputevdev/xf86inputevdev.mk
@@ -23,53 +23,22 @@
 # \date         July 2010
 ################################################################################
 
-XF86INPUTEVDEV_NAME := xf86-input-evdev
-XF86INPUTEVDEV_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_XF86INPUTEVDEV_VERSION_STRING)))
-XF86INPUTEVDEV_SITE := http://xorg.freedesktop.org/archive/individual/driver
-XF86INPUTEVDEV_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-XF86INPUTEVDEV_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/xf86-input-evdev/$(XF86INPUTEVDEV_VERSION)
-XF86INPUTEVDEV_PACKAGE := xf86-input-evdev-$(XF86INPUTEVDEV_VERSION).tar.bz2
-XF86INPUTEVDEV_SRC_DIR := $(PACKAGES_BUILD)/xf86-input-evdev-$(XF86INPUTEVDEV_VERSION)
-XF86INPUTEVDEV_BUILD_DIR := $(PACKAGES_BUILD)/xf86-input-evdev-$(XF86INPUTEVDEV_VERSION)
-
-XF86INPUTEVDEV_BINS =
-XF86INPUTEVDEV_SBINS =
-XF86INPUTEVDEV_INCLUDES = xorg/evdev-properties.h
-XF86INPUTEVDEV_LIBS = xorg/modules/input/evdev_drv.*
-XF86INPUTEVDEV_PKGCONFIGS = xorg-evdev.pc
-
-XF86INPUTEVDEV_DEPS = xserver_install
-
-xf86inputevdev_install:
-	@test -e $(XF86INPUTEVDEV_BUILD_DIR)/.installed || \
-	$(MAKE) $(XF86INPUTEVDEV_BUILD_DIR)/.installed
-	$(Q)$(MAKE) $(XF86INPUTEVDEV_BUILD_DIR)/.special
-
-$(XF86INPUTEVDEV_BUILD_DIR)/.installed: $(XF86INPUTEVDEV_DEPS) \
-	download_xf86inputevdev $(XF86INPUTEVDEV_BUILD_DIR)/.decompressed \
-	$(XF86INPUTEVDEV_BUILD_DIR)/.configured
-	$(call embtk_generic_message,"Compiling and installing \
-	xf86inputevdev-$(XF86INPUTEVDEV_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(XF86INPUTEVDEV_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(XF86INPUTEVDEV_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
-
-download_xf86inputevdev:
-	$(call embtk_download_pkg,XF86INPUTEVDEV)
-
-$(XF86INPUTEVDEV_BUILD_DIR)/.decompressed:
-	$(call embtk_decompress_pkg,XF86INPUTEVDEV)
-
-$(XF86INPUTEVDEV_BUILD_DIR)/.configured:
-	$(call embtk_configure_pkg,XF86INPUTEVDEV)
-
-xf86inputevdev_clean:
-	$(call embtk_cleanup_pkg,XF86INPUTEVDEV)
-
-.PHONY: $(XF86INPUTEVDEV_BUILD_DIR)/.special
-
-$(XF86INPUTEVDEV_BUILD_DIR)/.special:
+XF86INPUTEVDEV_NAME		:= xf86-input-evdev
+XF86INPUTEVDEV_VERSION		:= $(call embtk_get_pkgversion,xf86inputevdev)
+XF86INPUTEVDEV_SITE		:= http://xorg.freedesktop.org/archive/individual/driver
+XF86INPUTEVDEV_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+XF86INPUTEVDEV_PACKAGE		:= xf86-input-evdev-$(XF86INPUTEVDEV_VERSION).tar.bz2
+XF86INPUTEVDEV_SRC_DIR		:= $(PACKAGES_BUILD)/xf86-input-evdev-$(XF86INPUTEVDEV_VERSION)
+XF86INPUTEVDEV_BUILD_DIR	:= $(PACKAGES_BUILD)/xf86-input-evdev-$(XF86INPUTEVDEV_VERSION)
+
+XF86INPUTEVDEV_BINS		=
+XF86INPUTEVDEV_SBINS		=
+XF86INPUTEVDEV_INCLUDES		= xorg/evdev-properties.h
+XF86INPUTEVDEV_LIBS		= xorg/modules/input/evdev_drv.*
+XF86INPUTEVDEV_PKGCONFIGS	= xorg-evdev.pc
+
+XF86INPUTEVDEV_DEPS		= xserver_install
+
+define embtk_postinstall_xf86inputevdev
 	$(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/
-	@touch $@
+endef
diff --git a/packages/x11/xf86videofbdev/xf86videofbdev.mk b/packages/x11/xf86videofbdev/xf86videofbdev.mk
index 67338a3..749bcdd 100644
--- a/packages/x11/xf86videofbdev/xf86videofbdev.mk
+++ b/packages/x11/xf86videofbdev/xf86videofbdev.mk
@@ -23,53 +23,22 @@
 # \date         July 2010
 ################################################################################
 
-XF86VIDEOFBDEV_NAME := xf86-video-fbdev
-XF86VIDEOFBDEV_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_XF86VIDEOFBDEV_VERSION_STRING)))
-XF86VIDEOFBDEV_SITE := http://xorg.freedesktop.org/archive/individual/driver
-XF86VIDEOFBDEV_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-XF86VIDEOFBDEV_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/xf86-video-fbdev/$(XF86VIDEOFBDEV_VERSION)
-XF86VIDEOFBDEV_PACKAGE := xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION).tar.bz2
-XF86VIDEOFBDEV_SRC_DIR := $(PACKAGES_BUILD)/xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION)
-XF86VIDEOFBDEV_BUILD_DIR := $(PACKAGES_BUILD)/xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION)
-
-XF86VIDEOFBDEV_BINS =
-XF86VIDEOFBDEV_SBINS =
-XF86VIDEOFBDEV_INCLUDES =
-XF86VIDEOFBDEV_LIBS = xorg/modules/drivers/fbdev_drv.*
-XF86VIDEOFBDEV_PKGCONFIGS =
+XF86VIDEOFBDEV_NAME		:= xf86-video-fbdev
+XF86VIDEOFBDEV_VERSION		:= $(call embtk_get_pkgversion,xf86videofbdev)
+XF86VIDEOFBDEV_SITE		:= http://xorg.freedesktop.org/archive/individual/driver
+XF86VIDEOFBDEV_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+XF86VIDEOFBDEV_PACKAGE		:= xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION).tar.bz2
+XF86VIDEOFBDEV_SRC_DIR		:= $(PACKAGES_BUILD)/xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION)
+XF86VIDEOFBDEV_BUILD_DIR	:= $(PACKAGES_BUILD)/xf86-video-fbdev-$(XF86VIDEOFBDEV_VERSION)
+
+XF86VIDEOFBDEV_BINS		=
+XF86VIDEOFBDEV_SBINS		=
+XF86VIDEOFBDEV_INCLUDES		=
+XF86VIDEOFBDEV_LIBS		= xorg/modules/drivers/fbdev_drv.*
+XF86VIDEOFBDEV_PKGCONFIGS	=
 
 XF86VIDEOFBDEV_DEPS = xserver_install
 
-xf86videofbdev_install:
-	@test -e $(XF86VIDEOFBDEV_BUILD_DIR)/.installed || \
-	$(MAKE) $(XF86VIDEOFBDEV_BUILD_DIR)/.installed
-	$(Q)$(MAKE) $(XF86VIDEOFBDEV_BUILD_DIR)/.special
-
-$(XF86VIDEOFBDEV_BUILD_DIR)/.installed: $(XF86VIDEOFBDEV_DEPS) \
-	download_xf86videofbdev $(XF86VIDEOFBDEV_BUILD_DIR)/.decompressed \
-	$(XF86VIDEOFBDEV_BUILD_DIR)/.configured
-	$(call embtk_generic_message,"Compiling and installing \
-	xf86videofbdev-$(XF86VIDEOFBDEV_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(XF86VIDEOFBDEV_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(XF86VIDEOFBDEV_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
-
-download_xf86videofbdev:
-	$(call embtk_download_pkg,XF86VIDEOFBDEV)
-
-$(XF86VIDEOFBDEV_BUILD_DIR)/.decompressed:
-	$(call embtk_decompress_pkg,XF86VIDEOFBDEV)
-
-$(XF86VIDEOFBDEV_BUILD_DIR)/.configured:
-	$(call embtk_configure_pkg,XF86VIDEOFBDEV)
-
-xf86videofbdev_clean:
-	$(call embtk_cleanup_pkg,XF86VIDEOFBDEV)
-
-.PHONY: $(XF86VIDEOFBDEV_BUILD_DIR)/.special
-
-$(XF86VIDEOFBDEV_BUILD_DIR)/.special:
+define embtk_postinstall_xf86videofbdev
 	$(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/
-	@touch $@
+endef
diff --git a/packages/x11/xinput/xinput.mk b/packages/x11/xinput/xinput.mk
index 9c2aea2..dc45ad1 100644
--- a/packages/x11/xinput/xinput.mk
+++ b/packages/x11/xinput/xinput.mk
@@ -23,29 +23,19 @@
 # \date         September 2010
 ################################################################################
 
-XINPUT_NAME := xinput
-XINPUT_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_XINPUT_VERSION_STRING)))
-XINPUT_SITE := http://xorg.freedesktop.org/archive/individual/app
-XINPUT_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-XINPUT_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/xinput/$(XINPUT_VERSION)
-XINPUT_PACKAGE := xinput-$(XINPUT_VERSION).tar.bz2
-XINPUT_SRC_DIR := $(PACKAGES_BUILD)/xinput-$(XINPUT_VERSION)
-XINPUT_BUILD_DIR := $(PACKAGES_BUILD)/xinput-$(XINPUT_VERSION)
+XINPUT_NAME		:= xinput
+XINPUT_VERSION		:= $(call embtk_get_pkgversion,xinput)
+XINPUT_SITE		:= http://xorg.freedesktop.org/archive/individual/app
+XINPUT_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+XINPUT_PACKAGE		:= xinput-$(XINPUT_VERSION).tar.bz2
+XINPUT_SRC_DIR		:= $(PACKAGES_BUILD)/xinput-$(XINPUT_VERSION)
+XINPUT_BUILD_DIR	:= $(PACKAGES_BUILD)/xinput-$(XINPUT_VERSION)
 
-XINPUT_BINS = xinput
-XINPUT_SBINS =
-XINPUT_INCLUDES =
-XINPUT_LIBS =
-XINPUT_PKGCONFIGS =
+XINPUT_BINS		= xinput
+XINPUT_SBINS		=
+XINPUT_INCLUDES		=
+XINPUT_LIBS		=
+XINPUT_PKGCONFIGS	=
 
 XINPUT_DEPS := xproto_install inputproto_install libx11_install \
 	libxext_install libxi_install
-
-xinput_install:
-	$(call embtk_install_pkg,XINPUT)
-
-download_xinput:
-	$(call embtk_download_pkg,XINPUT)
-
-xinput_clean:
-	$(call embtk_cleanup_pkg,XINPUT)
diff --git a/packages/x11/xkbcomp/xkbcomp.mk b/packages/x11/xkbcomp/xkbcomp.mk
index 5bf3ccb..18c4050 100644
--- a/packages/x11/xkbcomp/xkbcomp.mk
+++ b/packages/x11/xkbcomp/xkbcomp.mk
@@ -23,28 +23,18 @@
 # \date         March 2010
 ################################################################################
 
-XKBCOMP_NAME := xkbcomp
-XKBCOMP_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_XKBCOMP_VERSION_STRING)))
-XKBCOMP_SITE := http://xorg.freedesktop.org/archive/individual/app
-XKBCOMP_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-XKBCOMP_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/xkbcomp/$(XKBCOMP_VERSION)
-XKBCOMP_PACKAGE := xkbcomp-$(XKBCOMP_VERSION).tar.bz2
-XKBCOMP_SRC_DIR := $(PACKAGES_BUILD)/xkbcomp-$(XKBCOMP_VERSION)
-XKBCOMP_BUILD_DIR := $(PACKAGES_BUILD)/xkbcomp-$(XKBCOMP_VERSION)
+XKBCOMP_NAME		:= xkbcomp
+XKBCOMP_VERSION		:= $(call embtk_get_pkgversion,xkbcomp)
+XKBCOMP_SITE		:= http://xorg.freedesktop.org/archive/individual/app
+XKBCOMP_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+XKBCOMP_PACKAGE		:= xkbcomp-$(XKBCOMP_VERSION).tar.bz2
+XKBCOMP_SRC_DIR		:= $(PACKAGES_BUILD)/xkbcomp-$(XKBCOMP_VERSION)
+XKBCOMP_BUILD_DIR	:= $(PACKAGES_BUILD)/xkbcomp-$(XKBCOMP_VERSION)
 
-XKBCOMP_BINS = xkbcomp
-XKBCOMP_SBINS =
-XKBCOMP_INCLUDES =
-XKBCOMP_LIBS =
-XKBCOMP_PKGCONFIGS =
+XKBCOMP_BINS		= xkbcomp
+XKBCOMP_SBINS		=
+XKBCOMP_INCLUDES	=
+XKBCOMP_LIBS 		=
+XKBCOMP_PKGCONFIGS	=
 
-XKBCOMP_DEPS = libxkbfile_install
-
-xkbcomp_install:
-	$(call embtk_install_pkg,XKBCOMP)
-
-download_xkbcomp:
-	$(call embtk_cleanup_pkg,XKBCOMP)
-
-xkbcomp_clean:
-	$(call embtk_cleanup_pkg,XKBCOMP)
+XKBCOMP_DEPS		= libxkbfile_install
diff --git a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk
index aec0d7f..82671e3 100644
--- a/packages/x11/xkeyboardconfig/xkeyboardconfig.mk
+++ b/packages/x11/xkeyboardconfig/xkeyboardconfig.mk
@@ -24,36 +24,17 @@
 ################################################################################
 
 XKEYBOARDCONFIG_NAME		:= xkeyboard-config
-XKEYBOARDCONFIG_VERSION		:= $(call embtk_get_pkgversion,XKEYBOARDCONFIG)
+XKEYBOARDCONFIG_VERSION		:= $(call embtk_get_pkgversion,xkeyboardconfig)
 XKEYBOARDCONFIG_SITE		:= http://www.x.org/releases/individual/data/xkeyboard-config
 XKEYBOARDCONFIG_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-XKEYBOARDCONFIG_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/xkeyboard-config/$(XKEYBOARDCONFIG_VERSION)
 XKEYBOARDCONFIG_PACKAGE		:= xkeyboard-config-$(XKEYBOARDCONFIG_VERSION).tar.bz2
 XKEYBOARDCONFIG_SRC_DIR		:= $(PACKAGES_BUILD)/xkeyboard-config-$(XKEYBOARDCONFIG_VERSION)
 XKEYBOARDCONFIG_BUILD_DIR	:= $(PACKAGES_BUILD)/xkeyboard-config-$(XKEYBOARDCONFIG_VERSION)
 
-XKEYBOARDCONFIG_BINS =
-XKEYBOARDCONFIG_SBINS =
-XKEYBOARDCONFIG_INCLUDES =
-XKEYBOARDCONFIG_LIBS =
-XKEYBOARDCONFIG_PKGCONFIGS =
+XKEYBOARDCONFIG_DEPS		:= intltool_host_install xkbcomp_install
 
-XKEYBOARDCONFIG_DEPS = intltool_host_install xkbcomp_install
-
-xkeyboardconfig_install:
-	$(call embtk_install_pkg,XKEYBOARDCONFIG)
-	$(Q)$(MAKE) $(XKEYBOARDCONFIG_BUILD_DIR)/.special
-
-download_xkeyboardconfig:
-	$(call embtk_download_pkg,XKEYBOARDCONFIG)
-
-xkeyboardconfig_clean:
-	$(call embtk_cleanup_pkg,XKEYBOARDCONFIG)
-
-.PHONY: $(XKEYBOARDCONFIG_BUILD_DIR)/.special
-
-$(XKEYBOARDCONFIG_BUILD_DIR)/.special:
+define embtk_postinstall_xkeyboardconfig
 	$(Q)-mkdir -p $(ROOTFS)/usr/share
 	$(Q)-mkdir -p $(ROOTFS)/usr/share/X11
 	$(Q)-cp -R $(SYSROOT)/usr/share/X11/xkb $(ROOTFS)/usr/share/X11/
-	@touch $@
+endef
diff --git a/packages/x11/xserver/xserver.mk b/packages/x11/xserver/xserver.mk
index 81246a3..542dfa6 100644
--- a/packages/x11/xserver/xserver.mk
+++ b/packages/x11/xserver/xserver.mk
@@ -23,37 +23,32 @@
 # \date         March 2010
 ################################################################################
 
-XSERVER_NAME := xorg-server
-XSERVER_VERSION := $(call embtk_get_pkgversion,XSERVER)
-XSERVER_SITE := http://ftp.x.org/pub/individual/xserver
-XSERVER_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-XSERVER_PACKAGE := xorg-server-$(XSERVER_VERSION).tar.bz2
-XSERVER_SRC_DIR := $(PACKAGES_BUILD)/xorg-server-$(XSERVER_VERSION)
-XSERVER_BUILD_DIR := $(PACKAGES_BUILD)/xorg-server-$(XSERVER_VERSION)
+XSERVER_NAME		:= xorg-server
+XSERVER_VERSION		:= $(call embtk_get_pkgversion,xserver)
+XSERVER_SITE		:= http://ftp.x.org/pub/individual/xserver
+XSERVER_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+XSERVER_PACKAGE		:= xorg-server-$(XSERVER_VERSION).tar.bz2
+XSERVER_SRC_DIR		:= $(PACKAGES_BUILD)/xorg-server-$(XSERVER_VERSION)
+XSERVER_BUILD_DIR	:= $(PACKAGES_BUILD)/xorg-server-$(XSERVER_VERSION)
 
-XSERVER_BINS = Xfbdev X Xorg
-XSERVER_SBINS =
-XSERVER_INCLUDES = xorg
-XSERVER_LIBS = xorg
-XSERVER_PKGCONFIGS = xorg-server.pc
+XSERVER_BINS		= Xfbdev X Xorg
+XSERVER_SBINS		=
+XSERVER_INCLUDES	= xorg
+XSERVER_LIBS		= xorg
+XSERVER_PKGCONFIGS	= xorg-server.pc
 
-ifeq ($(CONFIG_EMBTK_HAVE_XSERVER_KDRIVE),y)
-XSERVER_VARIANT := --enable-kdrive --disable-xorg
-else
-XSERVER_VARIANT := --disable-kdrive --enable-xorg
-endif
+XSERVER_VARIANT := $(if $(CONFIG_EMBTK_HAVE_XSERVER_KDRIVE),			\
+			--enable-kdrive --disable-xorg,				\
+			--disable-kdrive --enable-xorg)
 
-XSERVER_DEPS := utilmacros_install bigreqsproto_install compositeproto_install \
-		damageproto_install fixesproto_install fontsproto_install \
-		inputproto_install kbproto_install randrproto_install \
-		recordproto_install renderproto_install resourceproto_install \
-		videoproto_install xcbproto_install xcmiscproto_install \
-		xextproto_install xproto_install libxfont_install \
+XSERVER_DEPS := utilmacros_install bigreqsproto_install compositeproto_install	\
+		damageproto_install fixesproto_install fontsproto_install	\
+		inputproto_install kbproto_install randrproto_install		\
+		recordproto_install renderproto_install resourceproto_install	\
+		videoproto_install xcbproto_install xcmiscproto_install		\
+		xextproto_install xproto_install libxfont_install		\
 		libxkbfile_install xtrans_install openssl_install
-
-ifeq ($(CONFIG_EMBTK_HAVE_XSERVER_XORG),y)
-XSERVER_DEPS += libpciaccess_install
-endif
+XSERVER_DEPS += $(if $(CONFIG_EMBTK_HAVE_XSERVER_XORG),libpciaccess_install)
 
 XSERVER_CONFIGURE_OPTS := $(XSERVER_VARIANT) --with-sha1=libcrypto \
 		--disable-dga --disable-dri --disable-xvmc --disable-fontserver \
@@ -74,10 +69,10 @@ XSERVER_CONFIGURE_OPTS := $(XSERVER_VARIANT) --with-sha1=libcrypto \
 		--with-os-name=$(STRICT_GNU_TARGET) \
 		--with-os-vendor="embtoolkit.org"
 
-XSERVER_CONFIGURE_ENV := XLIB_CFLAGS=`$(PKGCONFIG_BIN) xcb --cflags`
-XSERVER_CONFIGURE_ENV += XLIB_LIBS=`$(PKGCONFIG_BIN) xcb --libs`
-XSERVER_CONFIGURE_ENV += TSLIB_CFLAGS=`$(PKGCONFIG_BIN) tslib --cflags`
-XSERVER_CONFIGURE_ENV += TSLIB_LIBS=`$(PKGCONFIG_BIN) tslib --libs`
+XSERVER_CONFIGURE_ENV = XLIB_CFLAGS=$(call embtk_pkgconfig_getcflags,xcb)
+XSERVER_CONFIGURE_ENV += XLIB_LIBS=$(call embtk_pkgconfig_getlibs,xcb)
+XSERVER_CONFIGURE_ENV += TSLIB_CFLAGS=$(call embtk_pkgconfig_getcflags,tslib)
+XSERVER_CONFIGURE_ENV += TSLIB_LIBS=$(call embtk_pkgconfig_getlibs,tslib)
 
 ifeq ($(CONFIG_EMBTK_HAVE_XSERVER_WITH_TSLIB),y)
 XSERVER_DEPS += tslib_install
@@ -86,18 +81,6 @@ else
 XSERVER_CONFIGURE_OPTS += --disable-tslib
 endif
 
-xserver_install:
-	$(call embtk_install_pkg,XSERVER)
-	$(Q)$(MAKE) $(XSERVER_BUILD_DIR)/.special
-
-download_xserver:
-	$(call embtk_download_pkg,XSERVER)
-
-xserver_clean:
-	$(call embtk_cleanup_pkg,XSERVER)
-
-.PHONY: $(XSERVER_BUILD_DIR)/.special
-
-$(XSERVER_BUILD_DIR)/.special:
+define embtk_postinstall_xserver
 	$(Q)-cp -R $(SYSROOT)/usr/$(LIBDIR)/xorg $(ROOTFS)/usr/$(LIBDIR)/
-	@touch $@
+endef
diff --git a/packages/x11/xtrans/xtrans.mk b/packages/x11/xtrans/xtrans.mk
index 22153ce..f5a2fec 100644
--- a/packages/x11/xtrans/xtrans.mk
+++ b/packages/x11/xtrans/xtrans.mk
@@ -23,30 +23,26 @@
 # \date         March 2010
 ################################################################################
 
-XTRANS_NAME := xtrans
-XTRANS_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_XTRANS_VERSION_STRING)))
-XTRANS_SITE := http://xorg.freedesktop.org/archive/individual/lib
-XTRANS_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-XTRANS_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/xtrans/$(XTRANS_VERSION)
-XTRANS_PACKAGE := xtrans-$(XTRANS_VERSION).tar.bz2
-XTRANS_SRC_DIR := $(PACKAGES_BUILD)/xtrans-$(XTRANS_VERSION)
-XTRANS_BUILD_DIR := $(PACKAGES_BUILD)/xtrans-$(XTRANS_VERSION)
+XTRANS_NAME		:= xtrans
+XTRANS_VERSION		:= $(call embtk_get_pkgversion,xtrans)
+XTRANS_SITE		:= http://xorg.freedesktop.org/archive/individual/lib
+XTRANS_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+XTRANS_PACKAGE		:= xtrans-$(XTRANS_VERSION).tar.bz2
+XTRANS_SRC_DIR		:= $(PACKAGES_BUILD)/xtrans-$(XTRANS_VERSION)
+XTRANS_BUILD_DIR	:= $(PACKAGES_BUILD)/xtrans-$(XTRANS_VERSION)
 
-XTRANS_BINS =
-XTRANS_SBINS =
-XTRANS_INCLUDES = X11/xtrans
-XTRANS_LIBS =
-XTRANS_PKGCONFIGS =
+XTRANS_BINS		=
+XTRANS_SBINS		=
+XTRANS_INCLUDES		= X11/xtrans
+XTRANS_LIBS		=
+XTRANS_PKGCONFIGS	=
 
 XTRANS_CONFIGURE_OPTS := --disable-malloc0returnsnull
 
-xtrans_install:
-	$(call embtk_install_pkg,XTRANS) && 				\
-	cp $(SYSROOT)/usr/share/pkgconfig/xtrans.pc $(EMBTK_PKG_CONFIG_PATH)	\
-	&& $(MAKE) pkgconfig_files_adapt
-
-download_xtrans:
-	$(call embtk_download_pkg,XTRANS)
-
-xtrans_clean:
-	$(call embtk_cleanup_pkg,XTRANS)
+define embtk_postinstall_xtrans
+	$(Q)if [ ! -e $(XTRANS_BUILD_DIR)/.installed]; then			\
+		cp $(SYSROOT)/usr/share/pkgconfig/xtrans.pc			\
+						$(EMBTK_PKG_CONFIG_PATH);	\
+		$(MAKE) pkgconfig_files_adapt;					\
+	fi
+endef