Merge branch 'v2.3'

.travis.yml

@@ -51,6 +51,10 @@ matrix:
   - os: osx
     osx_image: xcode7.3
     env: PLUMED_MACPORTS="plumed +allmodules"
+# osx serial macports debug variant
+  - os: osx
+    osx_image: xcode8.2
+    env: PLUMED_MACPORTS="plumed +allmodules"
 # I don't put any mpi variant with macports since it takes too long to compile
 ## This command can be used to allow failures:
 ##  allow_failures:
@@ -105,10 +109,14 @@ install:
 #  - if test -n "$PLUMED_MACPORTS" ; then wget https://distfiles.macports.org/MacPorts/MacPorts-2.3.4.tar.bz2 && tar xvfj MacPorts-2.3.4.tar.bz2 ; fi
 #  - if test -n "$PLUMED_MACPORTS" ; then cd MacPorts-2.3.4 && ./configure && sudo make install && cd - && sudo rm -fr MacPorts-2.3.4 ; fi
 # install macports from binary (faster):
-  - if test -n "$PLUMED_MACPORTS" ; then wget https://distfiles.macports.org/MacPorts/MacPorts-2.4.1-10.11-ElCapitan.pkg ; fi
-  - if test -n "$PLUMED_MACPORTS" ; then sudo installer -pkg MacPorts-2.4.1-10.11-ElCapitan.pkg -target / ; fi
+  - if test -n "$PLUMED_MACPORTS" ; then OSX_VERSION="$(sw_vers -productVersion | sed 's/\.[^\.]*$//')" ; fi
+  - MACPORTS_PKG=MacPorts-2.4.1-10.11-ElCapitan.pkg
+  - if test "$OSX_VERSION" == 10.12 ; then MACPORTS_PKG=MacPorts-2.4.1-10.12-Sierra.pkg ; fi
+  - echo "$MACPORTS_PKG"
+  - if test -n "$PLUMED_MACPORTS" ; then wget https://distfiles.macports.org/MacPorts/$MACPORTS_PKG ; fi
+  - if test -n "$PLUMED_MACPORTS" ; then sudo installer -pkg $MACPORTS_PKG -target / ; fi
   - if test -n "$PLUMED_MACPORTS" ; then export PATH=/opt/local/bin:$PATH ; fi
-  - if test -n "$PLUMED_MACPORTS" ; then sudo port -v selfupdate ; fi
+  - if test -n "$PLUMED_MACPORTS" ; then sudo port -N -v selfupdate ; fi
   - if test -n "$PLUMED_MACPORTS" ; then make macports ; fi
   - if test -n "$PLUMED_MACPORTS" ; then ./.travis/config.macports.sh ; fi
 
@@ -131,9 +139,7 @@ script:
   - if test "$PLUMED_CXX" ; then make install prefix="$HOME/opt" ; fi
 
 # build using macports
-# this is required for some misterious reason:
-  - if test -n "$PLUMED_MACPORTS" ; then sudo port install flex +universal ; fi
-  - if test -n "$PLUMED_MACPORTS" ; then sudo port install $PLUMED_MACPORTS ; fi
+  - if test -n "$PLUMED_MACPORTS" ; then sudo port -N install $PLUMED_MACPORTS ; fi
 
 # TEST:
   - if test "$VALGRIND" == yes ; then OPT=valgrind ; else OPT="" ; fi

macports/Portfile.in

 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id: Portfile 123374 2014-08-08 21:53:07Z mojca@macports.org $
 
 PortSystem          1.0
 
@@ -60,6 +59,8 @@ if {[mpi_variant_isset]} {
 
 variant matheval description {Enable libmatheval} {
   configure.args-replace --disable-matheval --enable-matheval
+# this is needed due to a problem with libmatheval:
+  depends_lib-append port:flex
   depends_lib-append port:libmatheval
 }