Re: [UPDATE] devel/openmpi 4.0.1

Please don't do the huge bump for SHARED_LIBS, just a standard major bump
for the existing libraries and start the new ones at 0.0

--
Sent from a phone, apologies for poor formatting.

On 31 May 2019 18:55:23 Martin Reindl <martin@catai.org> wrote:

> Hello ports@,
>
>
> here is an update for another port that probably get's not much widespread
> usage. Nevertheless, this is worthwhile for people running in an MPI-3.1
> environment. Tested on macppc, arm64 and amd64. I only needed this once, so
> I am not too keen on taking MAINTAINER. Note all fortran bits pass make test
> with the new egfortran from ports-gcc on the aforementioned archs.
>
>
> -m
>
>
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/openmpi/Makefile,v
> retrieving revision 1.26
> diff -u -p -u -p -r1.26 Makefile
> --- Makefile 21 Jan 2019 14:24:30 -0000 1.26
> +++ Makefile 30 May 2019 17:19:34 -0000
> @@ -1,52 +1,46 @@
> # $OpenBSD: Makefile,v 1.26 2019/01/21 14:24:30 jca Exp $
>
> -BROKEN-hppa = error: Could not determine global symbol label prefix
> -BROKEN-powerpc = checking if Fortran 77 compiler works... no
> +COMMENT = open source MPI-3.1 implementation
>
> -COMMENT = open source MPI-2 implementation
> -
> -V= 1.4.1
> +V= 4.0.1
> DISTNAME = openmpi-$V
> -REVISION = 8
> -
> -SHARED_LIBS = mca_common_sm 1.0 \
> - mpi 0.1 \
> - mpi_cxx 0.0 \
> - mpi_f77 0.0 \
> - open-pal 0.0 \
> - open-rte 0.0
>
> CATEGORIES = devel
>
> +MASTER_SITES =
> ${HOMEPAGE}/software/ompi/v${V:C/^([0-9]+\.[0-9]+).*/\1/}/downloads/
> +
> HOMEPAGE = http://www.open-mpi.org/
>
> +# BSD
> +PERMIT_PACKAGE_CDROM = Yes
> +
> +SHARED_LIBS += mca_common_dstore 1.0 \
> + mca_common_monitoring 60.0 \
> + mca_common_ompio 60.1 \
> + mca_common_sm 60.0 \
> + mpi 60.1 \
> + mpi_cxx 60.0 \
> + mpi_mpifh 60.1 \
> + mpi_usempi_ignore_tkr 60.0 \
> + mpi_usempif08 60.0 \
> + ompitrace 60.0 \
> + open-pal 60.1 \
> + open-rte 60.1
> +
> MODULES = fortran
> -MODFORTRAN_COMPILER = g77
> +MODFORTRAN_COMPILER = gfortran
> BUILD_DEPENDS += ${MODFORTRAN_BUILD_DEPENDS}
>
> -# BSD
> -PERMIT_PACKAGE_CDROM = Yes
> +LIB_DEPENDS += devel/libexecinfo
>
> WANTLIB += c m pthread ${COMPILER_LIBCXX} util z
> +WANTLIB += pciaccess execinfo
>
> COMPILER = base-clang ports-gcc base-gcc
>
> -MASTER_SITES =
> ${HOMEPAGE}/software/ompi/v${V:C/^([0-9]+\.[0-9]+).*/\1/}/downloads/
> -
> -# XXX: uses a locally modified libtool.
> -USE_LIBTOOL = No
> -
> -FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples/openmpi/
> CONFIGURE_STYLE = gnu
> -CONFIGURE_ENV = F77=${MODFORTRAN_COMPILER}
> +CONFIGURE_ARGS += --enable-mpi-cxx
>
> -.include <bsd.port.arch.mk>
> -.if ${PROPERTIES:Mclang}
> -CONFIGURE_ARGS = --disable-visibility
> -.endif
> -
> -# openmpi's otfinfo conflicts with the one from texlive
> -post-install:
> - mv ${PREFIX}/bin/otfinfo ${PREFIX}/bin/otfinfompi
> +FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples/openmpi/
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/openmpi/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- distinfo 18 Jan 2015 03:13:19 -0000 1.3
> +++ distinfo 30 May 2019 17:19:34 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (openmpi-1.4.1.tar.gz) = quq9IhjNxPEejgPhVTkQEpzIQw6TN2xANsqW/BoVubU=
> -SIZE (openmpi-1.4.1.tar.gz) = 9960381
> +SHA256 (openmpi-4.0.1.tar.gz) = 5V4hP+CaIUq58scirP2L97ObvBgA5LekZNON8V5wf1k=
> +SIZE (openmpi-4.0.1.tar.gz) = 17513706
> Index: patches/patch-ompi_contrib_vt_vt_tools_compwrap_compwrap_cc
> ===================================================================
> RCS file: patches/patch-ompi_contrib_vt_vt_tools_compwrap_compwrap_cc
> diff -N patches/patch-ompi_contrib_vt_vt_tools_compwrap_compwrap_cc
> --- patches/patch-ompi_contrib_vt_vt_tools_compwrap_compwrap_cc 11 Apr 2018
> 22:49:40 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,145 +0,0 @@
> -$OpenBSD: patch-ompi_contrib_vt_vt_tools_compwrap_compwrap_cc,v 1.1
> 2018/04/11 22:49:40 sthen Exp $
> -
> -Index: ompi/contrib/vt/vt/tools/compwrap/compwrap.cc
> ---- ompi/contrib/vt/vt/tools/compwrap/compwrap.cc.orig
> -+++ ompi/contrib/vt/vt/tools/compwrap/compwrap.cc
> -@@ -99,7 +99,7 @@ ReadDataFile()
> - "compiler_iflags_ftrace", "inst_avail", "inst_default"
> - };
> -
> -- std::string data_file = DATADIR"/" + ExeName + "-wrapper-data.txt";
> -+ std::string data_file = DATADIR "/" + ExeName + "-wrapper-data.txt";
> - std::ifstream in( data_file.c_str() );
> - if( !in )
> - {
> -@@ -646,11 +646,11 @@ ParseCommandLine( int argc, char ** argv )
> - //
> - // -vt:<cc|cxx|f77|f90> <cmd>
> - //
> -- else if( arg.compare("-vt:"WRAP_LANG_SUFFIX) == 0 )
> -+ else if( arg.compare("-vt:" WRAP_LANG_SUFFIX) == 0 )
> - {
> - if( i == argc - 1 )
> - {
> -- std::cerr << ExeName << ": <cmd> expected -- -vt:"WRAP_LANG_SUFFIX
> -+ std::cerr << ExeName << ": <cmd> expected -- -vt:" WRAP_LANG_SUFFIX
> - << std::endl;
> - return false;
> - }
> -@@ -824,7 +824,7 @@ Wrapper::showUsageText()
> - << " compiler wrapper for VampirTrace."
> - << std::endl << std::endl
> - << " Syntax: " << ExeName << " "
> -- << "[-vt:"WRAP_LANG_SUFFIX" <cmd>] "
> -+ << "[-vt:" WRAP_LANG_SUFFIX " <cmd>] "
> - << "[-vt:inst <insttype>] [-vt:<seq|mpi|omp|hyb>] "
> - << std::endl << " "
> - << "[-vt:opari <args>]"
> -@@ -840,7 +840,7 @@ Wrapper::showUsageText()
> - << std::endl
> - << " -vt:help Show this help message."
> - << std::endl
> -- << " -vt:"WRAP_LANG_SUFFIX" <cmd> ";
> -+ << " -vt:" WRAP_LANG_SUFFIX " <cmd> ";
> - if( strlen( WRAP_LANG_SUFFIX ) == 2 ) std::cout << " ";
> - std::cout << "Set the underlying compiler command.";
> - std::cout << std::endl << std::endl;
> -@@ -895,7 +895,7 @@ Wrapper::showUsageText()
> -
> - std::cout << " -vt:opari <args> Set options for OPARI command."
> - << std::endl
> -- << " (see "DATADIR"/doc/opari/Readme.html
> for more information)"
> -+ << " (see " DATADIR "/doc/opari/Readme.html
> for more information)"
> - << std::endl << std::endl
> - << " -vt:<seq|mpi|omp|hyb>"
> - << std::endl
> -@@ -939,7 +939,7 @@ Wrapper::showUsageText()
> - << std::endl << std::endl
> - << " See the man page for your underlying compiler for other
> options that can"
> - << std::endl
> -- << " be passed through 'vt"WRAP_LANG_SUFFIX"'."
> -+ << " be passed through 'vt" WRAP_LANG_SUFFIX "'."
> - << std::endl << std::endl
> - << " environment variables:"
> - << std::endl
> -@@ -952,7 +952,7 @@ Wrapper::showUsageText()
> - #elif defined(WRAP_LANG_F90)
> - << " VT_F90"
> -