diff --git a/srcpkgs/rxvt-unicode/rxvt-unicode-terminfo.INSTALL b/srcpkgs/rxvt-unicode/rxvt-unicode-terminfo.INSTALL deleted file mode 100644 index 79714cfee9b..00000000000 --- a/srcpkgs/rxvt-unicode/rxvt-unicode-terminfo.INSTALL +++ /dev/null @@ -1,5 +0,0 @@ -case "${ACTION}" in -post) - tic -s usr/share/terminfo/r/rxvt-unicode.terminfo - ;; -esac diff --git a/srcpkgs/rxvt-unicode/rxvt-unicode-terminfo.REMOVE b/srcpkgs/rxvt-unicode/rxvt-unicode-terminfo.REMOVE deleted file mode 100644 index 99f90f59cdc..00000000000 --- a/srcpkgs/rxvt-unicode/rxvt-unicode-terminfo.REMOVE +++ /dev/null @@ -1,6 +0,0 @@ -case "${ACTION}" in -pre) - rm -f usr/share/terminfo/r/rxvt-unicode - rm -f usr/share/terminfo/r/rxvt-unicode-256color - ;; -esac diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template index bf5f759fb22..ae522b1210d 100644 --- a/srcpkgs/rxvt-unicode/template +++ b/srcpkgs/rxvt-unicode/template @@ -1,7 +1,7 @@ # Template file for 'rxvt-unicode' pkgname=rxvt-unicode version=9.22 -revision=9 +revision=10 build_style=gnu-configure configure_args=" --with-terminfo=/usr/share/terminfo --enable-256-color @@ -13,7 +13,7 @@ configure_args=" $(vopt_if perl '--enable-perl' '--disable-perl') $(vopt_if startup_notification '--enable-startup-notification' '--disable-startup-notification') $(vopt_if unicode3 '--enable-unicode3' '--disable-unicode3')" -hostmakedepends="pkg-config $(vopt_if perl 'perl autoconf')" +hostmakedepends="pkg-config $(vopt_if perl 'perl autoconf') ncurses" makedepends="xorgproto fontconfig-devel libXrender-devel libXft-devel libSM-devel $(vopt_if gdk_pixbuf gdk-pixbuf-devel) $(vopt_if perl perl) @@ -27,16 +27,6 @@ homepage="http://software.schmorp.de/pkg/rxvt-unicode.html" distfiles="http://dist.schmorp.de/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd -pre_build() { - sed -i 's,tic,/bin/true,g' doc/Makefile -} - -post_install() { - vinstall doc/etc/rxvt-unicode.terminfo 644 usr/share/terminfo/r - vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications - vinstall ${FILESDIR}/${pkgname}.png 644 usr/share/pixmaps -} - # Package build options build_options="gdk_pixbuf perl startup_notification unicode3" desc_option_unicode3="Use 21 instead of 16 bits to represent unicode chars" @@ -74,6 +64,17 @@ do_configure() { fi } +pre_install() { + export TERMINFO="${DESTDIR}/usr/share/terminfo" + mkdir -p $TERMINFO +} + +post_install() { + vinstall doc/etc/rxvt-unicode.terminfo 644 usr/share/terminfo/r + vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications + vinstall ${FILESDIR}/${pkgname}.png 644 usr/share/pixmaps +} + rxvt-unicode-terminfo_package() { short_desc+=" - terminfo data" archs=noarch