Apply jperkin@'s patch for PR 49080, which changes it to use plist vars

for options instead of separate tiny plist files. This also allows
PLIST.Linux to be recognized.

6 files changed, 14 insertions, 16 deletions

diff --git a/parallel/openmpi/Makefile b/parallel/openmpi/Makefile
index d668edda098..c4af2c93011 100644
--- a/parallel/openmpi/Makefile
+++ b/parallel/openmpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/12/27 02:10:19 dholland Exp $
+# $NetBSD: Makefile,v 1.29 2015/01/15 20:26:47 dholland Exp $
 
 DISTNAME=	openmpi-1.6.4
 PKGREVISION=	4
@@ -37,10 +37,11 @@ USE_TOOLS+=		perl:run
 
 TEST_TARGET=	check
 
+PLIST_VARS+=	shm
 .if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || \
     ${OPSYS} == "Linux" || \
     (${OPSYS} == "NetBSD" && exists(/var/shm))
-PLIST_SRC+=		PLIST.shm
+PLIST.shm=	yes
 .endif
 
 ## Just in case you'll need it...
diff --git a/parallel/openmpi/PLIST b/parallel/openmpi/PLIST
index 431b71839db..e0e1d49419a 100644
--- a/parallel/openmpi/PLIST
+++ b/parallel/openmpi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2013/02/24 01:22:36 asau Exp $
+@comment $NetBSD: PLIST,v 1.12 2015/01/15 20:26:47 dholland Exp $
 bin/mpiCC
 bin/mpic++
 bin/mpicc
@@ -69,9 +69,11 @@ lib/libmca_common_sm.la
 lib/libmpi.la
 lib/libmpi_cxx.la
 lib/libmpi_f77.la
+${PLIST.f90}lib/libmpi_f90.la
 lib/libompitrace.la
 lib/libopen-pal.la
 lib/libopen-rte.la
+${PLIST.f90}lib/mpi.mod
 lib/openmpi/libompi_dbg_msgq.la
 lib/openmpi/mca_allocator_basic.la
 lib/openmpi/mca_allocator_bucket.la
@@ -124,6 +126,7 @@ lib/openmpi/mca_pml_ob1.la
 lib/openmpi/mca_pml_v.la
 lib/openmpi/mca_pubsub_orte.la
 lib/openmpi/mca_ras_cm.la
+${PLIST.sge}lib/openmpi/mca_ras_gridengine.la
 lib/openmpi/mca_rcache_vma.la
 lib/openmpi/mca_rmaps_load_balance.la
 lib/openmpi/mca_rmaps_rank_file.la
@@ -139,6 +142,7 @@ lib/openmpi/mca_routed_linear.la
 lib/openmpi/mca_routed_radix.la
 lib/openmpi/mca_routed_slave.la
 lib/openmpi/mca_shmem_mmap.la
+${PLIST.shm}lib/openmpi/mca_shmem_posix.la
 lib/openmpi/mca_shmem_sysv.la
 lib/openmpi/mca_topo_unity.la
 lib/openmpi/mca_vprotocol_pessimist.la
@@ -525,6 +529,7 @@ share/openmpi/help-opal-crs-none.txt
 share/openmpi/help-opal-maffinity-hwloc.txt
 share/openmpi/help-opal-runtime.txt
 share/openmpi/help-opal-shmem-mmap.txt
+${PLIST.shm}share/openmpi/help-opal-shmem-posix.txt
 share/openmpi/help-opal-shmem-sysv.txt
 share/openmpi/help-opal-util.txt
 share/openmpi/help-opal-wrapper.txt
@@ -549,6 +554,7 @@ share/openmpi/help-orterun.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-regex.txt
 share/openmpi/help-rmaps_rank_file.txt
 share/openmpi/mpiCC-wrapper-data.txt
diff --git a/parallel/openmpi/PLIST.f90 b/parallel/openmpi/PLIST.f90
deleted file mode 100644
index d24edacbfd1..00000000000
--- a/parallel/openmpi/PLIST.f90
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/libmpi_f90.la
-lib/mpi.mod
diff --git a/parallel/openmpi/PLIST.sge b/parallel/openmpi/PLIST.sge
deleted file mode 100644
index 3f2335f321b..00000000000
--- a/parallel/openmpi/PLIST.sge
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.sge,v 1.1 2014/05/22 13:24:49 manu Exp $
-lib/openmpi/mca_ras_gridengine.la
-share/openmpi/help-ras-gridengine.txt
diff --git a/parallel/openmpi/PLIST.shm b/parallel/openmpi/PLIST.shm
deleted file mode 100644
index 9268c6aa07a..00000000000
--- a/parallel/openmpi/PLIST.shm
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.shm,v 1.1 2014/02/18 22:21:33 joerg Exp $
-lib/openmpi/mca_shmem_posix.la
-share/openmpi/help-opal-shmem-posix.txt
diff --git a/parallel/openmpi/options.mk b/parallel/openmpi/options.mk
index 07909492c82..cd377d170df 100644
--- a/parallel/openmpi/options.mk
+++ b/parallel/openmpi/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2014/05/22 13:24:49 manu Exp $
+# $NetBSD: options.mk,v 1.8 2015/01/15 20:26:47 dholland Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openmpi
 PKG_SUPPORTED_OPTIONS=	debug f90 sge
@@ -9,13 +9,14 @@ PKG_SUPPORTED_OPTIONS=	debug f90 sge
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
+PLIST_VARS+=		f90 sge
 
 .if !empty(PKG_OPTIONS:Mf90)
 GCC_REQD+=		4.7
 GCCDIR=			${PREFIX}/gcc47
 CONFIGURE_ARGS+=	--enable-mpi-f90
 CONFIGURE_ENV+=		FC=${GCCDIR}/bin/gfortran
-PLIST_SRC+=		PLIST.f90
+PLIST.f90=		yes
 
 SUBST_CLASSES+=		f90
 SUBST_STAGE.f90=	post-configure
@@ -30,9 +31,7 @@ CONFIGURE_ARGS+=	--disable-mpi-f90
 
 .if !empty(PKG_OPTIONS:Msge)
 CONFIGURE_ARGS+=        --with-sge
-PLIST_SRC+=             ${PKGDIR}/PLIST.sge
+PLIST.sge=		yes
 .else
 CONFIGURE_ARGS+=	--without-sge
 .endif
-
-PLIST_SRC+=		PLIST