Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	core/sed/PKGBUILD
	extra/tcl/PKGBUILD
	extra/transmission/PKGBUILD

1 files changed, 10 insertions, 2 deletions

diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD
index 5b3c76238..e760e3735 100644
--- a/extra/tcl/PKGBUILD
+++ b/extra/tcl/PKGBUILD
@@ -1,20 +1,25 @@
-# $Id: PKGBUILD 173849 2012-12-25 00:34:44Z foutrelis $
+# $Id: PKGBUILD 173902 2012-12-27 19:20:12Z andyrtr $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tcl
 pkgver=8.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The Tcl scripting language"
 arch=('i686' 'x86_64' 'mips64el')
 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
   
+  # 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
   
@@ -38,4 +43,7 @@ package()
 
   # 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
 }