Add a knob WITH_SMPD, to enable SMPD instead of MPD, to work with SMPD under

Microsoft Windows.

Submitted by:	Intron <mag (at) intron.ac>

2 files changed, 100 insertions, 72 deletions

diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index 04252bb52b4f..238eff1a1d06 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mpich2
 DISTVERSION=	1.0.4p1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net parallel
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/	\
@@ -24,6 +25,7 @@ COMMENT=	A portable implementation of MPI-1 and MPI-2
 # - WITHOUT_JAVA	don't build MPE Jumpshot-4
 # - WITHOUT_X11		disable MPE graphics routines
 # - WITHOUT_F90		disable gfortran support
+# - WITH_SMPD		use SMPD instead of MPD for OS-mixed cluster
 #-----------------------------------------------------------------------
 
 USE_PYTHON=	yes
@@ -73,6 +75,14 @@ CONFIGURE_ENV+=	F90=${F90} F90FLAGS=${F90FLAGS}
 PLIST_SUB+=	F90=""
 .endif
 
+.if defined(WITH_SMPD)
+CONFIGURE_ARGS+=	--with-pmi=smpd --with-pm=smpd
+PLIST_SUB+=	PM_MPD="@comment " PM_SMPD=""
+.else
+CONFIGURE_ARGS+=	--with-pmi=simple --with-pm=mpd
+PLIST_SUB+=	PM_MPD="" PM_SMPD="@comment "
+.endif
+
 .if defined(NOPORTDOCS)
 CONFIGURE_ARGS+=	--without-docdir --without-htmldir
 .else
@@ -201,6 +211,23 @@ USE_GMAKE=	yes
 
 PREFIX:=	${PREFIX}/${PORTNAME}
 
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You could define the following options:"
+.if !defined(WITHOUT_JAVA)
+	@${ECHO_MSG} "- WITHOUT_JAVA	do not build MPE Jumpshot-4"
+.endif
+.if !defined(WITHOUT_X11)
+	@${ECHO_MSG} "- WITHOUT_X11	disable MPE graphics routines"
+.endif
+.if !defined(WITHOUT_F90)
+	@${ECHO_MSG} "- WITHOUT_F90	disable gfortran support"
+.endif
+.if !defined(WITH_SMPD)
+	@${ECHO_MSG} "- WITH_SMPD	use SMPD instead of MPD, to work with SMPD under MS Windows"
+.endif
+	@${ECHO_MSG}
+
 pre-configure:
 	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${THREAD2FIX:S|^|${WRKSRC}/|}
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${LOCALBASE2FIX:S|^|${WRKSRC}/|}
diff --git a/net/mpich2/pkg-plist b/net/mpich2/pkg-plist
index c58d71efda22..f0732ed52732 100644
--- a/net/mpich2/pkg-plist
+++ b/net/mpich2/pkg-plist
@@ -8,84 +8,85 @@ bin/clog2_repair
 %%JAVA%%bin/clogprint
 %%JAVA%%bin/jumpshot
 %%JAVA%%bin/logconvertor
-bin/mpd
-bin/mpd.py
-bin/mpd.pyc
-bin/mpd.pyo
-bin/mpdallexit
-bin/mpdallexit.py
-bin/mpdallexit.pyc
-bin/mpdallexit.pyo
-bin/mpdboot
-bin/mpdboot.py
-bin/mpdboot.pyc
-bin/mpdboot.pyo
-bin/mpdcheck
-bin/mpdcheck.py
-bin/mpdcheck.pyc
-bin/mpdcheck.pyo
-bin/mpdchkpyver.py
-bin/mpdchkpyver.pyc
-bin/mpdchkpyver.pyo
-bin/mpdcleanup
-bin/mpdcleanup.py
-bin/mpdcleanup.pyc
-bin/mpdcleanup.pyo
-bin/mpdexit
-bin/mpdexit.py
-bin/mpdexit.pyc
-bin/mpdexit.pyo
-bin/mpdgdbdrv.py
-bin/mpdgdbdrv.pyc
-bin/mpdgdbdrv.pyo
-bin/mpdhelp
-bin/mpdhelp.py
-bin/mpdhelp.pyc
-bin/mpdhelp.pyo
-bin/mpdkilljob
-bin/mpdkilljob.py
-bin/mpdkilljob.pyc
-bin/mpdkilljob.pyo
-bin/mpdlib.py
-bin/mpdlib.pyc
-bin/mpdlib.pyo
-bin/mpdlistjobs
-bin/mpdlistjobs.py
-bin/mpdlistjobs.pyc
-bin/mpdlistjobs.pyo
-bin/mpdman.py
-bin/mpdman.pyc
-bin/mpdman.pyo
-bin/mpdringtest
-bin/mpdringtest.py
-bin/mpdringtest.pyc
-bin/mpdringtest.pyo
-bin/mpdroot
-bin/mpdrun
-bin/mpdrun.py
-bin/mpdrun.pyc
-bin/mpdrun.pyo
-bin/mpdsigjob
-bin/mpdsigjob.py
-bin/mpdsigjob.pyc
-bin/mpdsigjob.pyo
-bin/mpdtrace
-bin/mpdtrace.py
-bin/mpdtrace.pyc
-bin/mpdtrace.pyo
+%%PM_MPD%%bin/mpd
+%%PM_MPD%%bin/mpd.py
+%%PM_MPD%%bin/mpd.pyc
+%%PM_MPD%%bin/mpd.pyo
+%%PM_MPD%%bin/mpdallexit
+%%PM_MPD%%bin/mpdallexit.py
+%%PM_MPD%%bin/mpdallexit.pyc
+%%PM_MPD%%bin/mpdallexit.pyo
+%%PM_MPD%%bin/mpdboot
+%%PM_MPD%%bin/mpdboot.py
+%%PM_MPD%%bin/mpdboot.pyc
+%%PM_MPD%%bin/mpdboot.pyo
+%%PM_MPD%%bin/mpdcheck
+%%PM_MPD%%bin/mpdcheck.py
+%%PM_MPD%%bin/mpdcheck.pyc
+%%PM_MPD%%bin/mpdcheck.pyo
+%%PM_MPD%%bin/mpdchkpyver.py
+%%PM_MPD%%bin/mpdchkpyver.pyc
+%%PM_MPD%%bin/mpdchkpyver.pyo
+%%PM_MPD%%bin/mpdcleanup
+%%PM_MPD%%bin/mpdcleanup.py
+%%PM_MPD%%bin/mpdcleanup.pyc
+%%PM_MPD%%bin/mpdcleanup.pyo
+%%PM_MPD%%bin/mpdexit
+%%PM_MPD%%bin/mpdexit.py
+%%PM_MPD%%bin/mpdexit.pyc
+%%PM_MPD%%bin/mpdexit.pyo
+%%PM_MPD%%bin/mpdgdbdrv.py
+%%PM_MPD%%bin/mpdgdbdrv.pyc
+%%PM_MPD%%bin/mpdgdbdrv.pyo
+%%PM_MPD%%bin/mpdhelp
+%%PM_MPD%%bin/mpdhelp.py
+%%PM_MPD%%bin/mpdhelp.pyc
+%%PM_MPD%%bin/mpdhelp.pyo
+%%PM_MPD%%bin/mpdkilljob
+%%PM_MPD%%bin/mpdkilljob.py
+%%PM_MPD%%bin/mpdkilljob.pyc
+%%PM_MPD%%bin/mpdkilljob.pyo
+%%PM_MPD%%bin/mpdlib.py
+%%PM_MPD%%bin/mpdlib.pyc
+%%PM_MPD%%bin/mpdlib.pyo
+%%PM_MPD%%bin/mpdlistjobs
+%%PM_MPD%%bin/mpdlistjobs.py
+%%PM_MPD%%bin/mpdlistjobs.pyc
+%%PM_MPD%%bin/mpdlistjobs.pyo
+%%PM_MPD%%bin/mpdman.py
+%%PM_MPD%%bin/mpdman.pyc
+%%PM_MPD%%bin/mpdman.pyo
+%%PM_MPD%%bin/mpdringtest
+%%PM_MPD%%bin/mpdringtest.py
+%%PM_MPD%%bin/mpdringtest.pyc
+%%PM_MPD%%bin/mpdringtest.pyo
+%%PM_MPD%%bin/mpdroot
+%%PM_MPD%%bin/mpdrun
+%%PM_MPD%%bin/mpdrun.py
+%%PM_MPD%%bin/mpdrun.pyc
+%%PM_MPD%%bin/mpdrun.pyo
+%%PM_MPD%%bin/mpdsigjob
+%%PM_MPD%%bin/mpdsigjob.py
+%%PM_MPD%%bin/mpdsigjob.pyc
+%%PM_MPD%%bin/mpdsigjob.pyo
+%%PM_MPD%%bin/mpdtrace
+%%PM_MPD%%bin/mpdtrace.py
+%%PM_MPD%%bin/mpdtrace.pyc
+%%PM_MPD%%bin/mpdtrace.pyo
 bin/mpicc
 bin/mpich2version
 bin/mpicxx
 bin/mpiexec
-bin/mpiexec.py
-bin/mpiexec.pyc
-bin/mpiexec.pyo
+%%PM_MPD%%bin/mpiexec.py
+%%PM_MPD%%bin/mpiexec.pyc
+%%PM_MPD%%bin/mpiexec.pyo
 bin/mpif77
 %%F90%%bin/mpif90
-bin/mpirun
-bin/mpirun.py
-bin/mpirun.pyc
-bin/mpirun.pyo
+%%PM_MPD%%bin/mpirun
+%%PM_MPD%%bin/mpirun.py
+%%PM_MPD%%bin/mpirun.pyc
+%%PM_MPD%%bin/mpirun.pyo
+%%PM_SMPD%%bin/smpd
 %%JAVA%%bin/rlogTOslog2
 %%JAVA%%bin/rlog_check_timeorder
 %%JAVA%%bin/rlog_print