diff --git a/Compiler/H5root/build b/Compiler/H5root/build
index f217615..0c5cdb4 100755
--- a/Compiler/H5root/build
+++ b/Compiler/H5root/build
@@ -1,16 +1,11 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="http://amas.web.psi.ch/Downloads/$P/$P-$V.tar.bz2"
+pbuild::set_download_url "http://amas.web.psi.ch/Downloads/$P/$P-$V.tar.bz2"
 
 pbuild::post_prep() {
 	./autogen.sh
 }
 
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}"
-}
-
 pbuild::post_install() {
 	# Unfortunatelly we need some fancy post-installation.
 	# Otherwise it wouldn't be possible to load the modules
diff --git a/Compiler/UMFPACK/build b/Compiler/UMFPACK/build
index bb5848d..dc365ab 100755
--- a/Compiler/UMFPACK/build
+++ b/Compiler/UMFPACK/build
@@ -1,7 +1,10 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="file://$PMODULES_DISTFILESDIR/$P-V.tar.bz2"
+pbuild::set_download_url "file://$PMODULES_DISTFILESDIR/$P-V.tar.bz2"
 
+pbuild::add_to_group 'Compiler'
+pbuild::compile_in_sourcetree
+	
 pbuild::configure() {
 	cat <<EOF > "${SRC_DIR}/SuiteSparse_config/SuiteSparse_config.mk"
 CF = \$(CFLAGS) \$(CPPFLAGS) \$(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
@@ -38,7 +41,3 @@ pbuild::install() {
 	make PREFIX="${PREFIX}" install
 }
 
-pbuild::add_to_group 'Compiler'
-pbuild::compile_in_sourcetree
-pbuild::make_all
-pbuild::cleanup_src
diff --git a/Compiler/boost/build b/Compiler/boost/build
index dc73fd0..bf41dc9 100755
--- a/Compiler/boost/build
+++ b/Compiler/boost/build
@@ -1,6 +1,6 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://netcologne.dl.sourceforge.net/project/boost/boost/$V/boost_${V_MAJOR}_${V_MINOR}_${V_PATCHLVL}.tar.gz"
+pbuild::set_download_url "https://netcologne.dl.sourceforge.net/project/$P/$P/$V/$P_${V_MAJOR}_${V_MINOR}_${V_PATCHLVL}.tar.gz"
 
 BOOST_BUILD_PATH="${BUILD_DIR}"
 
diff --git a/Compiler/clapack/build b/Compiler/clapack/build
index 8091cff..5ebe03b 100755
--- a/Compiler/clapack/build
+++ b/Compiler/clapack/build
@@ -1,7 +1,7 @@
 #!/usr/bin/env modbuild
 #
 
-SOURCE_URL="http://www.netlib.org/$P/$P-$V-CMAKE.tgz"
+pbuild:set_download_url "http://www.netlib.org/$P/$P-$V-CMAKE.tgz"
 
 pbuild::configure() {
 	cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
diff --git a/Compiler/eigen3/build b/Compiler/eigen3/build
index 03e756a..6b0d75a 100755
--- a/Compiler/eigen3/build
+++ b/Compiler/eigen3/build
@@ -1,12 +1,8 @@
 #!/usr/bin/env modbuild
 #
-# Notes:
-#   On Mac OS X VTK does not compile out of the box with self-compiled GCC.
-#   grep for "long-branch" and "pascal-string" in the cmake configuration
-#   and remove these strings.
-#
 
-SOURCE_URL="http://bitbucket.org/eigen/eigen/get/${V_MAJOR}.${V_MINOR}.${V_PATCHLVL}.tar.bz2"
+
+pbuild::set_download_url "http://bitbucket.org/eigen/eigen/get/${V_MAJOR}.${V_MINOR}.${V_PATCHLVL}.tar.bz2"
 
 pbuild::configure() {
 	export BOOST_ROOT="${BOOST_PREFIX}"
diff --git a/Compiler/gsl/build b/Compiler/gsl/build
index 4623fe9..383928a 100755
--- a/Compiler/gsl/build
+++ b/Compiler/gsl/build
@@ -1,12 +1,6 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"
-
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		|| exit 1
-}
+pbuild::set_download_url "https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"
 
 pbuild::add_to_group 'Compiler'
 pbuild::install_docfiles \
@@ -20,8 +14,6 @@ pbuild::install_docfiles \
 	'THANKS' \
 	'TODO'
 
-pbuild::make_all
-
 # Local Variables:
 # mode: sh
 # sh-basic-offset: 8
diff --git a/Compiler/gtest/build b/Compiler/gtest/build
index bfc3435..5f5362f 100755
--- a/Compiler/gtest/build
+++ b/Compiler/gtest/build
@@ -1,6 +1,6 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://github.com/google/googletest/archive/release-1.7.0.tar.gz"
+pbuild::set_download_url "https://github.com/google/googletest/archive/release-1.7.0.tar.gz"
 
 declare -a config_args=()
 
diff --git a/Compiler/root/build b/Compiler/root/build
index be2e917..e300e24 100755
--- a/Compiler/root/build
+++ b/Compiler/root/build
@@ -1,6 +1,8 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://root.cern.ch/download/root_v${V_MAJOR}.${V_MINOR}.${V_PATCHLVL}.source.tar.gz"
+# :FIXME: must be merged with build6!
+
+pbuild::set_download_url "https://root.cern.ch/download/root_v${V_MAJOR}.${V_MINOR}.${V_PATCHLVL}.source.tar.gz"
 
 declare -a EXTRA_LIBS=()
 config_args=''
diff --git a/Compiler/vtk/build b/Compiler/vtk/build
index ffafd2c..7f0680c 100755
--- a/Compiler/vtk/build
+++ b/Compiler/vtk/build
@@ -6,26 +6,19 @@
 #   and remove these strings.
 #
 
-SOURCE_URL="http://www.vtk.org/files/release/${V_MAJOR}.${V_MINOR}/VTK-$V.tar.gz"
+pbuild::set_download_url "http://www.vtk.org/files/release/${V_MAJOR}.${V_MINOR}/VTK-$V.tar.gz"
+pbuild::add_to_group 'Compiler'
 
-case ${OS} in
-Darwin )
-	pbuild::pre_configure() {
-		# for the time being: on Mac OS X we need GL/gl.h from MacPorts:
-		std::append_path C_INLCUDE_PATH '/opt/local/include'
-		std::append_path CPLUS_INCLUDE_PATH '/opt/local/include'
-	}
-	;;
-esac
-
-pbuild::configure() {
-	cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
-		-DVTK_INSTALL_INCLUDE_DIR:PATH=include \
-		-DVTK_INSTALL_LIB_DIR:PATH=lib \
-		-DVTK_USE_COCOA:BOOL=OFF \
-		"${SRC_DIR}"
+pbuild::pre_configure_Darwin() {
+	# for the time being: on Mac OS X we need GL/gl.h from MacPorts:
+	std::append_path C_INLCUDE_PATH '/opt/local/include'
+	std::append_path CPLUS_INCLUDE_PATH '/opt/local/include'
+}
+
+pbuild::pre_configure() {
+	pbuild::add_configure_args "-DVTK_INSTALL_INCLUDE_DIR:PATH=include"
+	pbuild::add_configure_args "-DVTK_INSTALL_LIB_DIR:PATH=lib"
+	pbuild::add_configure_args "-DVTK_USE_COCOA:BOOL=OFF"
 }
 
-pbuild::add_to_group 'Compiler'
-pbuild::make_all
 
diff --git a/HDF5/H5hut/build b/HDF5/H5hut/build
index 8104d2f..f59b02c 100755
--- a/HDF5/H5hut/build
+++ b/HDF5/H5hut/build
@@ -1,6 +1,8 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="http://amas.web.psi.ch/Downloads/$P/$P-$V.tar.gz"
+pbuild::set_download_url "http://amas.web.psi.ch/Downloads/$P/$P-$V.tar.gz"
+pbuild::add_to_group 'HDF5'
+pbuild::install_docfiles 'AUTHORS' 'COPYING'
 
 if [[ ${V_MAJOR} == 1 ]]; then
 	pbuild::compile_in_sourcetree
@@ -45,7 +47,4 @@ pbuild::install() {
 }
 
 
-pbuild::add_to_group 'HDF5'
-pbuild::install_docfiles 'AUTHORS' 'COPYING'
-pbuild::make_all
 
diff --git a/HDF5_serial/H5hut/build b/HDF5_serial/H5hut/build
index 2c30a5b..f70b6a8 100755
--- a/HDF5_serial/H5hut/build
+++ b/HDF5_serial/H5hut/build
@@ -1,6 +1,6 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="http://amas.web.psi.ch/Downloads/$P/$P-$V.tar.gz"
+pbuild::set_download_url "http://amas.web.psi.ch/Downloads/$P/$P-$V.tar.gz"
 
 #	--enable-vtkconverter \
 
diff --git a/Libraries/giflib/build b/Libraries/giflib/build
index a5356e6..510c8e1 100755
--- a/Libraries/giflib/build
+++ b/Libraries/giflib/build
@@ -1,11 +1,4 @@
 #!/usr/bin/env modbuild
 
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		|| exit 1
-}
-
+pbuild::set_download_url https://sourceforge.net/projects/$P/files/$P-${V_PKG}.tar.bz2
 pbuild::add_to_group 'Libraries'
-pbuild::set_build_dependencies "${COMPILER}"
-pbuild::make_all
diff --git a/Libraries/giflib/files/variants b/Libraries/giflib/files/variants
new file mode 100644
index 0000000..fb9866e
--- /dev/null
+++ b/Libraries/giflib/files/variants
@@ -0,0 +1 @@
+giflib/5.1.4	unstable
\ No newline at end of file
diff --git a/Libraries/libungif/build b/Libraries/libungif/build
index 4e172ee..6edcff6 100755
--- a/Libraries/libungif/build
+++ b/Libraries/libungif/build
@@ -1,10 +1,5 @@
 #!/usr/bin/env modbuild
 
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		|| exit 1
-}
-
+pbuild::set_download_url "https://sourceforge.net/projects/giflib/files/$P-${V_MAJOR}.x/$P-${V_PKG}/$P-${V_PKG}.tar.bz2
 pbuild::add_to_group 'Libraries'
-pbuild::make_all
+
diff --git a/Libraries/libungif/files/variants b/Libraries/libungif/files/variants
new file mode 100644
index 0000000..b2f9f01
--- /dev/null
+++ b/Libraries/libungif/files/variants
@@ -0,0 +1 @@
+libungif/4.1.4		unstable
\ No newline at end of file
diff --git a/Libraries/mpfr/build b/Libraries/mpfr/build
index c7659d3..dfeb98e 100755
--- a/Libraries/mpfr/build
+++ b/Libraries/mpfr/build
@@ -1,14 +1,6 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="http://www.mpfr.org/$P-$V/$P-$V.tar.gz"
-
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		--with-gmp=$GMP_PREFIX \
-		--disable-shared \
-		|| exit 1
-}
+pbuild::set_download_url "http://www.mpfr.org/$P-$V/$P-$V.tar.gz"
 
 # use system gcc to compile
 declare -rx CC=gcc
@@ -16,4 +8,8 @@ declare -rx CC=gcc
 module use 'Libraries'
 
 pbuild::add_to_group 'Libraries'
-pbuild::make_all
+
+pbuild::pre_configure() {
+	pbuild::add_configure_args "--with-gmp=${GMP_PREFIX}"
+	pbuild::add_configure_args "--disable-shared"
+}
diff --git a/Libraries/pcre/build b/Libraries/pcre/build
index 5841eab..d659195 100755
--- a/Libraries/pcre/build
+++ b/Libraries/pcre/build
@@ -1,14 +1,8 @@
 #!/usr/bin/env modbuild
 
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		|| exit 1
-}
-
+pbuild::set_download_url "https://ftp.pcre.org/pub/pcre/$P-${V_PKG}.tar.bz2"
 pbuild::add_to_group 'Tools'
 #pbuild::install_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README'
-pbuild::make_all
 
 # Local Variables:
 # mode: sh
diff --git a/Libraries/pcre/files/variants b/Libraries/pcre/files/variants
new file mode 100644
index 0000000..379f204
--- /dev/null
+++ b/Libraries/pcre/files/variants
@@ -0,0 +1 @@
+pcre/8.42	unstable
\ No newline at end of file
diff --git a/Libraries/tiff/build b/Libraries/tiff/build
index 6686dd9..451374c 100755
--- a/Libraries/tiff/build
+++ b/Libraries/tiff/build
@@ -1,17 +1,14 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="ftp://download.osgeo.org/libtiff/$P-$V.tar.gz"
-
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		--with-pic=yes \
-		--disable-shared \
-		--disable-jpeg \
-		|| exit 1
-}
+pbuild::set_download_url "ftp://download.osgeo.org/libtiff/$P-${V_PKG}.tar.gz"
 
 CC=gcc
 
 pbuild::add_to_group 'Libraries'
-pbuild::make_all
+
+pbuild::pre_configure() {
+	pbuild::add_configure_args "--with-pic=yes"
+	pbuild::add_configure_args "--disable-shared"
+	pbuild::add_configure_args "--disable-jpeg"
+}
+
diff --git a/MPI/OPAL/build b/MPI/OPAL/build
index 2eb5dee..60695ef 100755
--- a/MPI/OPAL/build
+++ b/MPI/OPAL/build
@@ -1,31 +1,18 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="http://amas.web.psi.ch/Downloads/$P/src/$P-$V.tar.bz2"
+pbuild::set_download_url "http://amas.web.psi.ch/Downloads/$P/src/$P-$V.tar.bz2"
+pbuild::add_to_group 'MPI'
 
-config_args=()
-
-case ${OS} in
-Darwin )
-	:
-	;;
-Linux )
+pbuild::pre_configure_Linux() {
 	if (( V_MAJOR < 2)); then
-		config_args+=( '-DENABLE_DKS=ON' )
+		pbuild::add_configure_args '-DENABLE_DKS=ON'
 	fi
-	;;
-esac
-
-# add -fopenmp to CC and CXX, if you want to compile with OpenMP
-pbuild::configure() {
-	cmake \
-		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DENABLE_SAAMG_SOLVER=TRUE \
-		"${config_args[@]}" \
-		"${SRC_DIR}"
 }
 
-pbuild::add_to_group 'MPI'
-pbuild::set_supported_compilers 'gcc/5.4.0' 'gcc/5.5.0' 'gcc/6.4.0' 'gcc/7.3.0'
-pbuild::make_all
+# add -fopenmp to CC and CXX, if you want to compile with OpenMP
+pbuild::pre_configure() {
+	pbuild::add_configure_args "-DCMAKE_BUILD_TYPE=Release"
+	pbuild::add_configure_args "-DENABLE_SAAMG_SOLVER=TRUE"
+}
+
 
diff --git a/MPI/SuperLU_DIST/build b/MPI/SuperLU_DIST/build
index acdec94..5f494be 100755
--- a/MPI/SuperLU_DIST/build
+++ b/MPI/SuperLU_DIST/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: need review!
+
 pbuild::configure() {
 	case ${COMPILER} in
 	gcc )
diff --git a/MPI/cpmd/build b/MPI/cpmd/build
index 2d6e809..e1fbcda 100755
--- a/MPI/cpmd/build
+++ b/MPI/cpmd/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: download url must be added and script must be reviewed!
+
 #pbuild::supported_os 'Linux'
 
 case $OS in 
diff --git a/MPI/dks/build b/MPI/dks/build
index b286846..12b5636 100755
--- a/MPI/dks/build
+++ b/MPI/dks/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: script does not work any more!
+
 SOURCE_URL="dks-1.1.2.tar.gz"
 
 declare -ra vers=( ${V//./ } )
diff --git a/MPI/gromacs/build b/MPI/gromacs/build
index c309a17..eaec276 100755
--- a/MPI/gromacs/build
+++ b/MPI/gromacs/build
@@ -1,23 +1,19 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="http://ftp.gromacs.org/pub/$P/$P-$V.tar.gz"
-
-pbuild::configure() {
-	cmake \
-		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-		-DCMAKE_BUILD_TYPE=RELEASE \
-		-DGMX_MPI=on \
-		-DGMX_GPU=off \
-		-DGMX_SIMD=SSE2 \
-		-DGMX_BUILD_OWN_FFTW=on \
-		"${SRC_DIR}" \
-		|| exit 1
-}
+pbuild::set_download_url "http://ftp.gromacs.org/pub/$P/$P-${V_PKG}.tar.gz"
 
 pbuild::add_to_group 'MPI'
 pbuild::install_docfiles \
 		AUTHORS \
 		COPYING \
 		README
-pbuild::make_all
+
+pbuild::pre_configure() {
+	pbuild::add_configure_args "-DCMAKE_BUILD_TYPE=RELEASE"
+	pbuild::add_configure_args "-DGMX_MPI=on"
+	pbuild::add_configure_args "-DGMX_GPU=off"
+	pbuild::add_configure_args "-DGMX_SIMD=SSE2"
+	pbuild::add_configure_args "-DGMX_BUILD_OWN_FFTW=on"
+}
+
 
diff --git a/Programming/Tcl/build b/Programming/Tcl/build
index ffeb164..a669295 100755
--- a/Programming/Tcl/build
+++ b/Programming/Tcl/build
@@ -1,16 +1,23 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tcl$V-src.tar.gz"
+pbuild::set_download_url "ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tcl$V-src.tar.gz"
+
+
+# use system's cc
+declare CC=cc
+
+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() {
-	case ${OS} in
-	Linux )
-		srcdir="${SRC_DIR}/unix"
-		;;
-	Darwin )
-		srcdir="${SRC_DIR}/macosx"
-		;;
-	esac
 	"${srcdir}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-shared=no \
@@ -20,10 +27,3 @@ pbuild::configure() {
 pbuild::post_install() {
 	{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
 }
-
-# use system's cc
-declare CC=cc
-
-pbuild::add_to_group 'Programming'
-pbuild::install_docfiles 'license.terms' 'README'
-pbuild::make_all
diff --git a/Programming/Tk/build b/Programming/Tk/build
index 47be001..d2dbb56 100755
--- a/Programming/Tk/build
+++ b/Programming/Tk/build
@@ -1,6 +1,12 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tk$V-src.tar.gz"
+pbuild::set_download_url ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tk$V-src.tar.gz"
+
+# use system's cc
+declare CC=cc
+
+pbuild::add_to_group 'Programming'
+pbuild::install_docfiles 'license.terms' 'README'
 
 pbuild::configure() {
 	case ${OS} in
@@ -25,9 +31,3 @@ pbuild::post_install() {
 	#{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
 }
 
-# use system's cc
-declare CC=cc
-
-pbuild::add_to_group 'Programming'
-pbuild::install_docfiles 'license.terms' 'README'
-pbuild::make_all
diff --git a/Programming/autoconf/build b/Programming/autoconf/build
index 95287dd..a74c3f6 100755
--- a/Programming/autoconf/build
+++ b/Programming/autoconf/build
@@ -1,12 +1,6 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"
-
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		|| exit 1
-}
+pbuild::set_download_url "https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"
 
 # use system gcc to compile
 declare -rx CC=gcc
@@ -21,8 +15,6 @@ pbuild::install_docfiles \
 	README \
 	THANKS
 
-pbuild::make_all
-
 # Local Variables:
 # mode: sh
 # sh-basic-offset: 8
diff --git a/Programming/automake/build b/Programming/automake/build
index 392dfed..ec7146c 100755
--- a/Programming/automake/build
+++ b/Programming/automake/build
@@ -1,12 +1,6 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"
-
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		|| exit 1
-}
+pbuild::set_download_url "https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"
 
 # use system gcc to compile
 declare -rx CC=gcc
@@ -20,7 +14,6 @@ pbuild::install_docfiles \
 	NEWS \
 	README \
 	THANKS
-pbuild::make_all
 
 # Local Variables:
 # mode: sh
diff --git a/Programming/binutils/build b/Programming/binutils/build
index 24b1ccd..c46aab6 100755
--- a/Programming/binutils/build
+++ b/Programming/binutils/build
@@ -1,12 +1,5 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="http://ftp.gnu.org/gnu/binutils/$P-$V.tar.gz"
-
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		|| exit 1
-}
+pbuild::set_download_url "http://ftp.gnu.org/gnu/binutils/$P-${V_PKG}.tar.gz"
 
 pbuild::add_to_group 'Programming'
-pbuild::make_all
diff --git a/Programming/cmake/build b/Programming/cmake/build
index 0724794..f0b450f 100755
--- a/Programming/cmake/build
+++ b/Programming/cmake/build
@@ -1,19 +1,16 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://cmake.org/files/v${V_MAJOR}.${V_MINOR}/$P-$V.tar.gz"
+pbuild::set_download_url "https://cmake.org/files/v${V_MAJOR}.${V_MINOR}/$P-$V.tar.gz"
+pbuild::add_to_group 'Programming'
 
 declare bootstrap_flags=''
 
-case $OS in
-Darwin )
+pbuild::pre_configure_Darwin() {
 	bootstrap_flags+='--system-curl'
-	;;
-esac
+}
 
 pbuild::configure() {
 	"${SRC_DIR}/bootstrap" --prefix="${PREFIX}" ${bootstrap_flags} --verbose
 }
 
-pbuild::add_to_group 'Programming'
-pbuild::make_all
 
diff --git a/Programming/cuda/build b/Programming/cuda/build
index c9450da..c727b69 100755
--- a/Programming/cuda/build
+++ b/Programming/cuda/build
@@ -18,4 +18,3 @@ pbuild::install() {
 	:
 }
 
-pbuild::make_all
diff --git a/Programming/gcc/build b/Programming/gcc/build
index fcbc473..79cc9e3 100755
--- a/Programming/gcc/build
+++ b/Programming/gcc/build
@@ -1,6 +1,6 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://ftp.gnu.org/gnu/gcc/$P-$V/$P-$V.tar.gz"
+pbuild::set_download_url "https://ftp.gnu.org/gnu/gcc/$P-$V/$P-$V.tar.gz"
 
 pbuild::patch_sources_Darwin() {
 	if (( V_MAJOR == 4 && V_MINOR <= 8 )) || \
diff --git a/Programming/ld64/build b/Programming/ld64/build
index 1f1f8e0..8a690e0 100755
--- a/Programming/ld64/build
+++ b/Programming/ld64/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: need review!
+
 CCTOOLS_VERSION='895'
 DYLD_VERSION='421.2'
 
diff --git a/Programming/libtool/build b/Programming/libtool/build
index 7cc62b5..c3abe11 100755
--- a/Programming/libtool/build
+++ b/Programming/libtool/build
@@ -1,17 +1,11 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"
-
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		|| exit 1
-}
+pbuild::set_download_url "https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"
 
 # use system gcc to compile
 declare -rx CC=gcc
 
 pbuild::add_to_group 'Programming'
 pbuild::install_docfiles 'AUTHORS' 'COPYING' 'NEWS' 'README' 'THANKS'
-pbuild::make_all
+
 
diff --git a/Programming/m4/build b/Programming/m4/build
index 72ac9f1..d069a41 100755
--- a/Programming/m4/build
+++ b/Programming/m4/build
@@ -1,15 +1,8 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.bz2"
-
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		|| exit 1
-}
+pbuild::set_download_url "https://ftp.gnu.org/gnu/$P/$P-$V.tar.bz2"
 
 # use system gcc to compile
 declare -rx CC=gcc
 
 pbuild::add_to_group 'Programming'
-pbuild::make_all
diff --git a/Programming/psi-python27/build b/Programming/psi-python27/build
index 8d9d6c8..8cf4860 100755
--- a/Programming/psi-python27/build
+++ b/Programming/psi-python27/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: to be removed or reviewed!
+
 pbuild::configure() {
 	:
 }
diff --git a/System/fsstress/build b/System/fsstress/build
index ed680a1..bb05fdb 100755
--- a/System/fsstress/build
+++ b/System/fsstress/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: needs review
+
 pbuild::configure() {
 	:
 }
diff --git a/System/mdtest/build b/System/mdtest/build
index 116dedd..255813b 100755
--- a/System/mdtest/build
+++ b/System/mdtest/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: needs review
+
 pbuild::configure() {
 	:
 }
diff --git a/System/mxm/build b/System/mxm/build
index 595506c..92bf035 100755
--- a/System/mxm/build
+++ b/System/mxm/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: needs review
+
 pbuild::prep() {
 	:
 }
diff --git a/System/patchelf/build b/System/patchelf/build
index 537eaca..1b9b33e 100755
--- a/System/patchelf/build
+++ b/System/patchelf/build
@@ -1,3 +1,6 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: needs review
+
 pbuild::set_download_url "https://nixos.org/releases/$P/$P-$V/$P-$V.tar.bz2"
+pbuils::add_to_group 'System'
diff --git a/System/unison/build b/System/unison/build
index 0ab99ea..f129bea 100755
--- a/System/unison/build
+++ b/System/unison/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: needs review
+
 pbuild::configure() {
 	:
 }
diff --git a/Tools/global/build b/Tools/global/build
index 0f863c6..5291660 100755
--- a/Tools/global/build
+++ b/Tools/global/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: need review!
+
 pbuild::configure() {
 	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
diff --git a/Tools/gnuplot/build b/Tools/gnuplot/build
index 3109f44..4fd76eb 100755
--- a/Tools/gnuplot/build
+++ b/Tools/gnuplot/build
@@ -7,8 +7,6 @@ pbuild::set_download_url \
 pbuild::set_sha256sum 'gnuplot-5.2.4.tar.gz:1515f000bd373aaa53b16183f274189d4f5e0ae47d22f434857933d16a4770cb'
 pbuild::install_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README'
 
-pbuild::make_all
-
 # Local Variables:
 # mode: sh
 # sh-basic-offset: 8
diff --git a/Tools/swig/build b/Tools/swig/build
index 485e754..7bd5302 100755
--- a/Tools/swig/build
+++ b/Tools/swig/build
@@ -1,16 +1,11 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://sourceforge.net/projects/swig/files/$P/$P-$V/$P-$V.tar.gz"
-
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		|| exit 1
-}
+pbuild::set_download_url "https://sourceforge.net/projects/swig/files/$P/$P-$V/$P-$V.tar.gz"
 
 pbuild::add_to_group 'Tools'
+
+# :FIXME: define to be isntall doc-files!
 #pbuild::install_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README'
-pbuild::make_all
 
 # Local Variables:
 # mode: sh
diff --git a/Tools/vim/build b/Tools/vim/build
index d314c55..8339f21 100755
--- a/Tools/vim/build
+++ b/Tools/vim/build
@@ -1,22 +1,17 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="ftp://ftp.vim.org/pub/vim/unix/$P-$V.tar.bz2"
-
-
-pbuild::configure() {
-	cd "${SRC_DIR}"
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		--enable-pythoninterp=dynamic \
-		--enable-python3interp=dynamic \
-		|| exit 1
-}
-
+pbuild::set_download_url "ftp://ftp.vim.org/pub/vim/unix/$P-$V.tar.bz2"
 
 pbuild::add_to_group 'Tools'
 pbuild::compile_in_sourcetree
+
+# :FIXME: define to be installed doc-files
 #pbuild::install_docfiles 'COPYING' 'README.md'
-pbuild::make_all
+
+pbuild::pre_configure() {
+	pbuild::add_configure_args "--enable-pythoninterp=dynamic"
+	pbuild::add_configure_args "--enable-python3interp=dynamic"
+}
 
 # Local Variables:
 # mode: sh