Add a java option.

Fix PLIST for the sge option.
Fix PLIST for linux.

5 files changed, 276 insertions, 13 deletions

diff --git a/parallel/openmpi/Makefile b/parallel/openmpi/Makefile
index d4b0c7350a7..30745978c2c 100644
--- a/parallel/openmpi/Makefile
+++ b/parallel/openmpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2015/12/12 22:41:19 asau Exp $
+# $NetBSD: Makefile,v 1.33 2015/12/13 06:49:01 markd Exp $
 
 DISTNAME=	openmpi-1.10.1
 CATEGORIES=	parallel
@@ -18,7 +18,6 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool \
 			${WRKSRC}/ompi/mca/io/romio/romio/libtool
 SHLIBTOOL_OVERRIDE=	${WRKSRC}/config/libtool.m4
 
-CONFIGURE_ARGS+=	--without-sge
 CONFIGURE_ARGS+=	--without-slurm
 CONFIGURE_ARGS+=	--enable-contrib-no-build=vt # in separate package
 CONFIGURE_ARGS+=	--with-libltdl=$(BUILDLINK_PREFIX.libltdl:Q) # use our libltdl
@@ -36,26 +35,33 @@ USE_TOOLS+=		perl:run
 
 TEST_TARGET=	check
 
-PLIST_VARS+=	linux loadleveler notifier-smtp ofud openib shm
+PLIST_VARS+=	f08 linux loadleveler oshmem pstattest shm
+PLIST_VARS+=	ignoretkr noignoretkr
 
 .if ${OPSYS} == "Linux"
 PLIST.shm=		yes
 PLIST.linux=		yes
-PLIST.openib=		yes
 PLIST.loadleveler=	yes
-PLIST.ofud=		yes
-PLIST.notifier-smtp=	yes
+PLIST.oshmem=		yes
+PLIST.ignoretkr=	yes
+PLIST.f08=		yes
 .elif ${OPSYS} == "AIX"
 PLIST.loadleveler=	yes
 .elif ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || \
     (${OPSYS} == "NetBSD" && exists(/var/shm))
 PLIST.shm=		yes
 .endif
+.if ${OPSYS} != "Linux"
+PLIST.pstattest=	yes
+PLIST.noignoretkr=	yes
+.endif
 
 ## Just in case you'll need it...
 # USE_TOOLS+=	aclocal autoconf automake bash perl
 # REPLACE_BASH=	autogen.sh
 
+REPLACE_PERL=	 ompi/tools/wrappers/mpijavac.pl.in
+
 # pre-configure:	replace-interpreter
 # 	cd $(WRKSRC) && $(BASH) autogen.sh
 
diff --git a/parallel/openmpi/PLIST b/parallel/openmpi/PLIST
index 6ef77b1f00c..1dc4dfb0e30 100644
--- a/parallel/openmpi/PLIST
+++ b/parallel/openmpi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2015/12/12 22:41:19 asau Exp $
+@comment $NetBSD: PLIST,v 1.15 2015/12/13 06:49:01 markd Exp $
 bin/mpiCC
 bin/mpic++
 bin/mpicc
@@ -7,6 +7,8 @@ bin/mpiexec
 bin/mpif77
 bin/mpif90
 bin/mpifort
+${PLIST.java}bin/mpijavac
+${PLIST.java}bin/mpijavac.pl
 bin/mpirun
 bin/ompi-clean
 bin/ompi-ps
@@ -24,6 +26,13 @@ bin/orte-top
 bin/ortecc
 bin/orted
 bin/orterun
+${PLIST.oshmem}bin/oshcc
+${PLIST.oshmem}bin/oshfort
+${PLIST.oshmem}bin/oshmem_info
+${PLIST.oshmem}bin/oshrun
+${PLIST.oshmem}bin/shmemcc
+${PLIST.oshmem}bin/shmemfort
+${PLIST.oshmem}bin/shmemrun
 include/mpi-ext.h
 include/mpi.h
 include/mpi_portable_platform.h
@@ -37,6 +46,8 @@ include/mpif-io-handles.h
 include/mpif-sentinels.h
 include/mpif-sizeof.h
 include/mpif.h
+${PLIST.oshmem}include/mpp/shmem.fh
+${PLIST.oshmem}include/mpp/shmem.h
 include/openmpi/ompi/mpi/cxx/comm.h
 include/openmpi/ompi/mpi/cxx/comm_inln.h
 include/openmpi/ompi/mpi/cxx/constants.h
@@ -68,18 +79,42 @@ include/openmpi/ompi/mpi/cxx/topology.h
 include/openmpi/ompi/mpi/cxx/topology_inln.h
 include/openmpi/ompi/mpi/cxx/win.h
 include/openmpi/ompi/mpi/cxx/win_inln.h
+${PLIST.java}include/openmpi/ompi/mpi/java/mpiJava.h
+${PLIST.oshmem}include/openshmem/oshmem_config.h
+${PLIST.oshmem}include/openshmem/oshmem/constants.h
+${PLIST.oshmem}include/openshmem/oshmem/frameworks.h
+${PLIST.oshmem}include/openshmem/oshmem/types.h
+${PLIST.oshmem}include/openshmem/oshmem/version.h
+${PLIST.oshmem}include/pshmem.h
+${PLIST.oshmem}include/pshmemx.h
+${PLIST.oshmem}include/shmem-compat.h
+${PLIST.oshmem}include/shmem.fh
+${PLIST.oshmem}include/shmem.h
+${PLIST.oshmem}include/shmemx.h
 lib/libmca_common_sm.la
 lib/libmpi.la
 lib/libmpi_cxx.la
+${PLIST.java}lib/libmpi_java.la
 lib/libmpi_mpifh.la
-lib/libmpi_usempi.la
+${PLIST.noignoretkr}lib/libmpi_usempi.la
+${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.oshmem}lib/liboshmem.la
+${PLIST.java}lib/mpi.jar
 lib/mpi.mod
+${PLIST.ignoretkr}lib/mpi_ext.mod
+${PLIST.f08}lib/mpi_f08.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/openmpi/libompi_dbg_msgq.la
 lib/openmpi/mca_allocator_basic.la
 lib/openmpi/mca_allocator_bucket.la
+${PLIST.oshmem}lib/openmpi/mca_atomic_basic.la
 lib/openmpi/mca_bcol_basesmuma.la
 lib/openmpi/mca_bcol_ptpcoll.la
 lib/openmpi/mca_bml_r2.la
@@ -128,6 +163,8 @@ lib/openmpi/mca_iof_mr_hnp.la
 lib/openmpi/mca_iof_mr_orted.la
 lib/openmpi/mca_iof_orted.la
 lib/openmpi/mca_iof_tool.la
+${PLIST.oshmem}lib/openmpi/mca_memheap_buddy.la
+${PLIST.oshmem}lib/openmpi/mca_memheap_ptmalloc.la
 lib/openmpi/mca_mpool_grdma.la
 lib/openmpi/mca_mpool_sm.la
 lib/openmpi/mca_odls_default.la
@@ -139,8 +176,11 @@ lib/openmpi/mca_plm_rsh.la
 lib/openmpi/mca_pml_bfo.la
 lib/openmpi/mca_pml_cm.la
 lib/openmpi/mca_pml_ob1.la
-lib/openmpi/mca_pstat_test.la
+${PLIST.linux}lib/openmpi/mca_pstat_linux.la
+${PLIST.pstattest}lib/openmpi/mca_pstat_test.la
 lib/openmpi/mca_pubsub_orte.la
+${PLIST.sge}lib/openmpi/mca_ras_gridengine.la
+${PLIST.loadleveler}lib/openmpi/mca_ras_loadleveler.la
 lib/openmpi/mca_ras_simulator.la
 lib/openmpi/mca_rcache_vma.la
 lib/openmpi/mca_rmaps_mindist.la
@@ -158,6 +198,8 @@ lib/openmpi/mca_routed_radix.la
 lib/openmpi/mca_sbgp_basesmsocket.la
 lib/openmpi/mca_sbgp_basesmuma.la
 lib/openmpi/mca_sbgp_p2p.la
+${PLIST.oshmem}lib/openmpi/mca_scoll_basic.la
+${PLIST.oshmem}lib/openmpi/mca_scoll_mpi.la
 lib/openmpi/mca_sec_basic.la
 lib/openmpi/mca_sharedfp_individual.la
 lib/openmpi/mca_sharedfp_lockedfile.la
@@ -165,6 +207,9 @@ lib/openmpi/mca_sharedfp_sm.la
 lib/openmpi/mca_shmem_mmap.la
 lib/openmpi/mca_shmem_posix.la
 lib/openmpi/mca_shmem_sysv.la
+${PLIST.oshmem}lib/openmpi/mca_spml_yoda.la
+${PLIST.oshmem}lib/openmpi/mca_sshmem_mmap.la
+${PLIST.oshmem}lib/openmpi/mca_sshmem_sysv.la
 lib/openmpi/mca_state_app.la
 lib/openmpi/mca_state_dvm.la
 lib/openmpi/mca_state_hnp.la
@@ -182,6 +227,7 @@ lib/pkgconfig/ompi-f90.pc
 lib/pkgconfig/ompi-fort.pc
 lib/pkgconfig/ompi.pc
 lib/pkgconfig/orte.pc
+${PLIST.f08}lib/pmpi_f08_interfaces.mod
 man/man1/mpiCC.1
 man/man1/mpic++.1
 man/man1/mpicc.1
@@ -190,6 +236,7 @@ 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-ps.1
@@ -206,6 +253,13 @@ man/man1/orte-submit.1
 man/man1/orte-top.1
 man/man1/orted.1
 man/man1/orterun.1
+${PLIST.oshmem}man/man1/oshcc.1
+${PLIST.oshmem}man/man1/oshfort.1
+${PLIST.oshmem}man/man1/oshrun.1
+${PLIST.oshmem}man/man1/oshmem_info.1
+${PLIST.oshmem}man/man1/shmemcc.1
+${PLIST.oshmem}man/man1/shmemfort.1
+${PLIST.oshmem}man/man1/shmemrun.1
 man/man3/MPI.3
 man/man3/MPI_Abort.3
 man/man3/MPI_Accumulate.3
@@ -587,6 +641,171 @@ man/man3/MPI_Win_wait.3
 man/man3/MPI_Wtick.3
 man/man3/MPI_Wtime.3
 man/man3/OpenMPI.3
+${PLIST.oshmem}man/man3/intro_shmem.3
+${PLIST.oshmem}man/man3/_my_pe.3
+${PLIST.oshmem}man/man3/_num_pes.3
+${PLIST.oshmem}man/man3/OpenSHMEM.3
+${PLIST.oshmem}man/man3/shfree.3
+${PLIST.oshmem}man/man3/shmalloc.3
+${PLIST.oshmem}man/man3/shmem_addr_accessible.3
+${PLIST.oshmem}man/man3/shmemalign.3
+${PLIST.oshmem}man/man3/shmem_barrier.3
+${PLIST.oshmem}man/man3/shmem_barrier_all.3
+${PLIST.oshmem}man/man3/shmem_broadcast32.3
+${PLIST.oshmem}man/man3/shmem_broadcast64.3
+${PLIST.oshmem}man/man3/shmem_char_g.3
+${PLIST.oshmem}man/man3/shmem_char_get.3
+${PLIST.oshmem}man/man3/shmem_char_p.3
+${PLIST.oshmem}man/man3/shmem_char_put.3
+${PLIST.oshmem}man/man3/shmem_clear_cache_inv.3
+${PLIST.oshmem}man/man3/shmem_clear_cache_line_inv.3
+${PLIST.oshmem}man/man3/shmem_clear_lock.3
+${PLIST.oshmem}man/man3/shmem_collect32.3
+${PLIST.oshmem}man/man3/shmem_collect64.3
+${PLIST.oshmem}man/man3/shmem_complexd_prod_to_all.3
+${PLIST.oshmem}man/man3/shmem_complexd_sum_to_all.3
+${PLIST.oshmem}man/man3/shmem_complexf_prod_to_all.3
+${PLIST.oshmem}man/man3/shmem_complexf_sum_to_all.3
+${PLIST.oshmem}man/man3/shmem_double_g.3
+${PLIST.oshmem}man/man3/shmem_double_get.3
+${PLIST.oshmem}man/man3/shmem_double_iget.3
+${PLIST.oshmem}man/man3/shmem_double_iput.3
+${PLIST.oshmem}man/man3/shmem_double_max_to_all.3
+${PLIST.oshmem}man/man3/shmem_double_min_to_all.3
+${PLIST.oshmem}man/man3/shmem_double_p.3
+${PLIST.oshmem}man/man3/shmem_double_prod_to_all.3
+${PLIST.oshmem}man/man3/shmem_double_put.3
+${PLIST.oshmem}man/man3/shmem_double_sum_to_all.3
+${PLIST.oshmem}man/man3/shmem_double_swap.3
+${PLIST.oshmem}man/man3/shmem_fcollect32.3
+${PLIST.oshmem}man/man3/shmem_fcollect64.3
+${PLIST.oshmem}man/man3/shmem_fence.3
+${PLIST.oshmem}man/man3/shmem_float_g.3
+${PLIST.oshmem}man/man3/shmem_float_get.3
+${PLIST.oshmem}man/man3/shmem_float_iget.3
+${PLIST.oshmem}man/man3/shmem_float_iput.3
+${PLIST.oshmem}man/man3/shmem_float_max_to_all.3
+${PLIST.oshmem}man/man3/shmem_float_min_to_all.3
+${PLIST.oshmem}man/man3/shmem_float_p.3
+${PLIST.oshmem}man/man3/shmem_float_prod_to_all.3
+${PLIST.oshmem}man/man3/shmem_float_put.3
+${PLIST.oshmem}man/man3/shmem_float_sum_to_all.3
+${PLIST.oshmem}man/man3/shmem_float_swap.3
+${PLIST.oshmem}man/man3/shmem_get128.3
+${PLIST.oshmem}man/man3/shmem_get32.3
+${PLIST.oshmem}man/man3/shmem_get64.3
+${PLIST.oshmem}man/man3/shmem_getmem.3
+${PLIST.oshmem}man/man3/shmem_iget128.3
+${PLIST.oshmem}man/man3/shmem_iget32.3
+${PLIST.oshmem}man/man3/shmem_iget64.3
+${PLIST.oshmem}man/man3/shmem_int_add.3
+${PLIST.oshmem}man/man3/shmem_int_and_to_all.3
+${PLIST.oshmem}man/man3/shmem_int_cswap.3
+${PLIST.oshmem}man/man3/shmem_int_fadd.3
+${PLIST.oshmem}man/man3/shmem_int_finc.3
+${PLIST.oshmem}man/man3/shmem_int_g.3
+${PLIST.oshmem}man/man3/shmem_int_get.3
+${PLIST.oshmem}man/man3/shmem_int_iget.3
+${PLIST.oshmem}man/man3/shmem_int_inc.3
+${PLIST.oshmem}man/man3/shmem_int_iput.3
+${PLIST.oshmem}man/man3/shmem_int_max_to_all.3
+${PLIST.oshmem}man/man3/shmem_int_min_to_all.3
+${PLIST.oshmem}man/man3/shmem_int_or_to_all.3
+${PLIST.oshmem}man/man3/shmem_int_p.3
+${PLIST.oshmem}man/man3/shmem_int_prod_to_all.3
+${PLIST.oshmem}man/man3/shmem_int_put.3
+${PLIST.oshmem}man/man3/shmem_int_sum_to_all.3
+${PLIST.oshmem}man/man3/shmem_int_swap.3
+${PLIST.oshmem}man/man3/shmem_int_wait.3
+${PLIST.oshmem}man/man3/shmem_int_wait_until.3
+${PLIST.oshmem}man/man3/shmem_int_xor_to_all.3
+${PLIST.oshmem}man/man3/shmem_iput128.3
+${PLIST.oshmem}man/man3/shmem_iput32.3
+${PLIST.oshmem}man/man3/shmem_iput64.3
+${PLIST.oshmem}man/man3/shmem_long_add.3
+${PLIST.oshmem}man/man3/shmem_long_and_to_all.3
+${PLIST.oshmem}man/man3/shmem_long_cswap.3
+${PLIST.oshmem}man/man3/shmem_longdouble_g.3
+${PLIST.oshmem}man/man3/shmem_longdouble_get.3
+${PLIST.oshmem}man/man3/shmem_longdouble_iget.3
+${PLIST.oshmem}man/man3/shmem_longdouble_iput.3
+${PLIST.oshmem}man/man3/shmem_longdouble_max_to_all.3
+${PLIST.oshmem}man/man3/shmem_longdouble_min_to_all.3
+${PLIST.oshmem}man/man3/shmem_longdouble_p.3
+${PLIST.oshmem}man/man3/shmem_longdouble_prod_to_all.3
+${PLIST.oshmem}man/man3/shmem_longdouble_put.3
+${PLIST.oshmem}man/man3/shmem_long_fadd.3
+${PLIST.oshmem}man/man3/shmem_long_finc.3
+${PLIST.oshmem}man/man3/shmem_long_g.3
+${PLIST.oshmem}man/man3/shmem_long_get.3
+${PLIST.oshmem}man/man3/shmem_long_iget.3
+${PLIST.oshmem}man/man3/shmem_long_inc.3
+${PLIST.oshmem}man/man3/shmem_long_iput.3
+${PLIST.oshmem}man/man3/shmem_longlong_add.3
+${PLIST.oshmem}man/man3/shmem_longlong_and_to_all.3
+${PLIST.oshmem}man/man3/shmem_longlong_cswap.3
+${PLIST.oshmem}man/man3/shmem_longlong_fadd.3
+${PLIST.oshmem}man/man3/shmem_longlong_finc.3
+${PLIST.oshmem}man/man3/shmem_longlong_g.3
+${PLIST.oshmem}man/man3/shmem_longlong_get.3
+${PLIST.oshmem}man/man3/shmem_longlong_iget.3
+${PLIST.oshmem}man/man3/shmem_longlong_inc.3
+${PLIST.oshmem}man/man3/shmem_longlong_iput.3
+${PLIST.oshmem}man/man3/shmem_longlong_max_to_all.3
+${PLIST.oshmem}man/man3/shmem_longlong_min_to_all.3
+${PLIST.oshmem}man/man3/shmem_longlong_or_to_all.3
+${PLIST.oshmem}man/man3/shmem_longlong_p.3
+${PLIST.oshmem}man/man3/shmem_longlong_prod_to_all.3
+${PLIST.oshmem}man/man3/shmem_longlong_put.3
+${PLIST.oshmem}man/man3/shmem_longlong_sum_to_all.3
+${PLIST.oshmem}man/man3/shmem_longlong_swap.3
+${PLIST.oshmem}man/man3/shmem_longlong_wait.3
+${PLIST.oshmem}man/man3/shmem_longlong_wait_until.3
+${PLIST.oshmem}man/man3/shmem_longlong_xor_to_all.3
+${PLIST.oshmem}man/man3/shmem_long_max_to_all.3
+${PLIST.oshmem}man/man3/shmem_long_min_to_all.3
+${PLIST.oshmem}man/man3/shmem_long_or_to_all.3
+${PLIST.oshmem}man/man3/shmem_long_p.3
+${PLIST.oshmem}man/man3/shmem_long_prod_to_all.3
+${PLIST.oshmem}man/man3/shmem_long_put.3
+${PLIST.oshmem}man/man3/shmem_long_sum_to_all.3
+${PLIST.oshmem}man/man3/shmem_long_swap.3
+${PLIST.oshmem}man/man3/shmem_long_wait.3
+${PLIST.oshmem}man/man3/shmem_long_wait_until.3
+${PLIST.oshmem}man/man3/shmem_long_xor_to_all.3
+${PLIST.oshmem}man/man3/shmem_pe_accessible.3
+${PLIST.oshmem}man/man3/shmem_ptr.3
+${PLIST.oshmem}man/man3/shmem_put128.3
+${PLIST.oshmem}man/man3/shmem_put32.3
+${PLIST.oshmem}man/man3/shmem_put64.3
+${PLIST.oshmem}man/man3/shmem_putmem.3
+${PLIST.oshmem}man/man3/shmem_quiet.3
+${PLIST.oshmem}man/man3/shmem_set_cache_inv.3
+${PLIST.oshmem}man/man3/shmem_set_cache_line_inv.3
+${PLIST.oshmem}man/man3/shmem_set_lock.3
+${PLIST.oshmem}man/man3/shmem_short_and_to_all.3
+${PLIST.oshmem}man/man3/shmem_short_g.3
+${PLIST.oshmem}man/man3/shmem_short_get.3
+${PLIST.oshmem}man/man3/shmem_short_iget.3
+${PLIST.oshmem}man/man3/shmem_short_iput.3
+${PLIST.oshmem}man/man3/shmem_short_max_to_all.3
+${PLIST.oshmem}man/man3/shmem_short_min_to_all.3
+${PLIST.oshmem}man/man3/shmem_short_or_to_all.3
+${PLIST.oshmem}man/man3/shmem_short_p.3
+${PLIST.oshmem}man/man3/shmem_short_prod_to_all.3
+${PLIST.oshmem}man/man3/shmem_short_put.3
+${PLIST.oshmem}man/man3/shmem_short_sum_to_all.3
+${PLIST.oshmem}man/man3/shmem_short_wait.3
+${PLIST.oshmem}man/man3/shmem_short_wait_until.3
+${PLIST.oshmem}man/man3/shmem_short_xor_to_all.3
+${PLIST.oshmem}man/man3/shmem_swap.3
+${PLIST.oshmem}man/man3/shmem_test_lock.3
+${PLIST.oshmem}man/man3/shmem_udcflush.3
+${PLIST.oshmem}man/man3/shmem_udcflush_line.3
+${PLIST.oshmem}man/man3/shmem_wait.3
+${PLIST.oshmem}man/man3/shmem_wait_until.3
+${PLIST.oshmem}man/man3/shrealloc.3
+${PLIST.oshmem}man/man3/start_pes.3
 man/man7/ompi_crcp.7
 man/man7/opal_crs.7
 man/man7/orte_filem.7
@@ -594,6 +813,7 @@ man/man7/orte_hosts.7
 man/man7/orte_snapc.7
 man/man7/orte_sstore.7
 share/openmpi/amca-param-sets/example.conf
+${PLIST.linux}share/openmpi/doc/COPYRIGHT-ptmalloc2.txt
 share/openmpi/examples/openmpi-default-hostfile
 share/openmpi/examples/openmpi-mca-params.conf
 share/openmpi/examples/openmpi-totalview.tcl
@@ -632,6 +852,7 @@ share/openmpi/help-opal-compress-gzip.txt
 share/openmpi/help-opal-crs-base.txt
 share/openmpi/help-opal-crs-none.txt
 share/openmpi/help-opal-hwloc-base.txt
+${PLIST.linux}share/openmpi/help-opal-memory-linux.txt
 share/openmpi/help-opal-runtime.txt
 share/openmpi/help-opal-shmem-mmap.txt
 share/openmpi/help-opal-shmem-posix.txt
@@ -659,13 +880,22 @@ share/openmpi/help-orte-sstore-base.txt
 share/openmpi/help-orte-top.txt
 share/openmpi/help-orted.txt
 share/openmpi/help-orterun.txt
+${PLIST.oshmem}share/openmpi/help-oshmem-info.txt
+${PLIST.oshmem}share/openmpi/help-oshmem-memheap.txt
+${PLIST.oshmem}share/openmpi/help-oshmem-spml-yoda.txt
+${PLIST.oshmem}share/openmpi/help-oshmem-sshmem-mmap.txt
+${PLIST.oshmem}share/openmpi/help-oshmem-sshmem-sysv.txt
+${PLIST.oshmem}share/openmpi/help-oshmem-sshmem.txt
 share/openmpi/help-plm-base.txt
 share/openmpi/help-plm-rsh.txt
 share/openmpi/help-ras-base.txt
+${PLIST.sge}share/openmpi/help-ras-gridengine.txt
 share/openmpi/help-ras-simulator.txt
 share/openmpi/help-regex.txt
 share/openmpi/help-rmaps_rank_file.txt
 share/openmpi/help-sec-base.txt
+${PLIST.oshmem}share/openmpi/help-shmem-api.txt
+${PLIST.oshmem}share/openmpi/help-shmem-runtime.txt
 share/openmpi/help-state-staged-hnp.txt
 share/openmpi/mca-coll-ml.config
 share/openmpi/mpiCC-wrapper-data.txt
@@ -677,3 +907,7 @@ share/openmpi/mpif90-wrapper-data.txt
 share/openmpi/mpifort-wrapper-data.txt
 share/openmpi/openmpi-valgrind.supp
 share/openmpi/ortecc-wrapper-data.txt
+${PLIST.oshmem}share/openmpi/oshcc-wrapper-data.txt
+${PLIST.oshmem}share/openmpi/oshfort-wrapper-data.txt
+${PLIST.oshmem}share/openmpi/shmemcc-wrapper-data.txt
+${PLIST.oshmem}share/openmpi/shmemfort-wrapper-data.txt
diff --git a/parallel/openmpi/distinfo b/parallel/openmpi/distinfo
index 6441385db0e..8a93462067a 100644
--- a/parallel/openmpi/distinfo
+++ b/parallel/openmpi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2015/12/12 22:41:19 asau Exp $
+$NetBSD: distinfo,v 1.16 2015/12/13 06:49:01 markd Exp $
 
 SHA1 (openmpi-1.10.1.tar.bz2) = caf6885f323a38b9c106a7815711313843409478
 RMD160 (openmpi-1.10.1.tar.bz2) = 70de0da1f31793333b51eda328a18c01c4ffa3c0
@@ -8,3 +8,4 @@ SHA1 (patch-aa) = 6fa20775c6e2abae7c9a2ae858dbb941652beab8
 SHA1 (patch-ai) = 5ddce5ee190ac7bf6964176e23c0a6e624c8c1dd
 SHA1 (patch-aj) = 547fa12b56bd5fe4c4b58d3558d78773bd9dc5c2
 SHA1 (patch-ak) = f79e69fc02510de8da3834729f471799e175bb9c
+SHA1 (patch-ompi_mpi_java_java_Makefile.in) = bd61f02f56e03af9799d2ba86d66c1ded35f62f4
diff --git a/parallel/openmpi/options.mk b/parallel/openmpi/options.mk
index cd377d170df..e888dbfe2b5 100644
--- a/parallel/openmpi/options.mk
+++ b/parallel/openmpi/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.8 2015/01/15 20:26:47 dholland Exp $
+# $NetBSD: options.mk,v 1.9 2015/12/13 06:49:01 markd Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openmpi
-PKG_SUPPORTED_OPTIONS=	debug f90 sge
+PKG_SUPPORTED_OPTIONS=	debug f90 java sge
 
 .include "../../mk/bsd.options.mk"
 
@@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS=	debug f90 sge
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-PLIST_VARS+=		f90 sge
+PLIST_VARS+=		f90 java sge
 
 .if !empty(PKG_OPTIONS:Mf90)
 GCC_REQD+=		4.7
@@ -28,6 +28,13 @@ SUBST_SED.f90+=		-e 's,^linker_flags=,linker_flags= -L${GCCDIR}/lib ,'
 CONFIGURE_ARGS+=	--disable-mpi-f90
 .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
diff --git a/parallel/openmpi/patches/patch-ompi_mpi_java_java_Makefile.in b/parallel/openmpi/patches/patch-ompi_mpi_java_java_Makefile.in
new file mode 100644
index 00000000000..868df6a98c2
--- /dev/null
+++ b/parallel/openmpi/patches/patch-ompi_mpi_java_java_Makefile.in
@@ -0,0 +1,15 @@
+$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