Downgrade to 8.4

2 files changed, 18 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4fa38774bb7f..6a6d4b5dcfda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
-pkgbase = tcl85
-	pkgdesc = The Tcl scripting language, 8.5 series
-	pkgver = 8.5.19
+pkgbase = tcl84
+	pkgdesc = The Tcl scripting language, 8.4 series
+	pkgver = 8.4.20
 	pkgrel = 1
 	url = http://tcl.sourceforge.net/
-	arch = i686
 	arch = x86_64
 	license = custom
 	provides = tcl
-	provides = tcl=8.5.19
+	provides = tcl=8.4.20
 	options = staticlibs
-	source = http://downloads.sourceforge.net/sourceforge/tcl/tcl8.5.19-src.tar.gz
-	md5sums = 4f4e1c919f6a6dbb37e9a12d429769a6
+	source = http://downloads.sourceforge.net/sourceforge/tcl/tcl8.4.20-src.tar.gz
+	md5sums = b57ecc6540026fd4a83288ac6bf2b02b
 
-pkgname = tcl85
+pkgname = tcl84
 
diff --git a/PKGBUILD b/PKGBUILD
index 8ca668104718..262d4c3eed21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,16 @@
 # Contributor: Weng Xuetian <wengxt@gmail.com>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
-pkgname=tcl85
-pkgver=8.5.19
+pkgname=tcl84
+pkgver=8.4.20
 pkgrel=1
-pkgdesc="The Tcl scripting language, 8.5 series"
-arch=('i686' 'x86_64')
+pkgdesc="The Tcl scripting language, 8.4 series"
+arch=('x86_64')
 url="http://tcl.sourceforge.net/"
 license=('custom')
 provides=("tcl" "tcl=${pkgver}")
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
-md5sums=('4f4e1c919f6a6dbb37e9a12d429769a6')
+md5sums=('b57ecc6540026fd4a83288ac6bf2b02b')
 options=('staticlibs')
 
 build() {
@@ -19,10 +19,10 @@ build() {
 	
 	# 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 \
-                --includedir=/usr/include/tcl8.5
+
+	autoreconf
+	./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --enable-64bit \
+                --includedir=/usr/include/tcl8.4
 	
 	make
 }
@@ -37,19 +37,13 @@ package()
 	cd ${srcdir}/tcl${pkgver}/unix
 	
 	make INSTALL_ROOT=${pkgdir} install install-private-headers
-	ln -s libtcl8.5.so "${pkgdir}/usr/lib/libtcl8.5.so.0"
+	ln -s libtcl8.4.so "${pkgdir}/usr/lib/libtcl8.4.so.0"
 	
 	# install license
 	install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 	rm -r ${pkgdir}/usr/share/man
-	mv ${pkgdir}/usr/lib/tcl8/  ${pkgdir}/usr/lib/tcl8.5/
-	sed -i -e's:variable paths {}:variable paths {/usr/lib/tcl$(v)/tcl8}:' \
-                    ${pkgdir}/usr/lib/tcl8.5/tm.tcl
 	
 	# remove buildroot traces
 	sed -i "s#${srcdir}#/usr/src#" ${pkgdir}/usr/lib/tclConfig.sh
-	mv ${pkgdir}/usr/lib/tclConfig.sh ${pkgdir}/usr/lib/tcl8.5/
-
-	# rename files
-	mv ${pkgdir}/usr/lib/pkgconfig/tcl.pc ${pkgdir}/usr/lib/pkgconfig/tcl85.pc
+	mv ${pkgdir}/usr/lib/tclConfig.sh ${pkgdir}/usr/lib/tcl8.4/
 }