X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/9bf5291670905e8bf621b5bf0ab56670d76f35c1..a2759fb484cd09119c6b3914a11b25e3c4571c3e:/package/ncurses/Makefile

diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index cdcf9feb6..4223b8033 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -4,17 +4,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncurses
 PKG_VERSION:=5.2
-PKG_RELEASE:=6
+PKG_RELEASE:=8
 PKG_MD5SUM:=464d6a49010cf2a6eb9ce59a264d4d47
 
-PKG_SOURCE_URL:=\
-	ftp://ftp.gnu.org/pub/gnu/$(PKG_NAME) \
-	ftp://gatekeeper.dec.com/pub/GNU/$(PKG_NAME) \
-        ftp://ftp.uu.net/archive/systems/gnu/$(PKG_NAME) \
-        ftp://ftp.eu.uu.net/pub/gnu/$(PKG_NAME) \
-        ftp://ftp.funet.fi/pub/gnu/prep/$(PKG_NAME) \
-        ftp://ftp.leo.org/pub/comp/os/unix/gnu/$(PKG_NAME) \
-        ftp://ftp.digex.net/pub/gnu/$(PKG_NAME)
+PKG_SOURCE_URL:=@GNU/ncurses
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
@@ -25,7 +18,10 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBNCURSES,libncurses,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
@@ -71,7 +67,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.prepared
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
 		ac_cv_linux_vers="2" \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
@@ -119,11 +115,11 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.prepared
 
 $(IPKG_LIBNCURSES):
 	install -d -m0755 $(IDIR_LIBNCURSES)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel}*.so.* $(IDIR_LIBNCURSES)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu}*.so.* $(IDIR_LIBNCURSES)/usr/lib/
 	install -d -m0755 $(IDIR_LIBNCURSES)/usr/share/terminfo
-	for f in a/ansi d/dumb l/linux s/screen v/vt100 v/vt102 x/xterm x/xterm-color; do \
+	for f in a/ansi d/dumb l/linux r/rxvt s/screen v/vt100 v/vt102 x/xterm x/xterm-color; do \
 		install -d -m0755 $(IDIR_LIBNCURSES)/usr/share/terminfo/`dirname $${f}`; \
-		cp -fpR $(PKG_INSTALL_DIR)/usr/share/terminfo/$${f} \
+		$(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$${f} \
 			$(IDIR_LIBNCURSES)/usr/share/terminfo/$${f}; \
 	done
 	$(RSTRIP) $(IDIR_LIBNCURSES)
@@ -131,14 +127,15 @@ $(IPKG_LIBNCURSES):
 
 $(STAGING_DIR)/usr/lib/libncurses.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/curses.h $(STAGING_DIR)/usr/include/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/{ncurses,panel}.h $(STAGING_DIR)/usr/include/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/panel.h $(STAGING_DIR)/usr/include/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(STAGING_DIR)/usr/include/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/unctrl.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/curses.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/{ncurses,panel}.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/panel.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/unctrl.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/menu.h $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(STAGING_DIR)/usr/lib/
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel}.{a,so*} $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu}.{a,so*} $(STAGING_DIR)/usr/lib/
 	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libncurses.so
@@ -147,12 +144,13 @@ uninstall-dev:
 	rm -rf \
 		$(STAGING_DIR)/usr/include/curses.h \
 		$(STAGING_DIR)/usr/include/{ncurses,panel}.h \
+		$(STAGING_DIR)/usr/include/menu.h \
 		$(STAGING_DIR)/usr/include/panel.h \
 		$(STAGING_DIR)/usr/include/term{,cap}.h \
 		$(STAGING_DIR)/usr/include/unctrl.h \
 		$(STAGING_DIR)/usr/lib/libcurses.so \
 		$(STAGING_DIR)/usr/lib/lib{ncurses,panel}.{a,so*} \
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev