From bda47922a51ffe7a9ba39af8b946cc967de37fbb Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 5 Dec 2014 18:15:20 +0000
Subject: tk: update to 8.6.3

---
 abs/core/tk/PKGBUILD | 55 ++++++++++++++++++----------------------------------
 1 file changed, 19 insertions(+), 36 deletions(-)

diff --git a/abs/core/tk/PKGBUILD b/abs/core/tk/PKGBUILD
index b9bf237..9b2872c 100644
--- a/abs/core/tk/PKGBUILD
+++ b/abs/core/tk/PKGBUILD
@@ -1,56 +1,39 @@
-# $Id: PKGBUILD 170723 2012-11-10 04:52:11Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=tk
-pkgver=8.5.13
+pkgver=8.6.3
 pkgrel=1
 pkgdesc="A windowing toolkit for use with tcl"
 arch=('i686' 'x86_64')
 url="http://tcl.sourceforge.net/"
 license=('custom')
 depends=("tcl=${pkgver}" 'libxss' 'libxft')
+options=('staticlibs')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
-md5sums=('1fc7dbb7495160756dbc805224afa360')
+sha1sums=('244ddc0f64cc3d429c9d86135d0bbe2cf06c9360')
 
 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
-  
+  cd tk${pkgver}/unix
+  [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit"
+  ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-rpath $BIT
   make
 }
 
-#check() {
-#  cd ${srcdir}/tk${pkgver}/unix
+check() {
+  cd tk${pkgver}/unix
 #  make test
-#}
+}
 
 package() {
-  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
-
-  # install license
-  install -Dm644 license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  cd tk${pkgver}/unix
+  make INSTALL_ROOT="${pkgdir}" install install-private-headers
+  ln -sf wish${pkgver%.*} "${pkgdir}/usr/bin/wish"
+  ln -sf libtk${pkgver%.*}.so "${pkgdir}/usr/lib/libtk.so"
+  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 -e "s#${srcdir}/tk${pkgver}/unix#/usr/lib#" \
+      -e "s#${srcdir}/tk${pkgver}#/usr/include#" \
+      -i "${pkgdir}/usr/lib/tkConfig.sh"
 }
-- 
cgit v0.12

