Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	BUGS
	package/autoconf/Makefile

4 files changed, 61 insertions, 40 deletions

diff --git a/package/ncurses/Config.in b/package/ncurses/Config.in
deleted file mode 100644
index 63ad59b23..000000000
--- a/package/ncurses/Config.in
+++ /dev/null
@@ -1,25 +0,0 @@
-config ADK_COMPILE_NCURSES
-	tristate
-	depends on ADK_PACKAGE_LIBNCURSES
-
-config ADK_PACKAGE_LIBNCURSES
-	prompt "libncurses........................ Terminal handling library"
-	tristate
-	default n
-	select ADK_COMPILE_NCURSES
-	help
-	  A terminal handling library
-	  
-	  Comes with: libcurses libform libmenu libncurses libpanel
-	  
-	  http://www.gnu.org/software/ncurses/
-
-config ADK_PACKAGE_LIBNCURSES_DEV
-	prompt "libncurses-dev.................. Ncurses development package"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBNCURSES
-	select ADK_COMPILE_NCURSES
-	help
-	  A terminal handling library
-
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index c008f1917..50b1eaaa5 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		cce05daf61a64501ef6cd8da1f727ec6
 PKG_DESCR:=		a terminal handling library and common terminal definitions
 PKG_SECTION:=		libs
-PKG_URL:=		http://www.gnu.org/software/ncurses
+PKG_URL:=		http://www.gnu.org/software/ncurses/
 PKG_SITES:=		${MASTER_SITE_GNU:=ncurses/}
 
 include ${TOPDIR}/mk/package.mk
@@ -17,12 +17,17 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBNCURSES_DEV}+=	libncurses-dev-install
+
 CONFIGURE_ENV+=		ac_cv_linux_vers=2
 CONFIGURE_ARGS+=	--without-cxx \
 			--without-cxx-binding \
+			--with-build-cc=${HOSTCC} \
 			--without-progs \
 			--with-fallbacks \
+			--disable-termcap \
 			--without-ada \
 			--with-shared \
 			--with-normal \
@@ -37,22 +42,24 @@ CONFIGURE_ARGS+=	--without-cxx \
 			--without-rcs-ids \
 			--enable-const \
 			--enable-echo
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
 ALL_TARGET:=		libs
 INSTALL_TARGET:=	install.libs install.data
 
+ifeq (${ADK_HOST_CYGWIN},y)
+CONFOPT:=		--with-shared
+endif
 
 pre-configure:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
 		./configure \
+		${CONFOPT} \
 		--with-build-cc=${HOSTCC} \
 		--with-progs \
 	);
 	${MAKE} -C ${WRKBUILD}/include
 	${MAKE} -C ${WRKBUILD}/progs
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	# this is installed as libncurses - make libcurses a "link"
 	rm -f ${WRKINST}/usr/lib/libcurses.so*
 	echo 'GROUP(-lncurses)' >${WRKINST}/usr/lib/libcurses.so
@@ -61,13 +68,15 @@ post-install:
 	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/lib
 	${CP} ${WRKINST}/usr/lib/lib{form,menu,ncurses,panel}.so* \
 	    ${IDIR_LIBNCURSES}/usr/lib
-	for f in a/ansi d/dumb l/linux r/rxvt s/screen v/vt100 v/vt102 \
-	    v/vt220 w/wsvt25 x/xterm x/xterm-color x/xterm-xfree86; do \
-		${INSTALL_DIR} \
-		    ${IDIR_LIBNCURSES}/usr/share/terminfo/$$(dirname $$f); \
-		${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/$$f \
-		    ${IDIR_LIBNCURSES}/usr/share/terminfo/$$f; \
+	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/
+	for f in ansi dumb linux rxvt screen vt100 vt102 \
+	    vt220 wsvt25 xterm xterm-color xterm-xfree86; do \
+		${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}; \
+		${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/*/$$f \
+		    ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}/$$f; \
 	done
+
+libncurses-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBNCURSES_DEV}/usr/include
 	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBNCURSES_DEV}/usr/include
 
diff --git a/package/ncurses/patches/patch-configure b/package/ncurses/patches/patch-configure
new file mode 100644
index 000000000..1ef36c733
--- /dev/null
+++ b/package/ncurses/patches/patch-configure
@@ -0,0 +1,16 @@
+--- ncurses-5.7.orig/configure	2008-10-26 02:04:38.000000000 +0200
++++ ncurses-5.7/configure	2009-11-15 22:44:41.000000000 +0100
+@@ -3985,13 +3985,6 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
+ 
+ 	: ${BUILD_CC:='${CC}'}
+ 
+-	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
+-		{ { echo "$as_me:3989: error: Cross-build requires two compilers.
+-Use --with-build-cc to specify the native compiler." >&5
+-echo "$as_me: error: Cross-build requires two compilers.
+-Use --with-build-cc to specify the native compiler." >&2;}
+-   { (exit 1); exit 1; }; }
+-	fi
+ 
+ else
+ 	: ${BUILD_CC:='${CC}'}
diff --git a/package/ncurses/patches/patch-misc_run_tic_in b/package/ncurses/patches/patch-misc_run_tic_in
index c2d76c4f7..b4c917fb8 100644
--- a/package/ncurses/patches/patch-misc_run_tic_in
+++ b/package/ncurses/patches/patch-misc_run_tic_in
@@ -1,12 +1,33 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- ncurses-5.7.orig/misc/run_tic.in	2006-10-28 21:43:30.000000000 +0200
-+++ ncurses-5.7/misc/run_tic.in	2009-05-07 18:43:38.156250000 +0200
-@@ -61,7 +61,7 @@ test -z "${DESTDIR}" && DESTDIR=
++++ ncurses-5.7/misc/run_tic.in	2009-12-30 15:14:43.273450029 +0100
+@@ -58,22 +58,25 @@ echo '** Building terminfo database, ple
+ 
+ test -z "${DESTDIR}" && DESTDIR=
+ 
++# original comment:
  # Allow tic to run either from the install-path, or from the build-directory.
  # Do not do this if we appear to be cross-compiling.  In that case, we rely
  # on the host's copy of tic to compile the terminfo database.
 -if test "$THAT_CC" = "$THIS_CC" ; then
-+if test "$THAT_CC" != "$THIS_CC" ; then
++#  -- end comment --
++# ATTENTION: Always use native tic from build environment
++#if test "$THAT_CC" = "$THIS_CC" ; then
  case "$PATH" in
  :*) PATH=../progs:../lib:${DESTDIR}$bindir$PATH ;;
  *) PATH=../progs:../lib:${DESTDIR}$bindir:$PATH ;;
+ esac
+ export PATH
+ SHLIB="sh $srcdir/shlib"
+-else
++#else
+ # Cross-compiling, so don't set PATH or run shlib.
+-SHLIB=
++#SHLIB=
+ # reset $suffix, since it applies to the target, not the build platform.
+-suffix=
+-fi
++#suffix=
++#fi
+ 
+ 
+ # set another env var that doesn't get reset when `shlib' runs, so `shlib' uses