From eaa181e77d44475ecb6b9daf636e5f8502085979 Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Date: Sun, 27 Feb 2011 15:14:30 +0100
Subject: Packages: X11/libXfont: convert to use generic macros

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
---
 packages/x11/libxfont/libxfont.kconfig |  9 +++++
 packages/x11/libxfont/libxfont.mk      | 65 ++++++----------------------------
 2 files changed, 19 insertions(+), 55 deletions(-)

(limited to 'packages/x11')

diff --git a/packages/x11/libxfont/libxfont.kconfig b/packages/x11/libxfont/libxfont.kconfig
index 1e908f2..897d0dc 100644
--- a/packages/x11/libxfont/libxfont.kconfig
+++ b/packages/x11/libxfont/libxfont.kconfig
@@ -25,6 +25,7 @@
 
 config EMBTK_HAVE_LIBXFONT
 	bool "Have libxfont"
+	select EMBTK_LIBXFONT_PKG_IS_TARBZ2
 	select EMBTK_HAVE_LIBFONTENC
 	select EMBTK_HAVE_FREETYPE
 	help
@@ -49,3 +50,11 @@ config EMBTK_LIBXFONT_VERSION_STRING
 	default "1.4.2"		if EMBTK_LIBXFONT_VERSION_1_4_2
 	default "1.4.1"		if EMBTK_LIBXFONT_VERSION_1_4_1
 
+config EMBTK_LIBXFONT_NEED_PATCH
+	bool
+config EMBTK_LIBXFONT_NEED_AUTORECONF
+	bool
+config EMBTK_LIBXFONT_PKG_IS_TARGZ
+	bool
+config EMBTK_LIBXFONT_PKG_IS_TARBZ2
+	bool
diff --git a/packages/x11/libxfont/libxfont.mk b/packages/x11/libxfont/libxfont.mk
index 296174e..25e33aa 100644
--- a/packages/x11/libxfont/libxfont.mk
+++ b/packages/x11/libxfont/libxfont.mk
@@ -23,9 +23,13 @@
 # \date         March 2010
 ################################################################################
 
-LIBXFONT_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_LIBXFONT_VERSION_STRING)))
+LIBXFONT_NAME := libXfont
+LIBXFONT_VERSION := $(call EMBTK_GET_PKG_VERSION,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_BINS =
@@ -38,64 +42,15 @@ LIBXFONT_INCLUDES = X11/fonts/bdfint.h X11/fonts/bufio.h X11/fonts/fntfilio.h \
 LIBXFONT_LIBS = libXfont.*
 LIBXFONT_PKGCONFIGS = xfont.pc
 
+LIBXFONT_CONFIGURE_OPTS := --disable-malloc0returnsnull
+
 LIBXFONT_DEPS = libfontenc_install freetype_install
 
 libxfont_install:
-	@test -e $(LIBXFONT_BUILD_DIR)/.installed || \
-	$(MAKE) $(LIBXFONT_BUILD_DIR)/.installed
-
-$(LIBXFONT_BUILD_DIR)/.installed: $(LIBXFONT_DEPS) download_libxfont \
-	$(LIBXFONT_BUILD_DIR)/.decompressed $(LIBXFONT_BUILD_DIR)/.configured
-	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
-	libxfont-$(LIBXFONT_VERSION) in your root filesystem...")
-	$(call EMBTK_KILL_LT_RPATH,$(LIBXFONT_BUILD_DIR))
-	$(Q)$(MAKE) -C $(LIBXFONT_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBXFONT_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
+	$(call EMBTK_INSTALL_PKG,LIBXFONT)
 
 download_libxfont:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(LIBXFONT_PACKAGE) \
-	if necessary...")
-	@test -e $(DOWNLOAD_DIR)/$(LIBXFONT_PACKAGE) || \
-	wget -O $(DOWNLOAD_DIR)/$(LIBXFONT_PACKAGE) \
-	$(LIBXFONT_SITE)/$(LIBXFONT_PACKAGE)
-
-$(LIBXFONT_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(LIBXFONT_PACKAGE) ...")
-	@tar -C $(PACKAGES_BUILD) -xjvf $(DOWNLOAD_DIR)/$(LIBXFONT_PACKAGE)
-	@touch $@
-
-$(LIBXFONT_BUILD_DIR)/.configured:
-	$(Q)cd $(LIBXFONT_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) --prefix=/usr --libdir=/usr/$(LIBDIR) \
-	--disable-malloc0returnsnull
-	@touch $@
+	$(call EMBTK_DOWNLOAD_PKG,LIBXFONT)
 
 libxfont_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup libxfont-$(LIBXFONT_VERSION)...")
-	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBXFONT_BINS)
-	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(LIBXFONT_SBINS)
-	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(LIBXFONT_INCLUDES)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(LIBXFONT_LIBS)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(LIBXFONT_PKGCONFIGS)
-	$(Q)-rm -rf $(LIBXFONT_BUILD_DIR)*
-
+	$(call EMBTK_CLEANUP_PKG,LIBXFONT)
-- 
cgit v1.2.3