*/*: In 7 ports remove GNU-10.3.0 from install paths

This makes them prone to breaking when GCC version is changed. Reported by: diizzy@
freebsd · Jan 18, 2022 · 737e7cd · 737e7cd
1 parent 70cc8bb
commit 737e7cd
Show file tree

Hide file tree

Showing 15 changed files with 258 additions and 230 deletions.
diff --git a/science/dftd4/Makefile b/science/dftd4/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	dftd4
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.0
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -20,4 +21,7 @@ USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
+post-patch: # see https://github.com/toml-f/toml-f/issues/51
+	@${REINPLACE_CMD} -e 's|$${CMAKE_Fortran_COMPILER_ID}-$${CMAKE_Fortran_COMPILER_VERSION}||' ${WRKSRC}/config/CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/science/dftd4/pkg-plist b/science/dftd4/pkg-plist
@@ -1,27 +1,27 @@
 bin/dftd4
 include/dftd4.h
-include/dftd4/GNU-10.3.0/dftd4.mod
-include/dftd4/GNU-10.3.0/dftd4_api.mod
-include/dftd4/GNU-10.3.0/dftd4_blas.mod
-include/dftd4/GNU-10.3.0/dftd4_charge.mod
-include/dftd4/GNU-10.3.0/dftd4_cutoff.mod
-include/dftd4/GNU-10.3.0/dftd4_damping.mod
-include/dftd4/GNU-10.3.0/dftd4_damping_atm.mod
-include/dftd4/GNU-10.3.0/dftd4_damping_rational.mod
-include/dftd4/GNU-10.3.0/dftd4_data.mod
-include/dftd4/GNU-10.3.0/dftd4_data_covrad.mod
-include/dftd4/GNU-10.3.0/dftd4_data_en.mod
-include/dftd4/GNU-10.3.0/dftd4_data_hardness.mod
-include/dftd4/GNU-10.3.0/dftd4_data_r4r2.mod
-include/dftd4/GNU-10.3.0/dftd4_data_zeff.mod
-include/dftd4/GNU-10.3.0/dftd4_disp.mod
-include/dftd4/GNU-10.3.0/dftd4_model.mod
-include/dftd4/GNU-10.3.0/dftd4_ncoord.mod
-include/dftd4/GNU-10.3.0/dftd4_output.mod
-include/dftd4/GNU-10.3.0/dftd4_param.mod
-include/dftd4/GNU-10.3.0/dftd4_reference.mod
-include/dftd4/GNU-10.3.0/dftd4_utils.mod
-include/dftd4/GNU-10.3.0/dftd4_version.mod
+include/dftd4/dftd4.mod
+include/dftd4/dftd4_api.mod
+include/dftd4/dftd4_blas.mod
+include/dftd4/dftd4_charge.mod
+include/dftd4/dftd4_cutoff.mod
+include/dftd4/dftd4_damping.mod
+include/dftd4/dftd4_damping_atm.mod
+include/dftd4/dftd4_damping_rational.mod
+include/dftd4/dftd4_data.mod
+include/dftd4/dftd4_data_covrad.mod
+include/dftd4/dftd4_data_en.mod
+include/dftd4/dftd4_data_hardness.mod
+include/dftd4/dftd4_data_r4r2.mod
+include/dftd4/dftd4_data_zeff.mod
+include/dftd4/dftd4_disp.mod
+include/dftd4/dftd4_model.mod
+include/dftd4/dftd4_ncoord.mod
+include/dftd4/dftd4_output.mod
+include/dftd4/dftd4_param.mod
+include/dftd4/dftd4_reference.mod
+include/dftd4/dftd4_utils.mod
+include/dftd4/dftd4_version.mod
 lib/cmake/dftd4/Findcustom-blas.cmake
 lib/cmake/dftd4/Findmctc-lib.cmake
 lib/cmake/dftd4/Findmstore.cmake

diff --git a/science/mctc-lib/Makefile b/science/mctc-lib/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	mctc-lib
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -17,4 +18,7 @@ GH_ACCOUNT=	grimme-lab
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
+post-patch: # see https://github.com/toml-f/toml-f/issues/51
+	@${REINPLACE_CMD} -e 's|$${CMAKE_Fortran_COMPILER_ID}-$${CMAKE_Fortran_COMPILER_VERSION}||' ${WRKSRC}/config/CMakeLists.txt ${WRKSRC}/CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/science/mctc-lib/pkg-plist b/science/mctc-lib/pkg-plist
@@ -1,38 +1,38 @@
 bin/mctc-convert
-include/mctc-lib/GNU-10.3.0/mctc_env.mod
-include/mctc-lib/GNU-10.3.0/mctc_env_accuracy.mod
-include/mctc-lib/GNU-10.3.0/mctc_env_error.mod
-include/mctc-lib/GNU-10.3.0/mctc_env_system.mod
-include/mctc-lib/GNU-10.3.0/mctc_env_testing.mod
-include/mctc-lib/GNU-10.3.0/mctc_io.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_constants.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_convert.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_filetype.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_math.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_read.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_read_ctfile.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_read_gaussian.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_read_genformat.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_read_pdb.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_read_qcschema.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_read_turbomole.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_read_vasp.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_read_xyz.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_resize.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_structure.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_structure_info.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_symbols.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_utils.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_write.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_write_ctfile.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_write_gaussian.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_write_genformat.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_write_pdb.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_write_qcschema.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_write_turbomole.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_write_vasp.mod
-include/mctc-lib/GNU-10.3.0/mctc_io_write_xyz.mod
-include/mctc-lib/GNU-10.3.0/mctc_version.mod
+include/mctc-lib/mctc_env.mod
+include/mctc-lib/mctc_env_accuracy.mod
+include/mctc-lib/mctc_env_error.mod
+include/mctc-lib/mctc_env_system.mod
+include/mctc-lib/mctc_env_testing.mod
+include/mctc-lib/mctc_io.mod
+include/mctc-lib/mctc_io_constants.mod
+include/mctc-lib/mctc_io_convert.mod
+include/mctc-lib/mctc_io_filetype.mod
+include/mctc-lib/mctc_io_math.mod
+include/mctc-lib/mctc_io_read.mod
+include/mctc-lib/mctc_io_read_ctfile.mod
+include/mctc-lib/mctc_io_read_gaussian.mod
+include/mctc-lib/mctc_io_read_genformat.mod
+include/mctc-lib/mctc_io_read_pdb.mod
+include/mctc-lib/mctc_io_read_qcschema.mod
+include/mctc-lib/mctc_io_read_turbomole.mod
+include/mctc-lib/mctc_io_read_vasp.mod
+include/mctc-lib/mctc_io_read_xyz.mod
+include/mctc-lib/mctc_io_resize.mod
+include/mctc-lib/mctc_io_structure.mod
+include/mctc-lib/mctc_io_structure_info.mod
+include/mctc-lib/mctc_io_symbols.mod
+include/mctc-lib/mctc_io_utils.mod
+include/mctc-lib/mctc_io_write.mod
+include/mctc-lib/mctc_io_write_ctfile.mod
+include/mctc-lib/mctc_io_write_gaussian.mod
+include/mctc-lib/mctc_io_write_genformat.mod
+include/mctc-lib/mctc_io_write_pdb.mod
+include/mctc-lib/mctc_io_write_qcschema.mod
+include/mctc-lib/mctc_io_write_turbomole.mod
+include/mctc-lib/mctc_io_write_vasp.mod
+include/mctc-lib/mctc_io_write_xyz.mod
+include/mctc-lib/mctc_version.mod
 lib/cmake/mctc-lib/Findjsonfortran.cmake
 lib/cmake/mctc-lib/mctc-lib-config-version.cmake
 lib/cmake/mctc-lib/mctc-lib-config.cmake

diff --git a/science/mstore/Makefile b/science/mstore/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	mstore
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -19,4 +20,7 @@ GH_ACCOUNT=	grimme-lab
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
+post-patch: # see https://github.com/toml-f/toml-f/issues/51
+	@${REINPLACE_CMD} -e 's|$${CMAKE_Fortran_COMPILER_ID}-$${CMAKE_Fortran_COMPILER_VERSION}||' ${WRKSRC}/config/CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/science/mstore/pkg-plist b/science/mstore/pkg-plist
@@ -1,18 +1,18 @@
 bin/mstore-fortranize
 bin/mstore-info
-include/mstore/GNU-10.3.0/mstore.mod
-include/mstore/GNU-10.3.0/mstore_amino20x4.mod
-include/mstore/GNU-10.3.0/mstore_but14diol.mod
-include/mstore/GNU-10.3.0/mstore_data_collection.mod
-include/mstore/GNU-10.3.0/mstore_data_record.mod
-include/mstore/GNU-10.3.0/mstore_data_store.mod
-include/mstore/GNU-10.3.0/mstore_heavy28.mod
-include/mstore/GNU-10.3.0/mstore_ice10.mod
-include/mstore/GNU-10.3.0/mstore_il16.mod
-include/mstore/GNU-10.3.0/mstore_mb16_43.mod
-include/mstore/GNU-10.3.0/mstore_upu23.mod
-include/mstore/GNU-10.3.0/mstore_version.mod
-include/mstore/GNU-10.3.0/mstore_x23.mod
+include/mstore/mstore.mod
+include/mstore/mstore_amino20x4.mod
+include/mstore/mstore_but14diol.mod
+include/mstore/mstore_data_collection.mod
+include/mstore/mstore_data_record.mod
+include/mstore/mstore_data_store.mod
+include/mstore/mstore_heavy28.mod
+include/mstore/mstore_ice10.mod
+include/mstore/mstore_il16.mod
+include/mstore/mstore_mb16_43.mod
+include/mstore/mstore_upu23.mod
+include/mstore/mstore_version.mod
+include/mstore/mstore_x23.mod
 lib/cmake/mstore/Findmctc-lib.cmake
 lib/cmake/mstore/mstore-config-version.cmake
 lib/cmake/mstore/mstore-config.cmake

diff --git a/science/multicharge/Makefile b/science/multicharge/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	multicharge
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.2
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -21,4 +22,7 @@ GH_ACCOUNT=	grimme-lab
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
+post-patch: # see https://github.com/toml-f/toml-f/issues/51
+	@${REINPLACE_CMD} -e 's|$${CMAKE_Fortran_COMPILER_ID}-$${CMAKE_Fortran_COMPILER_VERSION}||' ${WRKSRC}/config/CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/science/multicharge/pkg-plist b/science/multicharge/pkg-plist
@@ -1,18 +1,18 @@
 bin/multicharge
-include/multicharge/GNU-10.3.0/multicharge.mod
-include/multicharge/GNU-10.3.0/multicharge_blas.mod
-include/multicharge/GNU-10.3.0/multicharge_cutoff.mod
-include/multicharge/GNU-10.3.0/multicharge_data.mod
-include/multicharge/GNU-10.3.0/multicharge_data_covrad.mod
-include/multicharge/GNU-10.3.0/multicharge_ewald.mod
-include/multicharge/GNU-10.3.0/multicharge_lapack.mod
-include/multicharge/GNU-10.3.0/multicharge_model.mod
-include/multicharge/GNU-10.3.0/multicharge_ncoord.mod
-include/multicharge/GNU-10.3.0/multicharge_output.mod
-include/multicharge/GNU-10.3.0/multicharge_param.mod
-include/multicharge/GNU-10.3.0/multicharge_param_eeq2019.mod
-include/multicharge/GNU-10.3.0/multicharge_version.mod
-include/multicharge/GNU-10.3.0/multicharge_wignerseitz.mod
+include/multicharge/multicharge.mod
+include/multicharge/multicharge_blas.mod
+include/multicharge/multicharge_cutoff.mod
+include/multicharge/multicharge_data.mod
+include/multicharge/multicharge_data_covrad.mod
+include/multicharge/multicharge_ewald.mod
+include/multicharge/multicharge_lapack.mod
+include/multicharge/multicharge_model.mod
+include/multicharge/multicharge_ncoord.mod
+include/multicharge/multicharge_output.mod
+include/multicharge/multicharge_param.mod
+include/multicharge/multicharge_param_eeq2019.mod
+include/multicharge/multicharge_version.mod
+include/multicharge/multicharge_wignerseitz.mod
 lib/cmake/multicharge/Findcustom-blas.cmake
 lib/cmake/multicharge/Findcustom-lapack.cmake
 lib/cmake/multicharge/Findmctc-lib.cmake

diff --git a/science/simple-dftd3/Makefile b/science/simple-dftd3/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	simple-dftd3
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -22,4 +23,7 @@ GH_ACCOUNT=	awvwgk
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
+post-patch: # see https://github.com/toml-f/toml-f/issues/51
+	@${REINPLACE_CMD} -e 's|$${CMAKE_Fortran_COMPILER_ID}-$${CMAKE_Fortran_COMPILER_VERSION}||' ${WRKSRC}/config/CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/science/simple-dftd3/pkg-plist b/science/simple-dftd3/pkg-plist
@@ -1,28 +1,28 @@
 bin/s-dftd3
 include/dftd3.h
 include/s-dftd3.h
-include/s-dftd3/GNU-10.3.0/dftd3.mod
-include/s-dftd3/GNU-10.3.0/dftd3_api.mod
-include/s-dftd3/GNU-10.3.0/dftd3_blas.mod
-include/s-dftd3/GNU-10.3.0/dftd3_cutoff.mod
-include/s-dftd3/GNU-10.3.0/dftd3_damping.mod
-include/s-dftd3/GNU-10.3.0/dftd3_damping_atm.mod
-include/s-dftd3/GNU-10.3.0/dftd3_damping_mzero.mod
-include/s-dftd3/GNU-10.3.0/dftd3_damping_optimizedpower.mod
-include/s-dftd3/GNU-10.3.0/dftd3_damping_rational.mod
-include/s-dftd3/GNU-10.3.0/dftd3_damping_zero.mod
-include/s-dftd3/GNU-10.3.0/dftd3_data.mod
-include/s-dftd3/GNU-10.3.0/dftd3_data_covrad.mod
-include/s-dftd3/GNU-10.3.0/dftd3_data_r4r2.mod
-include/s-dftd3/GNU-10.3.0/dftd3_data_vdwrad.mod
-include/s-dftd3/GNU-10.3.0/dftd3_disp.mod
-include/s-dftd3/GNU-10.3.0/dftd3_model.mod
-include/s-dftd3/GNU-10.3.0/dftd3_ncoord.mod
-include/s-dftd3/GNU-10.3.0/dftd3_output.mod
-include/s-dftd3/GNU-10.3.0/dftd3_param.mod
-include/s-dftd3/GNU-10.3.0/dftd3_reference.mod
-include/s-dftd3/GNU-10.3.0/dftd3_utils.mod
-include/s-dftd3/GNU-10.3.0/dftd3_version.mod
+include/s-dftd3/dftd3.mod
+include/s-dftd3/dftd3_api.mod
+include/s-dftd3/dftd3_blas.mod
+include/s-dftd3/dftd3_cutoff.mod
+include/s-dftd3/dftd3_damping.mod
+include/s-dftd3/dftd3_damping_atm.mod
+include/s-dftd3/dftd3_damping_mzero.mod
+include/s-dftd3/dftd3_damping_optimizedpower.mod
+include/s-dftd3/dftd3_damping_rational.mod
+include/s-dftd3/dftd3_damping_zero.mod
+include/s-dftd3/dftd3_data.mod
+include/s-dftd3/dftd3_data_covrad.mod
+include/s-dftd3/dftd3_data_r4r2.mod
+include/s-dftd3/dftd3_data_vdwrad.mod
+include/s-dftd3/dftd3_disp.mod
+include/s-dftd3/dftd3_model.mod
+include/s-dftd3/dftd3_ncoord.mod
+include/s-dftd3/dftd3_output.mod
+include/s-dftd3/dftd3_param.mod
+include/s-dftd3/dftd3_reference.mod
+include/s-dftd3/dftd3_utils.mod
+include/s-dftd3/dftd3_version.mod
 lib/cmake/s-dftd3/Findcustom-blas.cmake
 lib/cmake/s-dftd3/Findmctc-lib.cmake
 lib/cmake/s-dftd3/Findmstore.cmake

diff --git a/science/tblite/Makefile b/science/tblite/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	tblite
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	science # chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -23,4 +24,7 @@ USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
+post-patch: # see https://github.com/toml-f/toml-f/issues/51
+	@${REINPLACE_CMD} -e 's|$${CMAKE_Fortran_COMPILER_ID}-$${CMAKE_Fortran_COMPILER_VERSION}||' ${WRKSRC}/config/CMakeLists.txt
+
 .include <bsd.port.mk>