pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

openmpi and scalapack: imported, removed from WIP



Module Name:	pkgsrc-wip
Committed By:	Dr. Thomas Orgis <thomas.orgis%uni-hamburg.de@localhost>
Pushed By:	thor
Date:		Fri Aug 26 00:59:49 2022 +0200
Changeset:	cd7cf2fc7acf4d342270ddf01839e375837e3a21

Modified Files:
	Makefile
Removed Files:
	openmpi/DESCR
	openmpi/Makefile
	openmpi/PLIST
	openmpi/buildlink3.mk
	openmpi/distinfo
	openmpi/options.mk
	openmpi/patches/patch-ak
	openmpi/patches/patch-config_opal__setup__wrappers.m4
	openmpi/patches/patch-configure
	openmpi/patches/patch-ompi_mca_io_romio321_romio_configure
	openmpi/patches/patch-ompi_mca_sharedfp_sm_sharedfp__sm.c
	openmpi/patches/patch-ompi_mpi_java_java_Makefile.in
	openmpi/patches/patch-opal_tools_wrappers_opal__wrapper.c
	scalapack/DESCR
	scalapack/Makefile
	scalapack/PLIST
	scalapack/distinfo
	scalapack/patches/patch-PR67-MPI-linking
	scalapack/patches/patch-SRC_pdtrord.f
	scalapack/patches/patch-SRC_pstrord.f
	scalapack/patches/patch-SRC_pstrsen.f
	scalapack/patches/patch-scalapack.pc.in

Log Message:
openmpi and scalapack: imported, removed from WIP

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cd7cf2fc7acf4d342270ddf01839e375837e3a21

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |   2 -
 openmpi/DESCR                                      |  21 -
 openmpi/Makefile                                   |  85 ---
 openmpi/PLIST                                      | 750 ---------------------
 openmpi/buildlink3.mk                              |  13 -
 openmpi/distinfo                                   |  12 -
 openmpi/options.mk                                 |  47 --
 openmpi/patches/patch-ak                           |  55 --
 .../patches/patch-config_opal__setup__wrappers.m4  |  17 -
 openmpi/patches/patch-configure                    |  69 --
 .../patch-ompi_mca_io_romio321_romio_configure     |  15 -
 .../patch-ompi_mca_sharedfp_sm_sharedfp__sm.c      |  14 -
 .../patches/patch-ompi_mpi_java_java_Makefile.in   |  15 -
 .../patch-opal_tools_wrappers_opal__wrapper.c      |  32 -
 scalapack/DESCR                                    |   7 -
 scalapack/Makefile                                 |  30 -
 scalapack/PLIST                                    |   7 -
 scalapack/distinfo                                 |  10 -
 scalapack/patches/patch-PR67-MPI-linking           | 418 ------------
 scalapack/patches/patch-SRC_pdtrord.f              |  19 -
 scalapack/patches/patch-SRC_pstrord.f              |  19 -
 scalapack/patches/patch-SRC_pstrsen.f              |  22 -
 scalapack/patches/patch-scalapack.pc.in            |  15 -
 23 files changed, 1694 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 6d0329e448..9aae3a13c4 100644
--- a/Makefile
+++ b/Makefile
@@ -2738,7 +2738,6 @@ SUBDIR+=	opengrok
 SUBDIR+=	openjazz
 SUBDIR+=	openjdk8-openjfx-hg
 SUBDIR+=	openlogos
-SUBDIR+=	openmpi
 SUBDIR+=	openmx-openmpi
 SUBDIR+=	opennurbs
 SUBDIR+=	openra
@@ -5201,7 +5200,6 @@ SUBDIR+=	sarf
 SUBDIR+=	sbc
 SUBDIR+=	sbcl-git
 SUBDIR+=	sblim-sfcc
-SUBDIR+=	scalapack
 SUBDIR+=	scare
 SUBDIR+=	scc
 SUBDIR+=	sccache
diff --git a/openmpi/DESCR b/openmpi/DESCR
deleted file mode 100644
index 76f037fffd..0000000000
--- a/openmpi/DESCR
+++ /dev/null
@@ -1,21 +0,0 @@
-The Open MPI Project is an open source Message Passing Interface
-implementation that is developed and maintained by a consortium of
-academic, research, and industry partners.
-
-Features implemented or in short-term development for Open MPI include:
-  - Full MPI-3.1 standards conformance
-  - Thread safety and concurrency
-  - Dynamic process spawning
-  - Network and process fault tolerance
-  - Support network heterogeneity
-  - Single library supports all networks
-  - Run-time instrumentation
-  - Many job schedulers supported
-  - Many OS's supported (32 and 64 bit)
-  - Production quality software
-  - High performance on all platforms
-  - Portable and maintainable
-  - Tunable by installers and end-users
-  - Component-based design, documented APIs
-  - Active, responsive mailing list
-  - Open source license based on the BSD license
diff --git a/openmpi/Makefile b/openmpi/Makefile
deleted file mode 100644
index eaefebc0a1..0000000000
--- a/openmpi/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# $NetBSD: Makefile,v 1.50 2022/07/27 14:28:32 wiz Exp $
-
-DISTNAME=	openmpi-4.1.4
-CATEGORIES=	parallel
-MASTER_SITES=	https://download.open-mpi.org/release/open-mpi/v4.1/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	thor%NetBSD.org@localhost
-HOMEPAGE=	https://www.open-mpi.org/
-COMMENT=	Open source MPI-3.1 implementation
-LICENSE=	modified-bsd
-
-CONFLICTS=	mpich-[0-9]*
-
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-USE_TOOLS+=		perl:run bash:run
-GNU_CONFIGURE=		yes
-CONFIG_SHELL=		bash
-CONFIGURE_ARGS+=	--enable-contrib-no-build=vt # in separate package
-CONFIGURE_ARGS+=	--with-libltdl=${BUILDLINK_PREFIX.libltdl}
-# See below about external hwloc.
-#CONFIGURE_ARGS+=	--with-hwloc=${BUILDLINK_PREFIX.hwloc}
-# OSHM Needs additional dependencies and also is surpassed with proper MPI
-# functionality. Rare use cases.
-CONFIGURE_ARGS+=	--disable-oshmem
-CONFIGURE_ARGS+=	OPAL_HAVE_LTDL_ADVISE=0
-LIBTOOL_OVERRIDE=	libtool \
-			ompi/contrib/vt/vt/extlib/otf/libtool \
-			ompi/contrib/vt/vt/libtool \
-			ompi/mca/io/romio/romio/libtool
-SHLIBTOOL_OVERRIDE=	config/libtool.m4
-
-.include "options.mk"
-
-TEST_TARGET=	check
-
-# Unsurprisingly, files that are only produced on GNU/Linux systems.
-PLIST_VARS+=	linux
-# \todo Explain.  Apparently built if !Linux.
-PLIST_VARS+=	pstattest
-# \todo Explain.
-PLIST_VARS+=	ignoretkr
-PLIST_VARS+=	noignoretkr
-
-
-.if ${OPSYS} == "Linux"
-PLIST.linux=		yes
-.endif
-
-.if ${OPSYS} != "Linux"
-PLIST.pstattest=	yes
-.endif
-
-.if ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
-PLIST.ignoretkr=	yes
-.else
-# \todo Explain why on Darwin we don't set one of them.
-.  if ${OPSYS} != "Darwin"
-PLIST.noignoretkr=	yes
-.  endif
-.endif
-
-REPLACE_PERL=	ompi/tools/wrappers/mpijavac.pl.in
-REPLACE_PERL+=	ompi/mca/common/monitoring/*.pl
-
-EGDIR=			${PREFIX}/share/examples/openmpi
-CONF_SAMPLES+=		openmpi-default-hostfile openmpi-mca-params.conf
-CONF_SAMPLES+=		pmix-mca-params.conf
-.for i in ${CONF_SAMPLES}
-CONF_FILES+=		${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i}
-.endfor
-
-INSTALLATION_DIRS+=	${EGDIR}
-
-post-install:
-.for i in ${CONF_SAMPLES}
-	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/${i} ${DESTDIR}${EGDIR}/${i}
-.endfor
-
-.include "../../devel/libltdl/buildlink3.mk"
-# Too old, use internal hwloc 2 instead. As hwloc 2 API/ABI is incompatible,
-# upgrade has to be considered carefully.
-#.include "../../parallel/hwloc/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/openmpi/PLIST b/openmpi/PLIST
deleted file mode 100644
index 6844f78fa4..0000000000
--- a/openmpi/PLIST
+++ /dev/null
@@ -1,750 +0,0 @@
-@comment $NetBSD$
-bin/aggregate_profile.pl
-bin/mpiCC
-bin/mpic++
-bin/mpicc
-bin/mpicxx
-bin/mpiexec
-bin/mpif77
-bin/mpif90
-bin/mpifort
-${PLIST.java}bin/mpijavac
-${PLIST.java}bin/mpijavac.pl
-bin/mpirun
-bin/ompi-clean
-bin/ompi-server
-bin/ompi_info
-bin/opal_wrapper
-bin/orte-clean
-bin/orte-info
-bin/orte-server
-bin/ortecc
-bin/orted
-bin/orterun
-bin/profile2mat.pl
-include/mpi-ext.h
-include/mpi.h
-include/mpi_portable_platform.h
-include/mpif-c-constants-decl.h
-${PLIST.f90}include/mpif-config.h
-${PLIST.f90}include/mpif-constants.h
-include/mpif-ext.h
-${PLIST.f90}include/mpif-externals.h
-${PLIST.f90}include/mpif-handles.h
-${PLIST.f90}include/mpif-io-constants.h
-${PLIST.f90}include/mpif-io-handles.h
-${PLIST.f90}include/mpif-sentinels.h
-include/mpif-sizeof.h
-include/mpif.h
-include/openmpi/mpiext/mpiext_affinity_c.h
-include/openmpi/mpiext/mpiext_cuda_c.h
-include/openmpi/mpiext/mpiext_pcollreq_c.h
-${PLIST.f90}include/openmpi/mpiext/mpiext_pcollreq_mpifh.h
-include/openmpi/mpiext/pmpiext_pcollreq_c.h
-${PLIST.java}include/openmpi/ompi/mpi/java/mpiJava.h
-lib/libmca_common_dstore.la
-lib/libmca_common_monitoring.la
-lib/libmca_common_ompio.la
-lib/libmca_common_sm.la
-lib/libmpi.la
-${PLIST.java}lib/libmpi_java.la
-${PLIST.f90}lib/libmpi_mpifh.la
-${PLIST.f90}${PLIST.noignoretkr}lib/libmpi_usempi.la
-${PLIST.f90}${PLIST.ignoretkr}lib/libmpi_usempi_ignore_tkr.la
-${PLIST.f08}lib/libmpi_usempif08.la
-lib/libompitrace.la
-lib/libopen-pal.la
-lib/libopen-rte.la
-${PLIST.java}lib/mpi.jar
-${PLIST.f90}lib/mpi.mod
-${PLIST.f90}${PLIST.ignoretkr}lib/mpi_ext.mod
-${PLIST.f08}lib/mpi_f08.mod
-${PLIST.f08}lib/mpi_f08_callbacks.mod
-${PLIST.f08}lib/mpi_f08_ext.mod
-${PLIST.f08}lib/mpi_f08_interfaces.mod
-${PLIST.f08}lib/mpi_f08_interfaces_callbacks.mod
-${PLIST.f08}lib/mpi_f08_types.mod
-lib/ompi_monitoring_prof.la
-lib/openmpi/libompi_dbg_msgq.la
-lib/openmpi/mca_allocator_basic.la
-lib/openmpi/mca_allocator_bucket.la
-lib/openmpi/mca_bml_r2.la
-lib/openmpi/mca_btl_self.la
-lib/openmpi/mca_btl_sm.la
-lib/openmpi/mca_btl_tcp.la
-lib/openmpi/mca_btl_vader.la
-lib/openmpi/mca_coll_adapt.la
-lib/openmpi/mca_coll_basic.la
-lib/openmpi/mca_coll_han.la
-lib/openmpi/mca_coll_inter.la
-lib/openmpi/mca_coll_libnbc.la
-lib/openmpi/mca_coll_monitoring.la
-lib/openmpi/mca_coll_self.la
-lib/openmpi/mca_coll_sm.la
-lib/openmpi/mca_coll_sync.la
-lib/openmpi/mca_coll_tuned.la
-lib/openmpi/mca_compress_bzip.la
-lib/openmpi/mca_compress_gzip.la
-lib/openmpi/mca_crs_none.la
-lib/openmpi/mca_errmgr_default_app.la
-lib/openmpi/mca_errmgr_default_hnp.la
-lib/openmpi/mca_errmgr_default_orted.la
-lib/openmpi/mca_errmgr_default_tool.la
-lib/openmpi/mca_ess_env.la
-lib/openmpi/mca_ess_hnp.la
-lib/openmpi/mca_ess_pmi.la
-lib/openmpi/mca_ess_singleton.la
-lib/openmpi/mca_ess_tool.la
-lib/openmpi/mca_fbtl_posix.la
-lib/openmpi/mca_fcoll_dynamic.la
-lib/openmpi/mca_fcoll_dynamic_gen2.la
-lib/openmpi/mca_fcoll_individual.la
-lib/openmpi/mca_fcoll_two_phase.la
-lib/openmpi/mca_fcoll_vulcan.la
-lib/openmpi/mca_filem_raw.la
-lib/openmpi/mca_fs_ufs.la
-lib/openmpi/mca_grpcomm_direct.la
-lib/openmpi/mca_io_ompio.la
-lib/openmpi/mca_io_romio321.la
-lib/openmpi/mca_iof_hnp.la
-lib/openmpi/mca_iof_orted.la
-lib/openmpi/mca_iof_tool.la
-lib/openmpi/mca_mpool_hugepage.la
-lib/openmpi/mca_odls_default.la
-lib/openmpi/mca_odls_pspawn.la
-lib/openmpi/mca_oob_tcp.la
-lib/openmpi/mca_op_avx.la
-lib/openmpi/mca_osc_monitoring.la
-lib/openmpi/mca_osc_pt2pt.la
-lib/openmpi/mca_osc_rdma.la
-lib/openmpi/mca_osc_sm.la
-lib/openmpi/mca_patcher_overwrite.la
-lib/openmpi/mca_plm_isolated.la
-lib/openmpi/mca_plm_rsh.la
-lib/openmpi/mca_pmix_flux.la
-lib/openmpi/mca_pmix_isolated.la
-lib/openmpi/mca_pmix_pmix3x.la
-lib/openmpi/mca_pml_cm.la
-lib/openmpi/mca_pml_monitoring.la
-lib/openmpi/mca_pml_ob1.la
-${PLIST.linux}lib/openmpi/mca_pstat_linux.la
-${PLIST.pstattest}lib/openmpi/mca_pstat_test.la
-${PLIST.sge}lib/openmpi/mca_ras_gridengine.la
-lib/openmpi/mca_ras_simulator.la
-lib/openmpi/mca_rcache_grdma.la
-${PLIST.linux}lib/openmpi/mca_reachable_netlink.la
-lib/openmpi/mca_reachable_weighted.la
-lib/openmpi/mca_regx_fwd.la
-lib/openmpi/mca_regx_naive.la
-lib/openmpi/mca_regx_reverse.la
-lib/openmpi/mca_rmaps_mindist.la
-lib/openmpi/mca_rmaps_ppr.la
-lib/openmpi/mca_rmaps_rank_file.la
-lib/openmpi/mca_rmaps_resilient.la
-lib/openmpi/mca_rmaps_round_robin.la
-lib/openmpi/mca_rmaps_seq.la
-lib/openmpi/mca_rml_oob.la
-lib/openmpi/mca_routed_binomial.la
-lib/openmpi/mca_routed_direct.la
-lib/openmpi/mca_routed_radix.la
-lib/openmpi/mca_rtc_hwloc.la
-lib/openmpi/mca_schizo_flux.la
-lib/openmpi/mca_schizo_jsm.la
-lib/openmpi/mca_schizo_ompi.la
-lib/openmpi/mca_schizo_orte.la
-lib/openmpi/mca_sharedfp_individual.la
-lib/openmpi/mca_sharedfp_lockedfile.la
-lib/openmpi/mca_sharedfp_sm.la
-lib/openmpi/mca_shmem_mmap.la
-lib/openmpi/mca_shmem_posix.la
-lib/openmpi/mca_shmem_sysv.la
-lib/openmpi/mca_state_app.la
-lib/openmpi/mca_state_hnp.la
-lib/openmpi/mca_state_novm.la
-lib/openmpi/mca_state_orted.la
-lib/openmpi/mca_state_tool.la
-lib/openmpi/mca_topo_basic.la
-lib/openmpi/mca_topo_treematch.la
-lib/openmpi/mca_vprotocol_pessimist.la
-lib/pkgconfig/ompi-c.pc
-lib/pkgconfig/ompi-cxx.pc
-lib/pkgconfig/ompi-f77.pc
-lib/pkgconfig/ompi-f90.pc
-lib/pkgconfig/ompi-fort.pc
-lib/pkgconfig/ompi.pc
-lib/pkgconfig/orte.pc
-lib/pkgconfig/pmix.pc
-lib/pmix/mca_bfrops_v12.la
-lib/pmix/mca_bfrops_v20.la
-lib/pmix/mca_bfrops_v21.la
-lib/pmix/mca_bfrops_v3.la
-lib/pmix/mca_gds_ds12.la
-${PLIST.linux}lib/pmix/mca_gds_ds21.la
-lib/pmix/mca_gds_hash.la
-lib/pmix/mca_pcompress_zlib.la
-lib/pmix/mca_plog_default.la
-lib/pmix/mca_plog_stdfd.la
-lib/pmix/mca_plog_syslog.la
-lib/pmix/mca_preg_compress.la
-lib/pmix/mca_preg_native.la
-lib/pmix/mca_psec_native.la
-lib/pmix/mca_psec_none.la
-lib/pmix/mca_psensor_file.la
-lib/pmix/mca_psensor_heartbeat.la
-lib/pmix/mca_pshmem_mmap.la
-lib/pmix/mca_psquash_flex128.la
-lib/pmix/mca_psquash_native.la
-lib/pmix/mca_ptl_tcp.la
-lib/pmix/mca_ptl_usock.la
-${PLIST.f08}lib/pmpi_f08_interfaces.mod
-man/man1/mpiCC.1
-man/man1/mpic++.1
-man/man1/mpicc.1
-man/man1/mpicxx.1
-man/man1/mpiexec.1
-man/man1/mpif77.1
-man/man1/mpif90.1
-man/man1/mpifort.1
-${PLIST.java}man/man1/mpijavac.1
-man/man1/mpirun.1
-man/man1/ompi-clean.1
-man/man1/ompi-server.1
-man/man1/ompi_info.1
-man/man1/opal_wrapper.1
-man/man1/orte-clean.1
-man/man1/orte-info.1
-man/man1/orte-server.1
-man/man1/orted.1
-man/man1/orterun.1
-man/man3/MPI.3
-man/man3/MPIX_Allgather_init.3
-man/man3/MPIX_Allgatherv_init.3
-man/man3/MPIX_Allreduce_init.3
-man/man3/MPIX_Alltoall_init.3
-man/man3/MPIX_Alltoallv_init.3
-man/man3/MPIX_Alltoallw_init.3
-man/man3/MPIX_Barrier_init.3
-man/man3/MPIX_Bcast_init.3
-man/man3/MPIX_Exscan_init.3
-man/man3/MPIX_Gather_init.3
-man/man3/MPIX_Gatherv_init.3
-man/man3/MPIX_Neighbor_allgather_init.3
-man/man3/MPIX_Neighbor_allgatherv_init.3
-man/man3/MPIX_Neighbor_alltoall_init.3
-man/man3/MPIX_Neighbor_alltoallv_init.3
-man/man3/MPIX_Neighbor_alltoallw_init.3
-man/man3/MPIX_Query_cuda_support.3
-man/man3/MPIX_Reduce_init.3
-man/man3/MPIX_Reduce_scatter_block_init.3
-man/man3/MPIX_Reduce_scatter_init.3
-man/man3/MPIX_Scan_init.3
-man/man3/MPIX_Scatter_init.3
-man/man3/MPIX_Scatterv_init.3
-man/man3/MPI_Abort.3
-man/man3/MPI_Accumulate.3
-man/man3/MPI_Add_error_class.3
-man/man3/MPI_Add_error_code.3
-man/man3/MPI_Add_error_string.3
-man/man3/MPI_Address.3
-man/man3/MPI_Aint_add.3
-man/man3/MPI_Aint_diff.3
-man/man3/MPI_Allgather.3
-man/man3/MPI_Allgatherv.3
-man/man3/MPI_Alloc_mem.3
-man/man3/MPI_Allreduce.3
-man/man3/MPI_Alltoall.3
-man/man3/MPI_Alltoallv.3
-man/man3/MPI_Alltoallw.3
-man/man3/MPI_Attr_delete.3
-man/man3/MPI_Attr_get.3
-man/man3/MPI_Attr_put.3
-man/man3/MPI_Barrier.3
-man/man3/MPI_Bcast.3
-man/man3/MPI_Bsend.3
-man/man3/MPI_Bsend_init.3
-man/man3/MPI_Buffer_attach.3
-man/man3/MPI_Buffer_detach.3
-man/man3/MPI_Cancel.3
-man/man3/MPI_Cart_coords.3
-man/man3/MPI_Cart_create.3
-man/man3/MPI_Cart_get.3
-man/man3/MPI_Cart_map.3
-man/man3/MPI_Cart_rank.3
-man/man3/MPI_Cart_shift.3
-man/man3/MPI_Cart_sub.3
-man/man3/MPI_Cartdim_get.3
-man/man3/MPI_Close_port.3
-man/man3/MPI_Comm_accept.3
-man/man3/MPI_Comm_c2f.3
-man/man3/MPI_Comm_call_errhandler.3
-man/man3/MPI_Comm_compare.3
-man/man3/MPI_Comm_connect.3
-man/man3/MPI_Comm_create.3
-man/man3/MPI_Comm_create_errhandler.3
-man/man3/MPI_Comm_create_group.3
-man/man3/MPI_Comm_create_keyval.3
-man/man3/MPI_Comm_delete_attr.3
-man/man3/MPI_Comm_disconnect.3
-man/man3/MPI_Comm_dup.3
-man/man3/MPI_Comm_dup_with_info.3
-man/man3/MPI_Comm_f2c.3
-man/man3/MPI_Comm_free.3
-man/man3/MPI_Comm_free_keyval.3
-man/man3/MPI_Comm_get_attr.3
-man/man3/MPI_Comm_get_errhandler.3
-man/man3/MPI_Comm_get_info.3
-man/man3/MPI_Comm_get_name.3
-man/man3/MPI_Comm_get_parent.3
-man/man3/MPI_Comm_group.3
-man/man3/MPI_Comm_idup.3
-man/man3/MPI_Comm_join.3
-man/man3/MPI_Comm_rank.3
-man/man3/MPI_Comm_remote_group.3
-man/man3/MPI_Comm_remote_size.3
-man/man3/MPI_Comm_set_attr.3
-man/man3/MPI_Comm_set_errhandler.3
-man/man3/MPI_Comm_set_info.3
-man/man3/MPI_Comm_set_name.3
-man/man3/MPI_Comm_size.3
-man/man3/MPI_Comm_spawn.3
-man/man3/MPI_Comm_spawn_multiple.3
-man/man3/MPI_Comm_split.3
-man/man3/MPI_Comm_split_type.3
-man/man3/MPI_Comm_test_inter.3
-man/man3/MPI_Compare_and_swap.3
-man/man3/MPI_Dims_create.3
-man/man3/MPI_Dist_graph_create.3
-man/man3/MPI_Dist_graph_create_adjacent.3
-man/man3/MPI_Dist_graph_neighbors.3
-man/man3/MPI_Dist_graph_neighbors_count.3
-man/man3/MPI_Errhandler_create.3
-man/man3/MPI_Errhandler_free.3
-man/man3/MPI_Errhandler_get.3
-man/man3/MPI_Errhandler_set.3
-man/man3/MPI_Error_class.3
-man/man3/MPI_Error_string.3
-man/man3/MPI_Exscan.3
-man/man3/MPI_Fetch_and_op.3
-man/man3/MPI_File_c2f.3
-man/man3/MPI_File_call_errhandler.3
-man/man3/MPI_File_close.3
-man/man3/MPI_File_create_errhandler.3
-man/man3/MPI_File_delete.3
-man/man3/MPI_File_f2c.3
-man/man3/MPI_File_get_amode.3
-man/man3/MPI_File_get_atomicity.3
-man/man3/MPI_File_get_byte_offset.3
-man/man3/MPI_File_get_errhandler.3
-man/man3/MPI_File_get_group.3
-man/man3/MPI_File_get_info.3
-man/man3/MPI_File_get_position.3
-man/man3/MPI_File_get_position_shared.3
-man/man3/MPI_File_get_size.3
-man/man3/MPI_File_get_type_extent.3
-man/man3/MPI_File_get_view.3
-man/man3/MPI_File_iread.3
-man/man3/MPI_File_iread_all.3
-man/man3/MPI_File_iread_at.3
-man/man3/MPI_File_iread_at_all.3
-man/man3/MPI_File_iread_shared.3
-man/man3/MPI_File_iwrite.3
-man/man3/MPI_File_iwrite_all.3
-man/man3/MPI_File_iwrite_at.3
-man/man3/MPI_File_iwrite_at_all.3
-man/man3/MPI_File_iwrite_shared.3
-man/man3/MPI_File_open.3
-man/man3/MPI_File_preallocate.3
-man/man3/MPI_File_read.3
-man/man3/MPI_File_read_all.3
-man/man3/MPI_File_read_all_begin.3
-man/man3/MPI_File_read_all_end.3
-man/man3/MPI_File_read_at.3
-man/man3/MPI_File_read_at_all.3
-man/man3/MPI_File_read_at_all_begin.3
-man/man3/MPI_File_read_at_all_end.3
-man/man3/MPI_File_read_ordered.3
-man/man3/MPI_File_read_ordered_begin.3
-man/man3/MPI_File_read_ordered_end.3
-man/man3/MPI_File_read_shared.3
-man/man3/MPI_File_seek.3
-man/man3/MPI_File_seek_shared.3
-man/man3/MPI_File_set_atomicity.3
-man/man3/MPI_File_set_errhandler.3
-man/man3/MPI_File_set_info.3
-man/man3/MPI_File_set_size.3
-man/man3/MPI_File_set_view.3
-man/man3/MPI_File_sync.3
-man/man3/MPI_File_write.3
-man/man3/MPI_File_write_all.3
-man/man3/MPI_File_write_all_begin.3
-man/man3/MPI_File_write_all_end.3
-man/man3/MPI_File_write_at.3
-man/man3/MPI_File_write_at_all.3
-man/man3/MPI_File_write_at_all_begin.3
-man/man3/MPI_File_write_at_all_end.3
-man/man3/MPI_File_write_ordered.3
-man/man3/MPI_File_write_ordered_begin.3
-man/man3/MPI_File_write_ordered_end.3
-man/man3/MPI_File_write_shared.3
-man/man3/MPI_Finalize.3
-man/man3/MPI_Finalized.3
-man/man3/MPI_Free_mem.3
-man/man3/MPI_Gather.3
-man/man3/MPI_Gatherv.3
-man/man3/MPI_Get.3
-man/man3/MPI_Get_accumulate.3
-man/man3/MPI_Get_address.3
-man/man3/MPI_Get_count.3
-man/man3/MPI_Get_elements.3
-man/man3/MPI_Get_elements_x.3
-man/man3/MPI_Get_library_version.3
-man/man3/MPI_Get_processor_name.3
-man/man3/MPI_Get_version.3
-man/man3/MPI_Graph_create.3
-man/man3/MPI_Graph_get.3
-man/man3/MPI_Graph_map.3
-man/man3/MPI_Graph_neighbors.3
-man/man3/MPI_Graph_neighbors_count.3
-man/man3/MPI_Graphdims_get.3
-man/man3/MPI_Grequest_complete.3
-man/man3/MPI_Grequest_start.3
-man/man3/MPI_Group_c2f.3
-man/man3/MPI_Group_compare.3
-man/man3/MPI_Group_difference.3
-man/man3/MPI_Group_excl.3
-man/man3/MPI_Group_f2c.3
-man/man3/MPI_Group_free.3
-man/man3/MPI_Group_incl.3
-man/man3/MPI_Group_intersection.3
-man/man3/MPI_Group_range_excl.3
-man/man3/MPI_Group_range_incl.3
-man/man3/MPI_Group_rank.3
-man/man3/MPI_Group_size.3
-man/man3/MPI_Group_translate_ranks.3
-man/man3/MPI_Group_union.3
-man/man3/MPI_Iallgather.3
-man/man3/MPI_Iallgatherv.3
-man/man3/MPI_Iallreduce.3
-man/man3/MPI_Ialltoall.3
-man/man3/MPI_Ialltoallv.3
-man/man3/MPI_Ialltoallw.3
-man/man3/MPI_Ibarrier.3
-man/man3/MPI_Ibcast.3
-man/man3/MPI_Ibsend.3
-man/man3/MPI_Iexscan.3
-man/man3/MPI_Igather.3
-man/man3/MPI_Igatherv.3
-man/man3/MPI_Improbe.3
-man/man3/MPI_Imrecv.3
-man/man3/MPI_Ineighbor_allgather.3
-man/man3/MPI_Ineighbor_allgatherv.3
-man/man3/MPI_Ineighbor_alltoall.3
-man/man3/MPI_Ineighbor_alltoallv.3
-man/man3/MPI_Ineighbor_alltoallw.3
-man/man3/MPI_Info_c2f.3
-man/man3/MPI_Info_create.3
-man/man3/MPI_Info_delete.3
-man/man3/MPI_Info_dup.3
-man/man3/MPI_Info_env.3
-man/man3/MPI_Info_f2c.3
-man/man3/MPI_Info_free.3
-man/man3/MPI_Info_get.3
-man/man3/MPI_Info_get_nkeys.3
-man/man3/MPI_Info_get_nthkey.3
-man/man3/MPI_Info_get_valuelen.3
-man/man3/MPI_Info_set.3
-man/man3/MPI_Init.3
-man/man3/MPI_Init_thread.3
-man/man3/MPI_Initialized.3
-man/man3/MPI_Intercomm_create.3
-man/man3/MPI_Intercomm_merge.3
-man/man3/MPI_Iprobe.3
-man/man3/MPI_Irecv.3
-man/man3/MPI_Ireduce.3
-man/man3/MPI_Ireduce_scatter.3
-man/man3/MPI_Ireduce_scatter_block.3
-man/man3/MPI_Irsend.3
-man/man3/MPI_Is_thread_main.3
-man/man3/MPI_Iscan.3
-man/man3/MPI_Iscatter.3
-man/man3/MPI_Iscatterv.3
-man/man3/MPI_Isend.3
-man/man3/MPI_Issend.3
-man/man3/MPI_Keyval_create.3
-man/man3/MPI_Keyval_free.3
-man/man3/MPI_Lookup_name.3
-man/man3/MPI_Message_c2f.3
-man/man3/MPI_Message_f2c.3
-man/man3/MPI_Mprobe.3
-man/man3/MPI_Mrecv.3
-man/man3/MPI_Neighbor_allgather.3
-man/man3/MPI_Neighbor_allgatherv.3
-man/man3/MPI_Neighbor_alltoall.3
-man/man3/MPI_Neighbor_alltoallv.3
-man/man3/MPI_Neighbor_alltoallw.3
-man/man3/MPI_Op_c2f.3
-man/man3/MPI_Op_commutative.3
-man/man3/MPI_Op_create.3
-man/man3/MPI_Op_f2c.3
-man/man3/MPI_Op_free.3
-man/man3/MPI_Open_port.3
-man/man3/MPI_Pack.3
-man/man3/MPI_Pack_external.3
-man/man3/MPI_Pack_external_size.3
-man/man3/MPI_Pack_size.3
-man/man3/MPI_Pcontrol.3
-man/man3/MPI_Probe.3
-man/man3/MPI_Publish_name.3
-man/man3/MPI_Put.3
-man/man3/MPI_Query_thread.3
-man/man3/MPI_Raccumulate.3
-man/man3/MPI_Recv.3
-man/man3/MPI_Recv_init.3
-man/man3/MPI_Reduce.3
-man/man3/MPI_Reduce_local.3
-man/man3/MPI_Reduce_scatter.3
-man/man3/MPI_Reduce_scatter_block.3
-man/man3/MPI_Register_datarep.3
-man/man3/MPI_Request_c2f.3
-man/man3/MPI_Request_f2c.3
-man/man3/MPI_Request_free.3
-man/man3/MPI_Request_get_status.3
-man/man3/MPI_Rget.3
-man/man3/MPI_Rget_accumulate.3
-man/man3/MPI_Rput.3
-man/man3/MPI_Rsend.3
-man/man3/MPI_Rsend_init.3
-man/man3/MPI_Scan.3
-man/man3/MPI_Scatter.3
-man/man3/MPI_Scatterv.3
-man/man3/MPI_Send.3
-man/man3/MPI_Send_init.3
-man/man3/MPI_Sendrecv.3
-man/man3/MPI_Sendrecv_replace.3
-man/man3/MPI_Sizeof.3
-man/man3/MPI_Ssend.3
-man/man3/MPI_Ssend_init.3
-man/man3/MPI_Start.3
-man/man3/MPI_Startall.3
-man/man3/MPI_Status_c2f.3
-man/man3/MPI_Status_f2c.3
-man/man3/MPI_Status_set_cancelled.3
-man/man3/MPI_Status_set_elements.3
-man/man3/MPI_Status_set_elements_x.3
-man/man3/MPI_T_category_changed.3
-man/man3/MPI_T_category_get_categories.3
-man/man3/MPI_T_category_get_cvars.3
-man/man3/MPI_T_category_get_info.3
-man/man3/MPI_T_category_get_num.3
-man/man3/MPI_T_category_get_pvars.3
-man/man3/MPI_T_cvar_get_info.3
-man/man3/MPI_T_cvar_get_num.3
-man/man3/MPI_T_cvar_handle_alloc.3
-man/man3/MPI_T_cvar_handle_free.3
-man/man3/MPI_T_cvar_read.3
-man/man3/MPI_T_cvar_write.3
-man/man3/MPI_T_enum_get_info.3
-man/man3/MPI_T_enum_get_item.3
-man/man3/MPI_T_finalize.3
-man/man3/MPI_T_init_thread.3
-man/man3/MPI_T_pvar_get_info.3
-man/man3/MPI_T_pvar_get_num.3
-man/man3/MPI_T_pvar_handle_alloc.3
-man/man3/MPI_T_pvar_handle_free.3
-man/man3/MPI_T_pvar_read.3
-man/man3/MPI_T_pvar_readreset.3
-man/man3/MPI_T_pvar_reset.3
-man/man3/MPI_T_pvar_session_create.3
-man/man3/MPI_T_pvar_session_free.3
-man/man3/MPI_T_pvar_start.3
-man/man3/MPI_T_pvar_stop.3
-man/man3/MPI_T_pvar_write.3
-man/man3/MPI_Test.3
-man/man3/MPI_Test_cancelled.3
-man/man3/MPI_Testall.3
-man/man3/MPI_Testany.3
-man/man3/MPI_Testsome.3
-man/man3/MPI_Topo_test.3
-man/man3/MPI_Type_c2f.3
-man/man3/MPI_Type_commit.3
-man/man3/MPI_Type_contiguous.3
-man/man3/MPI_Type_create_darray.3
-man/man3/MPI_Type_create_f90_complex.3
-man/man3/MPI_Type_create_f90_integer.3
-man/man3/MPI_Type_create_f90_real.3
-man/man3/MPI_Type_create_hindexed.3
-man/man3/MPI_Type_create_hindexed_block.3
-man/man3/MPI_Type_create_hvector.3
-man/man3/MPI_Type_create_indexed_block.3
-man/man3/MPI_Type_create_keyval.3
-man/man3/MPI_Type_create_resized.3
-man/man3/MPI_Type_create_struct.3
-man/man3/MPI_Type_create_subarray.3
-man/man3/MPI_Type_delete_attr.3
-man/man3/MPI_Type_dup.3
-man/man3/MPI_Type_extent.3
-man/man3/MPI_Type_f2c.3
-man/man3/MPI_Type_free.3
-man/man3/MPI_Type_free_keyval.3
-man/man3/MPI_Type_get_attr.3
-man/man3/MPI_Type_get_contents.3
-man/man3/MPI_Type_get_envelope.3
-man/man3/MPI_Type_get_extent.3
-man/man3/MPI_Type_get_extent_x.3
-man/man3/MPI_Type_get_name.3
-man/man3/MPI_Type_get_true_extent.3
-man/man3/MPI_Type_get_true_extent_x.3
-man/man3/MPI_Type_hindexed.3
-man/man3/MPI_Type_hvector.3
-man/man3/MPI_Type_indexed.3
-man/man3/MPI_Type_lb.3
-man/man3/MPI_Type_match_size.3
-man/man3/MPI_Type_set_attr.3
-man/man3/MPI_Type_set_name.3
-man/man3/MPI_Type_size.3
-man/man3/MPI_Type_size_x.3
-man/man3/MPI_Type_struct.3
-man/man3/MPI_Type_ub.3
-man/man3/MPI_Type_vector.3
-man/man3/MPI_Unpack.3
-man/man3/MPI_Unpack_external.3
-man/man3/MPI_Unpublish_name.3
-man/man3/MPI_Wait.3
-man/man3/MPI_Waitall.3
-man/man3/MPI_Waitany.3
-man/man3/MPI_Waitsome.3
-man/man3/MPI_Win_allocate.3
-man/man3/MPI_Win_allocate_shared.3
-man/man3/MPI_Win_attach.3
-man/man3/MPI_Win_c2f.3
-man/man3/MPI_Win_call_errhandler.3
-man/man3/MPI_Win_complete.3
-man/man3/MPI_Win_create.3
-man/man3/MPI_Win_create_dynamic.3
-man/man3/MPI_Win_create_errhandler.3
-man/man3/MPI_Win_create_keyval.3
-man/man3/MPI_Win_delete_attr.3
-man/man3/MPI_Win_detach.3
-man/man3/MPI_Win_f2c.3
-man/man3/MPI_Win_fence.3
-man/man3/MPI_Win_flush.3
-man/man3/MPI_Win_flush_all.3
-man/man3/MPI_Win_flush_local.3
-man/man3/MPI_Win_flush_local_all.3
-man/man3/MPI_Win_free.3
-man/man3/MPI_Win_free_keyval.3
-man/man3/MPI_Win_get_attr.3
-man/man3/MPI_Win_get_errhandler.3
-man/man3/MPI_Win_get_group.3
-man/man3/MPI_Win_get_info.3
-man/man3/MPI_Win_get_name.3
-man/man3/MPI_Win_lock.3
-man/man3/MPI_Win_lock_all.3
-man/man3/MPI_Win_post.3
-man/man3/MPI_Win_set_attr.3
-man/man3/MPI_Win_set_errhandler.3
-man/man3/MPI_Win_set_info.3
-man/man3/MPI_Win_set_name.3
-man/man3/MPI_Win_shared_query.3
-man/man3/MPI_Win_start.3
-man/man3/MPI_Win_sync.3
-man/man3/MPI_Win_test.3
-man/man3/MPI_Win_unlock.3
-man/man3/MPI_Win_unlock_all.3
-man/man3/MPI_Win_wait.3
-man/man3/MPI_Wtick.3
-man/man3/MPI_Wtime.3
-man/man3/OMPI_Affinity_str.3
-man/man3/OpenMPI.3
-man/man7/ompi_crcp.7
-man/man7/opal_crs.7
-man/man7/orte_filem.7
-man/man7/orte_hosts.7
-man/man7/orte_snapc.7
-man/man7/orte_sstore.7
-share/examples/openmpi/openmpi-default-hostfile
-share/examples/openmpi/openmpi-mca-params.conf
-share/examples/openmpi/pmix-mca-params.conf
-share/openmpi/amca-param-sets/example.conf
-share/openmpi/examples/openmpi-totalview.tcl
-share/openmpi/help-btl-vader.txt
-share/openmpi/help-coll-sync.txt
-share/openmpi/help-dash-host.txt
-share/openmpi/help-errmgr-base.txt
-share/openmpi/help-ess-base.txt
-share/openmpi/help-hostfile.txt
-share/openmpi/help-mca-base.txt
-share/openmpi/help-mca-bml-r2.txt
-share/openmpi/help-mca-coll-base.txt
-share/openmpi/help-mca-hook-base.txt
-share/openmpi/help-mca-var.txt
-share/openmpi/help-mpi-api.txt
-share/openmpi/help-mpi-btl-base.txt
-share/openmpi/help-mpi-btl-sm.txt
-share/openmpi/help-mpi-btl-tcp.txt
-share/openmpi/help-mpi-coll-sm.txt
-share/openmpi/help-mpi-common-sm.txt
-share/openmpi/help-mpi-errors.txt
-share/openmpi/help-mpi-pml-ob1.txt
-share/openmpi/help-mpi-runtime.txt
-share/openmpi/help-mpool-base.txt
-share/openmpi/help-oob-base.txt
-share/openmpi/help-oob-tcp.txt
-share/openmpi/help-opal-crs-none.txt
-share/openmpi/help-opal-hwloc-base.txt
-share/openmpi/help-opal-runtime.txt
-share/openmpi/help-opal-shmem-mmap.txt
-share/openmpi/help-opal-shmem-posix.txt
-share/openmpi/help-opal-shmem-sysv.txt
-${PLIST.linux}share/openmpi/help-opal-timer-linux.txt
-share/openmpi/help-opal-util.txt
-share/openmpi/help-opal-wrapper.txt
-share/openmpi/help-opal_info.txt
-share/openmpi/help-orte-clean.txt
-share/openmpi/help-orte-filem-raw.txt
-share/openmpi/help-orte-info.txt
-share/openmpi/help-orte-odls-base.txt
-share/openmpi/help-orte-odls-default.txt
-share/openmpi/help-orte-odls-pspawn.txt
-share/openmpi/help-orte-rmaps-base.txt
-share/openmpi/help-orte-rmaps-md.txt
-share/openmpi/help-orte-rmaps-ppr.txt
-share/openmpi/help-orte-rmaps-resilient.txt
-share/openmpi/help-orte-rmaps-rr.txt
-share/openmpi/help-orte-rmaps-seq.txt
-share/openmpi/help-orte-rtc-base.txt
-share/openmpi/help-orte-rtc-hwloc.txt
-share/openmpi/help-orte-runtime.txt
-share/openmpi/help-orte-server.txt
-share/openmpi/help-orte-snapc-base.txt
-share/openmpi/help-orted.txt
-share/openmpi/help-orterun.txt
-share/openmpi/help-osc-pt2pt.txt
-share/openmpi/help-plm-base.txt
-share/openmpi/help-plm-rsh.txt
-share/openmpi/help-pmix-base.txt
-share/openmpi/help-pmix-pmix3x.txt
-share/openmpi/help-ras-base.txt
-${PLIST.sge}share/openmpi/help-ras-gridengine.txt
-share/openmpi/help-ras-simulator.txt
-share/openmpi/help-rcache-base.txt
-share/openmpi/help-regex.txt
-share/openmpi/help-rmaps_rank_file.txt
-share/openmpi/help-state-base.txt
-share/openmpi/mpiCC-wrapper-data.txt
-share/openmpi/mpic++-wrapper-data.txt
-share/openmpi/mpicc-wrapper-data.txt
-share/openmpi/mpicxx-wrapper-data.txt
-share/openmpi/mpif77-wrapper-data.txt
-share/openmpi/mpif90-wrapper-data.txt
-share/openmpi/mpifort-wrapper-data.txt
-share/openmpi/openmpi-valgrind.supp
-share/openmpi/ortecc-wrapper-data.txt
-share/pmix/help-pmix-mca-base.txt
-share/pmix/help-pmix-mca-var.txt
-share/pmix/help-pmix-plog.txt
-share/pmix/help-pmix-psensor-file.txt
-share/pmix/help-pmix-psensor-heartbeat.txt
-share/pmix/help-pmix-runtime.txt
-share/pmix/help-pmix-server.txt
-share/pmix/pmix-valgrind.supp
diff --git a/openmpi/buildlink3.mk b/openmpi/buildlink3.mk
deleted file mode 100644
index 3f60ded88b..0000000000
--- a/openmpi/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2022/06/28 11:35:24 wiz Exp $
-
-BUILDLINK_TREE+=	openmpi
-
-.if !defined(OPENMPI_BUILDLINK3_MK)
-OPENMPI_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.openmpi+=	openmpi>=1.5.1
-BUILDLINK_PKGSRCDIR.openmpi?=	../../wip/openmpi
-
-.endif # OPENMPI_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-openmpi
diff --git a/openmpi/distinfo b/openmpi/distinfo
deleted file mode 100644
index b2359457aa..0000000000
--- a/openmpi/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.22 2021/10/26 11:10:37 nia Exp $
-
-BLAKE2s (openmpi-4.1.4.tar.bz2) = 0d98f1b9404f2a4328288c01d614421ca0a409f7e8550164664a5d692209b4b4
-SHA512 (openmpi-4.1.4.tar.bz2) = c70a92c9b16b8c76a871183f9b180d60861186e64140da897d206d53bc06213f31ea93b31734645f580f4bf28dda5605d85dbce2417e4596955384d961bed653
-Size (openmpi-4.1.4.tar.bz2) = 10042839 bytes
-SHA1 (patch-ak) = 1dba883fb533df57f5869b743e499a3117339529
-SHA1 (patch-config_opal__setup__wrappers.m4) = c3fe3cb5ff7cedcb5c847f25eea129d4299dd5d2
-SHA1 (patch-configure) = bb6373289ffa2beabccedb6ead679367c85dbe1e
-SHA1 (patch-ompi_mca_io_romio321_romio_configure) = 1adf4e3fff2ece5abba7c5909f006e8345917b9d
-SHA1 (patch-ompi_mca_sharedfp_sm_sharedfp__sm.c) = 7ce9147662864be5ae072166231d65189cb1bed2
-SHA1 (patch-ompi_mpi_java_java_Makefile.in) = bd61f02f56e03af9799d2ba86d66c1ded35f62f4
-SHA1 (patch-opal_tools_wrappers_opal__wrapper.c) = c21620ceab6aff220e6a4b74ce4929ff0d1c9885
diff --git a/openmpi/options.mk b/openmpi/options.mk
deleted file mode 100644
index d5c02ed47b..0000000000
--- a/openmpi/options.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: options.mk,v 1.10 2018/01/04 20:31:28 adam Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.openmpi
-PKG_SUPPORTED_OPTIONS=	debug f90 java sge slurm
-PKG_SUGGESTED_OPTIONS+=	f90
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-
-PLIST_VARS+=		f08 f90 java sge
-
-.if !empty(PKG_OPTIONS:Mf90)
-USE_LANGUAGES+=		fortran
-GCC_REQD+=		4.7
-CONFIGURE_ARGS+=	--enable-mpi-fortran=yes
-# Enabling fortran builds for Fortran 90, and also for Fortran 08 if
-# the toolchain is good enough.  In 2022, start by assuming that
-# USE_LANGUAGES=fortran gets us a sufficiently modern compiler.
-PLIST.f90=		yes
-PLIST.f08=		yes
-.else
-CONFIGURE_ARGS+=	--enable-mpi-fortran=no
-.endif
-
-.if !empty(PKG_OPTIONS:Mjava)
-CONFIGURE_ARGS+=	--enable-mpi-java
-PLIST.java=		yes
-.include "../../mk/java-vm.mk"
-.else
-CONFIGURE_ARGS+=	--disable-mpi-java
-.endif
-
-.if !empty(PKG_OPTIONS:Msge)
-CONFIGURE_ARGS+=	--with-sge
-PLIST.sge=		yes
-.else
-CONFIGURE_ARGS+=	--without-sge
-.endif
-
-.if !empty(PKG_OPTIONS:Mslurm)
-CONFIGURE_ARGS+=	--with-slurm
-.else
-CONFIGURE_ARGS+=	--without-slurm
-.endif
diff --git a/openmpi/patches/patch-ak b/openmpi/patches/patch-ak
deleted file mode 100644
index 19b915704a..0000000000
--- a/openmpi/patches/patch-ak
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2016/10/23 14:02:28 asau Exp $
-
-# Use pkgsrc variables
-
---- ompi/etc/Makefile.in.orig	2016-09-02 01:30:09.000000000 +0000
-+++ ompi/etc/Makefile.in
-@@ -89,6 +89,7 @@ am__make_running_with_option = \
- am__make_dryrun = (target_option=n; $(am__make_running_with_option))
- am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
- pkgdatadir = $(datadir)/@PACKAGE@
-+sysconfexampledir = $(pkgdatadir)/examples
- pkgincludedir = $(includedir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkglibexecdir = $(libexecdir)/@PACKAGE@
-@@ -1731,19 +1732,19 @@ uninstall-am: uninstall-local
- # details why the mkdir is in install-data-local.
- 
- install-data-local:
--	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
-+	$(MKDIR_P) $(DESTDIR)$(sysconfexampledir)
- 	@ p="$(ompi_config_files)"; \
- 	for file in $$p; do \
--	  if test -f $(DESTDIR)$(sysconfdir)/$$file; then \
-+	  if test -f $(DESTDIR)$(sysconfexampledir)/$$file; then \
- 	    echo "******************************* WARNING ************************************"; \
- 	    echo "*** Not installing new $$file over existing file in:"; \
--	    echo "***   $(DESTDIR)$(sysconfdir)/$$file"; \
-+	    echo "***   $(DESTDIR)$(sysconfexampledir)/$$file"; \
- 	    echo "******************************* WARNING ************************************"; \
- 	  else \
- 	    if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \
- 	    f="`echo $$file | sed -e 's|^.*/||'`"; \
--	    echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f"; \
--	    $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfdir)/$$f; \
-+	    echo " $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfexampledir)/$$f"; \
-+	    $(INSTALL_DATA) $$d$$file $(DESTDIR)$(sysconfexampledir)/$$f; \
- 	  fi; \
- 	done
- 
-@@ -1754,11 +1755,11 @@ install-data-local:
- uninstall-local:
- 	@ p="$(ompi_config_files)"; \
- 	for file in $$p; do \
--	  if test -f "$(DESTDIR)$(sysconfdir)/$$file"; then \
-+	  if test -f "$(DESTDIR)$(sysconfexampledir)/$$file"; then \
- 	  	if test -f "$$file"; then d=; else d="$(srcdir)/"; fi; \
--	    if diff "$(DESTDIR)$(sysconfdir)/$$file" "$$d$$file" > /dev/null 2>&1 ; then \
--	      echo "rm -f $(DESTDIR)$(sysconfdir)/$$file" ; \
--	      rm -f "$(DESTDIR)$(sysconfdir)/$$file" ; \
-+	    if diff "$(DESTDIR)$(sysconfexampledir)/$$file" "$$d$$file" > /dev/null 2>&1 ; then \
-+	      echo "rm -f $(DESTDIR)$(sysconfexampledir)/$$file" ; \
-+	      rm -f "$(DESTDIR)$(sysconfexampledir)/$$file" ; \
- 	    fi ; \
- 	  fi ; \
- 	done
diff --git a/openmpi/patches/patch-config_opal__setup__wrappers.m4 b/openmpi/patches/patch-config_opal__setup__wrappers.m4
deleted file mode 100644
index d8f8b8d59d..0000000000
--- a/openmpi/patches/patch-config_opal__setup__wrappers.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-config_opal__setup__wrappers.m4,v 1.1 2016/02/28 19:47:41 joerg Exp $
-
-Do not second guess the compiler's choice of DT_RPATH vs DT_RUNPATH.
-
---- config/opal_setup_wrappers.m4.orig	2016-02-24 13:18:55.229667898 +0000
-+++ config/opal_setup_wrappers.m4
-@@ -177,10 +177,6 @@ EOF
-            AC_MSG_RESULT([yes (no extra flags needed)])])
- 
-     OPAL_VAR_SCOPE_POP
--
--    # If we found RPATH support, check for RUNPATH support, too
--    AS_IF([test "$WRAPPER_RPATH_SUPPORT" = "rpath"],
--          [OPAL_SETUP_RUNPATH])
- ])
- 
- # Check to see if the linker supports the DT_RUNPATH flags via
diff --git a/openmpi/patches/patch-configure b/openmpi/patches/patch-configure
deleted file mode 100644
index d7ace886b1..0000000000
--- a/openmpi/patches/patch-configure
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD$
-
-# Portability of test command
-
---- configure.orig	2022-07-29 20:55:26.095390777 +0000
-+++ configure
-@@ -156118,7 +156118,7 @@ $as_echo_n "checking if memory patcher s
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $opal_memory_patcher_happy" >&5
- $as_echo "$opal_memory_patcher_happy" >&6; }
- 
--    if test "$opal_memory_patcher_happy" == "yes"; then :
-+    if test "$opal_memory_patcher_happy" = "yes"; then :
- 
-         for ac_func in __curbrk
- do :
-@@ -338377,7 +338377,7 @@ cat >>confdefs.h <<_ACEOF
- #define OMPI_MCA_OP_HAVE_SSE3 $op_sse3_support
- _ACEOF
- 
--     if test "$op_avx512_support" == "1"; then
-+     if test "$op_avx512_support" = "1"; then
-   MCA_BUILD_ompi_op_has_avx512_support_TRUE=
-   MCA_BUILD_ompi_op_has_avx512_support_FALSE='#'
- else
-@@ -338385,7 +338385,7 @@ else
-   MCA_BUILD_ompi_op_has_avx512_support_FALSE=
- fi
- 
--     if test "$op_avx2_support" == "1"; then
-+     if test "$op_avx2_support" = "1"; then
-   MCA_BUILD_ompi_op_has_avx2_support_TRUE=
-   MCA_BUILD_ompi_op_has_avx2_support_FALSE='#'
- else
-@@ -338393,7 +338393,7 @@ else
-   MCA_BUILD_ompi_op_has_avx2_support_FALSE=
- fi
- 
--     if test "$op_avx_support" == "1"; then
-+     if test "$op_avx_support" = "1"; then
-   MCA_BUILD_ompi_op_has_avx_support_TRUE=
-   MCA_BUILD_ompi_op_has_avx_support_FALSE='#'
- else
-@@ -338401,7 +338401,7 @@ else
-   MCA_BUILD_ompi_op_has_avx_support_FALSE=
- fi
- 
--     if test "$op_sse41_support" == "1"; then
-+     if test "$op_sse41_support" = "1"; then
-   MCA_BUILD_ompi_op_has_sse41_support_TRUE=
-   MCA_BUILD_ompi_op_has_sse41_support_FALSE='#'
- else
-@@ -338409,7 +338409,7 @@ else
-   MCA_BUILD_ompi_op_has_sse41_support_FALSE=
- fi
- 
--     if test "$op_sse3_support" == "1"; then
-+     if test "$op_sse3_support" = "1"; then
-   MCA_BUILD_ompi_op_has_sse3_support_TRUE=
-   MCA_BUILD_ompi_op_has_sse3_support_FALSE='#'
- else
-@@ -361527,7 +361527,7 @@ if test "${with_ompi_pmix_rte+set}" = se
-   withval=$with_ompi_pmix_rte;
- fi
- 
--    if test "$with_ompi_pmix_rte" == "yes"; then :
-+    if test "$with_ompi_pmix_rte" = "yes"; then :
-   should_build=$should_build
-            { $as_echo "$as_me:${as_lineno-$LINENO}: PMIx RTE selected by user" >&5
- $as_echo "$as_me: PMIx RTE selected by user" >&6;}
diff --git a/openmpi/patches/patch-ompi_mca_io_romio321_romio_configure b/openmpi/patches/patch-ompi_mca_io_romio321_romio_configure
deleted file mode 100644
index 492a5d27ac..0000000000
--- a/openmpi/patches/patch-ompi_mca_io_romio321_romio_configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-# POSIX sh compat
-
---- ompi/mca/io/romio321/romio/configure.orig	2019-02-05 14:00:57.202743253 +0000
-+++ ompi/mca/io/romio321/romio/configure
-@@ -22997,7 +22997,7 @@ if test "${with_aio_lite+set}" = set; th
-   withval=$with_aio_lite; with_aiolite=yes
- fi
- 
--if test "x$with_aiolite" == xyes; then :
-+if test "x$with_aiolite" = xyes; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lio_listio in -laio-lite" >&5
- $as_echo_n "checking for lio_listio in -laio-lite... " >&6; }
- if ${ac_cv_lib_aio_lite_lio_listio+:} false; then :
diff --git a/openmpi/patches/patch-ompi_mca_sharedfp_sm_sharedfp__sm.c b/openmpi/patches/patch-ompi_mca_sharedfp_sm_sharedfp__sm.c
deleted file mode 100644
index 37c7eebc8b..0000000000
--- a/openmpi/patches/patch-ompi_mca_sharedfp_sm_sharedfp__sm.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-# Fix missing constants
-
---- ompi/mca/sharedfp/sm/sharedfp_sm.c.orig	2022-07-29 23:04:14.067867314 +0000
-+++ ompi/mca/sharedfp/sm/sharedfp_sm.c
-@@ -26,6 +26,7 @@
-  * modules just to query their version and parameters
-  */
- 
-+#include <sys/stat.h>	// Hack for NetBSD
- #include "ompi_config.h"
- #include "mpi.h"
- #include "ompi/mca/sharedfp/sharedfp.h"
diff --git a/openmpi/patches/patch-ompi_mpi_java_java_Makefile.in b/openmpi/patches/patch-ompi_mpi_java_java_Makefile.in
deleted file mode 100644
index 868df6a98c..0000000000
--- a/openmpi/patches/patch-ompi_mpi_java_java_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ompi_mpi_java_java_Makefile.in,v 1.1 2015/12/13 06:49:01 markd Exp $
-
-Don't install jdocs - its dependent on particular javadoc version
-
---- ompi/mpi/java/java/Makefile.in.orig	2015-09-16 10:13:10.000000000 +0000
-+++ ompi/mpi/java/java/Makefile.in
-@@ -2017,7 +2017,7 @@ uninstall-am: uninstall-javaDATA uninsta
- @OMPI_WANT_JAVA_BINDINGS_TRUE@jdoc-uninstall:
- @OMPI_WANT_JAVA_BINDINGS_TRUE@	-rm -rf $(DESTDIR)$(docdir)/javadoc
- 
--@OMPI_WANT_JAVA_BINDINGS_TRUE@install-data-hook: jdoc-install
-+@OMPI_WANT_JAVA_BINDINGS_TRUE@install-data-hook: 
- @OMPI_WANT_JAVA_BINDINGS_TRUE@uninstall-local: jdoc-uninstall
- 
- # Can only put *files* in CLEANFILES; need to remove the generated doc
diff --git a/openmpi/patches/patch-opal_tools_wrappers_opal__wrapper.c b/openmpi/patches/patch-opal_tools_wrappers_opal__wrapper.c
deleted file mode 100644
index d014682273..0000000000
--- a/openmpi/patches/patch-opal_tools_wrappers_opal__wrapper.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-# Add rpath support
-
---- opal/tools/wrappers/opal_wrapper.c.orig	2022-07-30 14:00:47.068421047 +0000
-+++ opal/tools/wrappers/opal_wrapper.c
-@@ -57,6 +57,7 @@
- 
- #define OPAL_INCLUDE_FLAG  "-I"
- #define OPAL_LIBDIR_FLAG   "-L"
-+#define OPAL_RPATH_FLAG    "-R"
- 
- struct options_data_t {
-     char **compiler_args;
-@@ -347,6 +348,8 @@ data_callback(const char *key, const cha
-                 char *line;
-                 asprintf(&line, OPAL_INCLUDE_FLAG"%s",
-                          options_data[parse_options_idx].path_opalincludedir);
-+                asprintf(&line, OPAL_RPATH_FLAG"%s",
-+                         options_data[parse_options_idx].path_libdir);
-                 opal_argv_append_nosize(&options_data[parse_options_idx].preproc_flags, line);
-                 free(line);
-             }
-@@ -358,6 +361,8 @@ data_callback(const char *key, const cha
-             char *line;
-             asprintf(&line, OPAL_LIBDIR_FLAG"%s",
-                      options_data[parse_options_idx].path_opallibdir);
-+            asprintf(&line, OPAL_RPATH_FLAG"%s",
-+                     options_data[parse_options_idx].path_libdir);
-             opal_argv_append_nosize(&options_data[parse_options_idx].link_flags, line);
-             free(line);
-         }
diff --git a/scalapack/DESCR b/scalapack/DESCR
deleted file mode 100644
index 61edf42763..0000000000
--- a/scalapack/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-ScaLAPACK, or Scalable LAPACK, is a library of high performance linear
-algebra routines for distributed memory computers supporting MPI.
-
-The complete ScaLAPACK package is freely available on netlib and
-can be obtained via the World Wide Web or anonymous ftp.
-
-    http://www.netlib.org/scalapack/
diff --git a/scalapack/Makefile b/scalapack/Makefile
deleted file mode 100644
index b507949638..0000000000
--- a/scalapack/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	scalapack-2.2.0
-CATEGORIES=	math
-MASTER_SITES=	http://www.netlib.org/scalapack/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	thor%NetBSD.org@localhost
-HOMEPAGE=	http://www.netlib.org/scalapack/
-COMMENT=	Scalable Linear Algebra PACKage
-LICENSE=	modified-bsd
-
-USE_CMAKE=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c fortran
-
-CMAKE_ARGS=	-DBLA_PREFER_PKGCONFIG=on \
-		-DBLA_PKGCONFIG_LAPACK=${LAPACK_PC:Q} \
-		-DBLA_PKGCONFIG_BLAS=${BLAS_PC:Q} \
-		-DBUILD_SHARED_LIBS=ON
-
-TEST_TARGET=	test
-TEST_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/lib
-
-PKGCONFIG_OVERRIDE+=	scalapack.pc.in
-
-.include "../../mk/blas.buildlink3.mk"
-.include "../../mk/mpi.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/scalapack/PLIST b/scalapack/PLIST
deleted file mode 100644
index 0e648d6f49..0000000000
--- a/scalapack/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD$
-lib/cmake/${PKGNAME}/scalapack-config-version.cmake
-lib/cmake/${PKGNAME}/scalapack-config.cmake
-lib/cmake/${PKGNAME}/scalapack-targets-noconfig.cmake
-lib/cmake/${PKGNAME}/scalapack-targets.cmake
-lib/libscalapack.so
-lib/pkgconfig/scalapack.pc
diff --git a/scalapack/distinfo b/scalapack/distinfo
deleted file mode 100644
index ff43946473..0000000000
--- a/scalapack/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD$
-
-BLAKE2s (scalapack-2.2.0.tgz) = deff6c2cbd5993fa07333191f223995bfcdf55d65d30089970b976a97b2d9ccf
-SHA512 (scalapack-2.2.0.tgz) = 1e6c69a4faab8165c273479ff8b63e98df6a7253cffc524b5700d0344c3f89c52c5bccc5d3a9a9bded4d9da50080123abd8340b75e1f92317e471c4375704999
-Size (scalapack-2.2.0.tgz) = 4769286 bytes
-SHA1 (patch-PR67-MPI-linking) = 704d77790bcf5d73203a8d7a86161230d650e23c
-SHA1 (patch-SRC_pdtrord.f) = 7c51c59c4f570020595904e964901e27ec45e2c4
-SHA1 (patch-SRC_pstrord.f) = 1ca9fd5d3520b5ecb030f3e07fc0f13f1bbc8a2d
-SHA1 (patch-SRC_pstrsen.f) = 5956f03bae7ad44861a9b7776a1cb7a8438483fb
-SHA1 (patch-scalapack.pc.in) = c6a2b9068b89ecdf2b26263117b37761fdf14808
diff --git a/scalapack/patches/patch-PR67-MPI-linking b/scalapack/patches/patch-PR67-MPI-linking
deleted file mode 100644
index dc6c9db4dc..0000000000
--- a/scalapack/patches/patch-PR67-MPI-linking
+++ /dev/null
@@ -1,418 +0,0 @@
-$NetBSD$
-
-This includes upstream PR67 and the version fix, to be removed
-on update to next upstream release after 2.2.0. It modifies several
-files, as it would not make sense to have lots of separate patches
-for this one thing.
-
-diff -ru ../scalapack-2.2.0/BLACS/CMakeLists.txt ./BLACS/CMakeLists.txt
---- ../scalapack-2.2.0/BLACS/CMakeLists.txt	2021-10-12 21:09:12.000000000 +0200
-+++ ./BLACS/CMakeLists.txt	2022-07-19 10:33:55.051376486 +0200
-@@ -1,4 +1,4 @@
- add_subdirectory(SRC)
--if(${SCALAPACK_BUILD_TESTING})
-+if(${SCALAPACK_BUILD_TESTS})
-   add_subdirectory(TESTING)
- endif()
-diff -ru ../scalapack-2.2.0/BLACS/TESTING/CMakeLists.txt ./BLACS/TESTING/CMakeLists.txt
---- ../scalapack-2.2.0/BLACS/TESTING/CMakeLists.txt	2021-10-12 21:09:12.000000000 +0200
-+++ ./BLACS/TESTING/CMakeLists.txt	2022-07-19 16:20:28.028299214 +0200
-@@ -6,7 +6,7 @@
- endif()
- 
- add_executable(xFbtest ${FTestObj})
--target_link_libraries(xFbtest scalapack)
-+target_link_libraries(xFbtest scalapack MPI::MPI_Fortran)
- 
- set(CTestObj
-    Cbt.c)
-@@ -17,7 +17,7 @@
-    )
- 
- add_executable(xCbtest ${CTestObj} ${FTestObj})
--target_link_libraries(xCbtest scalapack)
-+target_link_libraries(xCbtest scalapack MPI::MPI_Fortran)
- 
- file(COPY bsbr.dat DESTINATION ${SCALAPACK_BINARY_DIR}/BLACS/TESTING)
- file(COPY bt.dat DESTINATION ${SCALAPACK_BINARY_DIR}/BLACS/TESTING)
-Only in ./BLACS/TESTING: CMakeLists.txt.orig
-diff -ru ../scalapack-2.2.0/CMakeLists.txt ./CMakeLists.txt
---- ../scalapack-2.2.0/CMakeLists.txt	2021-10-12 21:09:12.000000000 +0200
-+++ ./CMakeLists.txt	2022-07-20 16:30:35.443344793 +0200
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.2)
-+cmake_minimum_required(VERSION 3.9)
- project(SCALAPACK C Fortran)
- # Configure the warning and code coverage suppression file
- configure_file(
-@@ -27,8 +27,7 @@
- find_package(MPI)
- if (MPI_FOUND)
-    message(STATUS "Found MPI_LIBRARY : ${MPI_FOUND} ")
--   INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
--
-+   
-    find_program(MPI_C_COMPILER
-       NAMES mpicc
-       HINTS "${MPI_BASE_DIR}"
-@@ -232,14 +231,14 @@
- 
- if (UNIX)
-    add_library(scalapack ${blacs} ${tools} ${tools-C} ${extra_lapack} ${pblas} ${pblas-F} ${ptzblas} ${ptools} ${pbblas} ${redist} ${src} ${src-C})
--   target_link_libraries( scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+   target_link_libraries( scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_C)
-    scalapack_install_library(scalapack)
- else (UNIX) # Need to separate Fortran and C Code
-    OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON )
-    add_library(scalapack ${blacs} ${tools-C} ${pblas} ${ptools} ${redist} ${src-C})
--   target_link_libraries( scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+   target_link_libraries( scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_C)
-    add_library(scalapack-F ${pblas-F} ${pbblas} ${ptzblas} ${tools} ${src} ${extra_lapack} )
--   target_link_libraries( scalapack-F ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+   target_link_libraries( scalapack-F ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-    scalapack_install_library(scalapack)
-    scalapack_install_library(scalapack-F)
- endif (UNIX)
-@@ -255,9 +254,9 @@
- SET(CPACK_PACKAGE_NAME "ScaLAPACK")
- SET(CPACK_PACKAGE_VENDOR "University of Tennessee, Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd")
- SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ScaLAPACK- Linear Algebra Package")
--set(SCALAPACK_VERSION 2.1.0)
-+set(SCALAPACK_VERSION 2.2.0)
- set(CPACK_PACKAGE_VERSION_MAJOR 2)
--set(CPACK_PACKAGE_VERSION_MINOR 1)
-+set(CPACK_PACKAGE_VERSION_MINOR 2)
- set(CPACK_PACKAGE_VERSION_PATCH 0)
- set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
- SET(CPACK_PACKAGE_INSTALL_DIRECTORY "SCALAPACK")
-Only in .: CMakeLists.txt.orig
-diff -ru ../scalapack-2.2.0/PBLAS/CMakeLists.txt ./PBLAS/CMakeLists.txt
---- ../scalapack-2.2.0/PBLAS/CMakeLists.txt	2021-10-12 21:09:12.000000000 +0200
-+++ ./PBLAS/CMakeLists.txt	2022-07-19 10:33:55.052376486 +0200
-@@ -1,5 +1,5 @@
- add_subdirectory(SRC)
--if(${SCALAPACK_BUILD_TESTING})
-+if(${SCALAPACK_BUILD_TESTS})
-   add_subdirectory(TESTING)
-   add_subdirectory(TIMING)
- endif()
-diff -ru ../scalapack-2.2.0/PBLAS/TESTING/CMakeLists.txt ./PBLAS/TESTING/CMakeLists.txt
---- ../scalapack-2.2.0/PBLAS/TESTING/CMakeLists.txt	2021-10-12 21:09:12.000000000 +0200
-+++ ./PBLAS/TESTING/CMakeLists.txt	2022-07-19 16:21:42.412306092 +0200
-@@ -44,20 +44,20 @@
- add_executable(cpb3tst pcblas3tst.f ${cpbtcom})
- add_executable(zpb3tst pzblas3tst.f ${zpbtcom})
- 
--target_link_libraries(spb1tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(dpb1tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(cpb1tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(zpb1tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+target_link_libraries(spb1tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(dpb1tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(cpb1tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(zpb1tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
- 
--target_link_libraries(spb2tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(dpb2tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(cpb2tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(zpb2tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+target_link_libraries(spb2tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(dpb2tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(cpb2tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(zpb2tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
- 
--target_link_libraries(spb3tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(dpb3tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(cpb3tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(zpb3tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+target_link_libraries(spb3tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(dpb3tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(cpb3tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(zpb3tst scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
- 
- add_test(spb1tst ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./spb1tst)
- add_test(dpb1tst ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./dpb1tst)
-Only in ./PBLAS/TESTING: CMakeLists.txt.orig
-diff -ru ../scalapack-2.2.0/PBLAS/TIMING/CMakeLists.txt ./PBLAS/TIMING/CMakeLists.txt
---- ../scalapack-2.2.0/PBLAS/TIMING/CMakeLists.txt	2021-10-12 21:09:12.000000000 +0200
-+++ ./PBLAS/TIMING/CMakeLists.txt	2022-07-19 16:22:31.291310612 +0200
-@@ -44,20 +44,20 @@
- add_executable(cpb3tim pcblas3tim.f ${cpbtcom})
- add_executable(zpb3tim pzblas3tim.f ${zpbtcom})
- 
--target_link_libraries(spb1tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(dpb1tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(cpb1tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(zpb1tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+target_link_libraries(spb1tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(dpb1tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(cpb1tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(zpb1tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
- 
--target_link_libraries(spb2tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(dpb2tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(cpb2tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(zpb2tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+target_link_libraries(spb2tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(dpb2tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(cpb2tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(zpb2tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
- 
--target_link_libraries(spb3tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(dpb3tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(cpb3tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(zpb3tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+target_link_libraries(spb3tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(dpb3tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(cpb3tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(zpb3tim scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
- 
- add_test(spb1tim ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./spb1tim)
- add_test(dpb1tim ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./dpb1tim)
-Only in ./PBLAS/TIMING: CMakeLists.txt.orig
-diff -ru ../scalapack-2.2.0/REDIST/CMakeLists.txt ./REDIST/CMakeLists.txt
---- ../scalapack-2.2.0/REDIST/CMakeLists.txt	2021-10-12 21:09:12.000000000 +0200
-+++ ./REDIST/CMakeLists.txt	2022-07-19 10:33:55.052376486 +0200
-@@ -1,4 +1,4 @@
- add_subdirectory(SRC)
--if(${SCALAPACK_BUILD_TESTING})
-+if(${SCALAPACK_BUILD_TESTS})
-   add_subdirectory(TESTING)
- endif()
-diff -ru ../scalapack-2.2.0/REDIST/TESTING/CMakeLists.txt ./REDIST/TESTING/CMakeLists.txt
---- ../scalapack-2.2.0/REDIST/TESTING/CMakeLists.txt	2021-10-12 21:09:12.000000000 +0200
-+++ ./REDIST/TESTING/CMakeLists.txt	2022-07-19 16:14:17.879264986 +0200
-@@ -15,17 +15,17 @@
- add_executable(xctrmr pctrmrdrv.c)
- add_executable(xztrmr pztrmrdrv.c)
- 
--target_link_libraries(xigemr scalapack )
--target_link_libraries(xsgemr scalapack )
--target_link_libraries(xdgemr scalapack )
--target_link_libraries(xcgemr scalapack )
--target_link_libraries(xzgemr scalapack )
-+target_link_libraries(xigemr scalapack MPI::MPI_Fortran )
-+target_link_libraries(xsgemr scalapack MPI::MPI_Fortran )
-+target_link_libraries(xdgemr scalapack MPI::MPI_Fortran )
-+target_link_libraries(xcgemr scalapack MPI::MPI_Fortran )
-+target_link_libraries(xzgemr scalapack MPI::MPI_Fortran )
- 
--target_link_libraries(xitrmr scalapack )
--target_link_libraries(xstrmr scalapack )
--target_link_libraries(xdtrmr scalapack )
--target_link_libraries(xctrmr scalapack )
--target_link_libraries(xztrmr scalapack )
-+target_link_libraries(xitrmr scalapack MPI::MPI_Fortran )
-+target_link_libraries(xstrmr scalapack MPI::MPI_Fortran )
-+target_link_libraries(xdtrmr scalapack MPI::MPI_Fortran )
-+target_link_libraries(xctrmr scalapack MPI::MPI_Fortran )
-+target_link_libraries(xztrmr scalapack MPI::MPI_Fortran )
- 
- #add_test(xigemr ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./xigemr)
- #add_test(xsgemr ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./xsgemr)
-Only in ./REDIST/TESTING: CMakeLists.txt.orig
-diff -ru ../scalapack-2.2.0/TESTING/EIG/CMakeLists.txt ./TESTING/EIG/CMakeLists.txt
---- ../scalapack-2.2.0/TESTING/EIG/CMakeLists.txt	2021-10-12 21:09:12.000000000 +0200
-+++ ./TESTING/EIG/CMakeLists.txt	2022-07-19 16:19:40.461294815 +0200
-@@ -53,49 +53,49 @@
- add_executable(xshseqr pshseqrdriver.f psmatgen2.f ${cmatgen})
- add_executable(xdhseqr pdhseqrdriver.f pdmatgen2.f ${cmatgen})
- 
--target_link_libraries(xsbrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdbrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xcbrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzbrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xshrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdhrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xchrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzhrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xstrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdtrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xctrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xztrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xssvd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdsvd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xssep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xcsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xsgsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdgsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xcgsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzgsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xsnep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdnep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xcnep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xznep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xcevc scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzevc scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xssyevr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdsyevr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xcheevr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzheevr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+target_link_libraries(xsbrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdbrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xcbrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzbrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xshrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdhrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xchrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzhrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xstrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdtrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xctrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xztrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xssvd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdsvd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xssep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xcsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xsgsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdgsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xcgsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzgsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xsnep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdnep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xcnep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xznep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xcevc scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzevc scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xssyevr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdsyevr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xcheevr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzheevr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
- 
--target_link_libraries(xshseqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdhseqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+target_link_libraries(xshseqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdhseqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
- 
- if ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
-     set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy" )  # local to this directory
-Only in ./TESTING/EIG: CMakeLists.txt.orig
-diff -ru ../scalapack-2.2.0/TESTING/LIN/CMakeLists.txt ./TESTING/LIN/CMakeLists.txt
---- ../scalapack-2.2.0/TESTING/LIN/CMakeLists.txt	2021-10-12 21:09:12.000000000 +0200
-+++ ./TESTING/LIN/CMakeLists.txt	2022-07-19 16:16:53.702279395 +0200
-@@ -61,55 +61,55 @@
- add_executable(xzls pzlsdriver.f pzlsinfo.f pzqrt13.f pzqrt14.f pzqrt16.f pzqrt17.f ${zmatgen})
- 
- 
--target_link_libraries(xslu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xclu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xsdblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xddblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xcdblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzdblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xsdtlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xddtlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xcdtlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzdtlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xsgblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdgblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xcgblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzgblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xsllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xcllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xspbllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdpbllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xcpbllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzpbllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xsptllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdptllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xcptllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzptllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xsinv scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdinv scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xcinv scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzinv scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xsqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xcqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--
--target_link_libraries(xsls scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xdls scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xcls scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
--target_link_libraries(xzls scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+target_link_libraries(xslu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xclu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xsdblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xddblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xcdblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzdblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xsdtlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xddtlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xcdtlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzdtlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xsgblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdgblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xcgblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzgblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xsllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xcllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xspbllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdpbllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xcpbllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzpbllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xsptllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdptllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xcptllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzptllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xsinv scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdinv scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xcinv scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzinv scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xsqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xcqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+
-+target_link_libraries(xsls scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xdls scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xcls scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-+target_link_libraries(xzls scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
- 
- if ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
-     set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy" )  # local to this directory
-Only in ./TESTING/LIN: CMakeLists.txt.orig
diff --git a/scalapack/patches/patch-SRC_pdtrord.f b/scalapack/patches/patch-SRC_pdtrord.f
deleted file mode 100644
index 872b0b5aac..0000000000
--- a/scalapack/patches/patch-SRC_pdtrord.f
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-upstream gcc10 build fix, commit a0f76fc0c1c16646875b454b7d6f8d9d17726b5a
-
---- SRC/pdtrord.f.orig	2021-10-12 19:09:12.000000000 +0000
-+++ SRC/pdtrord.f
-@@ -487,10 +487,10 @@
-             MMAX( 1 ) = M
-             MMIN( 1 ) = M
-             IF( NPROCS.GT.1 )
--     $         CALL IGAMX2D( ICTXT, 'All', TOP, 1, 1, MMAX, 1, -1,
-+     $         CALL IGAMX2D( ICTXT, 'All', TOP, 1, 1, MMAX( 1 ), 1, -1,
-      $              -1, -1, -1, -1 )
-             IF( NPROCS.GT.1 )
--     $         CALL IGAMN2D( ICTXT, 'All', TOP, 1, 1, MMIN, 1, -1,
-+     $         CALL IGAMN2D( ICTXT, 'All', TOP, 1, 1, MMIN( 1 ), 1, -1,
-      $              -1, -1, -1, -1 )
-             IF( MMAX( 1 ).GT.MMIN( 1 ) ) THEN
-                M = MMAX( 1 )
diff --git a/scalapack/patches/patch-SRC_pstrord.f b/scalapack/patches/patch-SRC_pstrord.f
deleted file mode 100644
index 1a86d3e60f..0000000000
--- a/scalapack/patches/patch-SRC_pstrord.f
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-upstream gcc10 build fix, commit a0f76fc0c1c16646875b454b7d6f8d9d17726b5a
-
---- SRC/pstrord.f.orig	2021-10-12 19:09:12.000000000 +0000
-+++ SRC/pstrord.f
-@@ -487,10 +487,10 @@
-             MMAX( 1 ) = M
-             MMIN( 1 ) = M
-             IF( NPROCS.GT.1 )
--     $         CALL IGAMX2D( ICTXT, 'All', TOP, 1, 1, MMAX, 1, -1,
-+     $         CALL IGAMX2D( ICTXT, 'All', TOP, 1, 1, MMAX( 1 ), 1, -1,
-      $              -1, -1, -1, -1 )
-             IF( NPROCS.GT.1 )
--     $         CALL IGAMN2D( ICTXT, 'All', TOP, 1, 1, MMIN, 1, -1,
-+     $         CALL IGAMN2D( ICTXT, 'All', TOP, 1, 1, MMIN( 1 ), 1, -1,
-      $              -1, -1, -1, -1 )
-             IF( MMAX( 1 ).GT.MMIN( 1 ) ) THEN
-                M = MMAX( 1 )
diff --git a/scalapack/patches/patch-SRC_pstrsen.f b/scalapack/patches/patch-SRC_pstrsen.f
deleted file mode 100644
index 784f16745c..0000000000
--- a/scalapack/patches/patch-SRC_pstrsen.f
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-upstream gcc10 build fix, commit a0f76fc0c1c16646875b454b7d6f8d9d17726b5a
-
---- SRC/pstrsen.f.orig	2021-10-12 19:09:12.000000000 +0000
-+++ SRC/pstrsen.f
-@@ -526,11 +526,11 @@
-             MMAX( 1 ) = M
-             MMIN( 1 ) = M
-             IF( NPROCS.GT.1 )
--     $           CALL IGAMX2D( ICTXT, 'All', TOP, 1, 1, MMAX, 1, -1,
--     $                -1, -1, -1, -1 )
-+     $         CALL IGAMX2D( ICTXT, 'All', TOP, 1, 1, MMAX( 1 ), 1, -1,
-+     $              -1, -1, -1, -1 )
-             IF( NPROCS.GT.1 )
--     $           CALL IGAMN2D( ICTXT, 'All', TOP, 1, 1, MMIN, 1, -1,
--     $                -1, -1, -1, -1 )
-+     $         CALL IGAMN2D( ICTXT, 'All', TOP, 1, 1, MMIN( 1 ), 1, -1,
-+     $              -1, -1, -1, -1 )
-             IF( MMAX( 1 ).GT.MMIN( 1 ) ) THEN
-                M = MMAX( 1 )
-                IF( NPROCS.GT.1 )
diff --git a/scalapack/patches/patch-scalapack.pc.in b/scalapack/patches/patch-scalapack.pc.in
deleted file mode 100644
index 85d58ee2f0..0000000000
--- a/scalapack/patches/patch-scalapack.pc.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Do not assume fixed names for MPI and BLAS dependency pkg-config
-packages. They can vary.
-
---- scalapack.pc.in.orig	2021-10-12 19:09:12.000000000 +0000
-+++ scalapack.pc.in
-@@ -5,5 +5,5 @@ Name: scalapack
- Description: SCALAPACK reference implementation
- Version: @SCALAPACK_VERSION@
- URL: http://www.netlib.org/scalapack/
- Libs: -L${libdir} -lscalapack
--Requires: mpi lapack blas
-+Requires: @BLA_PKGCONFIG_LAPACK@ @BLA_PKGCONFIG_BLAS@
-+Libs.private: @MPI_LIBRARIES@


Home | Main Index | Thread Index | Old Index