2 files changed, 4 insertions, 46 deletions

diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index 510c0d2b998f..4c5b5bd0c059 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpich2
 DISTVERSION=	1.5
-PORTREVISION=	14
+PORTREVISION=	15
 PORTEPOCH=	5
 CATEGORIES=	net java parallel
 MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${DISTVERSION}/
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		libtool:keepla localbase fortran perl5 \
-		pkgconfig python:2.7
+		pkgconfig
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
 USE_LDCONFIG=	yes
@@ -30,7 +30,7 @@ INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE_i386=	JAVA
 OPTIONS_DEFINE_amd64=	JAVA
-OPTIONS_DEFINE=	SMPD X11 DOCS
+OPTIONS_DEFINE=	SMPD X11 DEBUG DOCS
 OPTIONS_DEFAULT_i386=	JAVA
 OPTIONS_DEFAULT_amd64=	JAVA
 OPTIONS_DEFAULT=	X11
@@ -40,7 +40,7 @@ X11_DESC=	build MPE graphics routines
 
 CONFIGURE_ARGS=	--enable-romio --enable-shared	\
 		--docdir="${DOCSDIR}" \
-		--with-python="${PYTHON_CMD}"
+		--without-python
 CONFIGURE_ENV=	FCFLAGS="${FFLAGS}" \
 		MPI_CFLAGS="-I${LOCALBASE}/include" \
 		PACKAGE="${PORTNAME}" \
@@ -157,10 +157,6 @@ pre-configure:
 .endfor
 
 post-install:
-	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py	\
-		-d ${PREFIX} -f bin)
-	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py	\
-		-d ${PREFIX} -f bin)
 	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${WRKDIR}/mpd.conf.dist
 	${INSTALL_DATA} ${WRKDIR}/mpd.conf.dist ${STAGEDIR}${PREFIX}/etc/
 .for pg in ${STAGE2FIX}
diff --git a/net/mpich2/pkg-plist b/net/mpich2/pkg-plist
index c44c49eed5be..aebc22e00db9 100644
--- a/net/mpich2/pkg-plist
+++ b/net/mpich2/pkg-plist
@@ -12,83 +12,45 @@ bin/clog2_repair
 %%JAVA%%bin/logconvertor
 %%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/mpic++
 bin/mpicc
 bin/mpich2version
 bin/mpicxx
 bin/mpiexec
 %%PM_MPD%%bin/mpiexec.py
-%%PM_MPD%%bin/mpiexec.pyc
-%%PM_MPD%%bin/mpiexec.pyo
 bin/mpif77
 bin/mpif90
 %%PM_MPD%%bin/mpirun
 %%PM_MPD%%bin/mpirun.py
-%%PM_MPD%%bin/mpirun.pyc
-%%PM_MPD%%bin/mpirun.pyo
 bin/parkill
 %%JAVA%%bin/rlogTOslog2
 %%JAVA%%bin/rlog_check_timeorder