diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template index 7054807648..3933f5f8c4 100644 --- a/srcpkgs/ncurses/template +++ b/srcpkgs/ncurses/template @@ -1,7 +1,7 @@ # Template build file for 'ncurses'. pkgname=ncurses version=5.9 -revision=6 +revision=7 short_desc="A System V Release 4.0 curses emulation library" maintainer="Juan RP " homepage="http://www.gnu.org/software/ncurses/" @@ -17,6 +17,11 @@ long_desc=" ecompiler infocmp, clear, tput, tset, and a termcap conversion tool captoinfo. Full manual pages are provided for the library and tools." +if [ "$CROSS_BUILD" ]; then + # needs host tic(1) + hostmakedepends="ncurses" +fi + do_configure() { mkdir ncurses-build ncursesw-build cd ${wrksrc}/ncursesw-build @@ -48,9 +53,6 @@ do_build() { do_install() { cd ${wrksrc}/ncursesw-build - if [ "$CROSS_BUILD" ]; then - sed -e "s#install : install.data install.libs#install: install.libs#g" -i misc/Makefile - fi make DESTDIR=${DESTDIR} install # Fool packages looking to link to non-wide-character ncurses libraries @@ -76,7 +78,7 @@ do_install() { ${DESTDIR}/usr/lib/libncurses.so.${version} # Create compat symlinks. - for f in curses ncurses form panel menu; do + for f in ncurses form panel menu; do ln -sfr ${DESTDIR}/usr/lib/lib${f}w.so.6 \ ${DESTDIR}/usr/lib/lib${f}w.so.5 done @@ -101,7 +103,6 @@ ncurses_package() { ncurses-libs_package() { short_desc+=" -- shared libraries" replaces="ncursesw>=0" - pkg_install() { vmove "usr/lib/*.so*" } @@ -109,10 +110,10 @@ ncurses-libs_package() { ncurses-devel_package() { depends="ncurses-libs>=${version}" - short_desc+=" -- development files" + short_desc+=" - development files" replaces="ncursesw-devel>=0" - pkg_install() { + vmove "usr/bin/ncurses*-config" vmove usr/include vmove "usr/lib/*.a" vmove usr/share/man/man3 @@ -120,12 +121,9 @@ ncurses-devel_package() { } } -if [ -z "$CROSS_BUILD" ]; then - ncurses-base_package() { - short_desc+=" -- base terminfo files" + short_desc+=" - base terminfo files" noarch=yes - pkg_install() { cat ${FILESDIR}/base-files | while read line; do vmove ${line} @@ -135,13 +133,10 @@ ncurses-base_package() { ncurses-term_package() { depends="ncurses-base>=${version}" - short_desc+=" -- full terminal descriptions" + short_desc+=" - full terminal descriptions" noarch=yes - pkg_install() { vmove usr/share/tabset vmove usr/share/terminfo } } - -fi # !CROSS_BUILD