From 0692aa16632d1d2d5e41c1ea3f9a4aadd7fb7167 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 22 May 2013 11:41:49 +0200 Subject: [PATCH] tk: enable xft; fix cross build; misc fixes. --- srcpkgs/tk/template | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/srcpkgs/tk/template b/srcpkgs/tk/template index c7cc933a62..7d8d2e7e05 100644 --- a/srcpkgs/tk/template +++ b/srcpkgs/tk/template @@ -1,7 +1,7 @@ # Template file for 'tk' pkgname=tk version=8.6.0 -revision=1 +revision=2 wrksrc="tk${version}" build_wrksrc=unix short_desc="The TK graphical user interface toolkit for TCL" @@ -10,14 +10,17 @@ homepage="http://www.tcl.tk" license="tcl/tk" distfiles="${SOURCEFORGE_SITE}/tcl/${pkgname}${version}-src.tar.gz" checksum=5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6 -makedepends="tcl-devel libX11-devel" -depends="tcl" + +hostmakedepends="pkg-config" +makedepends="tcl-devel libXext-devel libX11-devel libXScrnSaver-devel libXft-devel" do_configure() { if [ "${XBPS_MACHINE}" = "x86_64" ]; then - local args="${configure_args} --enable-64bits" + local args="--enable-64bits" + fi + if [ "$CROSS_BUILD" ]; then + local args="--with-tcl=$XBPS_CROSS_BASE/usr/lib" fi - ./configure ${CONFIGURE_SHARED_ARGS} --enable-threads \ --without-tzdata --enable-man-symlinks \ --disable-static --disable-rpath \ @@ -25,6 +28,10 @@ do_configure() { } do_build() { + if [ "$CROSS_BUILD" ]; then + # XXX + sed -e "s,-L/usr/lib,-L$XBPS_CROSS_BASE/usr/lib,g" -i Makefile + fi make ${makejobs} } @@ -37,10 +44,11 @@ do_install() { tk-devel_package() { depends="tk>=${version}" - short_desc="${short_desc} - development files" + short_desc=" - development files" pkg_install() { vmove usr/lib/tkConfig.sh vmove usr/include + vmove usr/lib/pkgconfig vmove usr/share/man/man3 vmove usr/share/man/mann }