6 files changed, 45 insertions, 24 deletions

diff --git a/math/petsc/Makefile b/math/petsc/Makefile
index f0cd01e978ad..4d9a0772bcd4 100644
--- a/math/petsc/Makefile
+++ b/math/petsc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	petsc
-DISTVERSION=	2.3.1-p16
-PORTREVISION=	1
+DISTVERSION=	2.3.2-p0
 PORTEPOCH=	1
 CATEGORIES=	math parallel
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/petsc/release-snapshots/
@@ -38,7 +37,7 @@ PKGMESSAGE=		${WRKDIR}/pkg-message
 .if !defined(WITHOUT_X11)
 USE_XLIB=		yes
 CONFIGURE_ARGS+=	--with-x-include=${X11BASE}/include	\
-			--with-x-library=${X11BASE}/lib/libX11.so
+			--with-x-lib=${X11BASE}/lib/libX11.so
 .endif
 
 FFLAGS?=	-O2
@@ -238,6 +237,14 @@ pre-configure:
 	@${REINPLACE_CMD} -e "s|/bin/ksh|${LOCALBASE}/bin/ksh93|"	\
 		${WRKSRC}/bin/popup
 	@${RM} ${WRKSRC}/bin/popup.bak
+.if defined(PACKAGE_BUILDING)
+	@${REINPLACE_CMD} -e "s|%%PACKAGE%%exit 1; ||"		\
+		-e "s|%%PACKAGE%%sys.exit(3)||"			\
+		${WRKSRC}/makefile ${WRKSRC}/config/configure.py
+.else
+	@${REINPLACE_CMD} -e "s|%%PACKAGE%%||"			\
+		${WRKSRC}/makefile ${WRKSRC}/config/configure.py
+.endif
 
 post-install:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/${PFX}/bin
diff --git a/math/petsc/distinfo b/math/petsc/distinfo
index 47481c1039b8..ade820f1579b 100644
--- a/math/petsc/distinfo
+++ b/math/petsc/distinfo
@@ -1,3 +1,3 @@
-MD5 (petsc-2.3.1-p16.tar.gz) = 643d8f429a074e19156f00d7f0e4e5dc
-SHA256 (petsc-2.3.1-p16.tar.gz) = 98dd93df32788e33d2cee381fb3af4dc20f90dc84308c0d3c84e2eb57093c6ee
-SIZE (petsc-2.3.1-p16.tar.gz) = 10266456
+MD5 (petsc-2.3.2-p0.tar.gz) = 3cec21fb34e17d22b5c887ddb9f80f33
+SHA256 (petsc-2.3.2-p0.tar.gz) = 1b4e778a2a0fd681056fbf31efb8b74a07f141644dd9e87a2644539023f5fbcf
+SIZE (petsc-2.3.2-p0.tar.gz) = 10716948
diff --git a/math/petsc/files/patch-config_configure.py b/math/petsc/files/patch-config_configure.py
new file mode 100644
index 000000000000..401c406c11be
--- /dev/null
+++ b/math/petsc/files/patch-config_configure.py
@@ -0,0 +1,11 @@
+--- ./config/configure.py.orig	Sat Sep  2 02:24:13 2006
++++ ./config/configure.py	Sat Sep  2 23:23:33 2006
+@@ -97,7 +97,7 @@
+     print '             *** Do not run configure as root, or using sudo. ***'
+     print '             ***** That should be reserved for installation *****'
+     print '================================================================================='
+-    sys.exit(3)
++    %%PACKAGE%%sys.exit(3)
+ 
+   # Check for broken cygwin
+   if chkcygwin():
diff --git a/math/petsc/files/patch-makefile b/math/petsc/files/patch-makefile
index df0143182fbb..36db50c2fc1b 100644
--- a/math/petsc/files/patch-makefile
+++ b/math/petsc/files/patch-makefile
@@ -1,14 +1,23 @@
---- makefile.orig	Thu Aug 11 01:33:48 2005
-+++ makefile	Sun Aug 21 22:58:52 2005
+--- makefile.orig	Sat Sep  2 03:57:37 2006
++++ makefile	Sat Sep  2 23:20:34 2006
 @@ -6,6 +6,7 @@
  ALL: all
- LOCDIR	 = . 
+ LOCDIR	 = ./
  DIRS	 = src include 
 +DOCS_DIR = ${INSTALL_DIR}/../share/doc/petsc
  CFLAGS	 = 
  FFLAGS	 = 
  
-@@ -247,14 +248,14 @@
+@@ -21,7 +22,7 @@
+       echo "  Do not run configure as root, or using sudo.";\
+       echo "    That should be reserved for installation";\
+       echo "********************************************************************"; \
+-      exit 1; fi
++      %%PACKAGE%%exit 1; fi
+ 	@${OMAKE}  PETSC_ARCH=${PETSC_ARCH}  chkpetsc_dir
+ 	-@${OMAKE} all_build 2>&1 | tee make_log_${PETSC_ARCH}
+ 	-@egrep -i "( error | error:)" make_log_${PETSC_ARCH} > /dev/null; if [ "$$?" = "0" ]; then \
+@@ -261,14 +262,14 @@
  	-@if [ "${INSTALL_DIR}" = "${PETSC_DIR}" ]; then \
  	  echo "You did not set a directory to install to";\
          else \
diff --git a/math/petsc/files/patch-python::PETSc::packages::X11.py b/math/petsc/files/patch-python::PETSc::packages::X11.py
deleted file mode 100644
index 981840edbf20..000000000000
--- a/math/petsc/files/patch-python::PETSc::packages::X11.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- python/PETSc/packages/X11.py.orig	Thu Aug 11 01:08:41 2005
-+++ python/PETSc/packages/X11.py	Sun Aug 21 23:06:02 2005
-@@ -26,7 +26,7 @@
-     import nargs
-     help.addArgument('X11', '-with-x=<bool>',                nargs.ArgBool(None, 1,   'Activate X11'))
-     help.addArgument('X11', '-with-x-include=<include dir>', nargs.ArgDir(None, None, 'Specify an include directory for X11'))
--    help.addArgument('X11', '-with-x-lib=<X11 lib>',         nargs.Arg(None, None,    'Specify X11 library file'))
-+    help.addArgument('X11', '-with-x-library=<X11 lib>',         nargs.Arg(None, None,    'Specify X11 library file'))
-     return
- 
-   def setupDependencies(self, framework):
diff --git a/math/petsc/pkg-plist b/math/petsc/pkg-plist
index b35acfcb1c05..5affadf53e8d 100644
--- a/math/petsc/pkg-plist
+++ b/math/petsc/pkg-plist
@@ -22,6 +22,7 @@
 %%PFX%%/bin/matlab/PetscBagRead.m
 %%PFX%%/bin/matlab/PetscBinaryRead.m
 %%PFX%%/bin/matlab/PetscBinaryWrite.m
+%%PFX%%/bin/matlab/PetscReadBinaryMatlab.m
 %%PFX%%/bin/matlab/closeport.m
 %%PFX%%/bin/matlab/launch.m
 %%PFX%%/bin/matlab/openport.m
@@ -30,6 +31,7 @@
 %%PFX%%/bin/mpirun.chiba
 %%PFX%%/bin/mpirun.gmalloc
 %%PFX%%/bin/mpirun.lam
+%%PFX%%/bin/mpirun.llrun
 %%PFX%%/bin/mpirun.poe
 %%PFX%%/bin/mpirun.prun
 %%PFX%%/bin/mpirun.uni
@@ -39,6 +41,9 @@
 %%PFX%%/bin/petsc_libtool
 %%PFX%%/bin/petscmpirun
 %%PFX%%/bin/popup
+%%PFX%%/bin/processSummary.py
+%%PFX%%/bin/processSummary.pyc
+%%PFX%%/bin/processSummary.pyo
 %%PFX%%/bin/taucc.py
 %%PFX%%/bin/taucc.pyc
 %%PFX%%/bin/taucc.pyo
@@ -66,15 +71,12 @@
 %%PFX%%/bmake/%%TARGET%%/configure.py
 %%PFX%%/bmake/%%TARGET%%/configure.pyc
 %%PFX%%/bmake/%%TARGET%%/configure.pyo
-%%PFX%%/bmake/%%TARGET%%/ejobs
-%%PFX%%/bmake/%%TARGET%%/jobs
 %%PFX%%/bmake/%%TARGET%%/petscconf
 %%PFX%%/bmake/%%TARGET%%/petscconf.h
 %%PFX%%/bmake/%%TARGET%%/petscconfiginfo.h
 %%PFX%%/bmake/%%TARGET%%/petscfix.h
 %%PFX%%/bmake/%%TARGET%%/petscmachineinfo.h
 %%PFX%%/bmake/%%TARGET%%/petscrules
-%%PFX%%/bmake/%%TARGET%%/rjobs
 %%PFX%%/bmake/petscconf
 %%PFX%%/include/adic/ad_deriv.h
 %%PFX%%/include/adic/ad_deriv.h.html
@@ -103,6 +105,7 @@
 %%PFX%%/include/finclude/index.html
 %%PFX%%/include/finclude/makefile
 %%PFX%%/include/finclude/makefile.html
+%%PFX%%/include/finclude/moddeps
 %%PFX%%/include/finclude/petsc.h
 %%PFX%%/include/finclude/petsc.h.html
 %%PFX%%/include/finclude/petscao.h
@@ -224,6 +227,8 @@
 %%MPIUNI%%%%PFX%%/lib/%%TARGET%%/libmpiuni.a
 %%PFX%%/lib/%%TARGET%%/libpetsc.a
 %%PFX%%/lib/%%TARGET%%/libpetsc.so
+%%PFX%%/lib/%%TARGET%%/libpetsccontrib.a
+%%PFX%%/lib/%%TARGET%%/libpetsccontrib.so
 %%PFX%%/lib/%%TARGET%%/libpetscdm.a
 %%PFX%%/lib/%%TARGET%%/libpetscdm.so
 %%PFX%%/lib/%%TARGET%%/libpetscksp.a