Merge branch 'v2.4'

macports/Portfile.in

@@ -83,7 +83,7 @@ depends_lib-append port:xdrfile port:zlib port:gsl
 # Notice that one of the optional modules (drr) requires boost_serialization
 variant allmodules description {Enable all optional modules} {
   configure.args-append --enable-modules=all --enable-boost-serialization
-  configure.ldflags-append -lboost_serialization
+  configure.ldflags-append -lboost_serialization-mt
   depends_lib-append port:boost
 }
 

regtest/drr/rt-extract/config

@@ -2,14 +2,3 @@ type=plumed
 plumed_needs=boost_serialization
 plumed_modules=drr
 arg="drr_tool --extract test.drrstate -v"
-
-# Skip this since it crashes on travis-ci
-# I'm not sure about the reason, could be the boost version of macports
-function plumed_custom_skip(){
-  if [ "$(uname)" == "Darwin" ] ; then
-    return 0
-  else
-    return 1
-  fi
-}
-

regtest/drr/rt-merge/config

-function plumed_custom_skip(){
-  if [ "$(uname)" == "Darwin" ] ; then
-    return 0
-  else
-    return 1
-  fi
-}
 type=plumed
 plumed_needs=boost_serialization
 plumed_modules=drr

regtest/drr/rt-restart/config

@@ -2,10 +2,3 @@ type=driver
 plumed_needs=boost_serialization
 plumed_modules=drr
 arg="--plumed plumed.dat --trajectory-stride 1 --timestep 0.005 --ixyz ala12_trajectory.xyz --dump-forces forces --dump-forces-fmt=%10.6f"
-function plumed_custom_skip(){
-  if [ "$(uname)" == "Darwin" ] ; then
-    return 0
-  else
-    return 1
-  fi
-}