rewrite PKGBUILD, bump to 8.6.11

2 files changed, 55 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2bdd9ce59c90..cd1fd6f02fc6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,25 @@
 pkgbase = tclkit
 	pkgdesc = single-file executable that provides a complete Tcl and Tk runtime
-	pkgver = 8.6.10
+	pkgver = 8.6.11
 	pkgrel = 1
-	url = https://github.com/patthoyts/kitgen
-	arch = i686
+	url = https://github.com/stiefel40k/kitgen
 	arch = x86_64
 	license = custom
 	makedepends = upx
 	makedepends = ucl
 	makedepends = libx11
 	makedepends = xorgproto
+	noextract = tk-8.6.11.1.tar.gz
+	noextract = tcl-8.6.11.tar.gz
 	options = emptydirs
 	options = !buildflags
 	options = !makeflags
 	options = !strip
-	source = https://github.com/stiefel40k/kitgen/archive/8.6.4-9.tar.gz
-	source = tk.tar.gz::https://github.com/tcltk/tk/archive/core-8-6-10.tar.gz
-	source = tcl.tar.gz::https://github.com/tcltk/tcl/archive/core-8-6-10.tar.gz
-	md5sums = ee23c17052b6e482cb845739363bb9c0
-	md5sums = 73a066dcc051915dfad48ae4810a6038
-	md5sums = b9578606270ac55d2cbabf35515724bc
+	source = kitgen-8.6.4-9.tar.gz::https://github.com/stiefel40k/kitgen/archive/8.6.4-9.tar.gz
+	source = tk-8.6.11.1.tar.gz::https://prdownloads.sourceforge.net/tcl/tk8.6.11.1-src.tar.gz
+	source = tcl-8.6.11.tar.gz::https://prdownloads.sourceforge.net/tcl/tcl8.6.11-src.tar.gz
+	sha256sums = 6a78963842e6810f85ba81a01866ba705b470feee8c0bb25a86992560b215150
+	sha256sums = 006cab171beeca6a968b6d617588538176f27be232a2b334a0e96173e89909be
+	sha256sums = 8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258
 
 pkgname = tclkit
-
diff --git a/PKGBUILD b/PKGBUILD
index a01bd5019351..9fb3ccf43cb3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,58 @@
 #Maintainer: Grey Christoforo <first name [at] last name [dot] net>
 pkgname=tclkit
-pkgver=8.6.10
-_tcl_tag=core-8-6-10
-_tk_tag=core-8-6-10
-_kit_tag=8.6.4-9
+pkgver=8.6.11
+_tcl_ver=8.6.11
+_tk_ver=8.6.11.1
+_kit_ver=8.6.4-9
 pkgrel=1
 pkgdesc="single-file executable that provides a complete Tcl and Tk runtime"
-arch=('i686' 'x86_64')
-url="https://github.com/patthoyts/kitgen"
+arch=(x86_64)
+url="https://github.com/stiefel40k/kitgen"
 options=(emptydirs !buildflags !makeflags !strip)
 license=('custom')
-makedepends=('upx' 'ucl' 'libx11' 'xorgproto')
-source=("https://github.com/stiefel40k/kitgen/archive/${_kit_tag}.tar.gz"
-	"tk.tar.gz::https://github.com/tcltk/tk/archive/${_tk_tag}.tar.gz"
-	"tcl.tar.gz::https://github.com/tcltk/tcl/archive/${_tcl_tag}.tar.gz")
-md5sums=('ee23c17052b6e482cb845739363bb9c0'
-         '73a066dcc051915dfad48ae4810a6038'
-         'b9578606270ac55d2cbabf35515724bc')
+makedepends=(
+'upx'
+'ucl'
+'libx11'
+'xorgproto')
+source=("kitgen-${_kit_ver}.tar.gz::https://github.com/stiefel40k/kitgen/archive/${_kit_ver}.tar.gz"
+	"tk-${_tk_ver}.tar.gz::https://prdownloads.sourceforge.net/tcl/tk${_tk_ver}-src.tar.gz"
+	"tcl-${_tcl_ver}.tar.gz::https://prdownloads.sourceforge.net/tcl/tcl${_tcl_ver}-src.tar.gz")
+
+sha256sums=('6a78963842e6810f85ba81a01866ba705b470feee8c0bb25a86992560b215150'
+            '006cab171beeca6a968b6d617588538176f27be232a2b334a0e96173e89909be'
+            '8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258')
+noextract=("tk-${_tk_ver}.tar.gz" "tcl-${_tcl_ver}.tar.gz")
+
+prepare() {
+  cd kitgen-${_kit_ver}
+  mkdir -p build/{tcl,tk}
+  bsdtar --strip-components 1 -xf "${srcdir}"/tk-${_tk_ver}.tar.gz -C build/tk
+  bsdtar --strip-components 1 -xf "${srcdir}"/tcl-${_tcl_ver}.tar.gz -C build/tcl
+}
 
 build() {
-  mv "kitgen-${_kit_tag}" kitgen
-  cd kitgen
-  mkdir -p 8.6
-  mv ../tk-$_tk_tag 8.6/tk
-  mv ../tcl-$_tcl_tag 8.6/tcl
-  local options="thread allenc cli dyn"
-  if [ "${CARCH}" = "x86_64" ]; then
-	local B64=b64
-  fi
-  ./config.sh 8.6/kit-large thread allenc cli dyn $B64
-  cd 8.6/kit-large
+  cd kitgen-${_kit_ver}
+
+  export B64=b64
+  export options="thread allenc cli dyn"
+
+  msg2 "config"
+  ./config.sh build/kit-large ${options} ${B64}
+
+  msg2 "make"
+  cd build/kit-large
   make
 }
 
+check() {
+  local _testver=$(echo 'puts $tcl_version' | "${srcdir}"/kitgen-${_kit_ver}/build/kit-large/tclkit-cli)
+  msg2 "Test passed with tclkit version = ${_testver}"
+}
+
 package() {
- mkdir -p "$pkgdir"/usr/bin
- install -o root -g root "$srcdir"/kitgen/8.6/kit-large/kit-* "$pkgdir"/usr/bin/.
- install -o root -g root "$srcdir"/kitgen/8.6/kit-large/tclkit-* "$pkgdir"/usr/bin/.
- cd "$pkgdir"/usr/bin/
- ln -s tclkit-cli tclkit
+ mkdir -p "${pkgdir}"/usr/bin
+ install -o root -g root "${srcdir}"/kitgen-${_kit_ver}/build/kit-large/kit-* "${pkgdir}"/usr/bin/.
+ install -o root -g root "${srcdir}"/kitgen-${_kit_ver}/build/kit-large/tclkit-* "${pkgdir}"/usr/bin/.
+ ln -s tclkit-cli "${pkgdir}"/usr/bin/tclkit
 }