From 646636563ad9b2411e9adbf5479673ce4909a613 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 16 Aug 2019 15:46:16 +0200 Subject: [PATCH 1/5] TclTk build-block added --- Programming/TclTk/build | 4 +++ Programming/TclTk/build_Tcl | 30 ++++++++++++++++ Programming/TclTk/build_Tk | 38 +++++++++++++++++++++ Programming/TclTk/files/variants.macos10.14 | 1 + Programming/TclTk/modulefile | 16 +++++++++ 5 files changed, 89 insertions(+) create mode 100644 Programming/TclTk/build create mode 100755 Programming/TclTk/build_Tcl create mode 100755 Programming/TclTk/build_Tk create mode 100644 Programming/TclTk/files/variants.macos10.14 create mode 100644 Programming/TclTk/modulefile diff --git a/Programming/TclTk/build b/Programming/TclTk/build new file mode 100644 index 0000000..d2c21a1 --- /dev/null +++ b/Programming/TclTk/build @@ -0,0 +1,4 @@ +#!/bin/bash + +./build_Tcl "$@" +./build_Tk "$@" diff --git a/Programming/TclTk/build_Tcl b/Programming/TclTk/build_Tcl new file mode 100755 index 0000000..f227ac2 --- /dev/null +++ b/Programming/TclTk/build_Tcl @@ -0,0 +1,30 @@ +#!/usr/bin/env modbuild + +pbuild::set_download_url "ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tcl${V_PKG}-src.tar.gz" + +pbuild::add_to_group 'Programming' +pbuild::install_docfiles 'license.terms' 'README' + +#pbuild::pre_prep() { +# pbuild::set_unpack_dir "tcl${V_PKG}-src.tar.gz" "${SRC_DIR}/Tcl" +# pbuild::set_unpack_dir "tk${V_PKG}-src.tar.gz" "${SRC_DIR}/Tk" +#} + +pbuild::pre_configure_Linux() { + srcdir="${SRC_DIR}/unix" +} + +pbuild::pre_configure_Darwin() { + srcdir="${SRC_DIR}/macosx" +} + +pbuild::configure() { + "${srcdir}"/configure \ + --prefix="${PREFIX}" \ + --enable-shared=no \ + || exit 1 +} + +pbuild::post_install() { + { cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; }; +} diff --git a/Programming/TclTk/build_Tk b/Programming/TclTk/build_Tk new file mode 100755 index 0000000..e785e95 --- /dev/null +++ b/Programming/TclTk/build_Tk @@ -0,0 +1,38 @@ +#!/usr/bin/env modbuild + +pbuild::set_download_url "ftp://ftp.tcl.tk/pub/tcl/tk8_6/tk${V_PKG}-src.tar.gz" + +pbuild::add_to_group 'Programming' +pbuild::install_docfiles 'license.terms' 'README' + + +pbuild::pre_configure_Linux() { + srcdir="${SRC_DIR}/unix" +} + +pbuild::pre_configure_Darwin() { + srcdir="${SRC_DIR}/macosx" +} + +pbuild::configure() { + export PATH="${PREFIX}/bin:$PATH" + export C_INCLUDE_PATH="${PREFIX}/include:${C_INCLUDE_PATH}" + export LIBRARY_PATH="${PREFIX}/lib:${LIBRARY_PATH}" + + "${srcdir}"/configure \ + --prefix="${PREFIX}" \ + --enable-shared=no \ + --with-tcl="${PREFIX}/lib" \ + || exit 1 +} + +pbuild::compile() { + export PATH="${PREFIX}/bin:$PATH" + export C_INCLUDE_PATH="${PREFIX}/include:${C_INCLUDE_PATH}" + export LIBRARY_PATH="${PREFIX}/lib:${LIBRARY_PATH}" + make -j3 +} + +pbuild::post_install() { + { cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; }; +} diff --git a/Programming/TclTk/files/variants.macos10.14 b/Programming/TclTk/files/variants.macos10.14 new file mode 100644 index 0000000..ce9ec9f --- /dev/null +++ b/Programming/TclTk/files/variants.macos10.14 @@ -0,0 +1 @@ +TclTk/8.6.9 stable diff --git a/Programming/TclTk/modulefile b/Programming/TclTk/modulefile new file mode 100644 index 0000000..a26e306 --- /dev/null +++ b/Programming/TclTk/modulefile @@ -0,0 +1,16 @@ +#%Module1.0 + +module-whatis "a very powerful, easy to learn programming language" +module-url "http://www.tcl.tk" +module-license "BSD-lik" +module-maintainer "Achim Gsell " + +module-help " +Tcl (Tool Command Language) is a very powerful but easy to learn dynamic +programming language, suitable for a very wide range of uses, including +web and desktop applications, networking, administration, testing and many +more. Open source and business-friendly, Tcl is a mature yet evolving +language that is truly cross platform, easily deployed and highly +extensible. +" + From de3d4df0543aa5be9b2d44e511fa89b46c524050 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 29 Aug 2019 17:32:23 +0200 Subject: [PATCH 2/5] new variants file for rhel6, support for macos removed --- Programming/TclTk/files/variants.macos10.14 | 1 - Programming/TclTk/files/variants.rhel6 | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 Programming/TclTk/files/variants.macos10.14 create mode 100644 Programming/TclTk/files/variants.rhel6 diff --git a/Programming/TclTk/files/variants.macos10.14 b/Programming/TclTk/files/variants.macos10.14 deleted file mode 100644 index ce9ec9f..0000000 --- a/Programming/TclTk/files/variants.macos10.14 +++ /dev/null @@ -1 +0,0 @@ -TclTk/8.6.9 stable diff --git a/Programming/TclTk/files/variants.rhel6 b/Programming/TclTk/files/variants.rhel6 new file mode 100644 index 0000000..7b9d247 --- /dev/null +++ b/Programming/TclTk/files/variants.rhel6 @@ -0,0 +1 @@ +TclTk/8.6.9 unstable From bdfbcdfdc305d8614f987ab06a94be9885ef0591 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 29 Aug 2019 17:35:09 +0200 Subject: [PATCH 3/5] TclTk: fix wrong setting of sym-link for wish --- Programming/TclTk/build_Tk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Programming/TclTk/build_Tk b/Programming/TclTk/build_Tk index e785e95..365d439 100755 --- a/Programming/TclTk/build_Tk +++ b/Programming/TclTk/build_Tk @@ -34,5 +34,5 @@ pbuild::compile() { } pbuild::post_install() { - { cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; }; + { cd "${PREFIX}"/bin && rm -f wish && ln -fs wish${V%.*} wish; }; } From 17cb4875c0f921ee50f9e7c61784b86bfbd0d963 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 29 Aug 2019 17:35:37 +0200 Subject: [PATCH 4/5] TclTk: fixes in main build script --- Programming/TclTk/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 Programming/TclTk/build diff --git a/Programming/TclTk/build b/Programming/TclTk/build old mode 100644 new mode 100755 index d2c21a1..d7fb54a --- a/Programming/TclTk/build +++ b/Programming/TclTk/build @@ -1,4 +1,4 @@ #!/bin/bash -./build_Tcl "$@" -./build_Tk "$@" +./build_Tcl "$@" ||exit $? +./build_Tk -f "$@" From a8461fc47bce78a8a715eafa0f7e6704e078d8ff Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 29 Aug 2019 18:44:13 +0200 Subject: [PATCH 5/5] TclTk: variant 8.6.9 released as stable --- Programming/TclTk/files/variants.rhel6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Programming/TclTk/files/variants.rhel6 b/Programming/TclTk/files/variants.rhel6 index 7b9d247..a4f9b5b 100644 --- a/Programming/TclTk/files/variants.rhel6 +++ b/Programming/TclTk/files/variants.rhel6 @@ -1 +1 @@ -TclTk/8.6.9 unstable +TclTk/8.6.9 stable