diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-01 15:38:30 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-01 15:38:30 +0100 |
| commit | b63a03da360e5a18e9044e7058ae69898db5ffb0 (patch) | |
| tree | 2901728a2c53e2eb590d577db1531ee2976a2cbf /extra/tcl/PKGBUILD | |
| parent | 73346505421c2d923e13e2020dd31ddd764b8fe4 (diff) | |
| parent | 26ac5932cb02318206fa6a528ed4bd82ad6af87c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/blender/PKGBUILD
community/cdfs/PKGBUILD
community/cdfs/cdfs.install
community/mc/PKGBUILD
community/open-vm-tools-modules/PKGBUILD
community/open-vm-tools-modules/modprobe.conf
community/open-vm-tools-modules/open-vm-tools-modules.install
community/open-vm-tools/PKGBUILD
community/open-vm-tools/open-vm-tools.conf.d
community/open-vm-tools/open-vm-tools.rc.d
community/open-vm-tools/scripts-network-FS19541.patch
community/pekwm/PKGBUILD
community/r8168-lts/PKGBUILD
community/simutrans/PKGBUILD
community/spectrwm/PKGBUILD
community/supertuxkart/PKGBUILD
community/tp_smapi/PKGBUILD
community/tp_smapi/tp_smapi.install
community/vhba-module/PKGBUILD
community/vhba-module/vhba-module.install
core/gcc/PKGBUILD
core/glibc/PKGBUILD
extra/fcgi/PKGBUILD
extra/gst-plugins-bad/PKGBUILD
extra/imap/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/lirc/PKGBUILD
extra/lirc/lirc.install
extra/llvm/PKGBUILD
extra/nvidia-304xx-utils/PKGBUILD
extra/ruby/PKGBUILD
extra/xscreensaver/PKGBUILD
Diffstat (limited to 'extra/tcl/PKGBUILD')
| -rw-r--r-- | extra/tcl/PKGBUILD | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD index e760e3735..26090b7e3 100644 --- a/extra/tcl/PKGBUILD +++ b/extra/tcl/PKGBUILD @@ -1,24 +1,22 @@ -# $Id: PKGBUILD 173902 2012-12-27 19:20:12Z andyrtr $ +# $Id: PKGBUILD 173926 2012-12-28 05:57:13Z andyrtr $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=tcl pkgver=8.6.0 -pkgrel=2 +pkgrel=3 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* + + # we build the tcl sqlite interface in sqlite-tcl package + 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 @@ 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 } |