ncurses contrib

update to 5.7
only build & install library & headers
configure with --prefix=/usr so library (newterm() at least) will look
at installed terminfo database (ncurses interface wouldn't work on OSX)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 4601755004750a2219c939a8a8ba962915d274b9..43ecbfbfbfd9a9eab83abc28e50705f0b55c4da5 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2354,7 +2354,8 @@ ncurses: ncurses-$(NCURSES_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .ncurses: ncurses
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --without-debug --enable-widec --without-develop --without-shared && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=/usr --without-debug --enable-widec --without-develop --without-shared && make -C ncurses && make -C include && make -C ncurses DESTDIR=$(PREFIX) install && make -C include DESTDIR=$(PREFIX) install)
+       (cp -R $(PREFIX)/usr/* $(PREFIX) && rm -rf $(PREFIX)/usr)
        touch $@
 
 CLEAN_FILE += .ncurses

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index dd8849b6b3e4993fb4aa810425fbc0955e9aa9e1..27603d8e6d4e4482c44171f03100c619588d4d0b 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -210,7 +210,7 @@ TAGLIB_VERSION=1.6
 TAGLIB_URL=http://developer.kde.org/~wheeler/files/src/taglib-$(TAGLIB_VERSION).tar.gz
 LUA_VERSION=5.1
 LUA_URL=http://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz
-NCURSES_VERSION=5.6
+NCURSES_VERSION=5.7
 NCURSES_URL=$(GNU)/ncurses/ncurses-$(NCURSES_VERSION).tar.gz
 ASA_URL=$(CONTRIB_VIDEOLAN)/asa.git.tar.gz
 PCRE_VERSION=8.00