diff --git a/MOVED b/MOVED index 034726985329a..1853da78f0de2 100644 --- a/MOVED +++ b/MOVED @@ -17183,3 +17183,4 @@ devel/autoconf213|devel/autoconf2.13|2022-05-27|Autoconf restructuring math/py-cdecimal||2022-05-27|Has expired: upstream does not support it after Python-3.2 devel/py-meliae||2022-05-27|Has expired: does not build against Python-3.9 databases/R-cran-RSQLite.extfuns|databases/R-cran-RSQLite|2022-05-31|Has expired: RSQLite incorporates RSQLite.extfuns +net/mpich2|net/mpich|2022-05-31|Has been deprecrated for a long time and build fails with GCC 11 diff --git a/net/Makefile b/net/Makefile index 7f3021a91582d..78c522568d9ae 100644 --- a/net/Makefile +++ b/net/Makefile @@ -466,7 +466,6 @@ SUBDIR += mpd-l2tp-ipv6pd-client SUBDIR += mpd5 SUBDIR += mpich - SUBDIR += mpich2 SUBDIR += mpifx SUBDIR += mping SUBDIR += mptsd diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile deleted file mode 100644 index 41e64570286ce..0000000000000 --- a/net/mpich2/Makefile +++ /dev/null @@ -1,189 +0,0 @@ -# Created by: dbader@ece.unm.edu - -PORTNAME= mpich2 -DISTVERSION= 1.5 -PORTREVISION= 15 -PORTEPOCH= 5 -CATEGORIES= net java parallel -MASTER_SITES= http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${DISTVERSION}/ -DIST_SUBDIR= mpich - -MAINTAINER= thierry@FreeBSD.org -COMMENT= Portable implementation of MPI-1 and MPI-2 - -LICENSE= MPICH -LICENSE_NAME= MPICH -LICENSE_FILE= ${WRKSRC}/COPYRIGHT -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept - -DEPRECATED= This is the legacy version, it is advised to use MPICH 3: net/mpich - -BUILD_DEPENDS= bash:shells/bash -RUN_DEPENDS= bash:shells/bash - -USES= libtool:keepla localbase fortran perl5 \ - pkgconfig -GNU_CONFIGURE= yes -USE_GCC= yes -USE_LDCONFIG= yes -USE_PERL5= build -INSTALL_TARGET= install-strip - -OPTIONS_DEFINE_i386= JAVA -OPTIONS_DEFINE_amd64= JAVA -OPTIONS_DEFINE= SMPD X11 DEBUG DOCS -OPTIONS_DEFAULT_i386= JAVA -OPTIONS_DEFAULT_amd64= JAVA -OPTIONS_DEFAULT= X11 -JAVA_DESC= build MPE Jumpshot-4 -SMPD_DESC= use SMPD instead of MPD, for a mixed-OS cluster -X11_DESC= build MPE graphics routines - -CONFIGURE_ARGS= --enable-romio --enable-shared \ - --docdir="${DOCSDIR}" \ - --without-python -CONFIGURE_ENV= FCFLAGS="${FFLAGS}" \ - MPI_CFLAGS="-I${LOCALBASE}/include" \ - PACKAGE="${PORTNAME}" \ - PTHREAD_LIBS="-lpthread" \ - BASH_SHELL="${LOCALBASE}/bin/bash" - -.if ${FFLAGS} == "-O" -FFLAGS= -O2 -.endif -LDFLAGS+= -lpthread -lexecinfo - -MAKE_ENV= CCACHE_DISABLE=yes PACKAGE=${PORTNAME} -NO_CCACHE= yes - -CONFLICTS= mpd mpich-3.* - -VERSO= 8.0.1 -VERSOM= ${VERSO:R:R} -PLIST_SUB= VER=${VERSO} VERM=${VERSOM} -SUB_FILES= pkg-message - -THREAD2FIX= configure test/mpi/threads/comm/Makefile.in \ - test/mpi/threads/pt2pt/Makefile.in \ - src/mpe2/src/logging/configure \ - src/mpi/romio/configure src/openpa/configure \ - src/pm/hydra/configure -LOCALBASE2FIX= src/mpe2/src/slog2sdk/trace_rlog/configure \ - src/mpe2/src/slog2sdk/trace_sample/configure \ - src/mpe2/src/graphics/configure -STAGE2FIX= bin/mpicc bin/mpicxx bin/mpif77 bin/mpif90 \ - etc/mpicc.conf etc/mpicxx.conf etc/mpif77.conf \ - etc/mpif90.conf sbin/mpeuninstall -DOC2PATCH= Makefile.in src/mpe2/sbin/mpeinstall.in \ - src/openpa/Makefile.in src/mpi/romio/util/romioinstall.in -CONFPFX2FIX1= src/pm/mpd/mpd.py -CONFPFX2FIX2= doc/installguide/install.tex.vin \ - src/pm/mpd/mpdroot.c -BIN2STRIP= check_callstack clog2_join clog2_print clog2_repair - -.include - -.if ${PORT_OPTIONS:MDEBUG} -MAKE_ENV+= VERBOSE=1 -.endif - -.if ! ${PORT_OPTIONS:MJAVA} -CONFIGURE_ARGS+= --without-java -PLIST_SUB+= JAVA="@comment " -PLX11= "@comment " -.else -.if ! ${PORT_OPTIONS:MX11} -IGNORE= WITH_JAVA requires WITH_X11 -.endif -CONFIGURE_ARGS+= --with-java="${JAVA_HOME}" -USE_JAVA= yes -PLIST_SUB+= JAVA="" -PLX11= "" -BIN2STRIP+= rlog_check_timeorder rlog_print -.endif - -#define WITH_RECV_TIMEOUT to be an appropriate value (>20 for slow machines), -#in order to set a different default MPIEXEC_RECV_TIMEOUT -.if defined(MAINTAINER_MODE) -WITH_RECV_TIMEOUT?= 100 -.else -WITH_RECV_TIMEOUT?= 20 -.endif - -.if ${PORT_OPTIONS:MSMPD} -CONFIGURE_ARGS+= --with-pmi=smpd --with-pm=smpd -PLIST_SUB+= PM_MPD="@comment " PM_SMPD="" -.else -CONFIGURE_ARGS+= --with-pmi=simple --with-pm=mpd -PLIST_SUB+= PM_MPD="" PM_SMPD="@comment " -BIN2STRIP+= mpdroot -.endif - -.if ! ${PORT_OPTIONS:MX11} -CONFIGURE_ARGS+= --disable-graphics -PLIST_SUB+= X11="@comment " -.else -CONFIGURE_ARGS+= --x-includes=${LOCALBASE}/include --x-libraries==${LOCALBASE}/lib -USES+= xorg -USE_XORG= x11 xt -PLIST_SUB+= X11=${PLX11} -.endif - -.include - -pre-configure: - ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${LOCALBASE2FIX:S|^|${WRKSRC}/|} - ${FIND} ${WRKSRC} -name configure | ${XARGS} \ - ${REINPLACE_CMD} -e 's|doc/$${PACKAGE}|doc/${PORTNAME}|' -.for fin in ${DOC2PATCH} -. if ${PORT_OPTIONS:MDOCS} - ${REINPLACE_CMD} -e 's|%%PORTDOCS%%||' ${WRKSRC}/${fin} -. else - ${REINPLACE_CMD} -e 's|%%PORTDOCS%%|#|' ${WRKSRC}/${fin} -. endif -.endfor -.if ! ${PORT_OPTIONS:MDOCS} - ${REINPLACE_CMD} -e 's|lib doc share|lib share|' \ - ${WRKSRC}/src/mpe2/src/slog2sdk/sbin/install-package.in -.endif - ${REINPLACE_CMD} -e '/MPIEXEC_RECV_TIMEOUT/s|20,|${WITH_RECV_TIMEOUT},|' \ - ${WRKSRC}/src/pm/mpd/mpiexec.py - ${REINPLACE_CMD} -e 's|%%SRCDIR%%|${WRKSRC}|' ${WRKSRC}/${CONFIGURE_SCRIPT} -.for cnf in ${CONFPFX2FIX1} - ${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' ${WRKSRC}/${cnf} -.endfor -.for cnf in ${CONFPFX2FIX2} - ${REINPLACE_CMD} -e 's|/etc/mpd.conf|${PREFIX}/etc/mpd.conf|' \ - ${WRKSRC}/${cnf} -.endfor - -post-install: - @${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${WRKDIR}/mpd.conf.dist - ${INSTALL_DATA} ${WRKDIR}/mpd.conf.dist ${STAGEDIR}${PREFIX}/etc/ -.for pg in ${STAGE2FIX} - ${REINPLACE_CMD} -e '/${STAGEDIR:C|/|\/|g}/s|${STAGEDIR}||' \ - ${STAGEDIR}${PREFIX}/${pg} - ${RM} ${STAGEDIR}${PREFIX}/${pg}.bak -.endfor -.for pg in ${BIN2STRIP} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${pg} -.endfor -.if ${PORT_OPTIONS:MJAVA} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/trace_rlog/libTraceInput.so -.endif - -.if defined(MAINTAINER_MODE) -regression-test: install -.if !exists(${HOME}/.mpd.conf) - @${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf - ${CHMOD} go-r ${HOME}/.mpd.conf - @${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!" -.endif - @${ECHO_MSG} "Increase MPIEXEC_RECV_TIMEOUT if needed!" - ${PREFIX}/bin/mpd & - (cd ${WRKSRC} && \ - PATH=${PATH}:${PREFIX}/bin VERBOSE=1 ${MAKE} testing) - ${PREFIX}/bin/mpdallexit -.endif - -.include diff --git a/net/mpich2/distinfo b/net/mpich2/distinfo deleted file mode 100644 index 1a6def9bf5cbb..0000000000000 --- a/net/mpich2/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (mpich/mpich2-1.5.tar.gz) = 7175926fc2e4230f00201e880318c08de4f949c0dbe167fe1b2e256ac79d5f66 -SIZE (mpich/mpich2-1.5.tar.gz) = 22826035 diff --git a/net/mpich2/files/patch-Makefile.in b/net/mpich2/files/patch-Makefile.in deleted file mode 100644 index d4de96233d192..0000000000000 --- a/net/mpich2/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2012-10-08 21:02:46.000000000 +0200 -+++ Makefile.in 2014-08-31 22:55:10.000000000 +0200 -@@ -6153,7 +6153,7 @@ - CLEAN_LOCAL_TARGETS = test-clean $(am__append_125) - - # used by nodist_pkgconfig_DATA --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(libdir)data/pkgconfig - - # contains all of the "errnames.txt" files that are used by maint/extracterrmsgs - # to build src/mpi/errhan/defmsg.h diff --git a/net/mpich2/files/patch-configure b/net/mpich2/files/patch-configure deleted file mode 100644 index 9914f3ea872fb..0000000000000 --- a/net/mpich2/files/patch-configure +++ /dev/null @@ -1,47 +0,0 @@ ---- configure.orig 2012-10-08 19:02:38 UTC -+++ configure -@@ -31361,7 +31361,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ - # The best solution is to turn off errors on particular routines - # if that isn't possible (e.g., too many of them), then - # just try arguments that turn off all checking -- for flags in "-mismatch" ; do -+ for flags in "-fallow-argument-mismatch" "-mismatch" ; do - testok=no - FFLAGS="$FFLAGS $flags" - cat > conftest.$ac_ext <<_ACEOF -@@ -31403,18 +31403,8 @@ the same routine with arguments of different types." " - fi - - addarg=$pac_cv_prog_f77_mismatched_args_parm -+FFLAGS="$FFLAGS $addarg" - -- if test "X$addarg" != "X" ; then -- # We could add the names of all of the MPI routines that -- # accept different types. Instead, we fail cleanly. -- # Some Fortran compilers allow you to turn off checking for -- # mismatched arguments for *all* routines. Adding an argument -- # that turns off checking for *everything* is not something that -- # configure should do - if the user wants this, they can follow -- # the instructions in the following error message. -- as_fn_error $? "The Fortran compiler $F77 does not accept programs that call the same routine with arguments of different types without the option $addarg. Rerun configure with FFLAGS=$addarg" "$LINENO" 5 -- fi -- - bindings="$bindings f77" - bindings_dirs="$bindings_dirs src/binding/f77" - -@@ -43769,12 +43759,12 @@ return thr_create (); - return 0; - } - _ACEOF --for ac_lib in '' thread; do -+for ac_lib in '' -lpthread; do - if test -z "$ac_lib"; then - ac_res="none required" - else -- ac_res=-l$ac_lib -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ ac_res=$ac_lib -+ LIBS="$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_thr_create=$ac_res diff --git a/net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in b/net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in deleted file mode 100644 index a391604385d89..0000000000000 --- a/net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in +++ /dev/null @@ -1,47 +0,0 @@ ---- src/mpe2/sbin/mpeinstall.in.orig 2012-04-30 22:12:21.000000000 +0200 -+++ src/mpe2/sbin/mpeinstall.in 2014-08-31 12:34:38.000000000 +0200 -@@ -531,7 +531,7 @@ - # so $docdir (with NULL PACKAGE) is appended to dirlist for removal. - savedPACKAGE=$PACKAGE - PACKAGE="" -- MkDir @docdir@ -+%%PORTDOCS%% MkDir @docdir@ - PACKAGE=$savedPACKAGE - fi - -@@ -579,15 +579,15 @@ - # ie INSTALL $top_srcdir/doc $docdir - # INSTALL $top_srcdir/man $mandir - # INSTALL $top_srcdir/html $htmldir --for type in doc man html ; do -- typename=${type}dir -- eval typevalue=\$"$typename" -- if [ -d $top_srcdir/$type ] ; then -- MkDir $typevalue -- echo "Installing $pkgname $type to $DESTDIR$typevalue" -- InstallDirRecur $top_srcdir/$type $typevalue $MODE -- fi --done -+%%PORTDOCS%%for type in doc man html ; do -+%%PORTDOCS%% typename=${type}dir -+%%PORTDOCS%% eval typevalue=\$"$typename" -+%%PORTDOCS%% if [ -d $top_srcdir/$type ] ; then -+%%PORTDOCS%% MkDir $typevalue -+%%PORTDOCS%% echo "Installing $pkgname $type to $DESTDIR$typevalue" -+%%PORTDOCS%% InstallDirRecur $top_srcdir/$type $typevalue $MODE -+%%PORTDOCS%% fi -+%%PORTDOCS%%done - - # Remove old uninstall file - if [ "$appendUninstall" = 0 -a -f $UNINSTALLFILE ] ; then -@@ -649,8 +649,8 @@ - if [ "$appendUninstall" = 0 ] ; then - cp $UNINSTALLFILE $sbinbuild_dir/mpeuninstall - # -- echo "Installed $pkgname in $DESTDIR$prefix" -- echo "$UNINSTALLFILE may be used to remove the installation" -+ echo "Installed $pkgname in $prefix" -+ echo "${sbindir}/${UNINSTALL_base} may be used to remove the installation" - fi - - if [ $errs -gt 0 ] ; then diff --git a/net/mpich2/files/patch-src_mpi_romio_configure b/net/mpich2/files/patch-src_mpi_romio_configure deleted file mode 100644 index 445f2c63e36d3..0000000000000 --- a/net/mpich2/files/patch-src_mpi_romio_configure +++ /dev/null @@ -1,18 +0,0 @@ ---- src/mpi/romio/configure.orig 2009-06-03 03:49:23.000000000 +0200 -+++ src/mpi/romio/configure 2009-06-22 19:13:16.000000000 +0200 -@@ -8755,12 +8755,12 @@ - return 0; - } - _ACEOF --for ac_lib in '' pthread; do -+for ac_lib in '' $PTHREAD_LIBS; do - if test -z "$ac_lib"; then - ac_res="none required" - else -- ac_res=-l$ac_lib -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ ac_res=$ac_lib -+ LIBS="$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext - if { (ac_try="$ac_link" diff --git a/net/mpich2/files/patch-src_mpi_romio_util_romioinstall.in b/net/mpich2/files/patch-src_mpi_romio_util_romioinstall.in deleted file mode 100644 index ef4f659c6f666..0000000000000 --- a/net/mpich2/files/patch-src_mpi_romio_util_romioinstall.in +++ /dev/null @@ -1,19 +0,0 @@ ---- ./src/mpi/romio/util/romioinstall.in.orig 2008-08-01 19:31:50.000000000 +0200 -+++ ./src/mpi/romio/util/romioinstall.in 2009-06-26 23:36:59.000000000 +0200 -@@ -145,11 +145,11 @@ - # Files - MkDir $prefix - -- echo "copying directory $ROMIO_HOME/doc to $docdir" -- MkDir $docdir -- for file in COPYRIGHT README users-guide.ps.gz ; do -- CopyFile $ROMIO_HOME/$file $docdir -- done -+%%PORTDOCS%% echo "copying directory $ROMIO_HOME/doc to $docdir" -+%%PORTDOCS%% MkDir $docdir -+%%PORTDOCS%% for file in COPYRIGHT README users-guide.ps.gz ; do -+%%PORTDOCS%% CopyFile $ROMIO_HOME/$file $docdir -+%%PORTDOCS%% done - - echo "copying directory include to $includedir" - MkDir $includedir diff --git a/net/mpich2/files/patch-src_openpa_Makefile.in b/net/mpich2/files/patch-src_openpa_Makefile.in deleted file mode 100644 index f8008ca54f2ae..0000000000000 --- a/net/mpich2/files/patch-src_openpa_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/openpa/Makefile.in.orig 2012-10-08 21:02:13.000000000 +0200 -+++ ./src/openpa/Makefile.in 2014-08-31 18:17:46.000000000 +0200 -@@ -316,7 +316,7 @@ - EXTRA_DIST = COPYRIGHT CHANGELOG openpa.pc.in VERSION - - # pkgconfig files --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(libdir)data/pkgconfig - pkgconfig_DATA = openpa.pc - all: all-recursive - diff --git a/net/mpich2/files/patch-src_openpa_configure b/net/mpich2/files/patch-src_openpa_configure deleted file mode 100644 index 28effdae704bc..0000000000000 --- a/net/mpich2/files/patch-src_openpa_configure +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/openpa/configure.orig 2009-06-03 03:50:24.000000000 +0200 -+++ ./src/openpa/configure 2009-06-23 20:51:27.000000000 +0200 -@@ -774,7 +774,7 @@ - localstatedir='${prefix}/var' - includedir='${prefix}/include' - oldincludedir='/usr/include' --docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -+docdir='${datarootdir}/doc/${PACKAGE}' - infodir='${datarootdir}/info' - htmldir='${docdir}' - dvidir='${docdir}' diff --git a/net/mpich2/files/patch-test_mpi_configure b/net/mpich2/files/patch-test_mpi_configure deleted file mode 100644 index ca9e5b6c3303a..0000000000000 --- a/net/mpich2/files/patch-test_mpi_configure +++ /dev/null @@ -1,30 +0,0 @@ ---- test/mpi/configure.orig 2012-10-08 19:02:24 UTC -+++ test/mpi/configure -@@ -9835,7 +9835,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ - # The best solution is to turn off errors on particular routines - # if that isn't possible (e.g., too many of them), then - # just try arguments that turn off all checking -- for flags in "-mismatch" ; do -+ for flags in "-fallow-argument-mismatch" "-mismatch" ; do - testok=no - FFLAGS="$FFLAGS $flags" - cat > conftest.$ac_ext <<_ACEOF -@@ -9877,17 +9877,7 @@ the same routine with arguments of different types." " - fi - - addarg=$pac_cv_prog_f77_mismatched_args_parm -- -- if test "X$addarg" != "X" ; then -- # We could add the names of all of the MPI routines that -- # accept different types. Instead, we fail cleanly. -- # Some Fortran compilers allow you to turn off checking for -- # mismatched arguments for *all* routines. Adding an argument -- # that turns off checking for *everything* is not something that -- # configure should do - if the user wants this, they can follow -- # the instructions in the following error message. -- as_fn_error $? "The Fortran compiler $F77 does not accept programs that call the same routine with arguments of different types without the option $addarg. Rerun configure with FFLAGS=$addarg" "$LINENO" 5 -- fi -+FFLAGS="$FFLAGS $addarg" - - # Check whether we need -lU77 to get iargc and getarg, which - # are used for a few of the tests in spawn (U77 was needed with diff --git a/net/mpich2/files/pkg-message.in b/net/mpich2/files/pkg-message.in deleted file mode 100644 index f2bf2b80f2f90..0000000000000 --- a/net/mpich2/files/pkg-message.in +++ /dev/null @@ -1,7 +0,0 @@ -[ -{ type: install - message: <