diff options
author | Michael Hanson <hansonorders@verizon.net> | 2010-11-11 20:19:16 (GMT) |
---|---|---|
committer | Michael Hanson <hansonorders@verizon.net> | 2010-11-11 20:19:16 (GMT) |
commit | 67a8448f689c98cfee4058376d7f9eb614e2db05 (patch) | |
tree | 9e7436d6e0603551539777f665df2e6b60a36308 /abs/core/tk | |
parent | 3d2398166dc2a96123d22af315e2f2073f6bb32f (diff) | |
parent | 8014e8344b6f1a789a938fccc3b356a525ce8207 (diff) | |
download | linhes_pkgbuild-67a8448f689c98cfee4058376d7f9eb614e2db05.zip linhes_pkgbuild-67a8448f689c98cfee4058376d7f9eb614e2db05.tar.gz linhes_pkgbuild-67a8448f689c98cfee4058376d7f9eb614e2db05.tar.bz2 |
Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/tk')
-rw-r--r-- | abs/core/tk/PKGBUILD | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/abs/core/tk/PKGBUILD b/abs/core/tk/PKGBUILD index 3c75949..4b18070 100644 --- a/abs/core/tk/PKGBUILD +++ b/abs/core/tk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 22248 2008-12-24 10:55:13Z allan $ +# $Id: PKGBUILD 90372 2010-09-11 03:52:30Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=tk -pkgver=8.5.6 +pkgver=8.5.9 pkgrel=1 pkgdesc="A windowing toolkit for use with tcl" arch=('i686' 'x86_64') @@ -11,10 +11,11 @@ url="http://tcl.sourceforge.net/" license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz) -md5sums=('7da2e00adddc7eed6080df904579d94e') +md5sums=('7cdeb9feb61593f58a0ae61f2497580e') build() { - cd ${srcdir}/tk${pkgver}/unix + cd ${srcdir}/tk${pkgver}/unix + if [ "$CARCH" = "x86_64" ]; then ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --enable-64bit else @@ -22,16 +23,29 @@ build() { fi make +} + +package() { + cd ${srcdir}/tk${pkgver}/unix + make INSTALL_ROOT=${pkgdir} install install-private-headers ln -sf wish8.5 ${pkgdir}/usr/bin/wish + + # install private headers (FS#14388) + cd ${srcdir}/tk${pkgver} + for dir in compat generic generic/ttk unix; do + install -dm755 ${pkgdir}/usr/include/tk-private/$dir + install -m644 -t ${pkgdir}/usr/include/tk-private/$dir $dir/*.h + done + # install license - install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - # remove buildroot traces / fixes #3602 + # remove buildroot traces sed -i \ - -e "s,^TK_BUILD_LIB_SPEC='-L.*/unix,TK_BUILD_LIB_SPEC='-L/usr/lib," \ - -e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='/usr/include'," \ - -e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix,TK_BUILD_STUB_LIB_SPEC='-L/usr/lib," \ - -e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='/usr/lib," \ - ${pkgdir}/usr/lib/tkConfig.sh + -e "s,^TK_BUILD_LIB_SPEC='-L.*/unix,TK_BUILD_LIB_SPEC='-L/usr/lib," \ + -e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='/usr/include'," \ + -e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix,TK_BUILD_STUB_LIB_SPEC='-L/usr/lib," \ + -e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='/usr/lib," \ + ${pkgdir}/usr/lib/tkConfig.sh } |