5 files changed, 73 insertions, 10 deletions

diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index 42bc5db4f3f4..be8c811ffa98 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mpich2
-PORTVERSION=	1.0.6
-PORTEPOCH=	2
+DISTVERSION=	1.0.6p1
+PORTEPOCH=	3
 CATEGORIES=	net parallel
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/	\
 		http://www-unix.mcs.anl.gov/mpi/mpich/downloads/
@@ -30,6 +30,7 @@ COMMENT=	A portable implementation of MPI-1 and MPI-2
 
 USE_PYTHON=	yes
 USE_PERL5_BUILD=yes
+USE_GNOME=	pkgconfig
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -137,6 +138,10 @@ pre-configure:
 		${WRKSRC}/src/mpe2/man/man4/${mp}
 .endfor
 
+post-configure:
+	${REINPLACE_CMD} -e 's|$${exec_prefix}|${PREFIX}|g;	\
+		s|$${prefix}|${PREFIX}|g' ${WRKSRC}/src/pkgconfig/mpich2-ch3.pc
+
 post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/bin
diff --git a/net/mpich2/distinfo b/net/mpich2/distinfo
index 895b35ed0289..7473d9d8e755 100644
--- a/net/mpich2/distinfo
+++ b/net/mpich2/distinfo
@@ -1,3 +1,3 @@
-MD5 (mpich/mpich2-1.0.6.tar.gz) = 49243ab250770c2839e570b15bae17f8
-SHA256 (mpich/mpich2-1.0.6.tar.gz) = 451a53bade172a9a398d053b3ec57046805668a39ef2153b3ace6fcf2161967b
-SIZE (mpich/mpich2-1.0.6.tar.gz) = 15435362
+MD5 (mpich/mpich2-1.0.6p1.tar.gz) = 6373b7824a782e890ecf4bfb77cbc4cc
+SHA256 (mpich/mpich2-1.0.6p1.tar.gz) = 38808f96071965c79451a8d975fe4f28454f56f27a19ce13b2aec85012521fcc
+SIZE (mpich/mpich2-1.0.6p1.tar.gz) = 15437620
diff --git a/net/mpich2/files/patch-configure b/net/mpich2/files/patch-configure
index 21123ba1a606..c6f17cec0700 100644
--- a/net/mpich2/files/patch-configure
+++ b/net/mpich2/files/patch-configure
@@ -1,6 +1,42 @@
---- configure.orig	Sun Jul 30 20:04:37 2006
-+++ configure	Tue Aug  8 16:50:50 2006
-@@ -28147,8 +28147,8 @@
+--- configure.orig	Tue Oct 30 21:17:11 2007
++++ configure	Mon Nov  5 11:01:30 2007
+@@ -3927,7 +3927,7 @@
+ fi
+ 
+ MPI_DEFAULT_COPTS="-O2"
+-if test "$compiler_optimizations" == "yes"; then
++if test "$compiler_optimizations" = "yes"; then
+    echo "$as_me:$LINENO: checking whether $CC accepts default optimizations" >&5
+ echo $ECHO_N "checking whether $CC accepts default optimizations... $ECHO_C" >&6
+    rm -f conftest.c
+@@ -5227,7 +5227,7 @@
+ 
+ MPI_DEFAULT_FOPTS="-O2"
+ if test "$enable_f77" = yes ; then
+-    if test "$compiler_optimizations" == "yes"; then
++    if test "$compiler_optimizations" = "yes"; then
+         echo "$as_me:$LINENO: checking whether $F77 accepts default optimizations" >&5
+ echo $ECHO_N "checking whether $F77 accepts default optimizations... $ECHO_C" >&6
+             rm -f conftest.f
+@@ -7592,7 +7592,7 @@
+ 
+ MPI_DEFAULT_F90OPTS="-O2"
+ if test "$enable_f90" = yes ; then
+-    if test "$compiler_optimizations" == "yes"; then
++    if test "$compiler_optimizations" = "yes"; then
+         echo "$as_me:$LINENO: checking whether $F90 accepts default optimizations" >&5
+ echo $ECHO_N "checking whether $F90 accepts default optimizations... $ECHO_C" >&6
+             rm -f conftest.f
+@@ -10340,7 +10340,7 @@
+ 
+ MPI_DEFAULT_CXXOPTS="-O2"
+ if test "$enable_cxx" = yes; then
+-    if test "$compiler_optimizations" == "yes"; then
++    if test "$compiler_optimizations" = "yes"; then
+         echo "$as_me:$LINENO: checking whether $CXX accepts default optimizations" >&5
+ echo $ECHO_N "checking whether $CXX accepts default optimizations... $ECHO_C" >&6
+             rm -f conftest.cpp
+@@ -30355,8 +30355,8 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test "$ac_cv_search_pthread_key_create" = no; then
@@ -11,7 +47,7 @@
      cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28192,7 +28192,7 @@
+@@ -30400,7 +30400,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
diff --git a/net/mpich2/files/patch-src_pkgconfig_Makefile.in b/net/mpich2/files/patch-src_pkgconfig_Makefile.in
new file mode 100644
index 000000000000..e4dfa01c84ea
--- /dev/null
+++ b/net/mpich2/files/patch-src_pkgconfig_Makefile.in
@@ -0,0 +1,20 @@
+--- src/pkgconfig/Makefile.in.orig	Tue Oct 30 21:22:35 2007
++++ src/pkgconfig/Makefile.in	Mon Nov  5 12:46:18 2007
+@@ -16,7 +16,7 @@
+ prefix          = @prefix@
+ libdir          = @libdir@
+ exec_prefix     = @exec_prefix@
+-pkgconfigdir    = @libdir@/pkgconfig
++pkgconfigdir    = $(LOCALBASE)/libdata/pkgconfig
+ MAKE            = @MAKE@
+ MPILIBNAME      = @MPILIBNAME@
+ PMPILIBNAME     = @PMPILIBNAME@
+@@ -48,7 +48,7 @@
+ # Install target
+ install:  FORCE_TARGET 
+ 	if [ ! -d ${DESTDIR}${pkgconfigdir} ] ; then $(MKDIR_P) ${DESTDIR}${pkgconfigdir} ; fi
+-	if [ -s mpich2-@DEVICE_NAME@.pc ] ; then $(INSTALL_PROGRAM) mpich2-@DEVICE_NAME@.pc ${DESTDIR}${pkgconfigdir}/mpich2-@DEVICE_NAME@.pc ; fi
++	if [ -s mpich2-@DEVICE_NAME@.pc ] ; then $(BSD_INSTALL_SCRIPT) mpich2-@DEVICE_NAME@.pc ${DESTDIR}${pkgconfigdir}/mpich2-@DEVICE_NAME@.pc ; fi
+ 
+ install-strip:
+ 	$(MAKE) INSTALL_STRIP_FLAG=-s install
diff --git a/net/mpich2/pkg-plist b/net/mpich2/pkg-plist
index 57d2c33cbcbd..f3cc677127ba 100644
--- a/net/mpich2/pkg-plist
+++ b/net/mpich2/pkg-plist
@@ -172,7 +172,6 @@ lib/libmpichf90.a
 lib/libtmpe.a
 %%JAVA%%lib/logconvertor.jar
 lib/mpe_prof.o
-lib/mpich2-ch3.pc
 %%JAVA%%lib/slog2filter.jar
 %%JAVA%%lib/slog2navigator.jar
 %%JAVA%%lib/slog2printrecur.jar
@@ -749,3 +748,6 @@ share/examples_logging/srtest.c
 @dirrm include
 @dirrm etc
 @dirrm bin
+@unexec rmdir %D 2>/dev/null || true
+@cwd %%LOCALBASE%%
+libdata/pkgconfig/mpich2-ch3.pc