git: 307bccbbf84b - main - science/pnetcdf: Clean up Makefile

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=307bccbbf84bc31b733d653a615db8e4463b0453

commit 307bccbbf84bc31b733d653a615db8e4463b0453
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-03-23 14:18:56 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-03-23 14:30:47 +0000

    science/pnetcdf: Clean up Makefile
---
 science/pnetcdf/Makefile | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/science/pnetcdf/Makefile b/science/pnetcdf/Makefile
index 20efb8a90604..de328531fed6 100644
--- a/science/pnetcdf/Makefile
+++ b/science/pnetcdf/Makefile
@@ -15,6 +15,8 @@ USE_PERL5=	build
 
 CFLAGS+=	-fPIC
 CONFIGURE_ARGS=	--with-mpi=${MPI_HOME} ac_cv_fc_compiler_nag=no
+# Workaround for GCC 10+ for Type mismatch between actual argument at (1) and actual argument at (2) (INTEGER(8)/CHARACTER(*)).
+FCFLAGS+=	-fallow-argument-mismatch
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 MAKE_JOBS_UNSAFE=	yes
@@ -24,6 +26,9 @@ CONFLICTS_INSTALL=	hdf-4.*
 OPTIONS_SINGLE=	MPI
 OPTIONS_SINGLE_MPI=	OPENMPI MPICH
 OPTIONS_DEFAULT=OPENMPI
+# Use Use MPICH option for 32-bit architecture.
+# PnetCDF requires MPI_Offset >= 8 but Open MPI sets MPI_Offset to 4 on 32-bit architecture regardless of LFS.
+# See https://github.com/open-mpi/ompi/issues/3195 for details.
 OPTIONS_DEFAULT_armv6=	MPICH
 OPTIONS_DEFAULT_armv7=	MPICH
 OPTIONS_DEFAULT_i386=	MPICH
@@ -36,15 +41,4 @@ OPTIONS_EXCLUDE_powerpc=OPENMPI
 MPICH_USES=	mpi:mpich
 OPENMPI_USES=	mpi:openmpi
 
-.include <bsd.port.pre.mk>
-
-.if ${GCC_DEFAULT} >= 10
-# Workaround for Type mismatch between actual argument at (1) and actual argument at (2) (INTEGER(8)/CHARACTER(*)).
-FCFLAGS+=	-fallow-argument-mismatch
-.endif
-
-.if (${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc) && ${PORT_OPTIONS:MOPENMPI}
-BROKEN=		Use MPICH option instead. PnetCDF requires MPI_Offset >= 8 but Open MPI sets MPI_Offset to 4 on 32-bit architecture regardless of LFS. See https://github.com/open-mpi/ompi/issues/3195 for details
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>