move ncurses to trunk and 7.07 (util-linux depends on it)

SVN-Revision: 7854

diff --git a/libs/ncurses/Makefile b/libs/ncurses/Makefile
deleted file mode 100644 (file)
index d9fc45a..0000000
--- a/libs/ncurses/Makefile
+++ /dev/null
@@ -1,178 +0,0 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ncurses
-PKG_VERSION:=5.6
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/ncurses
-PKG_MD5SUM:=b6593abe1089d6aab1551c105c9300e3
-PKG_CAT:=zcat
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libncurses
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Terminal handling library
-  DESCRIPTION:=Terminal handling library
-  URL:=http://www.gnu.org/software/ncurses/
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       -$(MAKE) -C $(PKG_BUILD_DIR) distclean
-       (cd $(PKG_BUILD_DIR); rm -f config.cache; \
-               CONFIG_SITE="" \
-               ./configure \
-                       --target=$(GNU_HOST_NAME) \
-                       --host=$(GNU_HOST_NAME) \
-                       --build=$(GNU_HOST_NAME) \
-                       --program-prefix="" \
-                       --program-suffix="" \
-                       --prefix=/usr \
-                       --exec-prefix=/usr \
-                       --bindir=/usr/bin \
-                       --datadir=/usr/share \
-                       --includedir=/usr/include \
-                       --infodir=/usr/share/info \
-                       --libdir=/usr/lib \
-                       --libexecdir=/usr/lib \
-                       --localstatedir=/var \
-                       --mandir=/usr/share/man \
-                       --sbindir=/usr/sbin \
-                       --sysconfdir=/etc \
-                       $(DISABLE_NLS) \
-                       $(DISABLE_LARGEFILE) \
-                       --enable-echo \
-                       --enable-const \
-                       --enable-overwrite \
-                       --disable-rpath \
-                       --without-ada \
-                       --without-cxx \
-                       --without-cxx-binding \
-                       --without-debug \
-                       --without-profile \
-                       --with-progs \
-                       --with-normal \
-                       --without-shared \
-                       --with-terminfo-dirs=/usr/share/terminfo \
-                       --with-default-terminfo-dir=/usr/share/terminfo \
-       );
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               libs install.progs
-       (cd $(PKG_BUILD_DIR); rm -f config.cache; \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ./configure \
-                       --target=$(GNU_TARGET_NAME) \
-                       --host=$(GNU_TARGET_NAME) \
-                       --build=$(GNU_HOST_NAME) \
-                       --program-prefix="" \
-                       --program-suffix="" \
-                       --prefix=/usr \
-                       --exec-prefix=/usr \
-                       --bindir=/usr/bin \
-                       --datadir=/usr/share \
-                       --includedir=/usr/include \
-                       --infodir=/usr/share/info \
-                       --libdir=/usr/lib \
-                       --libexecdir=/usr/lib \
-                       --localstatedir=/var \
-                       --mandir=/usr/share/man \
-                       --sbindir=/usr/sbin \
-                       --sysconfdir=/etc \
-                       $(DISABLE_NLS) \
-                       $(DISABLE_LARGEFILE) \
-                       --enable-echo \
-                       --enable-const \
-                       --enable-overwrite \
-                       --disable-rpath \
-                       --without-ada \
-                       --without-cxx \
-                       --without-cxx-binding \
-                       --without-debug \
-                       --without-profile \
-                       --without-progs \
-                       --with-normal \
-                       --with-shared \
-                       --with-terminfo-dirs=/usr/share/terminfo \
-                       --with-default-terminfo-dir=/usr/share/terminfo \
-       );
-       rm -f $(PKG_BUILD_DIR)/lib/lib*
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               BUILD_CC="$(TARGET_CC)" \
-               HOSTCC="$(HOSTCC)" \
-               HOSTCCFLAGS="" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               libs install.libs install.data
-endef
-
-define Package/libncurses/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}*.so.* $(1)/usr/lib/
-       $(INSTALL_DIR) $(1)/usr/share/terminfo
-       (cd $(PKG_INSTALL_DIR)/usr/share/terminfo; \
-               for dir in ??; do \
-                       [ -d "$$$$dir" ] || continue; \
-                       mv $$$$dir $$$$(echo -ne "\x$$$$dir"); \
-               done \
-       )
-       for file in a/ansi d/dumb l/linux r/rxvt s/screen v/vt100 v/vt102 x/xterm x/xterm-color; do \
-               $(INSTALL_DIR) $(1)/usr/share/terminfo/`dirname $$$$file`; \
-               $(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$$$$file \
-                       $(1)/usr/share/terminfo/$$$$file; \
-       done
-endef
-
-define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/curses.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses_dll.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/menu.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/form.h $(STAGING_DIR)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/eti.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(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,form}.{a,so*} $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/curses.h \
-               $(STAGING_DIR)/usr/include/ncurses.h \
-               $(STAGING_DIR)/usr/include/ncurses_dll.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/include/form.h \
-               $(STAGING_DIR)/usr/include/eti.h \
-               $(STAGING_DIR)/usr/lib/libcurses.so \
-               $(STAGING_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*}
-endef
-
-$(eval $(call BuildPackage,libncurses))

diff --git a/libs/ncurses/patches/500-cross.patch b/libs/ncurses/patches/500-cross.patch
deleted file mode 100644 (file)
index ebebc22..0000000
--- a/libs/ncurses/patches/500-cross.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur ncurses-5.6/aclocal.m4 ncurses-5.6-owrt/aclocal.m4
---- ncurses-5.6/aclocal.m4     2006-12-17 17:12:38.000000000 +0100
-+++ ncurses-5.6-owrt/aclocal.m4        2007-06-09 19:47:38.000000000 +0200
-@@ -3816,7 +3816,7 @@
-                       EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
-               fi
-               CF_SHARED_SONAME
--              MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,-lc -o $[@]'
-+              MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,$(LDFLAGS) -lc -o $[@]'
-               ;;
-       openbsd2*)
-               CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"