Index: /issm/trunk-jpl/externalpackages/gmt/configs/6.5/static/mac/cmake/ConfigUserAdvancedTemplate.cmake.patch
===================================================================
--- /issm/trunk-jpl/externalpackages/gmt/configs/6.5/static/mac/cmake/ConfigUserAdvancedTemplate.cmake.patch	(revision 28165)
+++ /issm/trunk-jpl/externalpackages/gmt/configs/6.5/static/mac/cmake/ConfigUserAdvancedTemplate.cmake.patch	(revision 28166)
@@ -1,13 +1,5 @@
 --- src/cmake/ConfigUserAdvancedTemplate.cmake	2024-01-07 01:32:40
-+++ ConfigUserAdvancedTemplate.cmake	2024-03-19 13:14:04
-@@ -39,19 +39,19 @@
- ## Section 1: Installation paths
- ##
- # Set install name suffix used for directories and gmt executables [undefined]:
--#set (GMT_INSTALL_NAME_SUFFIX "suffix")
-+set (CMAKE_INSTALL_PREFIX "$ENV{PREFIX}")
- 
- # Install into traditional directory structure. Disable to install a
- # distribution type directory structure (doc and share separated) [on]:
++++ ./ConfigUserAdvancedTemplate.cmake	2024-03-21 20:02:18
+@@ -46,12 +46,12 @@
  #set (GMT_INSTALL_TRADITIONAL_FOLDERNAMES OFF)
  
@@ -30,10 +22,10 @@
  # to nc-config) [auto]:
 -#set (NETCDF_ROOT "netcdf_install_prefix")
-+set (NETCDF_ROOT "$ENV{NETCDF_ROOT}")
++#set (NETCDF_ROOT "$ENV{NETCDF_ROOT}")
  
  # Set location of GDAL (can be root directory, path to header file or path to
  # gdal-config) [auto]:
 -#set (GDAL_ROOT "gdal_install_prefix")
-+set (GDAL_ROOT "$ENV{GDAL_ROOT}")
++#set (GDAL_ROOT "$ENV{GDAL_ROOT}")
  
  # Set location of GEOS (can be root directory, path to header file or path to
@@ -44,5 +36,5 @@
  # Set location of ZLIB (can be root directory or path to header file) [auto]:
 -#set (ZLIB_ROOT "zlib_install_prefix")
-+set (ZLIB_ROOT "$ENV{ZLIB_ROOT}")
++#set (ZLIB_ROOT "$ENV{ZLIB_ROOT}")
  
  # Set location of CURL (can be root directory or path to header file) [auto]:
Index: /issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh	(revision 28165)
+++ /issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh	(revision 28166)
@@ -6,4 +6,6 @@
 #
 VER="6.5.0"
+
+PREFIX="${ISSM_DIR}/externalpackages/gmt/install"
 
 # Find certain libraries so we do not have to hardcode them
@@ -22,5 +24,5 @@
 
 GDAL_EXTRA_LIBS="-lc++" # `$GDAL_ROOT/bin/gdal-config --dep-libs` does not report need to link to libc++ (see also customized configuration file ./configs/6/static/cmake/modules/FindGDAL.cmake)
-NETCDF_EXTRA_LIBS="-lpthread -ldl -liconv" # `$NETCDF_ROOT/bin/nc-config --libs` does not report certain dependencies of certain static libraries (see also customized configuration file ./configs/6/static/cmake/modules/FindNETCDF.cmake)
+NETCDF_EXTRA_LIBS="-lpthread -ldl -liconv" # `$NETCDF_ROOT/bin/nc-config --libs` does not report certain dependencies of certain static libraries (see also customized configuration file ./configs/${VER%.*}/static/cmake/modules/FindNETCDF.cmake)
 
 # Environment
@@ -30,5 +32,4 @@
 export CURL_LIBRARIES="${CURL_ROOT}/lib/libcurl.a;${ZLIB_ROOT}/lib/libz.a"
 export LDFLAGS="-lsqlite3 -framework CoreFoundation -framework Security"
-export PREFIX="${ISSM_DIR}/externalpackages/gmt/install" # NOTE: Need to export this to be picked up by customized ConfigUser.cmake (see below). Set to location where external package should be installed.
 
 # Download source
@@ -68,4 +69,5 @@
 #
 cmake \
+	-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 	-DBLAS_LIBRARIES="${BLAS_ROOT}/lib/libfblas.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
 	-DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
Index: /issm/trunk-jpl/packagers/mac/complete-issm-mac-intel-binaries-matlab.sh
===================================================================
--- /issm/trunk-jpl/packagers/mac/complete-issm-mac-intel-binaries-matlab.sh	(revision 28165)
+++ /issm/trunk-jpl/packagers/mac/complete-issm-mac-intel-binaries-matlab.sh	(revision 28166)
@@ -64,5 +64,5 @@
 ## Constants
 #
-MATLAB_NROPTIONS="'benchmark','all','exclude',[124,125,126,129,234,235,418,420,435,444,445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
+MATLAB_NROPTIONS="'benchmark','all','exclude',[124,125,126,129,234,235,418,420,435,444,445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2005,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
 MATLAB_PATH="/Applications/MATLAB_R2023b.app"
 PKG="ISSM-macOS-Intel-MATLAB" # Name of directory to copy distributable files to
Index: /issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-matlab.sh
===================================================================
--- /issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-matlab.sh	(revision 28165)
+++ /issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-matlab.sh	(revision 28166)
@@ -64,5 +64,5 @@
 ## Constants
 #
-MATLAB_NROPTIONS="'benchmark','all','exclude',[124,125,126,129,234,235,418,420,435,444,445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
+MATLAB_NROPTIONS="'benchmark','all','exclude',[124,125,126,129,234,235,418,420,435,444,445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2005,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
 MATLAB_PATH="/Applications/MATLAB_R2023b.app"
 PKG="ISSM-macOS-Silicon-MATLAB" # Name of directory to copy distributable files to