[arch-commits] Commit in tix/trunk (PKGBUILD)

[Sergej Pupykin]

    Date: Thursday, September 12, 2013 @ 12:15:21
  Author: spupykin
Revision: 97074

upgpkg: tix 8.4.3-5

upd

Modified:
  tix/trunk/PKGBUILD

----------+
 PKGBUILD |   33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-12 10:15:01 UTC (rev 97073)
+++ PKGBUILD	2013-09-12 10:15:21 UTC (rev 97074)
@@ -4,31 +4,39 @@
 
 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')
 
+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
+}
+
 build() {
   cd $srcdir/Tix$pkgver
 
-  patch -p1 <$srcdir/tcl-tk-path.patch
-
   export CFLAGS="$CFLAGS -DERR_IN_PROGRESS=2"
+  [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit"
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr \
+    --with-tcl=/usr/lib \
+    --with-tk=/usr/lib \
+    $BIT \
+
   make
-}
-
-package() {
-  cd $srcdir/Tix$pkgver
-
   make DESTDIR=$pkgdir install
   # move things around
 
@@ -42,10 +50,9 @@
   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/
 }
-