From b6caca77c0bde21e9087086bbddde0d86d517530 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 17 Mar 2015 12:01:52 +0100 Subject: [PATCH] ncurses: remove obsolete replaces; disable compressed manpages. --- srcpkgs/ncurses/template | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template index bebd575b9a5..bace68d14e3 100644 --- a/srcpkgs/ncurses/template +++ b/srcpkgs/ncurses/template @@ -1,7 +1,7 @@ # Template build file for 'ncurses'. pkgname=ncurses version=5.9 -revision=10 +revision=11 short_desc="A System V Release 4.0 curses emulation library" maintainer="Juan RP " homepage="http://www.gnu.org/software/ncurses/" @@ -15,15 +15,12 @@ if [ "$CROSS_BUILD" ]; then # needs host tic(1) hostmakedepends="ncurses" fi -depends="ncurses-base>=${version}" +depends="ncurses-base-${version}_${revision}" do_configure() { mkdir -p ncurses-build ncursesw-build cd ${wrksrc}/ncursesw-build - # Override config.sub with ours. - cp -f ${XBPS_CROSSPFDIR}/config.sub ${wrksrc} - # Make sure .pc files are generated mkdir -p /usr/lib/pkgconfig @@ -32,8 +29,8 @@ do_configure() { ../configure ${configure_args} \ --enable-widec --with-shared --without-debug \ --with-manpage-symlinks --without-ada --enable-ext-colors \ - --without-tests --with-manpage-format=gzip \ - --enable-pc-files PKG_CONFIG=/usr/bin/pkg-config + --without-tests --enable-pc-files \ + PKG_CONFIG=/usr/bin/pkg-config cd ${wrksrc}/ncurses-build # non-widec build @@ -93,15 +90,13 @@ do_install() { ncurses-libs_package() { short_desc+=" -- shared libraries" - replaces="ncursesw>=0" pkg_install() { vmove "usr/lib/*.so.*" } } ncurses-devel_package() { - depends="ncurses-libs>=${version}_${revision}" + depends="ncurses-libs-${version}_${revision}" short_desc+=" - development files" - replaces="ncursesw-devel>=0" pkg_install() { vmove "usr/bin/ncurses*-config" vmove usr/include @@ -109,7 +104,7 @@ ncurses-devel_package() { vmove "usr/lib/*.a" vmove "usr/lib/*.so" vmove usr/share/man/man3 - vmove usr/share/man/man1/ncursesw6-config.1.gz + vmove usr/share/man/man1/ncursesw6-config.1 } } ncurses-base_package() { @@ -122,7 +117,7 @@ ncurses-base_package() { } } ncurses-term_package() { - depends="ncurses-base>=${version}" + depends="ncurses-base-${version}_${revision}" short_desc+=" - full terminal descriptions" noarch=yes pkg_install() {