From 5e318adcb31a0ea0bbb7a763ca09872ce0fd9d84 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 11 Jul 2018 10:36:49 +0200
Subject: [PATCH] refactor variable names according to changes in
 Pmodules/0.99.15 in build-scripts of group 'Tools'

---
 Tools/asciidoc/build |  2 +-
 Tools/emacs/build    |  8 ++++----
 Tools/git/build      |  8 ++++----
 Tools/global/build   |  2 +-
 Tools/gnuplot/build  | 11 ++---------
 Tools/openssl/build  |  2 +-
 Tools/swig/build     |  2 +-
 Tools/vim/build      |  4 ++--
 Tools/xmlto/build    |  2 +-
 9 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/Tools/asciidoc/build b/Tools/asciidoc/build
index f674122..d8ddcdb 100755
--- a/Tools/asciidoc/build
+++ b/Tools/asciidoc/build
@@ -3,7 +3,7 @@
 SOURCE_URL="https://sourceforge.net/projects/asciidoc/files/$P/$V/$P-$V.tar.gz"
 
 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
diff --git a/Tools/emacs/build b/Tools/emacs/build
index 498d23b..629ec5a 100755
--- a/Tools/emacs/build
+++ b/Tools/emacs/build
@@ -20,7 +20,7 @@ Linux )
 esac
 
 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		${configure_args} \
 		|| exit 1
@@ -29,12 +29,12 @@ pbuild::configure() {
 
 pbuild::post_install() {
 	mkdir -p "${PREFIX}/bin"
-	install -m 0755 "${BUILD_BLOCK_DIR}/Emacs" "${PREFIX}/bin"
-	install -m 0755 "${BUILD_BLOCK_DIR}/Emacsclient" "${PREFIX}/bin"
+	install -m 0755 "${BUILDBLOCK_DIR}/Emacs" "${PREFIX}/bin"
+	install -m 0755 "${BUILDBLOCK_DIR}/Emacsclient" "${PREFIX}/bin"
 }
 
 pbuild::post_install_Darwin() {
-	cp -a "${MODULE_BUILDDIR}/nextstep/Emacs.app" "${PREFIX}"
+	cp -a "${BUILD_DIR}/nextstep/Emacs.app" "${PREFIX}"
 }
 
 pbuild::add_to_group 'Tools'
diff --git a/Tools/git/build b/Tools/git/build
index e48a85e..716bad3 100755
--- a/Tools/git/build
+++ b/Tools/git/build
@@ -11,8 +11,8 @@ Darwin )
 esac
 
 pbuild::configure() {
-	cd "${MODULE_SRCDIR}"
-	"${MODULE_SRCDIR}"/configure \
+	cd "${SRC_DIR}"
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--with-tcltk \
 		--with-perl="${PERL_PREFIX}/bin/perl" \
@@ -20,14 +20,14 @@ pbuild::configure() {
 }
 
 pbuild::build() {
-        cd "${MODULE_SRCDIR}"
+        cd "${SRC_DIR}"
         make
 
 	make -C contrib/subtree prefix="${prefix}"
 }
 
 pbuild::install() {
-        cd "${MODULE_SRCDIR}"
+        cd "${SRC_DIR}"
         make install
         make install-doc
 	make -C contrib/subtree prefix="${PREFIX}" install
diff --git a/Tools/global/build b/Tools/global/build
index 7559a60..4d7bcd8 100755
--- a/Tools/global/build
+++ b/Tools/global/build
@@ -1,7 +1,7 @@
 #!/usr/bin/env modbuild
 
 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--with-pic=yes \
 		--with-included-ltdl \
diff --git a/Tools/gnuplot/build b/Tools/gnuplot/build
index d774601..ce623c9 100755
--- a/Tools/gnuplot/build
+++ b/Tools/gnuplot/build
@@ -1,16 +1,9 @@
 #!/usr/bin/env modbuild
 
 pbuild::add_to_group 'Tools'
-pbuild::set_source_url "https://sourceforge.net/projects/gnuplot/files/$P/$V/$P-$V.tar.gz"
-pbuild::set_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README'
 
-pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
-		--prefix="${PREFIX}" \
-		--with-gif=no \
-		--with-tiff=no \
-		|| exit 1
-}
+pbuild::set_download_url "https://sourceforge.net/projects/gnuplot/files/$P/$V/$P-$V.tar.gz"
+pbuild::set_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README'
 
 pbuild::make_all
 
diff --git a/Tools/openssl/build b/Tools/openssl/build
index bac18bc..2a0a769 100755
--- a/Tools/openssl/build
+++ b/Tools/openssl/build
@@ -12,7 +12,7 @@ pbuild::configure() {
 		;;
 	esac
 	export CFLAGS=-fPIC
-	"${MODULE_SRCDIR}"/Configure shared --prefix="${PREFIX}" ${target} \
+	"${SRC_DIR}"/Configure shared --prefix="${PREFIX}" ${target} \
 		|| exit 1
 }
 
diff --git a/Tools/swig/build b/Tools/swig/build
index a8370dc..b3deeec 100755
--- a/Tools/swig/build
+++ b/Tools/swig/build
@@ -3,7 +3,7 @@
 SOURCE_URL="https://sourceforge.net/projects/swig/files/$P/$P-$V/$P-$V.tar.gz"
 
 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
diff --git a/Tools/vim/build b/Tools/vim/build
index f9173c2..d36b411 100755
--- a/Tools/vim/build
+++ b/Tools/vim/build
@@ -4,8 +4,8 @@ SOURCE_URL="ftp://ftp.vim.org/pub/vim/unix/$P-$V.tar.bz2"
 
 
 pbuild::configure() {
-	cd "${MODULE_SRCDIR}"
-	"${MODULE_SRCDIR}"/configure \
+	cd "${SRC_DIR}"
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-pythoninterp=dynamic \
 		--enable-python3interp=dynamic \
diff --git a/Tools/xmlto/build b/Tools/xmlto/build
index e2874b9..ab1861a 100755
--- a/Tools/xmlto/build
+++ b/Tools/xmlto/build
@@ -3,7 +3,7 @@
 SOURCE_URL="https://releases.pagure.org/$P/$P-$V.tar.bz2"
 
 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }