Merge branch 'master' of gitlab.psi.ch:Pmodules/buildblocks

2018-07-11 17:41:54 +02:00
parent f3dce9c25d c5e0f8bb79
commit dddfc97493
114 changed files with 1037 additions and 226 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.tar.gz filter=lfs diff=lfs merge=lfs -text
--- a/Compiler/H5root/build
+++ b/Compiler/H5root/build
@@ -7,7 +7,7 @@ pbuild::post_prep() {
 }

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}"
 }

@@ -40,7 +40,7 @@ pbuild::post_install() {
 	local sed_cmd="s:@PREFIX@:${PREFIX}:g;"
 	sed_cmd+="s:@HDF5_PREFIX@:${HDF5_SERIAL_PREFIX}:g;"
 	sed_cmd+="s:@ROOT_PREFIX@:${ROOT_PREFIX}:g;"
-	sed "${sed_cmd}" "${BUILD_BLOCK_DIR}/${V_MAJOR}/H5root" > "${PREFIX}/bin/H5root"
+	sed "${sed_cmd}" "${BUILDBLOCK_DIR}/${V_MAJOR}/H5root" > "${PREFIX}/bin/H5root"
 	chmod 0755 "${PREFIX}/bin/H5root"

 	# install serial HDF5 and H5hut header files
--- a/Compiler/OpenBLAS/0/variants
+++ b/Compiler/OpenBLAS/0/variants
@@ -12,6 +12,8 @@ OpenBLAS/0.2.19		stable		gcc/5.4.0
 OpenBLAS/0.2.19		stable		gcc/6.2.0
 OpenBLAS/0.2.19		stable		gcc/6.3.0

+OpenBLAS/0.2.20		stable		gcc/5.5.0
+OpenBLAS/0.2.20		stable		gcc/6.4.0
 OpenBLAS/0.2.20		stable		gcc/7.3.0
 OpenBLAS/0.2.20		stable		clang-macos/9.0.0
 OpenBLAS/0.2.20		stable		intel/17.4
--- a/Compiler/OpenBLAS/build
+++ b/Compiler/OpenBLAS/build
@@ -17,20 +17,20 @@ pbuild::configure() {
 		die 3 "Oops: unknown compiler: ${COMPILER}"
 		;;
 	esac
-	cat <<EOF > "${MODULE_SRCDIR}/make.inc"
+	cat <<EOF > "${SRC_DIR}/make.inc"
 SHELL = /bin/sh
 PLAT = 
 DRVOPTS  = \$(NOOPT)
 ARCHFLAGS= -ru
 EOF
-	echo "USE_SIMPLE_THREADED_LEVEL3 = 1" >> "${MODULE_SRCDIR}/Makefile.rule"
-	echo "NO_AVX = 1" >> "${MODULE_SRCDIR}/Makefile.rule"
-	echo "NO_AVX2 = 1" >> "${MODULE_SRCDIR}/Makefile.rule"
-	echo "USE_THREAD = 0" >> "${MODULE_SRCDIR}/Makefile.rule"
-	sed -i.bak "s/MACOSX_DEPLOYMENT_TARGET=.*/MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET/" "${MODULE_SRCDIR}/Makefile.system"
+	echo "USE_SIMPLE_THREADED_LEVEL3 = 1" >> "${SRC_DIR}/Makefile.rule"
+	echo "NO_AVX = 1" >> "${SRC_DIR}/Makefile.rule"
+	echo "NO_AVX2 = 1" >> "${SRC_DIR}/Makefile.rule"
+	echo "USE_THREAD = 0" >> "${SRC_DIR}/Makefile.rule"
+	sed -i.bak "s/MACOSX_DEPLOYMENT_TARGET=.*/MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET/" "${SRC_DIR}/Makefile.system"
 }

-pbuild::build() {
+pbuild::compile() {
 	make -j3
 }

--- a/Compiler/OpenBLAS_OMP/build
+++ b/Compiler/OpenBLAS_OMP/build
@@ -1,14 +1,14 @@
 #!/usr/bin/env modbuild

 pbuild::configure() {
-	cat <<EOF > "${MODULE_SRCDIR}/make.inc"
+	cat <<EOF > "${SRC_DIR}/make.inc"
 SHELL = /bin/sh
 PLAT = 
 DRVOPTS  = \$(OPTS)
 LOADER   = \$(FORTRAN) -pthread
 ARCHFLAGS= -ru
 EOF
-	cat <<EOF > "${MODULE_SRCDIR}/Makefile.rule"
+	cat <<EOF > "${SRC_DIR}/Makefile.rule"
 VERSION = 0.2.9
 TARGET = CORE2
 CC = gcc
@@ -23,8 +23,8 @@ COMMON_PROF = -pg
 EOF
 }

-pbuild::build() {
-	cd "${MODULE_SRCDIR}"
+pbuild::compile() {
+	cd "${SRC_DIR}"
 	make
 }

--- a/Compiler/SuperLU/build
+++ b/Compiler/SuperLU/build
@@ -4,7 +4,7 @@ SOURCE_URL="http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_$V.tar.gz"

 if (( V_MAJOR < 5 )); then
 pbuild::configure() {
-	cat <<EOF > "${MODULE_SRCDIR}/make.inc"
+	cat <<EOF > "${SRC_DIR}/make.inc"
 PLAT		= 
 SuperLUroot 	= \${PREFIX}
 SUPERLULIB   	= \$(SuperLUroot)/lib/libsuperlu.a
@@ -30,16 +30,16 @@ EOF
 }
 else
 pbuild::configure() {
-	cmake "${MODULE_SRCDIR}" \
+	cmake "${SRC_DIR}" \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		|| exit 1 

 }
 fi

-pbuild::build() {
+pbuild::compile() {
 	if (( V_MAJOR < 5 )); then
-		cd "${MODULE_SRCDIR}"
+		cd "${SRC_DIR}"
 		mkdir -p "${PREFIX}/lib"
 	fi
 	make
@@ -48,7 +48,7 @@ pbuild::build() {
 pbuild::install() {
 	make install
 	mkdir -p "${PREFIX}/include"
-	install -m 0444 "${MODULE_SRCDIR}"/SRC/*.h "${PREFIX}/include"
+	install -m 0444 "${SRC_DIR}"/SRC/*.h "${PREFIX}/include"
 }

 pbuild::add_to_group 'Compiler'
--- a/Compiler/UMFPACK/build
+++ b/Compiler/UMFPACK/build
@@ -3,7 +3,7 @@
 SOURCE_URL="file://$PMODULES_DISTFILESDIR/$P-V.tar.bz2"

 pbuild::configure() {
-	cat <<EOF > "${MODULE_SRCDIR}/SuiteSparse_config/SuiteSparse_config.mk"
+	cat <<EOF > "${SRC_DIR}/SuiteSparse_config/SuiteSparse_config.mk"
 CF = \$(CFLAGS) \$(CPPFLAGS) \$(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
 RANLIB = ranlib
 ARCHIVE = \$(AR) \$(ARFLAGS)
@@ -26,13 +26,13 @@ TBB =
 EOF
 }

-pbuild::build() {
-	cd "${MODULE_SRCDIR}/UMFPACK"
+pbuild::compile() {
+	cd "${SRC_DIR}/UMFPACK"
 	make TARGET=CORE2 BINARY=64 USE_THREAD=0 NO_SHARED=1
 }

 pbuild::install() {
-	cd "${MODULE_SRCDIR}/UMFPACK"
+	cd "${SRC_DIR}/UMFPACK"
 	install -d "${PREFIX}/include"
 	install -d "${PREFIX}/lib"
 	make PREFIX="${PREFIX}" install
--- a/Compiler/atlas/build
+++ b/Compiler/atlas/build
@@ -3,7 +3,7 @@
 SOURCE_URL="https://sourceforge.net/projects/math-atlas/files/Stable/$V/atlas$V.tar.bz2"

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
--- a/Compiler/boost/1/variants
+++ b/Compiler/boost/1/variants
@@ -18,11 +18,19 @@ boost/1.62.0         stable	gcc/4.8.5 Python/2.7.12
 boost/1.62.0         stable	gcc/4.9.4 Python/2.7.12 
 boost/1.62.0         stable	gcc/5.4.0 Python/2.7.12 
 boost/1.62.0         stable	gcc/6.2.0 Python/2.7.12 
-boost/1.62.0         unstable	gcc/6.3.0 Python/2.7.12 
-boost/1.62.0         unstable	gcc/7.1.0 Python/2.7.12 
+boost/1.62.0         stable	gcc/6.3.0 Python/2.7.12 
+boost/1.62.0         stable	gcc/7.1.0 Python/2.7.12 
 boost/1.63.0         stable     gcc/6.3.0 Python/2.7.12
-boost/1.64.0         unstable   gcc/5.4.0 Python/2.7.12
+boost/1.64.0         stable	gcc/5.4.0 Python/2.7.12

-boost/1.66.0         unstable   gcc/7.3.0 b:Python/2.7.12
-boost/1.66.0         unstable   clang-macos/9.0.0 b:Python/2.7.12
-boost/1.66.0         unstable   intel/17.4 b:Python/2.7.12
+boost/1.66.0         stable	gcc/5.5.0 b:Python/2.7.12
+boost/1.66.0         stable	gcc/6.4.0 b:Python/2.7.12
+boost/1.66.0         stable	gcc/7.3.0 b:Python/2.7.12
+boost/1.66.0         stable	clang-macos/9.0.0 b:Python/2.7.12
+boost/1.66.0         stable	intel/17.4 b:Python/2.7.12
+
+boost/1.67.0         stable	gcc/5.5.0 b:Python/2.7.14
+boost/1.67.0         stable	gcc/6.4.0 b:Python/2.7.14
+boost/1.67.0         stable	gcc/7.3.0 b:Python/2.7.14
+boost/1.67.0         stable	clang-macos/9.0.0 b:Python/2.7.14
+boost/1.67.0         stable	intel/17.4 b:Python/2.7.14
--- a/Compiler/boost/build
+++ b/Compiler/boost/build
@@ -2,22 +2,22 @@

 SOURCE_URL="https://netcologne.dl.sourceforge.net/project/boost/boost/$V/boost_${V_MAJOR}_${V_MINOR}_${V_PATCHLVL}.tar.gz"

-BOOST_BUILD_PATH="${MODULE_BUILDDIR}"
+BOOST_BUILD_PATH="${BUILD_DIR}"

 pbuild::configure() {
-	cd "${MODULE_SRCDIR}"
-	"${MODULE_SRCDIR}"/bootstrap.sh \
+	cd "${SRC_DIR}"
+	"${SRC_DIR}"/bootstrap.sh \
 		--prefix="${PREFIX}" \
 		--with-libraries=all \
 		--with-python-root="${PYTHON_PREFIX}" \
 		|| exit 1
 }

-pbuild::build() {
-	cd "${MODULE_SRCDIR}"
+pbuild::compile() {
+	cd "${SRC_DIR}"
 	./b2 \
 		--build-type=minimal \
-		--build-dir="${MODULE_BUILDDIR}" \
+		--build-dir="${BUILD_DIR}" \
 		--layout=system \
 		--without-mpi \
 		variant=release \
@@ -27,10 +27,10 @@ pbuild::build() {
 }

 pbuild::install() {
-	cd "${MODULE_SRCDIR}"
+	cd "${SRC_DIR}"
 	./b2 \
 		--build-type=minimal \
-		--build-dir="${MODULE_BUILDDIR}" \
+		--build-dir="${BUILD_DIR}" \
 		--layout=system \
 		--without-mpi \
 		variant=release \
--- a/Compiler/clapack/build
+++ b/Compiler/clapack/build
@@ -5,15 +5,15 @@ SOURCE_URL="http://www.netlib.org/$P/$P-$V-CMAKE.tgz"

 pbuild::configure() {
 	cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
-		"${MODULE_SRCDIR}" \
+		"${SRC_DIR}" \
 		|| exit 1
 }

 pbuild::install() {
 	mkdir -p "${PREFIX}/include"
 	mkdir -p "${PREFIX}/lib"
-	install -m 0644 "${MODULE_BUILDDIR}/F2CLIBS/libf2c/libf2c.a" "${PREFIX}/lib"
-	install -m 0644 "${MODULE_BUILDDIR}/SRC/liblapack.a" "${PREFIX}/lib"
+	install -m 0644 "${BUILD_DIR}/F2CLIBS/libf2c/libf2c.a" "${PREFIX}/lib"
+	install -m 0644 "${BUILD_DIR}/SRC/liblapack.a" "${PREFIX}/lib"
 }

 pbuild::add_to_group 'Compiler'
--- a/Compiler/eigen3/build
+++ b/Compiler/eigen3/build
@@ -21,7 +21,7 @@ pbuild::configure() {
 	config_args+=( "-DSUPERLU_LIBRARIES=${SUPERLU_LIBRARY_DIR}" )
 	cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
 		"${config_args[@]}" \
-		"${MODULE_SRCDIR}"
+		"${SRC_DIR}"
 }

 pbuild::add_to_group 'Compiler'
--- a/Compiler/gsl/2/variants
+++ b/Compiler/gsl/2/variants
@@ -1,9 +1,11 @@
-gsl/2.2.1            stable	gcc/4.8.5 
-gsl/2.2.1            stable	gcc/4.9.4 
-gsl/2.2.1            stable	gcc/5.4.0 
-gsl/2.2.1            stable	gcc/6.2.0 
-gsl/2.2.1            stable	gcc/6.3.0 
+gsl/2.2.1       stable		gcc/4.8.5 
+gsl/2.2.1       stable		gcc/4.9.4 
+gsl/2.2.1       stable		gcc/5.4.0 
+gsl/2.2.1       stable		gcc/6.2.0 
+gsl/2.2.1       stable		gcc/6.3.0 

-gsl/2.4.0            stable	gcc/7.3.0 
-gsl/2.4.0            stable	clang-macos/9.0.0
-gsl/2.4.0            stable	intel/17.4
+gsl/2.4		stable		gcc/5.5.0 
+gsl/2.4		stable		gcc/6.4.0 
+gsl/2.4		stable		gcc/7.3.0 
+gsl/2.4		stable		clang-macos/9.0.0
+gsl/2.4		stable		intel/17.4
--- a/Compiler/gsl/build
+++ b/Compiler/gsl/build
@@ -3,7 +3,7 @@
 SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
--- a/Compiler/gtest/1/variants
+++ b/Compiler/gtest/1/variants
@@ -1,3 +1,5 @@
 gtest/1.7.0	stable		b:cmake b:gcc/5.4.0
+gtest/1.7.0	stable		b:cmake b:gcc/5.5.0
+gtest/1.7.0	stable		b:cmake b:gcc/6.4.0
 gtest/1.7.0	stable		b:cmake b:gcc/7.3.0
 gtest/1.7.0	stable		b:cmake b:clang-macos/9.0.0
--- a/Compiler/gtest/build
+++ b/Compiler/gtest/build
@@ -22,11 +22,11 @@ pbuild::configure() {
                -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
                -DCMAKE_BUILD_TYPE=RELEASE \
                "${config_args[@]}" \
-                "${MODULE_SRCDIR}"
+                "${SRC_DIR}"
 }

 pbuild::install() {
-	local -r _include_srcdir="${MODULE_SRCDIR}/include/gtest"
+	local -r _include_srcdir="${SRC_DIR}/include/gtest"
 	local -r _include_dstdir="${PREFIX}/include/gtest"
 	if [[ -e "${_include_dstdir}" ]]; then
 		chmod -R u+w "${_include_dstdir}"
--- a/Compiler/hdf5_serial/1/variants.Linux
+++ b/Compiler/hdf5_serial/1/variants.Linux
@@ -32,9 +32,12 @@ hdf5_serial/1.8.17	stable		gcc/6.2.0
 hdf5_serial/1.8.18	stable		gcc/4.8.5 
 hdf5_serial/1.8.18	stable		gcc/4.9.4 
 hdf5_serial/1.8.18	stable		gcc/5.4.0 
+hdf5_serial/1.8.18	stable		gcc/5.5.0 
 hdf5_serial/1.8.18	stable		gcc/6.2.0
 hdf5_serial/1.8.18	stable		gcc/6.3.0
+hdf5_serial/1.8.18	stable		gcc/6.4.0
 hdf5_serial/1.8.18	stable		gcc/7.2.0
+hdf5_serial/1.8.18	stable		gcc/7.3.0

 hdf5_serial/1.8.19	stable		gcc/4.8.5 
 hdf5_serial/1.8.19	stable		gcc/4.9.4 
@@ -42,19 +45,28 @@ hdf5_serial/1.8.19	stable		gcc/5.4.0
 hdf5_serial/1.8.19	stable		gcc/6.3.0
 hdf5_serial/1.8.19	stable		gcc/7.2.0

+hdf5_serial/1.8.20	stable		gcc/5.5.0 
+hdf5_serial/1.8.20	stable		gcc/6.4.0 
+hdf5_serial/1.8.20	stable		gcc/7.3.0 
+
 hdf5_serial/1.10.1	stable		gcc/4.8.5 
 hdf5_serial/1.10.1	stable		gcc/4.9.4 
 hdf5_serial/1.10.1	stable		gcc/5.4.0 
+hdf5_serial/1.10.1	stable		gcc/5.5.0 
 hdf5_serial/1.10.1	stable		gcc/6.3.0
+hdf5_serial/1.10.1	stable		gcc/6.4.0
 hdf5_serial/1.10.1	stable		gcc/7.2.0
 hdf5_serial/1.10.1	stable		gcc/7.3.0

-hdf5_serial/1.10.2	stable		gcc/7.3.0

-hdf5_serial/1.10.1	unstable	intel/17.1
+hdf5_serial/1.10.1	stable		intel/17.1
 hdf5_serial/1.10.1	stable		intel/17.4

-hdf5_serial/1.10.2      unstable        intel/18.2

-hdf5_serial/1.10.1	unstable	pgi/17.3
-hdf5_serial/1.10.1	unstable	pgi/17.7
+hdf5_serial/1.10.1	stable		pgi/17.3
+hdf5_serial/1.10.1	stable		pgi/17.7
+
+hdf5_serial/1.10.2	stable		gcc/5.5.0
+hdf5_serial/1.10.2	stable		gcc/6.4.0
+hdf5_serial/1.10.2	stable		gcc/7.3.0
+hdf5_serial/1.10.2      stable		intel/18.2
--- a/Compiler/hdf5_serial/build
+++ b/Compiler/hdf5_serial/build
@@ -1,6 +1,6 @@
 #!/usr/bin/env modbuild

-SOURCE_URL="https://support.hdfgroup.org/ftp/HDF5/current${V_MAJOR}${V_MINOR}/src/hdf5-$V.tar.bz2"
+SOURCE_URL="https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${V_MAJOR}.${V_MINOR}/hdf5-$V/src/hdf5-$V.tar.bz2"

 pbuild::configure() {
 	test "$(basename "$CPP")" = "pgprepro" && {
@@ -8,7 +8,7 @@ pbuild::configure() {
 		CXX=g++
 		echo "INFO: substituted pgprepro with cpp, and pgc++ with g++!"
 	}
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-shared \
 		--enable-cxx \
--- a/Compiler/mpich/3/variants
+++ b/Compiler/mpich/3/variants
@@ -1,3 +1,4 @@
+mpich/3.2.1	stable		gcc/5.5.0
 mpich/3.2.1	stable		gcc/6.4.0
 mpich/3.2.1	stable		gcc/7.3.0
-mpich/3.2.1	unstable	intel/17.4
+mpich/3.2.1	stable		intel/17.4
--- a/Compiler/mpich/build
+++ b/Compiler/mpich/build
@@ -4,7 +4,7 @@ SOURCE_URL="http://www.mpich.org/static/downloads/$V/$P-$V.tar.gz"

 pbuild::configure() {
 	unset F90
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-cxx \
 		--enable-fortran \
--- a/Compiler/openmpi/1.10/variants.Linux
+++ b/Compiler/openmpi/1.10/variants.Linux
@@ -22,8 +22,10 @@ openmpi/1.10.4	stable		gcc/6.3.0
 openmpi/1.10.7	stable		gcc/4.8.5 b:cuda/8.0.44
 openmpi/1.10.7	stable		gcc/4.9.4 b:cuda/8.0.44
 openmpi/1.10.7	stable		gcc/5.4.0 b:cuda/8.0.44
+openmpi/1.10.7	stable		gcc/5.5.0
 openmpi/1.10.7	stable		gcc/6.2.0
 openmpi/1.10.7	stable		gcc/6.3.0
+openmpi/1.10.7	stable		gcc/6.4.0
 openmpi/1.10.7	stable		gcc/7.2.0
 openmpi/1.10.7	stable		gcc/7.3.0

--- a/Compiler/openmpi/2.1/variants.Linux
+++ b/Compiler/openmpi/2.1/variants.Linux
@@ -1,8 +1,15 @@
-openmpi/2.1.1   stable          gcc/6.4.0
 openmpi/2.1.0	stable		gcc/7.1.0
-openmpi/2.1.1	stable		gcc/7.2.0
-openmpi/2.1.2	stable		gcc/7.3.0

+openmpi/2.1.1   stable          gcc/6.4.0
+openmpi/2.1.1	stable		gcc/7.2.0
 openmpi/2.1.1   unstable        intel/17.1
 openmpi/2.1.1   stable          intel/17.4
+
+openmpi/2.1.2	stable		gcc/5.5.0
+openmpi/2.1.2	stable		gcc/6.4.0
+openmpi/2.1.2	stable		gcc/7.3.0
 openmpi/2.1.2   stable          intel/17.4
+
+openmpi/2.1.3	stable		gcc/5.5.0
+openmpi/2.1.3	stable		gcc/6.4.0
+openmpi/2.1.3	stable		gcc/7.3.0
--- a/Compiler/openmpi/3.0/variants.Darwin
+++ b/Compiler/openmpi/3.0/variants.Darwin
@@ -1 +0,0 @@
-openmpi/3.0.0   unstable          gcc/7.3.0
--- a/Compiler/openmpi/3/variants.Darwin
+++ b/Compiler/openmpi/3/variants.Darwin
@@ -0,0 +1,3 @@
+openmpi/3.0.0	stable		gcc/7.3.0
+openmpi/3.0.2	stable		gcc/7.3.0
+openmpi/3.1.1	stable		gcc/7.3.0
--- a/Compiler/openmpi/3.0/variants.Linux
+++ b/Compiler/openmpi/3.0/variants.Linux
@@ -1,3 +1,4 @@
+openmpi/3.0.0   stable          gcc/5.5.0
 openmpi/3.0.0   stable          gcc/6.4.0
 openmpi/3.0.0   stable          gcc/7.2.0
 openmpi/3.0.0   stable          gcc/7.3.0
@@ -6,5 +7,8 @@ openmpi/3.0.0   stable          intel/17.4
 openmpi/3.0.1   stable		gcc/5.5.0
 openmpi/3.0.1   stable		gcc/6.4.0
 openmpi/3.0.1   stable		gcc/7.3.0
-openmpi/3.0.1	unstable	gcc/8.1.0
+openmpi/3.0.1	stable		gcc/7.3.0
+openmpi/3.0.1	stable		gcc/8.1.0
 openpmi/3.0.1   unstable        intel/18.2
+
+openmpi/3.1.1	stable		gcc/8.1.0
--- a/Compiler/openmpi/build
+++ b/Compiler/openmpi/build
@@ -8,7 +8,7 @@ pbuild::configure() {
 		config_args+=( "--with-cuda=${CUDA_HOME}" )
 	fi

-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-mpi-cxx \
 		--enable-mpi-cxx-seek \
--- a/Compiler/roger/build
+++ b/Compiler/roger/build
@@ -5,7 +5,7 @@ pbuild::pre_configure() {
 }

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}"
 }

--- a/Compiler/root/6/variants
+++ b/Compiler/root/6/variants
@@ -6,9 +6,11 @@ root/6.08.00         stable	gcc/4.9.4 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3
 root/6.08.00         stable	gcc/5.4.0 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3
 root/6.08.00         stable	gcc/6.2.0 b:Python/2.7.12 b:gsl/1.16 b:cmake/3.6.3

-root/6.08.02         unstable   gcc/4.8.5 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
-root/6.08.02         unstable   gcc/4.9.4 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
-root/6.08.02         unstable   gcc/5.4.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
-root/6.08.02         unstable   gcc/6.2.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
+root/6.08.02    stable		gcc/4.8.5 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
+root/6.08.02    stable		gcc/4.9.4 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
+root/6.08.02    stable		gcc/5.4.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3
+root/6.08.02    stable		gcc/6.2.0 b:Python/2.7.12 b:gsl/2.2.1 b:cmake/3.6.3

+root/6.12.06	unstable	gcc/5.5.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3
+root/6.12.06	unstable	gcc/6.4.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3
 root/6.12.06	unstable	gcc/7.3.0 b:Python/2.7.12 b:gsl/2.4 b:cmake/3.6.3
--- a/Compiler/root/build
+++ b/Compiler/root/build
@@ -14,21 +14,24 @@ Darwin )
 Linux )
 	INSTANTCLIENT_INCLUDE_DIR='/usr/include/oracle/12.1/client64'
 	INSTANTCLIENT_LIBRARY_DIR='/usr/lib/oracle/12.1/client64/lib'
-	EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntshcore.so" )
-	EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntshcore.so.12.1" )
-	EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntsh.so" )
-	EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntsh.so.12.1" )
-	EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libipc1.so" )
-	EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libmql1.so" )
-	EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libnnz12.so" )
-	EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocci.so" )
-	EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocci.so.12.1" )
-	EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libociei.so" )
-	EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocijdbc12.so" )
-	EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libons.so" )
-	EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/liboramysql12.so" )
-	config_args+=" --with-oracle-incdir=${INSTANTCLIENT_INCLUDE_DIR}"
-	config_args+=" --with-oracle-libdir=${INSTANTCLIENT_LIBRARY_DIR}"
+	if [[ -e ${INSTANTCLIENT_INCLUDE_DIR} ]] && \
+           [[ -e ${INSTANTCLIENT_LIBRARY_DIR} ]]; then
+		EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntshcore.so" )
+		EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntshcore.so.12.1" )
+		EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntsh.so" )
+		EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libclntsh.so.12.1" )
+		EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libipc1.so" )
+		EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libmql1.so" )
+		EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libnnz12.so" )
+		EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocci.so" )
+		EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocci.so.12.1" )
+		EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libociei.so" )
+		EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libocijdbc12.so" )
+		EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/libons.so" )
+		EXTRA_LIBS+=( "${INSTANTCLIENT_LIBRARY_DIR}/liboramysql12.so" )
+		config_args+=" --with-oracle-incdir=${INSTANTCLIENT_INCLUDE_DIR}"
+		config_args+=" --with-oracle-libdir=${INSTANTCLIENT_LIBRARY_DIR}"
+	fi
 	;;
 *)
 	;;
@@ -40,7 +43,7 @@ esac
 #	xml
 #
 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--enable-asimage \
 		--enable-mathmore \
 		--disable-ldap \
@@ -55,7 +58,7 @@ pbuild::configure() {
 		|| exit 1
 }

-pbuild::build() {
+pbuild::compile() {
 	make -j 4
 }

--- a/Compiler/vtk/build
+++ b/Compiler/vtk/build
@@ -23,7 +23,7 @@ pbuild::configure() {
 		-DVTK_INSTALL_INCLUDE_DIR:PATH=include \
 		-DVTK_INSTALL_LIB_DIR:PATH=lib \
 		-DVTK_USE_COCOA:BOOL=OFF \
-		"${MODULE_SRCDIR}"
+		"${SRC_DIR}"
 }

 pbuild::add_to_group 'Compiler'
--- a/HDF5/H5hut/build
+++ b/HDF5/H5hut/build
@@ -23,7 +23,7 @@ pbuild::configure() {
 			;;
 	esac

-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-parallel \
 		--enable-debug \
@@ -34,7 +34,7 @@ pbuild::configure() {
 		|| exit 1
 }

-pbuild::build() {
+pbuild::compile() {
 	make -C src
 	make -C tools 
 }
--- a/HDF5/ioapi/build
+++ b/HDF5/ioapi/build
@@ -0,0 +1,60 @@
+#!/usr/bin/env modbuild
+
+pbuild::supported_os 'Darwin'
+
+pbuild::set_download_url "https://gitlab.psi.ch/Pmodules/download/raw/master/$P-$V.tar.gz"
+
+pbuild::add_to_group 'HDF5'
+pbuild::compile_in_sourcetree
+pbuild::add_patch 'files/Makefile.pncf.sed.patch'
+
+pbuild::add_docfile README.txt
+pbuild::add_docfile V32-CHANGES.txt
+pbuild::add_docfile VERSION.txt
+pbuild::add_docfile HTML/gpl.txt
+
+declare	config_args=()
+declare BIN=''
+
+pbuild::post_prep() {
+	find "${SRC_DIR}" -name "*.mod" -exec rm {} \;
+	find "${SRC_DIR}" -name "*.o" -exec rm {} \;
+}
+
+pbuild::pre_configure_Darwin() {
+	cp -av "${BUILDBLOCK_DIR}/files/Makeinclude.OSX_x86_gfortmpi" "ioapi"
+	BIN='OSX_x86_gfortmpi'
+}
+
+pbuild::pre_configure() {
+	cp Makefile.template Makefile
+	config_args+=( "BASEDIR=${SRC_DIR}" )
+	config_args+=( "CPLMODE=pncf" )
+	config_args+=( "INSTALL=${PREFIX}" )
+	config_args+=( "NCFLIBS=-lpnetcdf -lnetcdf -lnetcdff -lgfortran" )
+	config_args+=( "BIN=${BIN}" )
+}
+
+pbuild::configure() {
+	make "${config_args[@]}" configure
+}
+
+pbuild::compile() {
+	make "${config_args[@]}" all
+}
+
+pbuild::install() {
+	mkdir -p "${PREFIX}"
+	make "${config_args[@]}" install
+}
+
+pbuild::post_install() {
+	cd "${PREFIX}"
+	mkdir -p lib
+	mv -v "${BIN}"/*.a	'lib'
+	mv -v "${BIN}"/*.mod	'lib'
+	mv -v "${BIN}"		'bin'
+}
+
+pbuild::make_all
+
--- a/HDF5/ioapi/files/Makefile.pncf.sed.patch
+++ b/HDF5/ioapi/files/Makefile.pncf.sed.patch
@@ -0,0 +1,271 @@
+Only in src/: .configure
+Only in src/: .prep
+Only in src/: Linux2_x86_64
+Only in src/: Makefile
+Only in src/: OSX_x86_gfortmpi
+Only in src/ioapi: Makefile
+Only in src/ioapi: Makeinclude.OSX_x86_gfortmpi
+Only in ioapi-3.2/ioapi: bilin.o
+Only in ioapi-3.2/ioapi: bmatvec.o
+Only in ioapi-3.2/ioapi: bufint3.o
+Only in ioapi-3.2/ioapi: cbarnes1.o
+Only in ioapi-3.2/ioapi: cbarnesN.o
+Only in ioapi-3.2/ioapi: check3.o
+Only in ioapi-3.2/ioapi: check3c.o
+Only in ioapi-3.2/ioapi: chkbuf3.o
+Only in ioapi-3.2/ioapi: chkfil3.o
+Only in ioapi-3.2/ioapi: ckdesc3.o
+Only in ioapi-3.2/ioapi: ckfile3.o
+Only in ioapi-3.2/ioapi: ckgeom.o
+Only in ioapi-3.2/ioapi: ckname.o
+Only in ioapi-3.2/ioapi: cktflag3.o
+Only in ioapi-3.2/ioapi: close3.o
+Only in ioapi-3.2/ioapi: close3c.o
+Only in ioapi-3.2/ioapi: crdict3.o
+Only in ioapi-3.2/ioapi: crlf.o
+Only in ioapi-3.2/ioapi: crtbuf3.o
+Only in ioapi-3.2/ioapi: crtfil3.o
+Only in ioapi-3.2/ioapi: crtkf.o
+Only in ioapi-3.2/ioapi: currec.o
+Only in ioapi-3.2/ioapi: currstep.o
+Only in ioapi-3.2/ioapi: currstepc.o
+Only in ioapi-3.2/ioapi: daymon.o
+Only in ioapi-3.2/ioapi: daymonc.o
+Only in ioapi-3.2/ioapi: dble2real.o
+Only in ioapi-3.2/ioapi: dbllist.o
+Only in ioapi-3.2/ioapi: ddtvar3.o
+Only in ioapi-3.2/ioapi: ddtvar3c.o
+Only in ioapi-3.2/ioapi: ddtvar3v.o
+Only in ioapi-3.2/ioapi: desc3.o
+Only in ioapi-3.2/ioapi: desc3c.o
+Only in ioapi-3.2/ioapi: dmatvec.o
+Only in ioapi-3.2/ioapi: dscgrid.o
+Only in ioapi-3.2/ioapi: dscgridc.o
+Only in ioapi-3.2/ioapi: dt2str.o
+Only in ioapi-3.2/ioapi: dt2strc.o
+Only in ioapi-3.2/ioapi: envgets.o
+Only in ioapi-3.2/ioapi: filchk3.o
+Only in ioapi-3.2/ioapi: filchk3c.o
+Only in ioapi-3.2/ioapi: find1.o
+Only in ioapi-3.2/ioapi: find2.o
+Only in ioapi-3.2/ioapi: find3.o
+Only in ioapi-3.2/ioapi: find4.o
+Only in ioapi-3.2/ioapi: findc.o
+Only in ioapi-3.2/ioapi: findr1.o
+Only in ioapi-3.2/ioapi: findr2.o
+Only in ioapi-3.2/ioapi: findr3.o
+Only in ioapi-3.2/ioapi: findr4.o
+Only in ioapi-3.2/ioapi: findsc.o
+diff -ur ioapi-3.2/ioapi/fixed_src/STATE3.EXT src/ioapi/fixed_src/STATE3.EXT
+--- ioapi-3.2/ioapi/fixed_src/STATE3.EXT	2017-06-20 20:00:05.000000000 +0200
+++ src/ioapi/fixed_src/STATE3.EXT	2018-07-09 16:29:26.000000000 +0200
+@@ -11,8 +11,11 @@
+ !....................................................................
+ !  INCLUDE FILE  STATE3.EXT
+ !
+!   PRIVATE!
+!       For internal I/O API use only.
+!       Do not use in model or other application code.
+ !
+-!  DO NOT EDIT !!
+!   DO NOT EDIT !!
+ !
+ !       The EDSS/Models-3 I/O API depends in an essential manner
+ !       upon the contents of this INCLUDE file.  ANY CHANGES are
+Only in ioapi-3.2/ioapi: flush3.o
+Only in ioapi-3.2/ioapi: gcd.o
+Only in ioapi-3.2/ioapi: gctp.o
+Only in ioapi-3.2/ioapi: get_endian.o
+Only in ioapi-3.2/ioapi: getdate.o
+Only in ioapi-3.2/ioapi: getdble.o
+Only in ioapi-3.2/ioapi: getdfile.o
+Only in ioapi-3.2/ioapi: getdfilec.o
+Only in ioapi-3.2/ioapi: getdttime.o
+Only in ioapi-3.2/ioapi: getefile.o
+Only in ioapi-3.2/ioapi: getefilec.o
+Only in ioapi-3.2/ioapi: getffile.o
+Only in ioapi-3.2/ioapi: getmenu.o
+Only in ioapi-3.2/ioapi: getnum.o
+Only in ioapi-3.2/ioapi: getreal.o
+Only in ioapi-3.2/ioapi: getstr.o
+Only in ioapi-3.2/ioapi: getyn.o
+Only in ioapi-3.2/ioapi: grdchk3.o
+Only in ioapi-3.2/ioapi: gridops.o
+Only in ioapi-3.2/ioapi: hhmmss.o
+Only in ioapi-3.2/ioapi: hhmmssc.o
+Only in ioapi-3.2/ioapi: index1.o
+Only in ioapi-3.2/ioapi: init3.o
+Only in ioapi-3.2/ioapi: init3c.o
+Only in ioapi-3.2/ioapi: initblk3.o
+Only in ioapi-3.2/ioapi: initlog3.o
+Only in ioapi-3.2/ioapi: inqatt3.o
+Only in ioapi-3.2/ioapi: inqatt3c.o
+Only in ioapi-3.2/ioapi: interp3.o
+Only in ioapi-3.2/ioapi: interp3c.o
+Only in ioapi-3.2/ioapi: intg2real.o
+Only in ioapi-3.2/ioapi: intlist.o
+Only in ioapi-3.2/ioapi: iobin3.o
+Only in ioapi-3.2/ioapi: iocpl.o
+Only in ioapi-3.2/ioapi: iocplf2c.o
+Only in ioapi-3.2/ioapi: ioparms3.o
+Only in ioapi-3.2/ioapi: isdstime.o
+Only in ioapi-3.2/ioapi: jstep3.o
+Only in ioapi-3.2/ioapi: julian.o
+Only in ioapi-3.2/ioapi: julianc.o
+Only in ioapi-3.2/ioapi: junit.o
+Only in ioapi-3.2/ioapi: kfindx.o
+Only in ioapi-3.2/ioapi: kfopen.o
+Only in ioapi-3.2/ioapi: kfread.o
+Only in ioapi-3.2/ioapi: kfwrite.o
+Only in ioapi-3.2/ioapi: lambert.o
+Only in ioapi-3.2/ioapi: lblank.o
+Only in ioapi-3.2/ioapi: len2.o
+Only in ioapi-3.2/ioapi: ll2utm.o
+Only in ioapi-3.2/ioapi: locat1.o
+Only in ioapi-3.2/ioapi: locat2.o
+Only in ioapi-3.2/ioapi: locat3.o
+Only in ioapi-3.2/ioapi: locat4.o
+Only in ioapi-3.2/ioapi: locatc.o
+Only in ioapi-3.2/ioapi: locatr1.o
+Only in ioapi-3.2/ioapi: locatr2.o
+Only in ioapi-3.2/ioapi: locatr3.o
+Only in ioapi-3.2/ioapi: locatr4.o
+Only in ioapi-3.2/ioapi: locatsc.o
+Only in ioapi-3.2/ioapi: lustr.o
+Only in ioapi-3.2/ioapi: m3abort.o
+Only in ioapi-3.2/ioapi: m3err.o
+Only in ioapi-3.2/ioapi: m3errc.o
+Only in ioapi-3.2/ioapi: m3exit.o
+Only in ioapi-3.2/ioapi: m3exitc.o
+Only in ioapi-3.2/ioapi: m3mesgc.o
+Only in ioapi-3.2/ioapi: m3msg2.o
+Only in ioapi-3.2/ioapi: m3utilio.mod
+Only in ioapi-3.2/ioapi: m3utilio.o
+Only in ioapi-3.2/ioapi: m3warn.o
+Only in ioapi-3.2/ioapi: m3warnc.o
+Only in ioapi-3.2/ioapi: mmddyy.o
+Only in ioapi-3.2/ioapi: mmddyyc.o
+Only in ioapi-3.2/ioapi: modatts3.mod
+Only in ioapi-3.2/ioapi: modatts3.o
+Only in ioapi-3.2/ioapi: modgctp.mod
+Only in ioapi-3.2/ioapi: modgctp.o
+Only in ioapi-3.2/ioapi: modmpasfio.mod
+Only in ioapi-3.2/ioapi: modmpasfio.o
+Only in ioapi-3.2/ioapi: modncfio.mod
+Only in ioapi-3.2/ioapi: modncfio.o
+Only in ioapi-3.2/ioapi: modpdata.mod
+Only in ioapi-3.2/ioapi: modpdata.o
+Only in ioapi-3.2/ioapi: modwrfio.mod
+Only in ioapi-3.2/ioapi: modwrfio.o
+Only in ioapi-3.2/ioapi: name2fid.o
+Only in ioapi-3.2/ioapi: nameval.o
+Only in ioapi-3.2/ioapi: nextime.o
+Only in ioapi-3.2/ioapi: nextimec.o
+Only in ioapi-3.2/ioapi: open3.o
+Only in ioapi-3.2/ioapi: open3c.o
+Only in ioapi-3.2/ioapi: opnfil3.o
+Only in ioapi-3.2/ioapi: opnkf.o
+Only in ioapi-3.2/ioapi: opnlist3.o
+Only in ioapi-3.2/ioapi: opnlog3.o
+Only in ioapi-3.2/ioapi: pcoef.o
+Only in ioapi-3.2/ioapi: pgrdsum.o
+Only in ioapi-3.2/ioapi: pmatvec.o
+Only in ioapi-3.2/ioapi: pn_crtfil3.o
+Only in ioapi-3.2/ioapi: pn_opnfil3.o
+Only in ioapi-3.2/ioapi: pn_wrvars.o
+Only in ioapi-3.2/ioapi: poly.o
+Only in ioapi-3.2/ioapi: promptdfile.o
+Only in ioapi-3.2/ioapi: promptffile.o
+Only in ioapi-3.2/ioapi: promptgrid.o
+Only in ioapi-3.2/ioapi: promptmfile.o
+Only in ioapi-3.2/ioapi: rdatt3.o
+Only in ioapi-3.2/ioapi: rdatt3c.o
+Only in ioapi-3.2/ioapi: rdbndary.o
+Only in ioapi-3.2/ioapi: rdbuf3.o
+Only in ioapi-3.2/ioapi: rdcustom.o
+Only in ioapi-3.2/ioapi: rddict3.o
+Only in ioapi-3.2/ioapi: rdgrdded.o
+Only in ioapi-3.2/ioapi: rdgrnest.o
+Only in ioapi-3.2/ioapi: rdiddata.o
+Only in ioapi-3.2/ioapi: rdprofil.o
+Only in ioapi-3.2/ioapi: rdsmatrx.o
+Only in ioapi-3.2/ioapi: rdtflag.o
+Only in ioapi-3.2/ioapi: rdvars.o
+Only in ioapi-3.2/ioapi: read3.o
+Only in ioapi-3.2/ioapi: read3c.o
+Only in ioapi-3.2/ioapi: read4d.o
+Only in ioapi-3.2/ioapi: read4dc.o
+Only in ioapi-3.2/ioapi: readsmet.o
+Only in ioapi-3.2/ioapi: realist.o
+Only in ioapi-3.2/ioapi: rmfile.o
+Only in ioapi-3.2/ioapi: runspec.o
+Only in ioapi-3.2/ioapi: scanint.o
+Only in ioapi-3.2/ioapi: sec2time.o
+Only in ioapi-3.2/ioapi: sec2timec.o
+Only in ioapi-3.2/ioapi: secsdiff.o
+Only in ioapi-3.2/ioapi: secsdiffc.o
+Only in ioapi-3.2/ioapi: setsphere.o
+Only in ioapi-3.2/ioapi: shut3.o
+Only in ioapi-3.2/ioapi: shut3c.o
+Only in ioapi-3.2/ioapi: skipl.o
+Only in ioapi-3.2/ioapi: sleep3.o
+Only in ioapi-3.2/ioapi: smatvec.o
+Only in ioapi-3.2/ioapi: sortic.o
+Only in ioapi-3.2/ioapi: sortir.o
+Only in ioapi-3.2/ioapi: sortis.o
+Only in ioapi-3.2/ioapi: splitline.o
+Only in ioapi-3.2/ioapi: str2dble.o
+Only in ioapi-3.2/ioapi: str2int.o
+Only in ioapi-3.2/ioapi: str2real.o
+Only in ioapi-3.2/ioapi: strlist.o
+Only in ioapi-3.2/ioapi: sync3.o
+Only in ioapi-3.2/ioapi: sync3c.o
+Only in ioapi-3.2/ioapi: syncfid.o
+Only in ioapi-3.2/ioapi: synchtao.o
+Only in ioapi-3.2/ioapi: systemf.o
+Only in ioapi-3.2/ioapi: time2sec.o
+Only in ioapi-3.2/ioapi: time2secc.o
+Only in ioapi-3.2/ioapi: trimlen.o
+Only in ioapi-3.2/ioapi: ungridb.o
+Only in ioapi-3.2/ioapi: ungridi.o
+Only in ioapi-3.2/ioapi: upcase.o
+Only in ioapi-3.2/ioapi: utm2ll.o
+Only in ioapi-3.2/ioapi: wkday.o
+Only in ioapi-3.2/ioapi: wkdayc.o
+Only in ioapi-3.2/ioapi: wratt3.o
+Only in ioapi-3.2/ioapi: wratt3c.o
+Only in ioapi-3.2/ioapi: wrbndary.o
+Only in ioapi-3.2/ioapi: wrbuf3.o
+Only in ioapi-3.2/ioapi: wrcustom.o
+Only in ioapi-3.2/ioapi: wrdict3.o
+Only in ioapi-3.2/ioapi: wrgrdded.o
+Only in ioapi-3.2/ioapi: wrgrnest.o
+Only in ioapi-3.2/ioapi: wriddata.o
+Only in ioapi-3.2/ioapi: write3.o
+Only in ioapi-3.2/ioapi: write3c.o
+Only in ioapi-3.2/ioapi: write4d.o
+Only in ioapi-3.2/ioapi: write4dc.o
+Only in ioapi-3.2/ioapi: wrmpigrd.o
+Only in ioapi-3.2/ioapi: wrpatch.o
+Only in ioapi-3.2/ioapi: wrprofil.o
+Only in ioapi-3.2/ioapi: wrsmatrx.o
+Only in ioapi-3.2/ioapi: wrtflag.o
+Only in ioapi-3.2/ioapi: wrvars.o
+Only in ioapi-3.2/ioapi: xtbuf3.o
+Only in ioapi-3.2/ioapi: xtract3.o
+Only in ioapi-3.2/ioapi: xtract3c.o
+Only in ioapi-3.2/ioapi: year4.o
+Only in ioapi-3.2/ioapi: yr2day.o
+Only in src/m3tools: Makefile
+diff -ur ioapi-3.2/m3tools/Makefile.pncf.sed src/m3tools/Makefile.pncf.sed
+--- ioapi-3.2/m3tools/Makefile.pncf.sed	2017-10-21 03:37:21.000000000 +0200
+++ src/m3tools/Makefile.pncf.sed	2018-07-09 18:01:58.000000000 +0200
+@@ -99,7 +99,7 @@
+ insertgrid      jul2greg        juldate         juldiff         julshift        \
+ kfxtract        latlon          m3agmax         m3agmask        m3cple          \
+ m3combo         m3diff          m3edhdr         m3fake          m3hdr           \
+-m3interp        m3mask          m3merge         m3pair          m3probe         \
+m3interp        m3merge         m3pair          m3probe         \
+ m3stat          m3totxt         m3tproc         m3tshift        m3wndw          \
+ m3xtract        mtxblend        mtxbuild        mtxcalc         mtxcple         \
+ presterp        presz           projtool        selmrg2d        timeshift       \
--- a/HDF5/ioapi/files/Makeinclude.OSX_x86_gfortmpi
+++ b/HDF5/ioapi/files/Makeinclude.OSX_x86_gfortmpi
@@ -0,0 +1,46 @@
+# Version "$Id: Makeinclude.Linux2_x86_64gfortmpi 1 2017-06-10 18:05:20Z coats $"
+#
+#  Build MPI/PnetCDF distributed-file support using "mpif90" and "mpcc",
+#  where compilers are built "on top of" Gnu compilers
+#
+#  12/2013 by CJC: Conditional preprocessor-code "-DNEED_ARGS=1"
+#  to implement  IARGC() and GETARG() for compilers
+#  ("gfortran" version 4.8 or later to be exact) that insist on
+#  enforcing F2003-only with no backwards nor industry-standards compatibility.
+#
+#  Remove "-DNEED_ARGS=1" from ARCHFLAGS for version 4.7.x and earlier
+#
+# Use "-march=native -mtune=native" if compile-platform and compute-platform
+# are the same.
+# Use "-Wall -Wsurprising" for full diagnostics.
+
+AR   = ar
+CC   = mpicc
+CXX  = mpiCC
+FC   = mpif90
+M4   = m4
+LINK = $(CC)
+
+## Module-include-directory command
+MODI = -I
+E132 = -ffixed-line-length-132
+
+MFLAGS    = -ffast-math -funroll-loops -m64  #  -Wall -Wsurprising -march=native -mtune=native
+
+OMPFLAGS  = -fopenmp
+OMPLIBS   = -fopenmp
+COPTFLAGS = -O3 ${MFLAGS}
+FOPTFLAGS = -O3 ${MFLAGS}
+FPPFLAGS  = -DF90=1 -DIOAPI_PNCF=1
+FSFLAGS   = -fno-automatic
+ARCHFLAGS = \
+ -DAUTO_ARRAYS=1 \
+ -DF90=1 -DFLDMN=1 \
+ -DFSTR_L=int \
+ -DIOAPI_NO_STDOUT=1 \
+ -DNEED_ARGS=1
+PARFLAGS  =
+ARCHLIB   = -dynamic -lm -lpthread -lc
+
+M4DEFFILE = $(PVM_ROOT)/conf/$(PVM_ARCH).m4
+PVMLIBS   = -lpvm3
--- a/HDF5/ioapi/files/variants
+++ b/HDF5/ioapi/files/variants
@@ -0,0 +1 @@
+ioapi/3.2	unstable	gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1 netcdf/4.6.1 parallel-netcdf/1.9.0
--- a/HDF5/ioapi/modulefile
+++ b/HDF5/ioapi/modulefile
@@ -0,0 +1,19 @@
+#%Module1.0
+
+module-whatis		"Models-3 Input/Output Applications Programming Interface"
+module-url		"https://www.cmascenter.org/ioapi/"
+module-license		"GNU GPLv2"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help		"
+The Models-3 Input/Output Applications Programming Interface (I/O API) is
+a selective and direct-access programming interface to the data: you tell
+the system what variables and dates and times you're talking about and it
+figures all the stuff about record numbers, etc., for itself. Also, you
+don't have to read the data in consecutive order, or to write it in order,
+either -- you just ask for what you want, and the I/O API finds it for you
+(although there are moderate performance penalties for writing data out-of-
+order). The files are self-describing files -- that is, the file headers
+have all the dimensioning and descriptive information needed about the data
+in them. 
+"
--- a/HDF5/netcdf/4/variants
+++ b/HDF5/netcdf/4/variants
@@ -0,0 +1 @@
+netcdf/4.6.1	unstable	gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1 parallel-netcdf/1.9.0
--- a/HDF5/netcdf/build
+++ b/HDF5/netcdf/build
@@ -1,5 +1,7 @@
 #!/usr/bin/env modbuild

+SOURCE_URL="https://www.unidata.ucar.edu/downloads/$P/ftp/$P-$V.tar.gz"
+
 pbuild::pre_configure() {
 	:
 }
@@ -11,16 +13,28 @@ pbuild::configure() {
 	F90=$MPIF90
 	FC=$MPIFC
 	FORTRAN=$MPIFORTRAN
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-netcdf-4 \
 		--with-pic \
+		--enable-pnetcdf \
+		--enable-remote-fortran-bootstrap \
 		|| exit 1
 }

+pbuild::compile() {
+	make check
+	make 
+	make install
+	make build-netcdf-fortran
+	make install-netcdf-fortran
+}
+
+pbuild::install() {
+	:
+}
+
 pbuild::add_to_group 'HDF5'
-pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}" 'hdf5'
-pbuild::set_build_dependencies   "${COMPILER}" "${MPI}" 'hdf5'
 pbuild::set_docfiles 'COPYRIGHT' 'README.md' 'RELEASE_NOTES.md'
 pbuild::make_all

--- a/HDF5/parallel-netcdf/1/variants
+++ b/HDF5/parallel-netcdf/1/variants
@@ -0,0 +1 @@
+parallel-netcdf/1.9.0	unstable	gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1
--- a/HDF5/parallel-netcdf/build
+++ b/HDF5/parallel-netcdf/build
@@ -0,0 +1,28 @@
+#!/usr/bin/env modbuild
+
+SOURCE_URL="http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/$P-$V.tar.gz"
+
+pbuild::pre_configure() {
+	:
+}
+
+pbuild::configure() {
+	"${SRC_DIR}"/configure \
+		--prefix="${PREFIX}" \
+		--with-mpi="${OPENMPI_DIR}" \
+		--with-pic \
+		--disable-shared \
+		|| exit 1
+}
+
+pbuild::add_to_group 'HDF5'
+pbuild::set_docfiles \
+	AUTHORS  \
+	COPYING \
+	COPYRIGHT \
+	CREDITS \
+	ChangeLog \
+	NEWS \
+	RELEASE_NOTES
+pbuild::make_all
+
--- a/HDF5/parallel-netcdf/modulefile
+++ b/HDF5/parallel-netcdf/modulefile
@@ -0,0 +1,21 @@
+#%Module1.0
+
+module-whatis		"parallel netCDF"
+module-url		"https://trac.mcs.anl.gov/projects/parallel-netcdf/wiki/WikiStart"
+module-license		"BSD-like, see \${PARALLEL_NETCDF_DIR}/share/doc/parallel-netcdf/COPYRIGHT"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help		"
+PnetCDF is a high-performance parallel I/O library for accessing files in
+format compatibility with Unidata's NetCDF, specifically the formats of
+CDF-1, 2, and 5. The CDF-5 file format, an extension of CDF-2, supports
+unsigned data types and uses 64-bit integers to allow users to define
+large dimensions, attributes, and variables (> 2B array elements).
+
+In addition to the conventional netCDF read and write APIs, PnetCDF also
+provides a new set of nonblocking APIs. Nonblocking APIs allow users to
+post multiple read and write requests first, and later let PnetCDF to
+aggregate the requests into a large MPI-IO request, hence to achieve a
+better performance. See nonblocking I/O for further description and example
+programs. 
+"
--- a/HDF5_serial/H5hut/build
+++ b/HDF5_serial/H5hut/build
@@ -5,8 +5,8 @@ SOURCE_URL="http://amas.web.psi.ch/Downloads/$P/$P-$V.tar.gz"
 #	--enable-vtkconverter \

 pbuild::configure() {
-	# (cd "${MODULE_SRCDIR}" && ./autogen.sh)
-	"${MODULE_SRCDIR}"/configure \
+	# (cd "${SRC_DIR}" && ./autogen.sh)
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-debug \
 		--with-hdf5="${HDF5_SERIAL_PREFIX}" \
@@ -14,7 +14,7 @@ pbuild::configure() {
 		|| exit 1
 }

-pbuild::build() {
+pbuild::compile() {
 	make -C src
 	make -C tools 
 }
--- a/Libraries/giflib/build
+++ b/Libraries/giflib/build
@@ -1,7 +1,7 @@
 #!/usr/bin/env modbuild

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
--- a/Libraries/gmp/build
+++ b/Libraries/gmp/build
@@ -3,7 +3,7 @@
 SOURCE_URL="https://gmplib.org/download/$P/$P-$V.tar.bz2"

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--disable-shared \
 		|| exit 1
--- a/Libraries/libungif/build
+++ b/Libraries/libungif/build
@@ -1,7 +1,7 @@
 #!/usr/bin/env modbuild

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
--- a/Libraries/mpc/build
+++ b/Libraries/mpc/build
@@ -1,9 +1,13 @@
 #!/usr/bin/env modbuild

-SOURCE_URL="ftp://ftp.gnu.org/gnu/$P/$P-$V_MAJOR.$V_MINOR.$V_PATCHLVL.tar.gz"
+module use 'Libraries'
+
+pbuild::set_source_url "ftp://ftp.gnu.org/gnu/${P}/${P}-${V_PKG}.tar.gz"
+pbuild::add_to_group 'Libraries'
+pbuild::use_cc '/usr/bin/cc'

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--with-gmp=$GMP_PREFIX \
 		--with-mpfr=$MPFR_PREFIX \
@@ -11,10 +15,5 @@ pbuild::configure() {
 		|| exit 1
 }

-# use system gcc to compile
-declare -rx CC=gcc
-
-module use 'Libraries'
-pbuild::add_to_group 'Libraries'
 pbuild::make_all

--- a/Libraries/mpfr/build
+++ b/Libraries/mpfr/build
@@ -3,7 +3,7 @@
 SOURCE_URL="http://www.mpfr.org/$P-$V/$P-$V.tar.gz"

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--with-gmp=$GMP_PREFIX \
 		--disable-shared \
--- a/Libraries/pcre/build
+++ b/Libraries/pcre/build
@@ -1,7 +1,7 @@
 #!/usr/bin/env modbuild

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
--- a/Libraries/tiff/build
+++ b/Libraries/tiff/build
@@ -3,7 +3,7 @@
 SOURCE_URL="ftp://download.osgeo.org/libtiff/$P-$V.tar.gz"

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--with-pic=yes \
 		--disable-shared \
--- a/MPI/BoxLib/build
+++ b/MPI/BoxLib/build
@@ -4,7 +4,7 @@ pbuild::configure() {
 	CC=$MPICC CXX=$MPICXX cmake \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCMAKE_BUILD_TYPE=RELEASE \
-		"${MODULE_SRCDIR}"
+		"${SRC_DIR}"
 }

 pbuild::add_to_group 'MPI'
--- a/MPI/OPAL.14/build
+++ b/MPI/OPAL.14/build
@@ -10,7 +10,7 @@ pbuild::configure() {
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCMAKE_BUILD_TYPE=RELEASE \
 		-DENABLE_SAAMG_SOLVER=TRUE \
-		"${MODULE_SRCDIR}"
+		"${SRC_DIR}"
 }

 pbuild::add_to_group 'MPI'
--- a/MPI/OPAL/build
+++ b/MPI/OPAL/build
@@ -22,7 +22,7 @@ pbuild::configure() {
 		-DCMAKE_BUILD_TYPE=Release \
 		-DENABLE_SAAMG_SOLVER=TRUE \
 		"${config_args[@]}" \
-		"${MODULE_SRCDIR}"
+		"${SRC_DIR}"
 }

 pbuild::add_to_group 'MPI'
--- a/MPI/SuperLU_DIST/build
+++ b/MPI/SuperLU_DIST/build
@@ -12,7 +12,7 @@ pbuild::configure() {
 		die 3 "Oops: unknown compiler: ${COMPILER}"
 		;;
 	esac
-	cat <<EOF > "${MODULE_SRCDIR}/make.inc"
+	cat <<EOF > "${SRC_DIR}/make.inc"
 PLAT		= 
 DSuperLUroot 	= \${PREFIX}
 DSUPERLULIB   	= \$(DSuperLUroot)/lib/libsuperlu_dist.a
@@ -36,8 +36,8 @@ CDEFS        = -DAdd__
 EOF
 }

-pbuild::build() {
-	cd "${MODULE_SRCDIR}"
+pbuild::compile() {
+	cd "${SRC_DIR}"
 	mkdir -p "${PREFIX}/lib"
 	make
 }
@@ -45,7 +45,7 @@ pbuild::build() {
 pbuild::install() {
 	make install
 	mkdir -p "${PREFIX}/include"
-	install -m 0444 "${MODULE_SRCDIR}"/SRC/*.h "${PREFIX}/include"
+	install -m 0444 "${SRC_DIR}"/SRC/*.h "${PREFIX}/include"
 }


--- a/MPI/cpmd/build
+++ b/MPI/cpmd/build
@@ -12,17 +12,17 @@ case $OS in
 esac

 pbuild::configure() {
-	cp -v "${BUILD_BLOCK_DIR}/${target}" "${MODULE_BUILDDIR}/configure"
+	cp -v "${BUILDBLOCK_DIR}/${target}" "${BUILD_DIR}/configure"
 	./configure.sh "${target}" || exit 1
 }

-pbuild::build() {
+pbuild::compile() {
 	make
 }

 pbuild::install() {
 	mkdir -p "${PREFIX}/bin"
-	cp "${MODULE_SRCDIR}/bin/cpmd.x" "${PREFIX}/bin"
+	cp "${SRC_DIR}/bin/cpmd.x" "${PREFIX}/bin"
 }

 pbuild::add_to_group 'MPI'
--- a/MPI/dks/build
+++ b/MPI/dks/build
@@ -22,7 +22,7 @@ pbuild::configure() {
 	cmake \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		"${conf[@]}" \
-		"${MODULE_SRCDIR}" \
+		"${SRC_DIR}" \
 		|| exit 1
 }

--- a/MPI/elegant/README.md
+++ b/MPI/elegant/README.md
@@ -50,8 +50,9 @@ ELEGANT_VERSION=34.2.0

 ## Setup Environment
 ```
-DOWNLOAD_DIR='/afs/psi.ch/software/Pmodules/distfiles/elegant'
-PREFIX=/opt/psi/MPI/elegant/${ELEGANT_VERSION}/${MPI}/${MPI_VERSION}/${COMPILER}/${COMPILER_VERSION}
+source "${PMODULES_ROOT}/config/modbuild.conf"
+DOWNLOAD_DIR="${PMODULES_DISTFILESDIR}/elegant"
+PREFIX="${PMODULES_ROOT}/MPI/elegant/${ELEGANT_VERSION}/${MPI}/${MPI_VERSION}/${COMPILER}/${COMPILER_VERSION}"

 export EPICS_BASE="${PREFIX}/epics/base"
 export HOST_ARCH=linux-x86_64
--- a/MPI/gromacs/build
+++ b/MPI/gromacs/build
@@ -10,7 +10,7 @@ pbuild::configure() {
 		-DGMX_GPU=off \
 		-DGMX_SIMD=SSE2 \
 		-DGMX_BUILD_OWN_FFTW=on \
-		"${MODULE_SRCDIR}" \
+		"${SRC_DIR}" \
 		|| exit 1
 }

--- a/MPI/hdf5/1.10/variants.Linux
+++ b/MPI/hdf5/1.10/variants.Linux
@@ -12,3 +12,5 @@ hdf5/1.10.1	unstable	intel/17.4 openmpi/1.10.7
 hdf5/1.10.1	unstable	intel/17.4 openmpi/2.1.2
 hdf5/1.10.1	unstable	intel/17.4 openmpi/3.0.0
 hdf5/1.10.1	unstable	intel/17.4 intel-mpi/17.4
+
+hdf5/1.10.2 	stable    	gcc/7.3.0 openmpi/3.0.1
--- a/MPI/hdf5/build
+++ b/MPI/hdf5/build
@@ -27,7 +27,7 @@ pbuild::configure() {
 	#config_args+=( "--enable-threadsafe" )
 	config_args+=( "--with-pic" )

-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		"${config_args[@]}" \
 		|| exit 1
--- a/MPI/ippl/build
+++ b/MPI/ippl/build
@@ -12,7 +12,7 @@ pbuild::configure() {
 	cmake \
 		-DCMAKE_BUILD_TYPE=RELEASE \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-		"${MODULE_SRCDIR}" \
+		"${SRC_DIR}" \
 		|| exit 1 
 }

--- a/MPI/lammps/2018/variants
+++ b/MPI/lammps/2018/variants
@@ -0,0 +1 @@
+lammps/2018.3	unstable	gcc/7.3.0 openmpi/3.0.1
--- a/MPI/lammps/build
+++ b/MPI/lammps/build
@@ -1,26 +1,25 @@
 #!/usr/bin/env modbuild

-SOURCE_URL="lammps-2017.8.tar.gz"
-
+pbuild::add_to_group 'MPI'
+pbuild::set_download_url https://gitlab.psi.ch/Pmodules/download/raw/master/$P-$V.tar.gz
+pbuild::set_docfiles \
+		LICENSE \
+		README
 pbuild::compile_in_sourcetree

 pbuild::configure() {
-	cp -v "${BUILD_BLOCK_DIR}/files/Makefile.PSI" "${MODULE_BUILDDIR}/src/MAKE/MINE"
+	cp -v "${BUILDBLOCK_DIR}/files/Makefile.PSI" "${BUILD_DIR}/src/MAKE/MINE"
 }

-pbuild::build() {
+pbuild::compile() {
 	make -C src PSI
 }

 pbuild::install() {
 	install -m 0755 -d "${PREFIX}/bin"
-	install -m 0755  "${MODULE_BUILDDIR}/src/lmp_PSI" "${PREFIX}/bin/lmp_omp"
+	install -m 0755  "${BUILD_DIR}/src/lmp_PSI" "${PREFIX}/bin/lmp_omp"
 	strip "${PREFIX}/bin/lmp_omp"
 }

-pbuild::add_to_group 'MPI'
-pbuild::set_docfiles \
-		LICENSE \
-		README
 pbuild::make_all

--- a/MPI/parmetis/build
+++ b/MPI/parmetis/build
@@ -25,14 +25,14 @@ pbuild::configure() {
 	if (( MAJOR_VERSION == 4 )) ; then
 		cmake \
 			-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-			-DMETIS_PATH="${MODULE_SRCDIR}/metis" \
-			-DGKLIB_PATH="${MODULE_SRCDIR}/metis/GKlib" \
-			"${MODULE_SRCDIR}" \
+			-DMETIS_PATH="${SRC_DIR}/metis" \
+			-DGKLIB_PATH="${SRC_DIR}/metis/GKlib" \
+			"${SRC_DIR}" \
 			|| exit 1
 	fi
 }

-pbuild::build() {
+pbuild::compile() {
 	CC=$MPICC
 	CXX=$MPICXX
 	F77=$MPIF77
@@ -40,7 +40,7 @@ pbuild::build() {
 	FC=$MPIFC
 	FORTRAN=$MPIFORTRAN
 	if (( MAJOR_VERSION == 3 )) ; then
-		cd "${MODULE_SRCDIR}"
+		cd "${SRC_DIR}"
 		make -e -j3 || exit 1

 		mkdir -p $PREFIX/include/metis
@@ -54,7 +54,7 @@ pbuild::build() {
 		make install

 		LIBMETIS_A=$(find . -name libmetis.a)
-		METIS_H=$(find "${MODULE_SRCDIR}" -name metis.h)
+		METIS_H=$(find "${SRC_DIR}" -name metis.h)

 		install -m 0644 $METIS_H    $PREFIX/include
 		install -m 0644 $LIBMETIS_A $PREFIX/lib
--- a/MPI/trilinos/build
+++ b/MPI/trilinos/build
@@ -77,7 +77,7 @@ pbuild::configure() {
           -DTrilinos_ENABLE_Tpetra:BOOL=ON \
           -DTrilinos_ENABLE_TESTS:BOOL=OFF \
 	   "${config_args[@]}" \
-           "${MODULE_SRCDIR}" || exit 1
+           "${SRC_DIR}" || exit 1
 }

 pbuild::add_to_group 'HDF5'
--- a/MX/phenix/build
+++ b/MX/phenix/build
@@ -4,12 +4,12 @@ pbuild::configure() {
 	:
 }

-pbuild::build() {
+pbuild::compile() {
 	:
 }

 pbuild::install() {
-	cd "${MODULE_SRCDIR}"
+	cd "${SRC_DIR}"
 	./install --prefix="${PREFIX%/*}"
 }

--- a/OPAL/opt-pilot/README.md
+++ b/OPAL/opt-pilot/README.md
@@ -0,0 +1 @@
+This build-block is obsolete! opt-pilot has been integrated into OPAL.
--- a/OPAL/opt-pilot/build
+++ b/OPAL/opt-pilot/build
@@ -11,7 +11,7 @@ pbuild::configure() {
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCMAKE_BUILD_TYPE=RELEASE \
 		"${configure_args[@]}" \
-		"${MODULE_SRCDIR}" || std::die 1 "cmake failed"
+		"${SRC_DIR}" || std::die 1 "cmake failed"
 }

 pbuild::add_to_group 'OPAL'
--- a/Programming/Python/build
+++ b/Programming/Python/build
@@ -8,7 +8,7 @@ pbuild::configure() {
 	export LDFLAGS="-L${OPENSSL_LIBRARY_DIR}"
 	export CPPFLAGS="-fPIC -I${OPENSSL_INCLUDE_DIR} -I${OPENSSL_INCLUDE_DIR}/openssl"
 	export LD_LIBRARY_PATH+=":${PREFIX}/lib"
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-shared \
 		|| exit 1
@@ -22,7 +22,7 @@ pbuild::post_install() {
 	ln -fs "${PREFIX}/include/python${V%.*}m" "${PREFIX}/include/python"
 	ln -fs "${PREFIX}/include/python${V%.*}m" "${PREFIX}/include/python${V%.*}"
 	PATH+=":${PREFIX}/bin"
-	cd "${BUILD_BLOCK_DIR}"
+	cd "${BUILDBLOCK_DIR}"
 	"${PREFIX}/bin/python" 'get-pip.py'
 	pip${V_MAJOR} install numpy
 	pip${V_MAJOR} install scipy
--- a/Programming/Tcl/build
+++ b/Programming/Tcl/build
@@ -5,10 +5,10 @@ SOURCE_URL="ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tcl$V-src.tar.gz"
 pbuild::configure() {
 	case ${OS} in
 	Linux )
-		srcdir="${MODULE_SRCDIR}/unix"
+		srcdir="${SRC_DIR}/unix"
 		;;
 	Darwin )
-		srcdir="${MODULE_SRCDIR}/macosx"
+		srcdir="${SRC_DIR}/macosx"
 		;;
 	esac
 	"${srcdir}"/configure \
--- a/Programming/Tk/build
+++ b/Programming/Tk/build
@@ -5,10 +5,10 @@ SOURCE_URL="ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tk$V-src.tar.gz"
 pbuild::configure() {
 	case ${OS} in
 	Linux )
-		srcdir="${MODULE_SRCDIR}/unix"
+		srcdir="${SRC_DIR}/unix"
 		;;
 	Darwin )
-		srcdir="${MODULE_SRCDIR}/macosx"
+		srcdir="${SRC_DIR}/macosx"
 		C_INCLUDE_PATH+=":/opt/local/include"
 		LIBRARY_PATH+=":/opt/local/lib"
 		;;
--- a/Programming/autoconf/build
+++ b/Programming/autoconf/build
@@ -3,7 +3,7 @@
 SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
--- a/Programming/automake/build
+++ b/Programming/automake/build
@@ -3,7 +3,7 @@
 SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
--- a/Programming/binutils/build
+++ b/Programming/binutils/build
@@ -3,7 +3,7 @@
 SOURCE_URL="http://ftp.gnu.org/gnu/binutils/$P-$V.tar.gz"

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
--- a/Programming/cctools/build
+++ b/Programming/cctools/build
@@ -0,0 +1,26 @@
+#!/usr/bin/env modbuild
+#
+# :FIXME: this is work in progress!
+#
+pbuild::add_to_group 'Programming'
+pbuild::set_download_url "https://opensource.apple.com/tarballs/cctools/$P-$V.tar.gz"
+pbuild::compile_in_sourcetree
+
+pbuild::set_default_patch_strip 0
+pbuild::add_patch 'files/PR-12400897.patch'
+pbuild::add_patch 'files/PR-37520.patch'
+pbuild::add_patch 'files/cctools-829-lto.patch'
+pbuild::add_patch 'files/cctools-839-static-dis_info.patch'
+pbuild::add_patch 'files/cctools-862-prunetrie.patch'
+pbuild::add_patch 'files/cctools-895-OFILE_LLVM_BITCODE.patch'
+pbuild::add_patch 'files/cctools-895-big_endian.patch'
+pbuild::add_patch 'files/not-clang.patch'
+
+#pbuild::set_docfiles 'COPYING' 'COPYING.LIB' 'COPYING.RUNTIME' 'COPYING3' 'COPYING3.LIB' 'NEWS' 'README'
+
+pbuild::configure() {
+	:
+}
+
+pbuild::make_all
+
--- a/Programming/cctools/files/PR-12400897.patch
+++ b/Programming/cctools/files/PR-12400897.patch
@@ -0,0 +1,35 @@
+--- misc/nm.c	1969-12-31 16:00:00.000000000 -0800
+++ misc/nm.c	2012-09-29 12:36:22.000000000 -0700
+@@ -496,7 +496,7 @@ void *cookie)
+     uint32_t nsymbols;
+     struct value_diff *value_diffs;
+ 
+-    char *short_name, *has_suffix;
+    char *short_name, *suffix;
+     enum bool is_framework;
+ 
+ 	cmd_flags = (struct cmd_flags *)cookie;
+@@ -650,9 +650,20 @@ void *cookie)
+ 		    process_flags.lib_names[j] =
+ 			(char *)dl + dl->dylib.name.offset;
+ 		    short_name = guess_short_name(process_flags.lib_names[j],
+-						  &is_framework, &has_suffix);
+-		    if(short_name != NULL)
+-			process_flags.lib_names[j] = short_name;
+						  &is_framework, &suffix);
+		    if(short_name != NULL) {
+			if (suffix) {
+			    char *combined_name;
+			    asprintf(&combined_name, "%s%s", short_name, suffix);
+			    if (combined_name) {
+				process_flags.lib_names[j] = combined_name;
+				free(short_name);
+				free(suffix);
+			    }
+			} else {
+			    process_flags.lib_names[j] = short_name;
+			}
+		    }
+ 		    j++;
+ 		}
+ 		lc = (struct load_command *)
--- a/Programming/cctools/files/PR-37520.patch
+++ b/Programming/cctools/files/PR-37520.patch
@@ -0,0 +1,55 @@
+--- as/ppc.c.orig	2013-01-04 10:39:49.000000000 +0100
+++ as/ppc.c	2013-01-04 10:40:02.000000000 +0100
+@@ -1019,6 +1019,8 @@ char *op)
+ 
+ 	/* if this instruction requires labels mark it for later */
+ 	switch(insn.reloc){
+	case NO_RELOC:
+	    break;
+ 	case PPC_RELOC_HI16:
+ 	case PPC_RELOC_LO16:
+ 	case PPC_RELOC_HA16:
+@@ -1033,6 +1035,7 @@ char *op)
+ 		    insn.reloc);
+ 	    break;
+ 	case PPC_RELOC_BR14:
+	case PPC_RELOC_BR14_predicted:
+ 	    fix_new(frag_now,
+ 		    thisfrag - frag_now->fr_literal,
+ 		    4,
+--- as/m88k.c.orig	1969-12-31 16:00:00.000000000 -0800
+++ as/m88k.c	2013-07-05 10:32:19.000000000 -0700
+@@ -600,6 +600,10 @@ char *op)
+ 
+ 	/* if this instruction requires labels mark it for later */
+ 	switch (insn.reloc) {
+
+		case NO_RELOC:
+				break;
+
+ 		case M88K_RELOC_LO16:
+ 		case M88K_RELOC_HI16:
+ 				fix_new(
+--- as/sparc.c.orig	1969-12-31 16:00:00.000000000 -0800
+++ as/sparc.c	2013-07-05 10:32:14.000000000 -0700
+@@ -851,6 +851,20 @@ sparc_ip (str)
+  		  /* plug absolutes directly into opcode */
+ 
+ 		  switch(the_insn.reloc) {
+		  case SPARC_RELOC_13:
+		    if (the_insn.exp.X_seg == SEG_BIG)
+		      opcode |= (*(int *) generic_bignum) & 0x1fff;
+		    else
+		      opcode |= the_insn.exp.X_add_number & 0x1fff;
+		    the_insn.reloc = SPARC_RELOC_NONE;
+		    break;
+		  case SPARC_RELOC_22:
+		    if (the_insn.exp.X_seg == SEG_BIG)
+		      opcode |= (*(int *) generic_bignum) & 0x3fffff;
+		    else
+		      opcode |= the_insn.exp.X_add_number & 0x3fffff;
+		    the_insn.reloc = SPARC_RELOC_NONE;
+		    break;
+ 		  case SPARC_RELOC_HI22:
+ 		    /* extract upper 22 bits from constant */
+ 		    opcode |= (the_insn.exp.X_add_number >> 10) & 0x3fffff;
--- a/Programming/cctools/files/cctools-829-lto.patch
+++ b/Programming/cctools/files/cctools-829-lto.patch
@@ -0,0 +1,39 @@
+--- libstuff/lto.c.orig	1969-12-31 16:00:00.000000000 -0800
+++ libstuff/lto.c	2012-09-04 14:59:31.000000000 -0700
+@@ -112,13 +112,21 @@ void **pmod) /* maybe NULL */
+ 	    lto_path = makestr(prefix, "../lib/libLTO.dylib", NULL);
+ 
+ 	    lto_handle = dlopen(lto_path, RTLD_NOW);
+	    free(lto_path);
+	    lto_path = NULL;
+ 	    if(lto_handle == NULL){
+-		free(lto_path);
+-		lto_path = NULL;
+-		lto_handle = dlopen("/Applications/Xcode.app/Contents/"
+-				    "Developer/Toolchains/XcodeDefault."
+-				    "xctoolchain/usr/lib/libLTO.dylib",
+-				    RTLD_NOW);
+		const char *lto_paths[] = {
+		    "@@LLVM_LIBDIR@@/libLTO.dylib",
+		    "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/libLTO.dylib",
+		    "/usr/lib/libLTO.dylib",
+		    "/Applications/Xcode.app/usr/lib/libLTO.dylib",
+		    "/Developer/usr/lib/libLTO.dylib",
+		    NULL
+                };
+                const char **p;
+		for(p = lto_paths; *p && !lto_handle ; p++) {
+		    lto_handle = dlopen(*p, RTLD_NOW);
+		}
+ 	    }
+ 	    if(lto_handle == NULL)
+ 		return(0);
+@@ -142,8 +150,6 @@ void **pmod) /* maybe NULL */
+ 	       lto_get_sym_attr == NULL ||
+ 	       lto_get_sym_name == NULL){
+ 		dlclose(lto_handle);
+-		if(lto_path != NULL)
+-		    free(lto_path);
+ 		return(0);
+ 	    }
+ 	}
--- a/Programming/cctools/files/cctools-839-static-dis_info.patch
+++ b/Programming/cctools/files/cctools-839-static-dis_info.patch
@@ -0,0 +1,22 @@
+--- otool/arm_disasm.c.orig	2013-08-29 14:23:24.000000000 -0700
+++ otool/arm_disasm.c	2013-08-29 14:23:51.000000000 -0700
+@@ -62,7 +62,7 @@ typedef char bfd_byte;
+ 
+ /* HACKS to avoid pulling in all of FSF binutils include/dis-asm.h */
+ typedef int (*fprintf_ftype) (void *, const char*, ...);
+-struct disassemble_info { /* HACK'ed up for just what we need here */
+static struct disassemble_info { /* HACK'ed up for just what we need here */
+   fprintf_ftype fprintf_func;
+   void *stream;
+ 
+--- otool/i386_disasm.c.orig	2013-08-29 14:23:19.000000000 -0700
+++ otool/i386_disasm.c	2013-08-29 14:24:00.000000000 -0700
+@@ -1600,7 +1600,7 @@ static unsigned int xmm_rm(int r_m, int 
+ /*
+  * This is passed to the llvm disassembler.
+  */
+-struct disassemble_info {
+static struct disassemble_info {
+   enum bool verbose;
+   /* Relocation information.  */
+   struct relocation_info *sorted_relocs;
--- a/Programming/cctools/files/cctools-862-prunetrie.patch
+++ b/Programming/cctools/files/cctools-862-prunetrie.patch
@@ -0,0 +1,34 @@
+--- misc/Makefile.orig	2015-01-10 20:43:30.000000000 -0800
+++ misc/Makefile	2015-01-10 20:51:27.000000000 -0800
+@@ -201,14 +201,18 @@ indr.NEW: indr.o
+ 		$(OFILE_DIR)/indr.private.o
+ 	$(DSYMUTIL) $(SYMROOT)/indr.NEW
+ 
+-strip.NEW: strip.o
+strip.NEW: strip.o PruneTrie.o
+ 	$(CC) $(RC_CFLAGS) -nostdlib -r \
+ 		-o $(OBJROOT)/strip.private.o \
+ 		$(OFILE_DIR)/strip.o $(LIBSTUFF)
+ 	$(CXX) $(RC_CFLAGS) $(SDK) -o $(SYMROOT)/strip.NEW \
+-		$(OFILE_DIR)/strip.private.o $(LIB_PRUNETRIE) $(CXXLIB)
+		$(OFILE_DIR)/strip.private.o $(OFILE_DIR)/PruneTrie.o $(CXXLIB)
+ 	$(DSYMUTIL) $(SYMROOT)/strip.NEW
+ 
+PruneTrie.o: PruneTrie.cpp
+	$(CXX) $(CXXFLAGS) $(RC_CFLAGS) $(SDK) $(CXXLIB) -c -o \
+		$(OBJROOT)/PruneTrie.o $(SRCROOT)/PruneTrie.cpp
+
+ nmedit.NEW: nmedit.o
+ 	$(CC) $(RC_CFLAGS) -nostdlib -r \
+ 		-o $(OBJROOT)/nmedit.private.o \
+--- misc/strip.c.orig	2015-01-10 21:25:17.000000000 -0800
+++ misc/strip.c	2015-01-10 21:25:40.000000000 -0800
+@@ -47,7 +47,7 @@
+ #include "stuff/unix_standard_mode.h"
+ #include "stuff/execute.h"
+ #ifdef TRIE_SUPPORT
+-#include <mach-o/prune_trie.h>
+#include "prune_trie.h"
+ #endif /* TRIE_SUPPORT */
+ 
+ /* These are set from the command line arguments */
--- a/Programming/cctools/files/cctools-895-OFILE_LLVM_BITCODE.patch
+++ b/Programming/cctools/files/cctools-895-OFILE_LLVM_BITCODE.patch
@@ -0,0 +1,18 @@
+--- misc/strings.c-orig	2016-12-09 19:03:02.000000000 +0100
+++ misc/strings.c	2016-12-23 10:35:34.000000000 +0100
+@@ -335,8 +335,13 @@
+ 	 * If the ofile is not an object file then process it without reguard
+ 	 * to sections.
+ 	 */
+-	if(ofile->object_addr == NULL || ofile->member_type == OFILE_LLVM_BITCODE){
+-	    if(ofile->file_type == OFILE_FAT && ofile->arch_flag.cputype != 0){
+	if(ofile->object_addr == NULL
+#ifdef LTO_SUPPORT
+	   || ofile->member_type == OFILE_LLVM_BITCODE){
+#else
+	  ){
+#endif /* LTO_SUPPORT */
+	  if(ofile->file_type == OFILE_FAT && ofile->arch_flag.cputype != 0){
+ 		if(ofile->fat_header->magic == FAT_MAGIC_64){
+ 		    addr = ofile->file_addr +
+ 			   ofile->fat_archs64[ofile->narch].offset;
--- a/Programming/cctools/files/cctools-895-big_endian.patch
+++ b/Programming/cctools/files/cctools-895-big_endian.patch
@@ -0,0 +1,12 @@
+--- libstuff/ofile.c-	2016-12-16 11:53:10.000000000 -0500
+++ libstuff/ofile.c	2016-12-16 11:53:41.000000000 -0500
+@@ -3423,7 +3423,7 @@
+ 	    if(size - offset > sizeof(uint32_t)){
+ 		memcpy(&magic, addr + offset, sizeof(uint32_t));
+ #ifdef __BIG_ENDIAN__
+-		if(magic == FAT_MAGIC || (magic == FAT_MAGIC_64)
+		if(magic == FAT_MAGIC || magic == FAT_MAGIC_64)
+ #endif /* __BIG_ENDIAN__ */
+ #ifdef __LITTLE_ENDIAN__
+ 		if(magic == SWAP_INT(FAT_MAGIC) ||
+
--- a/Programming/cctools/files/not-clang.patch
+++ b/Programming/cctools/files/not-clang.patch
@@ -0,0 +1,12 @@
+--- as/driver.c.orig	2015-11-23 21:01:45.000000000 -0800
+++ as/driver.c	2015-11-23 21:09:24.000000000 -0800
+@@ -280,6 +280,9 @@ char **envp)
+ 	   arch_flag.cputype == CPU_TYPE_ARM)
+ 	    run_clang = 1;
+ 
+        /* MACPORTS: Don't use the clang assembler for now. */
+        run_clang = 0;
+
+ 	/*
+ 	 * Use the clang as the assembler if is the default or asked to with
+ 	 * the -q flag. But don't use it asked to use the system assembler
--- a/Programming/cctools/files/snowleopard-strnlen.patch
+++ b/Programming/cctools/files/snowleopard-strnlen.patch
@@ -0,0 +1,21 @@
+--- otool/ofile_print.c.orig	2013-11-10 22:33:14.000000000 -0800
+++ otool/ofile_print.c	2013-11-10 22:34:19.000000000 -0800
+@@ -225,6 +225,18 @@
+ #include "stuff/guess_short_name.h"
+ #include "ofile_print.h"
+ 
+static size_t
+strnlen(const char *s, size_t maxlen)
+{
+	size_t len;
+
+	for (len = 0; len < maxlen; len++, s++) {
+		if (!*s)
+			break;
+	}
+	return (len);
+}
+
+ /* <mach/loader.h> */
+ /* The maximum section alignment allowed to be specified, as a power of two */
+ #define MAXSECTALIGN		15 /* 2**15 or 0x8000 */
--- a/Programming/cctools/files/variants
+++ b/Programming/cctools/files/variants
@@ -0,0 +1 @@
+ctools/895	unstable
--- a/Programming/cmake/build
+++ b/Programming/cmake/build
@@ -11,7 +11,7 @@ Darwin )
 esac

 pbuild::configure() {
-	"${MODULE_SRCDIR}/bootstrap" --prefix="${PREFIX}" ${bootstrap_flags} --verbose
+	"${SRC_DIR}/bootstrap" --prefix="${PREFIX}" ${bootstrap_flags} --verbose
 }

 pbuild::add_to_group 'Programming'
--- a/Programming/cuda/build
+++ b/Programming/cuda/build
@@ -10,7 +10,7 @@ pbuild::configure() {
 	:
 }

-pbuild::build() {
+pbuild::compile() {
 	:
 }

--- a/Programming/gcc/build
+++ b/Programming/gcc/build
@@ -5,11 +5,11 @@ SOURCE_URL="https://ftp.gnu.org/gnu/gcc/$P-$V/$P-$V.tar.gz"
 pbuild::patch_sources_Darwin() {
 	if (( V_MAJOR == 4 && V_MINOR <= 8 )) || \
 	   (( V_MAJOR == 4 && V_MINOR == 9 && V_PATCHLVL < 4)); then
-		patch -p1 < "${BUILD_BLOCK_DIR}/${V_MAJOR}/non-dead-strip.patch"
-		patch -p1 < "${BUILD_BLOCK_DIR}/${V_MAJOR}/configure-as.patch"
+		patch -p1 < "${BUILDBLOCK_DIR}/${V_MAJOR}/non-dead-strip.patch"
+		patch -p1 < "${BUILDBLOCK_DIR}/${V_MAJOR}/configure-as.patch"
 	fi
 	if (( V_MAJOR == 5 )) || (( V_MAJOR == 6 )); then
-		patch -p1 < "${BUILD_BLOCK_DIR}/${V_MAJOR}/PR57438_avoiding_empty_function_bodies_and_trailing_labels.patch"
+		patch -p1 < "${BUILDBLOCK_DIR}/${V_MAJOR}/PR57438_avoiding_empty_function_bodies_and_trailing_labels.patch"
 	fi
 }

@@ -45,7 +45,7 @@ pbuild::configure() {
 		echo "Unsupported OS '${OS}'!"
 		;;
 	esac
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		"${conf_args[@]}" \
 		|| exit 1
--- a/Programming/ld64/build
+++ b/Programming/ld64/build
@@ -11,12 +11,12 @@ DYLD_SOURCE_URL="http://opensource.apple.com/tarballs/dyld/dyld-${DYLD_VERSION}.
 pbuild::patch_sources () {
 	find_patchdir() {
 		local -a patchdirs=()
-		patchdirs+=( "${BUILD_BLOCK_DIR}/${V}/patches.${OS}" )
-		patchdirs+=( "${BUILD_BLOCK_DIR}/${V}/patches" )
-		patchdirs+=( "${BUILD_BLOCK_DIR}/${V%.*}/patches.${OS}" )
-		patchdirs+=( "${BUILD_BLOCK_DIR}/${V%.*}/patches" )
-		patchdirs+=( "${BUILD_BLOCK_DIR}/${V%.*.*}/patches.${OS}" )
-		patchdirs+=( "${BUILD_BLOCK_DIR}/${V%.*.*}/patches" )
+		patchdirs+=( "${BUILDBLOCK_DIR}/${V}/patches.${OS}" )
+		patchdirs+=( "${BUILDBLOCK_DIR}/${V}/patches" )
+		patchdirs+=( "${BUILDBLOCK_DIR}/${V%.*}/patches.${OS}" )
+		patchdirs+=( "${BUILDBLOCK_DIR}/${V%.*}/patches" )
+		patchdirs+=( "${BUILDBLOCK_DIR}/${V%.*.*}/patches.${OS}" )
+		patchdirs+=( "${BUILDBLOCK_DIR}/${V%.*.*}/patches" )

 		for patchdir in "${patchdirs[@]}"; do
 			 [[ -e "${patchdir}" ]] && return 0;
@@ -32,8 +32,8 @@ pbuild::patch_sources () {
 }

 pbuild::post_prep() {
-	local -r DYLD_SRC_DIR="${PMODULES_TMPDIR}/dyld-${DYLD_VERSION}/src"
-	local -r CCTOOLS_SRC_DIR="${PMODULES_TMPDIR}/cctools-${CCTOOLS_VERSION}/src"
+	local -r DYLD_SRC_DIR="${TEMP_DIR}/dyld-${DYLD_VERSION}/src"
+	local -r CCTOOLS_SRC_DIR="${TEMP_DIR}/cctools-${CCTOOLS_VERSION}/src"

        local source_file=''
        pbuild::get_source source_file "${DYLD_SOURCE_URL}" "${PMODULES_DISTFILESDIR}" ||
@@ -44,21 +44,21 @@ pbuild::post_prep() {
                std::die 4 "cctools/${CCTOOLS_VERSION}: sourcecode not found."
        pbuild::unpack "${source_file}" "${CCTOOLS_SRC_DIR}"

-	cd "${MODULE_SRCDIR}"
+	cd "${SRC_DIR}"
 	mkdir -p "include/mach-o"
 	rsync --archive "../../cctools-${CCTOOLS_VERSION}/src/include/mach-o/" "include/mach-o/"
 	rsync --archive "../../dyld-${DYLD_VERSION}/src/include/mach-o/" "include/mach-o/"
 	mkdir -p "include/llvm-c"
-	cp -v "${BUILD_BLOCK_DIR}/files/Disassembler.h" "include/llvm-c/"
-	cp -v "${BUILD_BLOCK_DIR}/files/lto.h" "include/llvm-c/"
+	cp -v "${BUILDBLOCK_DIR}/files/Disassembler.h" "include/llvm-c/"
+	cp -v "${BUILDBLOCK_DIR}/files/lto.h" "include/llvm-c/"
 }

 pbuild::configure() {
-	cp -v "${BUILD_BLOCK_DIR}/files/Makefile-${V_MAJOR}" "${MODULE_SRCDIR}/Makefile"
+	cp -v "${BUILDBLOCK_DIR}/files/Makefile-${V_MAJOR}" "${SRC_DIR}/Makefile"
 }

-pbuild::build() {
-	cd "${MODULE_SRCDIR}"
+pbuild::compile() {
+	cd "${SRC_DIR}"
 	which $CC
 	make OTHER_CXXFLAGS="-std=c++11 -I$PWD/include" OTHER_LDFLAGS="-L/Applications/Xcode.app/Contents/Frameworks -lLTO"
 }
--- a/Programming/libtool/build
+++ b/Programming/libtool/build
@@ -3,7 +3,7 @@
 SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
--- a/Programming/m4/build
+++ b/Programming/m4/build
@@ -3,7 +3,7 @@
 SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.bz2"

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
--- a/Programming/perl/5/variants
+++ b/Programming/perl/5/variants
@@ -1 +1 @@
-perl/5.26.1	unstable
+perl/5.26.1	stable
--- a/Programming/perl/build
+++ b/Programming/perl/build
@@ -3,7 +3,7 @@
 SOURCE_URL="http://www.cpan.org/src/5.0/$P-$V.tar.gz"

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure.gnu \
+	"${SRC_DIR}"/configure.gnu \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
--- a/Programming/psi-python27/build
+++ b/Programming/psi-python27/build
@@ -4,12 +4,12 @@ pbuild::configure() {
 	:
 }

-pbuild::build() {
+pbuild::compile() {
 	:
 }

 pbuild::install() {
-	cd "${MODULE_SRCDIR}"
+	cd "${SRC_DIR}"
 	rsync --exclude=".info" --delete --verbose --archive . "${PREFIX}"
 }

--- a/System/filebench/build
+++ b/System/filebench/build
@@ -1,7 +1,7 @@
 #!/usr/bin/env modbuild

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
--- a/System/fsstress/build
+++ b/System/fsstress/build
@@ -4,14 +4,14 @@ pbuild::configure() {
 	:
 }

-pbuild::build() {
-        cd "${MODULE_SRCDIR}"
+pbuild::compile() {
+        cd "${SRC_DIR}"

 	make -j ${JOBS}
 }

 pbuild::install() {
-        cd "${MODULE_SRCDIR}"
+        cd "${SRC_DIR}"
 	mkdir -p ${PREFIX}/bin
 	install -m 0755 fsstress "${PREFIX}/bin"
 }
--- a/System/mdtest/build
+++ b/System/mdtest/build
@@ -4,14 +4,14 @@ pbuild::configure() {
 	:
 }

-pbuild::build() {
-        cd "${MODULE_SRCDIR}"
+pbuild::compile() {
+        cd "${SRC_DIR}"

 	make -j ${JOBS}
 }

 pbuild::install() {
-        cd "${MODULE_SRCDIR}"
+        cd "${SRC_DIR}"
 	mkdir -p ${PREFIX}/bin
 	install -m 0755 mdtest "${PREFIX}/bin"
 }
--- a/System/nmap/build
+++ b/System/nmap/build
@@ -1,7 +1,7 @@
 #!/usr/bin/env modbuild

 pbuild::configure() {
-	cd "${MODULE_SRCDIR}"
+	cd "${SRC_DIR}"
 	./configure \
 		--prefix="${PREFIX}" \
 		--with-libpcap=included \
@@ -11,13 +11,13 @@ pbuild::configure() {
 		--with-liblinear=included
 }

-pbuild::build() {
-	cd "${MODULE_SRCDIR}"
+pbuild::compile() {
+	cd "${SRC_DIR}"
 	make -j "${JOBS}"
 }

 pbuild::install() {
-	cd "${MODULE_SRCDIR}"
+	cd "${SRC_DIR}"
 	make install
 }

--- a/System/patchelf/build
+++ b/System/patchelf/build
@@ -1,7 +1,7 @@
 #!/usr/bin/env modbuild

 pbuild::configure() {
-	"${MODULE_SRCDIR}"/configure \
+	"${SRC_DIR}"/configure \
 		--prefix="${PREFIX}" \
 		|| exit 1
 }
--- a/System/unison/build
+++ b/System/unison/build
@@ -4,13 +4,13 @@ pbuild::configure() {
 	:
 }

-pbuild::build() {
-	cd "${MODULE_SRCDIR}"
+pbuild::compile() {
+	cd "${SRC_DIR}"
 	make
 }

 pbuild::install() {
-	cd "${MODULE_SRCDIR}"
+	cd "${SRC_DIR}"
 	install -m 0755 -d "${PREFIX}/bin"
 	install -m 0755 unison "${PREFIX}/bin"
 }
--- a/Tools/asciidoc/8/variants
+++ b/Tools/asciidoc/8/variants
@@ -1 +1 @@
-asciidoc/8.6.9	unstable	Python/2.7.14
+asciidoc/8.6.9	stable		Python/2.7.14
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`*.tar.gz filter=lfs diff=lfs merge=lfs -text`
				`@@ -0,0 +1 @@`
				`ioapi/3.2 unstable gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1 netcdf/4.6.1 parallel-netcdf/1.9.0`
				`@@ -0,0 +1 @@`
				`netcdf/4.6.1 unstable gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1 parallel-netcdf/1.9.0`
				`@@ -0,0 +1 @@`
				`parallel-netcdf/1.9.0 unstable gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1`
				`@@ -0,0 +1 @@`
				`lammps/2018.3 unstable gcc/7.3.0 openmpi/3.0.1`
				`@@ -0,0 +1 @@`
				`This build-block is obsolete! opt-pilot has been integrated into OPAL.`