Packages: ncurses: convert to use generic macros

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

2 files changed, 24 insertions, 40 deletions

diff --git a/packages/misc/ncurses/ncurses.kconfig b/packages/misc/ncurses/ncurses.kconfig
index 4ae713a..4e76433 100644
--- a/packages/misc/ncurses/ncurses.kconfig
+++ b/packages/misc/ncurses/ncurses.kconfig
@@ -24,6 +24,7 @@
 
 config EMBTK_HAVE_NCURSES
 	bool "Have ncurses"
+	select EMBTK_NCURSES_PKG_IS_TARGZ
 	select KEMBTK_EGLIBC_OPTION_EGLIBC_CHARSETS if EMBTK_CLIB_EGLIBC
 	help
 		The Ncurses (new curses) library is a free software emulation of
@@ -48,3 +49,11 @@ config EMBTK_NCURSES_VERSION_STRING
 	string
 	default "5.7"	if EMBTK_NCURSES_VERSION_5_7
 
+config EMBTK_NCURSES_NEED_PATCH
+	bool
+config EMBTK_NCURSES_NEED_AUTORECONF
+	bool
+config EMBTK_NCURSES_PKG_IS_TARGZ
+	bool
+config EMBTK_NCURSES_PKG_IS_TARBZ2
+	bool
diff --git a/packages/misc/ncurses/ncurses.mk b/packages/misc/ncurses/ncurses.mk
index 8b89bb9..b2306de 100644
--- a/packages/misc/ncurses/ncurses.mk
+++ b/packages/misc/ncurses/ncurses.mk
@@ -23,9 +23,13 @@
 # \date         January 2010
 ################################################################################
 
-NCURSES_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_NCURSES_VERSION_STRING)))
+NCURSES_NAME := ncurses
+NCURSES_VERSION := $(call EMBTK_GET_PKG_VERSION,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_BINS = captoinfo clear infocmp infotocap ncurses5-config reset tic toe \
@@ -40,6 +44,11 @@ NCURSES_LIBS = libcurses.a libform.a libform_g.a libmenu.a libmenu_g.a \
 		libpanel_g.a terminfo
 NCURSES_PKGCONFIGS =
 
+NCURSES_CONFIGURE_OPTS := --disable-rpath --without-cxx-binding		\
+			--without-ada --disable-database		\
+			--enable-termcap --without-progs		\
+			--program-prefix=""
+
 ncurses_install:
 	@test -e $(NCURSES_BUILD_DIR)/.installed || \
 	$(MAKE) $(NCURSES_BUILD_DIR)/.installed
@@ -54,52 +63,18 @@ $(NCURSES_BUILD_DIR)/.installed: download_ncurses \
 	@touch $@
 
 download_ncurses:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(NCURSES_PACKAGE) \
-	if necessary...")
-	@test -e $(DOWNLOAD_DIR)/$(NCURSES_PACKAGE) || \
-	wget -O $(DOWNLOAD_DIR)/$(NCURSES_PACKAGE) \
-	$(NCURSES_SITE)/$(NCURSES_PACKAGE)
+	$(call EMBTK_DOWNLOAD_PKG,NCURSES)
 
 $(NCURSES_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(NCURSES_PACKAGE) ...")
-	@tar -C $(PACKAGES_BUILD) -xzf $(DOWNLOAD_DIR)/$(NCURSES_PACKAGE)
-	@touch $@
+	$(call EMBTK_DECOMPRESS_PKG,NCURSES)
 
 $(NCURSES_BUILD_DIR)/.configured:
-	$(Q)cd $(NCURSES_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) -fPIC" \
-	CXXFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
-	CPPFLAGS="-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) --program-prefix="" \
-	--prefix=/usr --disable-rpath --without-cxx-binding --without-ada \
-	--libdir=/usr/$(LIBDIR) --disable-database --enable-termcap \
-	--without-progs
-	@touch $@
+	$(call EMBTK_CONFIGURE_PKG,NCURSES)
 
 ncurses_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup ncurses...")
-	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(NCURSES_BINS)
-	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(NCURSES_SBINS)
-	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(NCURSES_INCLUDES)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(NCURSES_LIBS)
-	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(NCURSES_PKGCONFIGS)
-	$(Q)-rm -rf $(NCURSES_BUILD_DIR)*
+	$(call EMBTK_CLEANUP_PKG,NCURSES)
 
-.PHONY: $(NCURSES_BUILD_DIR)/.special
+.PHONY: $(NCURSES_BUILD_DIR)/.special ncurses_clean
 
 $(NCURSES_BUILD_DIR)/.special:
 	$(Q)mkdir -p $(ROOTFS)/usr/share