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

[Allan McRae]

    Date: Saturday, August 16, 2008 @ 01:06:01
  Author: allan
Revision: 8744

Merged revisions 3826-8743 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/tk/trunk

........
  r3826 | allan | 2008-07-01 19:41:10 +1000 (Tue, 01 Jul 2008) | 2 lines
  
  upgpkg: tk 8.5.3-1
      check-in ChangeLog and patch
........
  r8743 | allan | 2008-08-16 15:04:51 +1000 (Sat, 16 Aug 2008) | 1 line
  
  upgpkg: tk 8.5.4-1
........

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

-----------+
 ChangeLog |   11 +++++++++++
 PKGBUILD  |    8 ++++----
 2 files changed, 15 insertions(+), 4 deletions(-)


Property changes on: tk/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /tk/trunk:1-3825
   + /tk/trunk:1-8743

Copied: tk/repos/extra-i686/ChangeLog (from rev 8743, tk/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2008-08-16 05:06:01 UTC (rev 8744)
@@ -0,0 +1,11 @@
+2008-08-16 Allan McRae <allan at archlinux.org>
+
+	* 8.5.4-1 :
+	new upstream release
+	FHS man pages
+
+2008-07-01 Allan McRae <allan at archlinux.org>
+
+	* 8.5.3-1 :
+	new upstream release
+	added patch for xproto-7.0.13 compatibility

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-08-16 05:04:51 UTC (rev 8743)
+++ extra-i686/PKGBUILD	2008-08-16 05:06:01 UTC (rev 8744)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=tk
-pkgver=8.5.3
+pkgver=8.5.4
 pkgrel=1
 pkgdesc="A windowing toolkit for use with tcl"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@
 depends=("tcl=${pkgver}" 'libxss' 'libxft')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz
         xproto-7-0-13.patch)
-md5sums=('c7d2ef187d0f313850689cda20148ec3'
+md5sums=('a6aee7653566ec0b7c4b0f4c24a96f20'
          '024f8db9663bd7035feac59aabd7e516')
 
 build() {
@@ -21,9 +21,9 @@
 
   cd ${srcdir}/tk${pkgver}/unix  
   if [ "$CARCH" = "x86_64" ]; then
-    ./configure --prefix=/usr --enable-threads --enable-64bit
+    ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --enable-64bit
   else
-    ./configure --prefix=/usr --enable-threads --disable-64bit
+    ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-64bit
   fi
   
   make