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

5 files changed, 37 insertions, 270 deletions

diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 4a2eea8e7..fb3a39eb5 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -4,25 +4,25 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ncurses
-PKG_VERSION:=		5.7
-PKG_RELEASE:=		4
-PKG_MD5SUM:=		cce05daf61a64501ef6cd8da1f727ec6
+PKG_VERSION:=		5.9
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		8cb9c412e5f2d96bc6f459aa8c6282a1
 PKG_DESCR:=		a terminal handling library
 PKG_SECTION:=		libs
+PKG_BUILDDEP:=		ncurses-host
 PKG_URL:=		http://www.gnu.org/software/ncurses/
 PKG_SITES:=		${MASTER_SITE_GNU:=ncurses/}
-
-PKG_SUBPKGS:=		LIBNCURSES LIBNCURSES_DEV
-PKGSD_LIBNCURSES_DEV:=	development files for libncurses
-PKGSC_LIBNCURSES_DEV:=	devel
+PKG_LIBNAME:=		libncurses
+PKG_OPTS:=		dev
 
 PKG_FLAVOURS_LIBNCURSES:=	FULL_TERMINFO
 PKGFD_FULL_TERMINFO:=		install the complete set of terminfo files as provided upstream
 
+include ${TOPDIR}/mk/host.mk
 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,${PKGSD_LIBNCURSES_DEV},${PKGSC_LIBNCURSES_DEV}))
+$(eval $(call HOST_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TARGET_CFLAGS+=		-lgcc
 CONFIGURE_ENV+=		ac_cv_linux_vers=2
@@ -30,42 +30,49 @@ CONFIGURE_ARGS+=	--without-cxx \
 			--without-cxx-binding \
 			--with-build-cc=${CC_FOR_BUILD} \
 			--without-progs \
-			--with-fallbacks \
 			--disable-termcap \
+			--enable-symlinks \
 			--without-ada \
 			--with-shared \
-			--with-normal \
 			--without-debug \
 			--without-profile \
 			--without-gpm \
+			--without-manpages \
+			--without-tests \
 			--enable-overwrite \
 			--with-terminfo-dirs=/usr/share/terminfo \
 			--with-default-terminfo-dir=/usr/share/terminfo \
 			--disable-big-core \
 			--disable-home-terminfo \
 			--without-rcs-ids \
-			--enable-const \
-			--enable-echo
+			--enable-const
 ALL_TARGET:=		libs
 INSTALL_TARGET:=	install.libs install.data
 
-pre-configure:
-	# create tic host binary
-	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
-		./configure \
-		--with-shared \
-		--with-build-cc=${CC_FOR_BUILD} \
-		--with-progs \
-		--without-debug \
-		--without-profile \
-	);
-	${MAKE} -C ${WRKBUILD}/include
-	${MAKE} -C ${WRKBUILD}/progs
-	${CP} ${WRKBUILD}/progs/tic ${STAGING_HOST_DIR}/bin
-	find ${WRKBUILD} -name *.o -exec rm {} \;
-	find ${WRKBUILD} -name *.a -exec rm {} \;
+# use sth which does not exist
+HOST_ALL_TARGET:=	progs
+HOST_INSTALL_TARGET:=	install.includes install.progs
+HOST_CONFIGURE_ARGS+=	--without-shared \
+			--with-build-cc=${CC_FOR_BUILD} \
+			--with-progs \
+			--with-ticlib \
+			--disable-tic-depends \
+			--enable-symlinks \
+			--without-manpages \
+			--without-tests \
+			--without-cxx \
+			--without-cxx-binding \
+			--without-gpm \
+			--without-ada \
+			--disable-termcap \
+			--without-debug \
+			--without-profile
+
+libncurses-hostinstall:
+	${CP} ${HOST_WRKINST}/usr/bin/* ${STAGING_HOST_DIR}/usr/bin
 
 libncurses-install:
+	rm -rf ${WRKINST}/usr/lib/terminfo
 	# this is installed as libncurses - make libcurses a "link"
 	rm -f ${WRKINST}/usr/lib/libcurses.so*
 	echo 'GROUP(-lncurses)' >${WRKINST}/usr/lib/libcurses.so
@@ -79,18 +86,12 @@ ifeq (${ADK_PACKAGE_LIBNCURSES_FULL_TERMINFO},y)
 else
 	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/
 	for f in ansi dumb linux screen vt100 vt102 \
-	    rxvt-unicode vt220 xterm xterm-color xterm-xfree86; do \
+	    rxvt vt220 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
 endif
 
-libncurses-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBNCURSES_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBNCURSES_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBNCURSES_DEV}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/ncurses5-config \
-		${IDIR_LIBNCURSES_DEV}/usr/bin
-
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ncurses/patches/patch-configure b/package/ncurses/patches/patch-configure
deleted file mode 100644
index 1ef36c733..000000000
--- a/package/ncurses/patches/patch-configure
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
deleted file mode 100644
index b4c917fb8..000000000
--- a/package/ncurses/patches/patch-misc_run_tic_in
+++ /dev/null
@@ -1,33 +0,0 @@
---- ncurses-5.7.orig/misc/run_tic.in	2006-10-28 21:43:30.000000000 +0200
-+++ 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
-+#  -- 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
diff --git a/package/ncurses/patches/patch-misc_terminfo_src b/package/ncurses/patches/patch-misc_terminfo_src
deleted file mode 100644
index 47535d1cb..000000000
--- a/package/ncurses/patches/patch-misc_terminfo_src
+++ /dev/null
@@ -1,174 +0,0 @@
---- ncurses-5.7.orig/misc/terminfo.src	2008-10-13 01:03:54.000000000 +0200
-+++ ncurses-5.7/misc/terminfo.src	2010-07-15 17:30:24.852569567 +0200
-@@ -3965,6 +3965,171 @@ rxvt-cygwin-native|rxvt terminal emulato
- rxvt-16color|xterm with 16 colors like aixterm,
- 	ncv#32, use=ibm+16color, use=rxvt,
- 
-+# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
-+# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
-+# Updated: Marc Lehmann <pcg@goof.com>, 17 Feb 2005
-+# Updated: Marc Lehmann <schmorp@schmorp.de>, 04 Nov 2008: change init/reset sequences
-+rxvt-unicode|rxvt-unicode terminal (X Window System),
-+	am,
-+	bce,
-+	eo,
-+	km,
-+	msgr,
-+	xenl,
-+	hs,
-+	cols#80,
-+	it#8,
-+	lines#24,
-+	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG,
-+	bel=^G,
-+	blink=\E[5m,
-+	bold=\E[1m,
-+	civis=\E[?25l,
-+	clear=\E[H\E[2J,
-+	cnorm=\E[?25h,
-+	cr=^M,
-+	csr=\E[%i%p1%d;%p2%dr,
-+	cub=\E[%p1%dD,
-+	cub1=^H,
-+	cud=\E[%p1%dB,
-+	cud1=^J,
-+	cuf=\E[%p1%dC,
-+	cuf1=\E[C,
-+	cup=\E[%i%p1%d;%p2%dH,
-+	cuu=\E[%p1%dA,
-+	cuu1=\E[A,
-+	cvvis=\E[?25h,
-+	dch=\E[%p1%dP,
-+	dch1=\E[P,
-+	dl=\E[%p1%dM,
-+	dl1=\E[M,
-+	ed=\E[J,
-+	el=\E[K,
-+	el1=\E[1K,
-+	flash=\E[?5h$<20/>\E[?5l,
-+	home=\E[H,
-+	hpa=\E[%i%p1%dG,
-+	ht=^I,
-+	hts=\EH,
-+	ich=\E[%p1%d@,
-+	ich1=\E[@,
-+	il=\E[%p1%dL,
-+	il1=\E[L,
-+	ind=^J,
-+	is1=\E[\041p,
-+	is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
-+	kDC=\E[3$,
-+	kIC=\E2$,
-+	kEND=\E[8$,
-+	kHOM=\E[7$,
-+	kLFT=\E[d,
-+	kNXT=\E[6$,
-+	kPRV=\E[5$,
-+	kRIT=\E[c,
-+	kbs=\177,
-+	ka1=\EOw,
-+	ka3=\EOy,
-+	kb2=\EOu,
-+	kc1=\EOq,
-+	kc3=\EOs,
-+	kcbt=\E[Z,
-+	kcub1=\E[D,
-+	kcud1=\E[B,
-+	kcuf1=\E[C,
-+	kcuu1=\E[A,
-+	kdch1=\E[3~,
-+	kel=\E[8\^,
-+	kend=\E[8~,
-+	kent=\EOM,
-+	kf1=\E[11~,
-+	kf10=\E[21~,
-+	kf11=\E[23~,
-+	kf12=\E[24~,
-+	kf13=\E[25~,
-+	kf14=\E[26~,
-+	kf15=\E[28~,
-+	kf16=\E[29~,
-+	kf17=\E[31~,
-+	kf18=\E[32~,
-+	kf19=\E[33~,
-+	kf2=\E[12~,
-+	kf20=\E[34~,
-+	kf3=\E[13~,
-+	kf4=\E[14~,
-+	kf5=\E[15~,
-+	kf6=\E[17~,
-+	kf7=\E[18~,
-+	kf8=\E[19~,
-+	kf9=\E[20~,
-+	kfnd=\E[1~,
-+	khome=\E[7~,
-+	kich1=\E[2~,
-+	kmous=\E[M,
-+	knp=\E[6~,
-+	kpp=\E[5~,
-+	kslt=\E[4~,
-+	rc=\E8,
-+	rev=\E[7m,
-+	ri=\EM,
-+	rmso=\E[27m,
-+	rmul=\E[24m,
-+	rs1=\Ec,
-+	rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
-+	sgr0=\E[m\017,
-+	enacs=,
-+	smacs=\E(0,
-+	rmacs=\E(B,
-+	smso=\E[7m,
-+	smul=\E[4m,
-+	tbc=\E[3g,
-+	vpa=\E[%i%p1%dd,
-+	colors#88,
-+	pairs#256,
-+	btns#5,
-+	lm#0,
-+	ccc,
-+	npc,
-+	mc5i,
-+	ncv#0,
-+	mir,
-+	xon,
-+	bw,
-+	ech=\E[%p1%dX,
-+	mc0=\E[i,
-+	mc4=\E[4i,
-+	mc5=\E[5i,
-+	sitm=\E[3m,
-+	ritm=\E[23m,
-+	smam=\E[?7h,
-+	rmam=\E[?7l,
-+	smir=\E[4h,
-+	rmir=\E[4l,
-+	smcup=\E[?1049h,
-+	rmcup=\E[r\E[?1049l,
-+	smkx=\E=,
-+	rmkx=\E>,
-+	indn=\E[%p1%dS,
-+	rin=\E[%p1%dT,
-+	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
-+	op=\E[39;49m,
-+	setaf=\E[38;5;%p1%dm,
-+	setab=\E[48;5;%p1%dm,
-+	setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
-+	setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
-+	initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\,
-+	sc=\E7,
-+	s0ds=\E(B,
-+	s1ds=\E(0,
-+	s2ds=\E*B,
-+	s3ds=\E+B,
-+	u6=\E[%i%d;%dR,
-+	u7=\E[6n,
-+	u8=\E[?1;2c,
-+	u9=\E[c,
-+	tsl=\E]2;,
-+	fsl=\007,
-+	dsl=\E]2;\007,
-+
- # mrxvt 0.5.3
- #
- # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
diff --git a/package/ncurses/patches/patch-progs_Makefile_in b/package/ncurses/patches/patch-progs_Makefile_in
deleted file mode 100644
index db8b6a74b..000000000
--- a/package/ncurses/patches/patch-progs_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ncurses-5.7.orig/progs/Makefile.in	2008-09-07 15:58:55.000000000 +0200
-+++ ncurses-5.7/progs/Makefile.in	2010-07-26 17:44:33.000000000 +0200
-@@ -109,7 +109,7 @@ LDFLAGS_SHARED	= $(LDFLAGS) $(CFLAGS_SHA
- 
- LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)
- 
--LIBS_TIC	= @LDFLAGS_STATIC@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
-+LIBS_TIC	= ../lib/libncurses.a
- LDFLAGS_TIC	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)
- 
- LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@