[arch-commits] Commit in tcl/repos (3 files)

[Allan McRae]

    Date: Tuesday, July 1, 2008 @ 05:10:55
  Author: allan
Revision: 3824

fix merge conflict

Added:
  tcl/repos/extra-i686/ChangeLog
    (from rev 3823, tcl/trunk/ChangeLog)
Modified:
  tcl/repos/extra-i686/	(properties)
  tcl/repos/extra-i686/PKGBUILD

-----------+
 ChangeLog |    4 ++++
 PKGBUILD  |   28 ++++++++++++++++------------
 2 files changed, 20 insertions(+), 12 deletions(-)


Property changes on: tcl/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /tcl/trunk:1
   + /tcl/trunk:1-3823

Copied: tcl/repos/extra-i686/ChangeLog (from rev 3823, tcl/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2008-07-01 09:10:55 UTC (rev 3824)
@@ -0,0 +1,4 @@
+2008-07-01 Allan McRae <allan at archlinux.org>
+
+	* 8.5.3-1 :
+	new upstream release.

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-07-01 09:06:33 UTC (rev 3823)
+++ extra-i686/PKGBUILD	2008-07-01 09:10:55 UTC (rev 3824)
@@ -1,8 +1,9 @@
 # $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 # Committer: Judd Vinet <jvinet at zeroflux.org>
+
 pkgname=tcl
-pkgver=8.5.2
+pkgver=8.5.3
 pkgrel=1
 pkgdesc="The Tcl scripting language"
 arch=('i686' 'x86_64')
@@ -10,19 +11,22 @@
 depends=(glibc)
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
 url="http://tcl.sourceforge.net/"
-md5sums=('2eeff7a61844b3e6de5202da1275cff1')
+md5sums=('651b2dc097a0291e31d44c72dcb5135e')
 
 build() {
-  cd ${startdir}/src/tcl${pkgver}/unix
-if [ "$CARCH" = "x86_64" ]; then
-  ./configure --prefix=/usr --enable-threads --enable-64bit
-  else   ./configure --prefix=/usr --enable-threads --disable-64bit
-fi
+  cd ${srcdir}/tcl${pkgver}/unix
+  
+  if [ "$CARCH" = "x86_64" ]; then
+    ./configure --prefix=/usr --enable-threads --enable-64bit
+  else
+     ./configure --prefix=/usr --enable-threads --disable-64bit
+  fi
+  
   make || return 1
-  make INSTALL_ROOT=${startdir}/pkg install install-private-headers
-  ln -sf tclsh8.5 ${startdir}/pkg/usr/bin/tclsh
+  make INSTALL_ROOT=${pkgdir} install install-private-headers
+  ln -sf tclsh8.5 ${pkgdir}/usr/bin/tclsh
   # install license
-  install -Dm644 ../license.terms $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 
   # remove buildroot traces / fixes #3602
   sed -i \
@@ -33,5 +37,5 @@
   -e "s,^TCL_LIB_FILE='libtcl8.5..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.5\$\{TCL_DBGX\}.so\"," \
   -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/lib'," \
   -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/lib'," \
-  $startdir/pkg/usr/lib/tclConfig.sh
+  ${pkgdir}/usr/lib/tclConfig.sh
 }