From 8996dd88e696bae485c13257572e2f38f5633251 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 13 Sep 2013 01:42:57 -0700
Subject: Fri Sep 13 01:42:32 PDT 2013

---
 community/tix/PKGBUILD | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

(limited to 'community/tix')

diff --git a/community/tix/PKGBUILD b/community/tix/PKGBUILD
index fd24d859b..a81b64c5c 100644
--- a/community/tix/PKGBUILD
+++ b/community/tix/PKGBUILD
@@ -1,28 +1,41 @@
-# $Id: PKGBUILD 78264 2012-10-17 10:27:42Z allan $
+# $Id: PKGBUILD 97075 2013-09-12 10:15:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brice Méalier <mealier_brice@yahoo.fr>
 
 pkgname=tix
 pkgver=8.4.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Tk Interface eXtension, a powerful set of user interface components"
 arch=(i686 'x86_64')
 url="http://tix.sourceforge.net/"
 license=("BSD")
 depends=('tk' 'libx11')
-source=(http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz
-	tcl-tk-path.patch)
+source=("http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz"
+	"tix-8.4.3-tcl8.6.patch::https://bugs.archlinux.org/task/36882?getfile=10973"
+	"tcl-tk-path.patch")
 md5sums=('2b8bf4b10a852264678182652f477e59'
+         'c26297f9e1744dc38308a062ef00549e'
          'd4df48da39dd51872d58706a51bab505')
 
-build() {
+prepare() {
   cd $srcdir/Tix$pkgver
+  sed -i -e 's:-Os::g' -i configure tclconfig/tcl.m4
+  patch -Np1 -i "${srcdir}/tix-8.4.3-tcl8.6.patch"
+  sed -i -e 's:generic/tclInt.h:tclInt.h:g' configure
+  sed -i -e 's:generic/tkInt.h:tkInt.h:g' configure
+}
 
-  patch -p1 <$srcdir/tcl-tk-path.patch
+build() {
+  cd $srcdir/Tix$pkgver
 
   export CFLAGS="$CFLAGS -DERR_IN_PROGRESS=2"
+  [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit"
+
+  ./configure --prefix=/usr \
+    --with-tcl=/usr/lib \
+    --with-tk=/usr/lib \
+    $BIT \
 
-  ./configure --prefix=/usr
   make
   make DESTDIR=$pkgdir install
   # move things around
@@ -37,10 +50,9 @@ build() {
   cp -p man/tixwish.1 $pkgdir/usr/share/man/man1
   cd $srcdir/Tix$pkgver/man
   for i in *.n; do
-	  cp -p $i $pkgdir/usr/share/man/man3/${i%n}3
+    cp -p $i $pkgdir/usr/share/man/man3/${i%n}3
   done
 
   mkdir -p $pkgdir/usr/share/licenses/tix
   cp $srcdir/Tix$pkgver/license.terms  $pkgdir/usr/share/licenses/tix/
 }
-
-- 
cgit v1.2.3-54-g00ecf