build-scripts reviewed

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

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

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}"
 

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 \

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}"

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

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=()
 

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=''

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
 

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
 

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 \
 

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

Libraries/giflib/files/variants

@@ -0,0 +1 @@
+giflib/5.1.4	unstable

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
+

Libraries/libungif/files/variants

@@ -0,0 +1 @@
+libungif/4.1.4		unstable

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"
+}

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

Libraries/pcre/files/variants

@@ -0,0 +1 @@
+pcre/8.42	unstable

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"
+}
+

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"
+}
+
 

MPI/SuperLU_DIST/build

@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: need review!
+
 pbuild::configure() {
 	case ${COMPILER} in
 	gcc )

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 

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//./ } )

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"
+}
+
 

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

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

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

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

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

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
 

Programming/cuda/build

@@ -18,4 +18,3 @@ pbuild::install() {
 	:
 }
 
-pbuild::make_all

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 )) || \

Programming/ld64/build

@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: need review!
+
 CCTOOLS_VERSION='895'
 DYLD_VERSION='421.2'
 

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
+
 

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

Programming/psi-python27/build

@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: to be removed or reviewed!
+
 pbuild::configure() {
 	:
 }

System/fsstress/build

@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: needs review
+
 pbuild::configure() {
 	:
 }

System/mdtest/build

@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: needs review
+
 pbuild::configure() {
 	:
 }

System/mxm/build

@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: needs review
+
 pbuild::prep() {
 	:
 }

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'

System/unison/build

@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: needs review
+
 pbuild::configure() {
 	:
 }

Tools/global/build

@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild
 
+# :FIXME: need review!
+
 pbuild::configure() {
 	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \

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

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

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