Packages: X11/xkbcomp: convert to use generic macros

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

2 files changed, 13 insertions, 62 deletions

diff --git a/packages/x11/xkbcomp/xkbcomp.kconfig b/packages/x11/xkbcomp/xkbcomp.kconfig
index aa591be..6d46b2c 100644
--- a/packages/x11/xkbcomp/xkbcomp.kconfig
+++ b/packages/x11/xkbcomp/xkbcomp.kconfig
@@ -25,6 +25,7 @@
 
 config EMBTK_HAVE_XKBCOMP
 	bool "Have xkbcomp"
+	select EMBTK_XKBCOMP_PKG_IS_TARBZ2
 	select EMBTK_HAVE_LIBXKBFILE
 	help
 		xkbcomp for X windowing system.
@@ -52,3 +53,9 @@ config EMBTK_XKBCOMP_VERSION_STRING
 
 config EMBTK_XKBCOMP_NEED_PATCH
 	bool
+config EMBTK_XKBCOMP_NEED_AUTORECONF
+	bool
+config EMBTK_XKBCOMP_PKG_IS_TARGZ
+	bool
+config EMBTK_XKBCOMP_PKG_IS_TARBZ2
+	bool
diff --git a/packages/x11/xkbcomp/xkbcomp.mk b/packages/x11/xkbcomp/xkbcomp.mk
index 53bf815..15d4ada 100644
--- a/packages/x11/xkbcomp/xkbcomp.mk
+++ b/packages/x11/xkbcomp/xkbcomp.mk
@@ -23,10 +23,13 @@
 # \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_BINS = xkbcomp
@@ -38,69 +41,10 @@ XKBCOMP_PKGCONFIGS =
 XKBCOMP_DEPS = libxkbfile_install
 
 xkbcomp_install:
-	@test -e $(XKBCOMP_BUILD_DIR)/.installed || \
-	$(MAKE) $(XKBCOMP_BUILD_DIR)/.installed
-
-$(XKBCOMP_BUILD_DIR)/.installed: $(XKBCOMP_DEPS) download_xkbcomp \
-	$(XKBCOMP_BUILD_DIR)/.decompressed $(XKBCOMP_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
-	xkbcomp-$(XKBCOMP_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(XKBCOMP_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(XKBCOMP_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
+	$(call EMBTK_INSTALL_PKG,XKBCOMP)
 
 download_xkbcomp:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(XKBCOMP_PACKAGE) \
-	if necessary...")
-	@test -e $(DOWNLOAD_DIR)/$(XKBCOMP_PACKAGE) || \
-	wget -O $(DOWNLOAD_DIR)/$(XKBCOMP_PACKAGE) \
-	$(XKBCOMP_SITE)/$(XKBCOMP_PACKAGE)
-ifeq ($(CONFIG_EMBTK_XKBCOMP_NEED_PATCH),y)
-	@test -e $(DOWNLOAD_DIR)/xkbcomp-$(XKBCOMP_VERSION).patch || \
-	wget -O $(DOWNLOAD_DIR)/xkbcomp-$(XKBCOMP_VERSION).patch \
-	$(XKBCOMP_PATCH_SITE)/xkbcomp-$(XKBCOMP_VERSION)-*.patch
-endif
-
-$(XKBCOMP_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(XKBCOMP_PACKAGE) ...")
-	@tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(XKBCOMP_PACKAGE)
-ifeq ($(CONFIG_EMBTK_XKBCOMP_NEED_PATCH),y)
-	@cd $(XKBCOMP_BUILD_DIR); \
-	patch -p1 < $(DOWNLOAD_DIR)/xkbcomp-$(XKBCOMP_VERSION).patch
-endif
-	@touch $@
-
-$(XKBCOMP_BUILD_DIR)/.configured:
-	$(Q)cd $(XKBCOMP_BUILD_DIR); \
-	CC=$(TARGETCC_CACHED) \
-	CXX=$(TARGETCXX_CACHED) \
-	AR=$(TARGETAR) \
-	RANLIB=$(TARGETRANLIB) \
-	AS=$(CROSS_COMPILE)as \
-	LD=$(TARGETLD) \
-	NM=$(TARGETNM) \
-	STRIP=$(TARGETSTRIP) \
-	OBJDUMP=$(TARGETOBJDUMP) \
-	OBJCOPY=$(TARGETOBJCOPY) \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
-	CPPFLGAS="-I$(SYSROOT)/usr/include" \
-	PKG_CONFIG=$(PKGCONFIG_BIN) \
-	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
-	--target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) \
-	--prefix=/usr
-	@touch $@
+	$(call EMBTK_CLEANUP_PKG,XKBCOMP)
 
 xkbcomp_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup xkbcomp...")
-	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XKBCOMP_BINS)
-	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XKBCOMP_SBINS)
-	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XKBCOMP_INCLUDES)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XKBCOMP_LIBS)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XKBCOMP_PKGCONFIGS)
-	$(Q)-rm -rf $(XKBCOMP_BUILD_DIR)*
-
+	$(call EMBTK_CLEANUP_PKG,XKBCOMP)