Packages: libXft: convert to use generic macros

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

1 files changed, 10 insertions, 55 deletions

diff --git a/packages/x11/libxft/libxft.mk b/packages/x11/libxft/libxft.mk
index 459564e..97ce48b 100644
--- a/packages/x11/libxft/libxft.mk
+++ b/packages/x11/libxft/libxft.mk
@@ -23,9 +23,13 @@
 # \date         June 2010
 ################################################################################
 
-LIBXFT_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_LIBXFT_VERSION_STRING)))
+LIBXFT_NAME := libXft
+LIBXFT_VERSION := $(call EMBTK_GET_PKG_VERSION,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_BINS = xft-config
@@ -34,64 +38,15 @@ LIBXFT_INCLUDES = X11/xft
 LIBXFT_LIBS = libXft.*
 LIBXFT_PKGCONFIGS = xft.pc
 
+LIBXFT_CONFIGURE_OPTS := --disable-malloc0returnsnull
+
 LIBXFT_DEPS = freetype_install fontconfig_install libxrender_install
 
 libxft_install:
-	@test -e $(LIBXFT_BUILD_DIR)/.installed || \
-	$(MAKE) $(LIBXFT_BUILD_DIR)/.installed
-
-$(LIBXFT_BUILD_DIR)/.installed: $(LIBXFT_DEPS) download_libxft \
-	$(LIBXFT_BUILD_DIR)/.decompressed $(LIBXFT_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
-	libxft-$(LIBXFT_VERSION) in your root filesystem...")
-	$(call EMBTK_KILL_LT_RPATH,$(LIBXFT_BUILD_DIR))
-	$(Q)$(MAKE) -C $(LIBXFT_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBXFT_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
+	$(call EMBTK_INSTALL_PKG,LIBXFT)
 
 download_libxft:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(LIBXFT_PACKAGE) \
-	if necessary...")
-	@test -e $(DOWNLOAD_DIR)/$(LIBXFT_PACKAGE) || \
-	wget -O $(DOWNLOAD_DIR)/$(LIBXFT_PACKAGE) \
-	$(LIBXFT_SITE)/$(LIBXFT_PACKAGE)
-
-$(LIBXFT_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(LIBXFT_PACKAGE) ...")
-	@tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(LIBXFT_PACKAGE)
-	@touch $@
-
-$(LIBXFT_BUILD_DIR)/.configured:
-	$(Q)cd $(LIBXFT_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 \
-	--disable-malloc0returnsnull
-	@touch $@
+	$(call EMBTK_DOWNLOAD_PKG,LIBXFT)
 
 libxft_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup libxft...")
-	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBXFT_BINS)
-	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LIBXFT_SBINS)
-	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBXFT_INCLUDES)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBXFT_LIBS)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBXFT_PKGCONFIGS)
-	$(Q)-rm -rf $(LIBXFT_BUILD_DIR)*
-
+	$(call EMBTK_CLEANUP_PKG,LIBXFT)