Date: Thursday, December 20, 2012 @ 08:13:04 Author: allan Revision: 173664
upgpkg: tk 8.6.0-1 major upstream update Modified: tk/trunk/PKGBUILD ----------+ PKGBUILD | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-12-20 13:11:46 UTC (rev 173663) +++ PKGBUILD 2012-12-20 13:13:04 UTC (rev 173664) @@ -3,7 +3,7 @@ # Contributor: Judd Vinet <[email protected]> pkgname=tk -pkgver=8.5.13 +pkgver=8.6.0 pkgrel=1 pkgdesc="A windowing toolkit for use with tcl" arch=('i686' 'x86_64') @@ -11,16 +11,13 @@ license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz) -md5sums=('1fc7dbb7495160756dbc805224afa360') +md5sums=('b883a1a3c489c17413fb602a94bf54e8') build() { cd ${srcdir}/tk${pkgver}/unix - if [ "$CARCH" = "x86_64" ]; then - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --enable-64bit - else - ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-64bit - fi + [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit" + ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT make } @@ -34,23 +31,12 @@ cd ${srcdir}/tk${pkgver}/unix make INSTALL_ROOT=${pkgdir} install install-private-headers - ln -sf wish8.5 ${pkgdir}/usr/bin/wish - - # install private headers (FS#14388) - cd ${srcdir}/tk${pkgver} - for dir in compat generic generic/ttk unix; do - install -dm755 ${pkgdir}/usr/include/tk-private/$dir - install -m644 -t ${pkgdir}/usr/include/tk-private/$dir $dir/*.h - done + ln -sf wish8.6 ${pkgdir}/usr/bin/wish # install license install -Dm644 license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE # remove buildroot traces - sed -i \ - -e "s,^TK_BUILD_LIB_SPEC='-L.*/unix,TK_BUILD_LIB_SPEC='-L/usr/lib," \ - -e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='/usr/include'," \ - -e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix,TK_BUILD_STUB_LIB_SPEC='-L/usr/lib," \ - -e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='/usr/lib," \ - ${pkgdir}/usr/lib/tkConfig.sh + sed -i "s#${srcdir}#/usr/src#" ${pkgdir}/usr/lib/tkConfig.sh + }
