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

[andyrtr at archlinux.org]

    Date: Friday, December 28, 2012 @ 00:56:33
  Author: andyrtr
Revision: 173925

upgpkg: tcl 8.6.0-3

fix more file conflicts FS#33222 - there's no need to build the tcl sqlite interface here at all since we keep doing this in sqlite-tcl pkg

Modified:
  tcl/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-28 05:30:53 UTC (rev 173924)
+++ PKGBUILD	2012-12-28 05:56:33 UTC (rev 173925)
@@ -4,22 +4,20 @@
 
 pkgname=tcl
 pkgver=8.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="The Tcl scripting language"
 arch=('i686' 'x86_64')
 url="http://tcl.sourceforge.net/"
 license=('custom')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
-# tcl E: Dependency zlib detected and not included (libraries ['usr/lib/libz.so.1'] needed in files ['usr/lib/libtcl8.6.so'])
-# depends=('zlib')  ???
 md5sums=('573aa5fe678e9185ef2b3c56b24658d3')
 
 build() {
   cd ${srcdir}/tcl${pkgver}/unix
+
+  # we build the tcl sqlite interface in sqlite-tcl package
+  rm -rf ${srcdir}/tcl${pkgver}/pkgs/sqlite3*
   
-  # maybe drop sqlite build at all? isn't this the same we already have in sqlite and sqlite-tcl pkg?
-  # rm -rf ${srcdir}/tcl${pkgver}/pkgs/sqlite3*
-  
   [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit"
   ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT
   
@@ -43,7 +41,4 @@
 
   # remove buildroot traces
   sed -i "s#${srcdir}#/usr/src#" ${pkgdir}/usr/lib/{tcl,tdbc1.0.0/tdbc,itcl4.0.0/itcl}Config.sh
-  
-  # fix a fileconflitct - FS#33201
-  rm ${pkgdir}/usr/share/man/mann/sqlite3.n
 }