Import of pkgsrc-2015Q1

parallel/openmpi/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2014/02/18 22:21:33 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2015/01/15 20:51:11 dholland Exp $
 
 DISTNAME=	openmpi-1.6.4
-PKGREVISION=	1
+PKGREVISION=	4
 CATEGORIES=	parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.6/downloads/
 EXTRACT_SUFX=	.tar.bz2
@@ -20,7 +20,6 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool \
 SHLIBTOOL_OVERRIDE=	${WRKSRC}/config/libtool.m4 \
 			${WRKSRC}/opal/libltdl/m4/libtool.m4
 
-CONFIGURE_ARGS+=	--without-sge
 CONFIGURE_ARGS+=	--without-slurm
 CONFIGURE_ARGS+=	--enable-contrib-no-build=vt # in separate package
 CONFIGURE_ARGS+=	--with-libltdl=external # use our libltdl
@@ -38,9 +37,20 @@ USE_TOOLS+=		perl:run
 
 TEST_TARGET=	check
 
-.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || \
+PLIST_VARS+=	linux loadleveler notifier-smtp ofud openib shm
+
+.if ${OPSYS} == "Linux"
+PLIST.shm=		yes
+PLIST.linux=		yes
+PLIST.openib=		yes
+PLIST.loadleveler=	yes
+PLIST.ofud=		yes
+PLIST.notifier-smtp=	yes
+.elif ${OPSYS} == "AIX"
+PLIST.loadleveler=	yes
+.elif ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || \
     (${OPSYS} == "NetBSD" && exists(/var/shm))
-PLIST_SRC+=		PLIST.shm
+PLIST.shm=		yes
 .endif
 
 ## Just in case you'll need it...

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.13 2015/01/15 20:51:11 dholland Exp $
 bin/mpiCC
 bin/mpic++
 bin/mpicc
@@ -69,12 +69,16 @@ 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
+${PLIST.ofud}lib/openmpi/mca_btl_ofud.la                
+${PLIST.openib}lib/openmpi/mca_btl_openib.la              
 lib/openmpi/mca_bml_r2.la
 lib/openmpi/mca_btl_self.la
 lib/openmpi/mca_btl_sm.la
@@ -110,6 +114,7 @@ lib/openmpi/mca_mpool_fake.la
 lib/openmpi/mca_mpool_rdma.la
 lib/openmpi/mca_mpool_sm.la
 lib/openmpi/mca_notifier_command.la
+${PLIST.notifier-smtp}lib/openmpi/mca_notifier_smtp.la           
 lib/openmpi/mca_notifier_syslog.la
 lib/openmpi/mca_odls_default.la
 lib/openmpi/mca_oob_tcp.la
@@ -122,8 +127,11 @@ lib/openmpi/mca_pml_cm.la
 lib/openmpi/mca_pml_csum.la
 lib/openmpi/mca_pml_ob1.la
 lib/openmpi/mca_pml_v.la
+${PLIST.linux}lib/openmpi/mca_pstat_linux.la
 lib/openmpi/mca_pubsub_orte.la
 lib/openmpi/mca_ras_cm.la
+${PLIST.sge}lib/openmpi/mca_ras_gridengine.la
+${PLIST.loadleveler}lib/openmpi/mca_ras_loadleveler.la
 lib/openmpi/mca_rcache_vma.la
 lib/openmpi/mca_rmaps_load_balance.la
 lib/openmpi/mca_rmaps_rank_file.la
@@ -139,7 +147,9 @@ 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
+${PLIST.linux}lib/openmpi/mca_sysinfo_linux.la
 lib/openmpi/mca_topo_unity.la
 lib/openmpi/mca_vprotocol_pessimist.la
 lib/pkgconfig/ompi-c.pc
@@ -484,7 +494,9 @@ man/man7/opal_crs.7
 man/man7/orte_filem.7
 man/man7/orte_hosts.7
 man/man7/orte_snapc.7
+${PLIST.openib}share/openmpi/amca-param-sets/btl-openib-benchmark
 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
@@ -499,6 +511,8 @@ share/openmpi/help-mca-op-base.txt
 share/openmpi/help-mca-param.txt
 share/openmpi/help-mpi-api.txt
 share/openmpi/help-mpi-btl-base.txt
+${PLIST.openib}share/openmpi/help-mpi-btl-openib-cpc-base.txt
+${PLIST.openib}share/openmpi/help-mpi-btl-openib.txt
 share/openmpi/help-mpi-btl-sm.txt
 share/openmpi/help-mpi-btl-tcp.txt
 share/openmpi/help-mpi-coll-sm.txt
@@ -523,8 +537,10 @@ share/openmpi/help-opal-carto-file.txt
 share/openmpi/help-opal-crs-base.txt
 share/openmpi/help-opal-crs-none.txt
 share/openmpi/help-opal-maffinity-hwloc.txt
+${PLIST.linux}share/openmpi/help-opal-memory-linux.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
@@ -533,6 +549,7 @@ share/openmpi/help-orte-filem-base.txt
 share/openmpi/help-orte-filem-rsh.txt
 share/openmpi/help-orte-iof.txt
 share/openmpi/help-orte-notifier-command.txt
+${PLIST.notifier-smtp}share/openmpi/help-orte-notifier-smtp.txt
 share/openmpi/help-orte-odls-base.txt
 share/openmpi/help-orte-ps.txt
 share/openmpi/help-orte-rmaps-base.txt
@@ -549,8 +566,10 @@ 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
+${PLIST.openib}share/openmpi/mca-btl-openib-device-params.ini
 share/openmpi/mpiCC-wrapper-data.txt
 share/openmpi/mpic++-wrapper-data.txt
 share/openmpi/mpicc-wrapper-data.txt

parallel/openmpi/PLIST.f90

@@ -1,2 +0,0 @@
-lib/libmpi_f90.la
-lib/mpi.mod

parallel/openmpi/PLIST.shm

@@ -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

parallel/openmpi/options.mk

@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.6 2014/02/19 09:44:56 jperkin 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
+PKG_SUPPORTED_OPTIONS=	debug f90 sge
 
 .include "../../mk/bsd.options.mk"
 
@@ -9,13 +9,14 @@ PKG_SUPPORTED_OPTIONS=	debug f90
 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
@@ -27,4 +28,10 @@ SUBST_SED.f90+=		-e 's,^linker_flags=,linker_flags= -L${GCCDIR}/lib ,'
 CONFIGURE_ARGS+=	--disable-mpi-f90
 .endif
 
-PLIST_SRC+=		PLIST
+
+.if !empty(PKG_OPTIONS:Msge)
+CONFIGURE_ARGS+=        --with-sge
+PLIST.sge=		yes
+.else
+CONFIGURE_ARGS+=	--without-sge
+.endif