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

Programming/gcc/modulefile

@@ -1,11 +1,11 @@
 #%Module1.0
 
-set whatis	"GNU Compiler Collection"
-set url		"http://gcc.gnu.org/"
-set license	"GNU GPL v2/v3"
-set maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+module-whatis		"GNU Compiler Collection"
+module-url		"http://gcc.gnu.org/"
+module-license		"GNU GPL v2/v3"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
 
-set help	"
+module-help	"
 The GNU Compiler Collection includes front ends for C, C++, Objective-C,
 Fortran, Java, Ada, and Go, as well as libraries for these languages
 (libstdc++, libgcj,...). GCC was originally written as the compiler for
@@ -17,8 +17,6 @@ This module includes compilers for
 - Fortran
 "
 
-source		$env(PSI_LIBMODULES)
-
 set-family	"Compiler"
 
 setenv		CC			$PREFIX/bin/gcc

Tools/git/2/variants

@@ -1,3 +1,4 @@
 git/2.3.3	stable		Tcl/8.6.4 Tk/8.6.4
 git/2.5.2	stable		Tcl/8.6.4 Tk/8.6.4
 git/2.8.1	stable		Tcl/8.6.4 Tk/8.6.4
+git/2.11.1	unstable	Tcl/8.6.4 Tk/8.6.4

Tools/git/modulefile

@@ -2,12 +2,12 @@
 
 set dont-setenv { GIT_DIR }
 
-set whatis	"distributed version control system"
-set url		"http://git-scm.com/"
-set license	"GNU GPL v2"
-set maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+module-whatis		"distributed version control system"
+module-url		"http://git-scm.com/"
+module-license		"GNU GPL v2"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
 
-set help	"
+module-help	"
 Git is a free and open source distributed version control system
 designed to handle everything from small to very large projects
 with speed and efficiency.
@@ -17,5 +17,3 @@ performance. It outclasses SCM tools like Subversion, CVS, Perforce,
 and ClearCase with features like cheap local branching, convenient
 staging areas, and multiple workflows. 
 "
-
-source		$env(PSI_LIBMODULES)