Python: updated including dependencies

Programming/TclTk/build

@@ -1,4 +1,32 @@
-#!/bin/bash
+#!/usr/bin/env modbuild
 
-./build_Tcl "$@" ||exit $?
-./build_Tk  -f "$@"
+#pbuild::install_docfiles 'license.terms' 'README'
+
+pbuild::configure_Darwin() {
+	export CXX=/usr/bin/clang++
+	export CC=/usr/bin/clang
+	PATH+=":/opt/X11/bin"
+	export PKG_CONFIG_PATH="/opt/X11/share/pkgconfig:/opt/X11/lib/pkgconfig:$PKG_CONFIG_PATH"
+	"${SRC_DIR}/macosx/configure" \
+		--prefix="${PREFIX}" \
+		--enable-threads \
+		--disable-symbols \
+		|| exit 1
+}
+
+pbuild::configure() {
+	"${SRC_DIR}/unix/configure" \
+		--prefix="${PREFIX}" \
+		|| exit 1
+}
+
+pbuild::post_install() {
+	{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
+}
+
+pbuild::post_install_Darwin() {
+	local -r libtcl="libtcl${V_MAJOR}.${V_MINOR}.dylib"
+	install_name_tool \
+			-id @executable_path/../lib/${libtcl} \
+			"${PREFIX}/lib/${libtcl}"
+}

Programming/TclTk/build-Tk

@@ -1,14 +1,20 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "ftp://ftp.tcl.tk/pub/tcl/tk${V_MAJOR}_${V_MINOR}/tk${V_PKG}-src.tar.gz"
-
-pbuild::add_to_group 'Programming'
-
 export PATH="${PREFIX}/bin:$PATH"
-export C_INCLUDE_PATH="${PREFIX}/include:${C_INCLUDE_PATH}"
-export LIBRARY_PATH="${PREFIX}/lib:${LIBRARY_PATH}"
+if [[ -v C_INCLUDE_PATH ]]; then
+	C_INCLUDE_PATH="${PREFIX}/include:${C_INCLUDE_PATH}"
+else
+	C_INCLUDE_PATH="${PREFIX}/include"
+fi
+export C_INCLUDE_PATH
+if [[ -v LIBRARY_PATH ]]; then
+	LIBRARY_PATH="${PREFIX}/lib:${LIBRARY_PATH}"
+else
+	LIBRARY_PATH="${PREFIX}/lib"
+fi
+export LIBRARY_PATH
 
-pbuild::configure_Darwin() {
+pbuil:d:configure_Darwin() {
 	PATH+=":/opt/X11/bin"
 	export CXX=/usr/bin/clang++
 	export CC=/usr/bin/clang
@@ -24,7 +30,7 @@ pbuild::configure_Darwin() {
 		|| exit 1
 }
 
-pbuild::configure_Linux() {
+pbuild::configure() {
 	"${SRC_DIR}/unix/configure" \
 		--prefix="${PREFIX}" \
 		--with-tcl="${PREFIX}/lib" \

Programming/TclTk/build_Tcl

@@ -1,35 +0,0 @@
-#!/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::configure_Darwin() {
-	export CXX=/usr/bin/clang++
-	export CC=/usr/bin/clang
-	PATH+=":/opt/X11/bin"
-	export PKG_CONFIG_PATH="/opt/X11/share/pkgconfig:/opt/X11/lib/pkgconfig:$PKG_CONFIG_PATH"
-	"${SRC_DIR}/macosx/configure" \
-		--prefix="${PREFIX}" \
-		--enable-threads \
-		--disable-symbols \
-		|| exit 1
-}
-
-pbuild::configure_Linux() {
-	"${SRC_DIR}/unix/configure" \
-		--prefix="${PREFIX}" \
-		|| exit 1
-}
-
-pbuild::post_install() {
-	{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
-}
-
-pbuild::post_install_Darwin() {
-	local -r libtcl="libtcl${V_MAJOR}.${V_MINOR}.dylib"
-	install_name_tool \
-			-id @executable_path/../lib/${libtcl} \
-			"${PREFIX}/lib/${libtcl}"
-}

Programming/TclTk/files/config.yaml

@@ -0,0 +1,32 @@
+format: 1
+TclTk:
+  defaults:
+    group: Programming
+    overlay: base
+    relstage: stable
+    urls:
+      - url: http://prdownloads.sourceforge.net/tcl/tcl${V_PKG}-src.tar.gz
+  shasums:
+  versions:
+    8.6.16:
+      config:
+        sub_packages:
+          - name: Tk
+            version: 8.6.16
+            build_args:
+    8.6.9:
+      config:
+        sub_packages:
+          - name: Tk
+            version: 8.6.9
+            build_args:
+
+Tk:
+  type: sub_package
+  defaults:
+    urls:
+      - url: http://prdownloads.sourceforge.net/tcl/tk${V_PKG}-src.tar.gz 
+  versions:
+    8.6.16:
+    8.6.9:
+

Programming/TclTk/files/variants.macos10.14

@@ -1 +0,0 @@
-TclTk/8.6.9	stable

Programming/TclTk/files/variants.rhel6

@@ -1 +0,0 @@
-TclTk/8.6.9	stable