tk: enable xft; fix cross build; misc fixes.

This commit is contained in:
Juan RP 2013-05-22 11:41:49 +02:00
parent 14fc02a21a
commit 0692aa1663

View file

@ -1,7 +1,7 @@
# Template file for 'tk' # Template file for 'tk'
pkgname=tk pkgname=tk
version=8.6.0 version=8.6.0
revision=1 revision=2
wrksrc="tk${version}" wrksrc="tk${version}"
build_wrksrc=unix build_wrksrc=unix
short_desc="The TK graphical user interface toolkit for TCL" short_desc="The TK graphical user interface toolkit for TCL"
@ -10,14 +10,17 @@ homepage="http://www.tcl.tk"
license="tcl/tk" license="tcl/tk"
distfiles="${SOURCEFORGE_SITE}/tcl/${pkgname}${version}-src.tar.gz" distfiles="${SOURCEFORGE_SITE}/tcl/${pkgname}${version}-src.tar.gz"
checksum=5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6 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() { do_configure() {
if [ "${XBPS_MACHINE}" = "x86_64" ]; then 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 fi
./configure ${CONFIGURE_SHARED_ARGS} --enable-threads \ ./configure ${CONFIGURE_SHARED_ARGS} --enable-threads \
--without-tzdata --enable-man-symlinks \ --without-tzdata --enable-man-symlinks \
--disable-static --disable-rpath \ --disable-static --disable-rpath \
@ -25,6 +28,10 @@ do_configure() {
} }
do_build() { 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} make ${makejobs}
} }
@ -37,10 +44,11 @@ do_install() {
tk-devel_package() { tk-devel_package() {
depends="tk>=${version}" depends="tk>=${version}"
short_desc="${short_desc} - development files" short_desc=" - development files"
pkg_install() { pkg_install() {
vmove usr/lib/tkConfig.sh vmove usr/lib/tkConfig.sh
vmove usr/include vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/share/man/man3 vmove usr/share/man/man3
vmove usr/share/man/mann vmove usr/share/man/mann
} }