From 60f3468c867af2730e909a46f3204f3033d37327 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 11 Jul 2011 16:08:16 +0200
Subject: [PATCH] tcl: update to 8.5.10.

---
 srcpkgs/tcl/tcl-devel.template | 12 +++++-----
 srcpkgs/tcl/template           | 40 ++++++++++++++++++++--------------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/tcl/tcl-devel.template b/srcpkgs/tcl/tcl-devel.template
index 4c57c2eed32..916fb7c32ff 100644
--- a/srcpkgs/tcl/tcl-devel.template
+++ b/srcpkgs/tcl/tcl-devel.template
@@ -5,16 +5,14 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run glibc-devel
 Add_dependency run tcl
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}//usr/lib/tclConfig.sh ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/share/man/man{3,n} ${DESTDIR}/usr/share/man
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/lib/tclConfig.sh usr/lib
+	vmove usr/include usr
+	vmove usr/share/man/man3 usr/share/man
+	vmove usr/share/man/mann usr/share/man
 }
diff --git a/srcpkgs/tcl/template b/srcpkgs/tcl/template
index 725884e16bb..6f365e4ea29 100644
--- a/srcpkgs/tcl/template
+++ b/srcpkgs/tcl/template
@@ -1,30 +1,38 @@
 # Template file for 'tcl'
 pkgname=tcl
-version=8.5.8
-revision=1
-wrksrc="tcl${version}"
+version=8.5.10
+wrksrc="tcl${version}/unix"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}${version}-src.tar.gz"
-build_style=gnu_configure
-configure_script="./unix/configure"
-configure_args="--enable-threads --without-tzdata --enable-man-symlinks"
-if [ "${xbps_machine}" = "x86_64" ]; then
-	configure_args="${configure_args} --enable-64bits"
-fi
-make_install_target="INSTALL_ROOT=$XBPS_DESTDIR/$pkgname-$version
- install install-private-headers"
+build_style=custom-install
 short_desc="The TCL scripting language"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=6b090c1024038d0381e1ccfbd6d5c0f0e6ef205269ceb9d28bd7bd7ac5bbf4a7
+homepage="www.tcl.tk"
+license="tcl/tk"
+checksum=f582063edd5419a39ee8f7b5c8f95d557b5daad13efb0ed2f0967ca185613bb7
 long_desc="
  This package contains Tcl, John Osterhout's Tool Command Language, an
  exceedingly simple language great for general scripting and for
  embedding in other programs."
 
-subpackages="$pkgname-devel" 
+subpackages="tcl-devel"
+
 Add_dependency run glibc
 
-post_install()
+do_build()
 {
-	cd ${DESTDIR}/usr/bin && ln -sf tclsh8.5 tclsh
-	chmod 755 ${DESTDIR}/usr/lib/libtcl*.so*
+	if [ "${xbps_machine}" = "x86_64" ]; then
+		local args="${configure_args} --enable-64bits"
+	fi
+
+	./configure ${CONFIGURE_SHARED_ARGS} --enable-threads \
+		--without-tzdata --enable-man-symlinks $args
+
+	make ${makejobs}
+}
+	
+do_install()
+{
+	make INSTALL_ROOT=${DESTDIR} install install-private-headers
+	ln -sf /usr/bin/tclsh8.5 ${DESTDIR}/usr/bin/tclsh
+	vinstall ../license.terms 644 usr/share/licenses/tcl LICENSE
 }