add feeds.conf to .gitignore

[openwrt.git] / package / ncurses / Makefile

diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 4223b80..a27334b 100644 (file)
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -1,156 +1,160 @@
+# 
+# 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
 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncurses

-PKG_VERSION:=5.2
-PKG_RELEASE:=8
-PKG_MD5SUM:=464d6a49010cf2a6eb9ce59a264d4d47
+PKG_VERSION:=5.6
+PKG_RELEASE:=1

 
 

-PKG_SOURCE_URL:=@GNU/ncurses

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

-PKG_CAT:=zcat
+PKG_SOURCE_URL:=@GNU/ncurses
+PKG_MD5SUM:=b6593abe1089d6aab1551c105c9300e3

 
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+include $(INCLUDE_DIR)/package.mk

 
 

-include $(TOPDIR)/package/rules.mk
+define Package/libncurses
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Terminal handling library
+  URL:=http://www.gnu.org/software/ncurses/
+endef

 
 

-$(eval $(call PKG_template,LIBNCURSES,libncurses,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Build/Configure
+endef

 
 

-$(PKG_BUILD_DIR)/.configured:
-       touch $@
+TARGET_CFLAGS += $(FPIC)

 
 

-$(PKG_BUILD_DIR)/.built:
+define Build/Compile

        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)

-       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+       -$(MAKE) -C $(PKG_BUILD_DIR) distclean
+       (cd $(PKG_BUILD_DIR); rm -f config.cache; \
+               CONFIG_SITE="" \

                ./configure \
                ./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 \
+                       --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
        );
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                libs install.progs

-       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+       (cd $(PKG_BUILD_DIR); rm -f config.cache; \

                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \

-               CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-               ac_cv_linux_vers="2" \
+               CPPFLAGS="$(TARGET_CPPFLAGS)" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \

                ./configure \
                ./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 \
+                       --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)" \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                BUILD_CC="$(TARGET_CC)" \
                HOSTCC="$(HOSTCC)" \

-               HOSTCCFLAGS="\$$(CPPFLAGS)" \
+               HOSTCCFLAGS="" \

                DESTDIR="$(PKG_INSTALL_DIR)" \
                libs install.libs install.data
                DESTDIR="$(PKG_INSTALL_DIR)" \
                libs install.libs install.data

-       touch $@
+endef

 
 

-$(IPKG_LIBNCURSES):
-       install -d -m0755 $(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 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) $(PKG_INSTALL_DIR)/usr/share/terminfo/$${f} \
-                       $(IDIR_LIBNCURSES)/usr/share/terminfo/$${f}; \
+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
        done

-       $(RSTRIP) $(IDIR_LIBNCURSES)
-       $(IPKG_BUILD) $(IDIR_LIBNCURSES) $(PACKAGE_DIR)
-
-$(STAGING_DIR)/usr/lib/libncurses.so: $(PKG_BUILD_DIR)/.built
-       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,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) $(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
-
-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*} \
+endef

 
 

-compile-targets: install-dev
-clean-targets: uninstall-dev
+define Build/InstallDev
+       mkdir -p $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/curses.h $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses.h $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses_dll.h $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/menu.h $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/panel.h $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/unctrl.h $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/form.h $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/eti.h $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/
+endef

 
 

+$(eval $(call BuildPackage,libncurses))