Index: head/net/mpich/Makefile =================================================================== --- head/net/mpich/Makefile (revision 487709) +++ head/net/mpich/Makefile (revision 487710) @@ -1,91 +1,91 @@ # $FreeBSD$ PORTNAME= mpich PORTVERSION= 3.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net parallel MASTER_SITES= http://www.mpich.org/static/downloads/${DISTVERSION}/ MAINTAINER= ports@FreeBSD.org COMMENT= Portable implementation of MPI-1, MPI-2 and MPI-3 LICENSE= MPICH LICENSE_NAME= MPICH LICENSE_FILE= ${WRKSRC}/COPYRIGHT LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libhwloc.so:devel/hwloc CONFLICTS= lam-7.* mpd-[0-9]* mpiexec-0.* mpich2-[0-9]* GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= compiler:c11 libtool pkgconfig USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS FORTRAN OPTIONS_GROUP= PM OPTIONS_GROUP_PM= GFORKER HYDRA OPTIONS_RADIO= DEFAULTPM OPTIONS_RADIO_DEFAULTPM=DGFORKER DHYDRA OPTIONS_DEFAULT= FORTRAN GFORKER HYDRA DHYDRA OPTIONS_SUB= yes FORTRAN_USES= fortran FORTRAN_CONFIGURE_ENABLE= fortran FORTRAN_CONFIGURE_ON= \ MPICH_MPICC_LDFLAGS="${MPICH_LDFLAGS}" \ MPICH_MPICXX_LDFLAGS="${MPICH_LDFLAGS}" \ MPICH_MPIF77_LDFLAGS="${MPICH_LDFLAGS}" \ MPICH_MPIFORT_LDFLAGS="${MPICH_LDFLAGS}" MPICH_LDFLAGS= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \ -L${LOCALBASE}/lib/gcc${_GCC_VER} -B${LOCALBASE}/bin PM_DESC= Process managers GFORKER_DESC= Simple local process manager HYDRA_DESC= Parallel process manager DEFAULTPM_DESC= Default process manager DGFORKER_DESC= Make gforker the default process manager DHYDRA_DESC= Make hydra the default process manager CONFIGURE_ARGS= --enable-fast="" --with-hwloc-prefix=${LOCALBASE} \ ac_cv_path_BASH_SHELL="" \ pkgconfigdir="${PREFIX}/libdata/pkgconfig" \ MPICHLIB_CFLAGS="${CFLAGS}" CFLAGS="" \ MPICHLIB_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="" \ MPICHLIB_CXXFLAGS="${CXXFLAGS}" CXXFLAGS="" \ MPICHLIB_FFLAGS="${FFLAGS}" FFLAGS="" \ MPICHLIB_FCFLAGS="${FCFLAGS}" FCFLAGS="" \ MPICHLIB_LDFLAGS="${LDFLAGS}" LDFLAGS="" \ MPICHLIB_LIBS="${LIBS}" LIBS="" .include .for pm in ${OPTIONS_GROUP_PM} . if ${PORT_OPTIONS:M${pm}} . if empty(PMLIST) PMLIST= ${pm:tl} . elif ${PORT_OPTIONS:MD${pm}} PMLIST:= ${pm:tl},${PMLIST} . else PMLIST:= ${PMLIST},${pm:tl} . endif . endif .endfor .if empty(PMLIST) CONFIGURE_ARGS+=--without-pm PLIST_SUB+= EXEC="@comment " EXECGFORKER="@comment " .else CONFIGURE_ARGS+=--with-pm=${PMLIST} PLIST_SUB+= EXEC="" .if ${PMLIST:M*,gforker*} PLIST_SUB+= EXECGFORKER="" .else PLIST_SUB+= EXECGFORKER="@comment " .endif .endif post-patch: @${RM} -r ${WRKSRC}/www .include Index: head/net/mpich/files/patch-src_binding_cxx_mpicxx.h.in =================================================================== --- head/net/mpich/files/patch-src_binding_cxx_mpicxx.h.in (nonexistent) +++ head/net/mpich/files/patch-src_binding_cxx_mpicxx.h.in (revision 487710) @@ -0,0 +1,18 @@ +--- src/binding/cxx/mpicxx.h.in.orig 2018-12-17 19:36:19 UTC ++++ src/binding/cxx/mpicxx.h.in +@@ -16,6 +16,7 @@ + // GCC (specifically) g++ changed the calling convention + // between 3.2.3 and 3.4.3 (!!) Normally such changes + // should only occur at major releases (e.g., version 3 to 4) ++#if 0 // FreeBSD: remove this version check that fails for no apparent reason + #ifdef __GNUC__ + # if __GNUC__ >= @GNUCXX_VERSION@ + # if __GNUC_MINOR__ > 2 && @GNUCXX_MINORVERSION@ == 2 +@@ -23,6 +24,7 @@ + # endif + # endif + #endif ++#endif + + /* + * Because the API is defined, some methods have parameters that are Property changes on: head/net/mpich/files/patch-src_binding_cxx_mpicxx.h.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property