4 files changed, 30 insertions, 20 deletions

diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index 2fe6d7a3617c..c78b3f22ecaa 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	mpich2
-PORTVERSION=	1.2.1
-PORTEPOCH=	4
+DISTVERSION=	1.2.1p1
+PORTEPOCH=	5
 CATEGORIES=	net parallel
-MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${PORTVERSION}/
+MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${DISTVERSION}/
 DIST_SUBDIR=	mpich
 #PATCH_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/mpich2-patch/
 #PATCHFILES=
diff --git a/net/mpich2/distinfo b/net/mpich2/distinfo
index 82e63471c38c..ffc87c8d72f8 100644
--- a/net/mpich2/distinfo
+++ b/net/mpich2/distinfo
@@ -1,3 +1,3 @@
-MD5 (mpich/mpich2-1.2.1.tar.gz) = 0956a85fc7de2305eeb7cdd12742d9e9
-SHA256 (mpich/mpich2-1.2.1.tar.gz) = 394736543f021ac0ea73f3f40a58ca0320b7223487eb13991f0312aa9e8721c1
-SIZE (mpich/mpich2-1.2.1.tar.gz) = 18284454
+MD5 (mpich/mpich2-1.2.1p1.tar.gz) = fa7e8dc7c5fb60395ab26c5b239321ca
+SHA256 (mpich/mpich2-1.2.1p1.tar.gz) = a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
+SIZE (mpich/mpich2-1.2.1p1.tar.gz) = 18014859
diff --git a/net/mpich2/files/patch-src_openpa_Makefile.in b/net/mpich2/files/patch-src_openpa_Makefile.in
index ff6b8e1b007f..a6188cf07f06 100644
--- a/net/mpich2/files/patch-src_openpa_Makefile.in
+++ b/net/mpich2/files/patch-src_openpa_Makefile.in
@@ -1,7 +1,16 @@
---- ./src/openpa/Makefile.in.orig	2009-07-21 23:48:43.000000000 +0200
-+++ ./src/openpa/Makefile.in	2009-07-22 18:57:27.000000000 +0200
-@@ -260,16 +260,16 @@
- $(am__aclocal_m4_deps):
+--- ./src/openpa/Makefile.in.orig	2010-02-22 23:22:28.000000000 +0100
++++ ./src/openpa/Makefile.in	2010-03-10 21:36:17.000000000 +0100
+@@ -229,7 +229,7 @@
+ EXTRA_DIST = COPYRIGHT CHANGELOG openpa.pc.in
+ 
+ # pkgconfig files
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = libdata/pkgconfig
+ pkgconfig_DATA = openpa.pc
+ all: all-recursive
+ 
+@@ -272,16 +272,16 @@
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
  install-dist_docDATA: $(dist_doc_DATA)
  	@$(NORMAL_INSTALL)
 -	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
diff --git a/net/mpich2/pkg-plist b/net/mpich2/pkg-plist
index 3b718377d84d..c8a987baf235 100644
--- a/net/mpich2/pkg-plist
+++ b/net/mpich2/pkg-plist
@@ -124,7 +124,7 @@ include/clog_uuid.h
 include/mpe.h
 include/mpe_callstack.h
 include/mpe_graphics.h
-%%X11%%include/mpe_graphicsf.h
+include/mpe_graphicsf.h
 include/mpe_log.h
 include/mpe_log_thread.h
 include/mpe_logf.h
@@ -164,7 +164,7 @@ include/primitives/opa_unsafe.h
 %%JAVA%%lib/clogprint.jar
 %%JAVA%%lib/jumpshot.jar
 %%JAVA%%lib/jumpshot_launcher.jar
-%%X11%%lib/libampe.a
+lib/libampe.a
 lib/libfmpich.a
 lib/libfmpich.so
 lib/libfmpich.so.1
@@ -725,10 +725,10 @@ sbin/mpeuninstall
 %%DATADIR%%/examples_collchk/wrong_reals.f
 %%DATADIR%%/examples_collchk/wrong_root.c
 %%DATADIR%%/examples_collchk/wrong_scatterv.c
-%%X11%%%%DATADIR%%/examples_graphics/Makefile
-%%X11%%%%DATADIR%%/examples_graphics/cpi.c
-%%X11%%%%DATADIR%%/examples_graphics/cxgraphics.c
-%%X11%%%%DATADIR%%/examples_graphics/fxgraphics.f
+%%DATADIR%%/examples_graphics/Makefile
+%%DATADIR%%/examples_graphics/cpi.c
+%%DATADIR%%/examples_graphics/cxgraphics.c
+%%DATADIR%%/examples_graphics/fxgraphics.f
 %%DATADIR%%/examples_logging/Makefile
 %%DATADIR%%/examples_logging/comm1_isr.c
 %%DATADIR%%/examples_logging/comm1_isr_loop.c
@@ -749,15 +749,15 @@ sbin/mpeuninstall
 %%DATADIR%%/examples_logging/pthread_sendrecv.c
 %%DATADIR%%/examples_logging/pthread_sendrecv_user.c
 %%DATADIR%%/examples_logging/srtest.c
-%%JAVA%%%%DATADIR%%/logfiles/barrier.rlog
-%%JAVA%%%%DATADIR%%/logfiles/fpilog.clog
-%%JAVA%%%%DATADIR%%/logfiles/fpilog.slog2
+%%X11%%%%DATADIR%%/logfiles/barrier.rlog
+%%X11%%%%DATADIR%%/logfiles/fpilog.clog
+%%X11%%%%DATADIR%%/logfiles/fpilog.slog2
 @unexec if diff -q %D/etc/mpd.conf %D/etc/mpd.conf.dist; then rm %D/etc/mpd.conf; fi
 etc/mpd.conf.dist
 @exec if [ ! -f %B/mpd.conf ]; then cp %B/mpd.conf.dist %B/mpd.conf; fi
 %%JAVA%%@dirrm %%DATADIR%%/logfiles
 @dirrm %%DATADIR%%/examples_logging
-%%X11%%@dirrm %%DATADIR%%/examples_graphics
+@dirrm %%DATADIR%%/examples_graphics
 @dirrm %%DATADIR%%/examples_collchk
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/www4
@@ -770,3 +770,4 @@ etc/mpd.conf.dist
 @dirrm include/primitives
 @cwd %%LOCALBASE%%
 libdata/pkgconfig/mpich2-ch3.pc
+@comment libdata/pkgconfig/openpa.pc