Remove autodection of hesiod since it will be enabled by default if present on host...

[openwrt.git] / package / ncurses / Makefile

diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 1bab2d9..4223b80 100644 (file)
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -4,17 +4,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncurses
 PKG_VERSION:=5.2
 
 PKG_NAME:=ncurses
 PKG_VERSION:=5.2

-PKG_RELEASE:=6
+PKG_RELEASE:=8

 PKG_MD5SUM:=464d6a49010cf2a6eb9ce59a264d4d47
 
 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
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 


@@ -25,7 +18,51 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBNCURSES,libncurses,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 
 $(eval $(call PKG_template,LIBNCURSES,libncurses,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 

-$(PKG_BUILD_DIR)/.configured: $(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} ; \
+               ./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 -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \


@@ -52,42 +89,37 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                --sysconfdir=/etc \
                $(DISABLE_NLS) \
                $(DISABLE_LARGEFILE) \
                --sysconfdir=/etc \
                $(DISABLE_NLS) \
                $(DISABLE_LARGEFILE) \

-               --with-terminfo-dirs=/usr/share/terminfo \
-               --with-default-terminfo-dir=/usr/share/terminfo \
+               --enable-echo \
+               --enable-const \
+               --enable-overwrite \
+               --disable-rpath \

                --without-ada \
                --without-cxx \
                --without-cxx-binding \
                --without-ada \
                --without-cxx \
                --without-cxx-binding \

-               --without-progs \
-               --without-profile \

                --without-debug \
                --without-debug \

-               --disable-rpath \
-               --enable-echo \
-               --enable-const \
-               --enable-overwrite \
-               --with-shared \
+               --without-profile \
+               --without-progs \

                --with-normal \
                --with-normal \

+               --with-shared \
+               --with-terminfo-dirs=/usr/share/terminfo \
+               --with-default-terminfo-dir=/usr/share/terminfo \

        );
        );

-       touch $@
-
-$(PKG_BUILD_DIR)/.built:
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)

        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                BUILD_CC="$(TARGET_CC)" \
                HOSTCC="$(HOSTCC)" \
                HOSTCCFLAGS="\$$(CPPFLAGS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                BUILD_CC="$(TARGET_CC)" \
                HOSTCC="$(HOSTCC)" \
                HOSTCCFLAGS="\$$(CPPFLAGS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \

-               all install
+               libs install.libs install.data

        touch $@
        touch $@

-       
+

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


@@ -95,27 +127,30 @@ $(IPKG_LIBNCURSES):
 
 $(STAGING_DIR)/usr/lib/libncurses.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
 
 $(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
        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
 
 uninstall-dev:
        rm -rf \
 
 install-dev: $(STAGING_DIR)/usr/lib/libncurses.so
 
 uninstall-dev:
        rm -rf \

-         $(PKG_INSTALL_DIR)/usr/include/curses.h \
-         $(PKG_INSTALL_DIR)/usr/include/{ncurses,panel}.h \
-         $(PKG_INSTALL_DIR)/usr/include/panel.h \
-         $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h \
-         $(PKG_INSTALL_DIR)/usr/include/unctrl.h \
-         $(PKG_INSTALL_DIR)/usr/lib/libcurses.so \
-         $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel}.{a,so*} \
+               $(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