9 files changed, 76 insertions, 154 deletions

diff --git a/math/petsc/Makefile b/math/petsc/Makefile
index 57047169da58..f906bdc6940a 100644
--- a/math/petsc/Makefile
+++ b/math/petsc/Makefile
@@ -6,17 +6,15 @@
 #
 
 PORTNAME=	petsc
-PORTVERSION=	2.2.1
+PORTVERSION=	2.3.0
 CATEGORIES=	math parallel
 MASTER_SITES=	ftp://info.mcs.anl.gov/pub/petsc/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. software_old
-DISTNAME=	v${PORTVERSION}-${PATCH_LEVEL}.${PORTNAME}
+DISTNAME=	v${PORTVERSION}.${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable, Extensible Toolkit for Scientific computation
 
-PATCH_LEVEL=	23
-
 HAS_CONFIGURE=		yes
 USE_PYTHON=		yes
 USE_REINPLACE=		yes
@@ -24,11 +22,14 @@ CONFIGURE_SCRIPT=	config/configure.py
 CONFIGURE_LOG=		configure.log
 CONFIGURE_ENV=		PETSC_ARCH=${TARGET}	\
 			PETSC_DIR=${WRKSRC}
-CONFIGURE_ARGS=		--prefix=${PREFIX} --CFLAGS="${CFLAGS}"	\
-			--CXX_CXXFLAGS="${CXXFLAGS}" --FFLAGS="${FFLAGS}"
+CONFIGURE_ARGS=		--prefix=${PREFIX} --CFLAGS="${CFLAGS}"			\
+			--CXX_CXXFLAGS="${CXXFLAGS}" --FFLAGS="${FFLAGS}"	\
+			--with-python=1 ---with-shared=1
+ALL_TARGET=		all python
 MAKEFILE=		makefile
-MAKE_ENV=		PETSC_DIR=${WRKSRC} BOPT=O
+MAKE_ENV=		PETSC_DIR=${WRKSRC}
 
+SUB_FILES=		pkg-message
 PKGMESSAGE=		${WRKDIR}/pkg-message
 
 .if !defined(WITHOUT_X11)
@@ -52,13 +53,13 @@ CONFIGURE_ARGS+=	--with-blas-lapack-lib=${LIBBLASLAPACK}
 .if !defined(WITHOUT_SUPERLU)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libsuperlu.a:${PORTSDIR}/math/superlu
 CONFIGURE_ARGS+=	--with-superlu-include=${LOCALBASE}/include/superlu	\
-			--with-superlu-lib="-L${LOCALBASE}/lib -lsuperlu"
+			--with-superlu-lib=${LOCALBASE}/lib/libsuperlu.a
 .endif
 
 .if !defined(WITHOUT_UMFPACK)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libumfpack.a:${PORTSDIR}/math/umfpack
 CONFIGURE_ARGS+=	--with-umfpack-include="${LOCALBASE}/include/UMFPACK"	\
-			--with-umfpack-lib="-L${LOCALBASE}/lib -lumfpack -lamd"
+			--with-umfpack-lib=[${LOCALBASE}/lib/libumfpack.a,${LOCALBASE}/lib/libamd.a]
 .endif
 
 .if !defined(NOPORTDOCS)
@@ -98,17 +99,17 @@ CONFIGURE_ARGS+=	--with-blocksolve95=0
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libBS95.a:${PORTSDIR}/math/blocksolve95
 CONFIGURE_ARGS+=	--with-blocksolve95-include=${LOCALBASE}/include	\
-			--with-blocksolve95-lib="-L${LOCALBASE}/lib -lBS95"
+			--with-blocksolve95-lib=${LOCALBASE}/lib/libBS95.a
 .endif
 
 .if defined(WITHOUT_PARMETIS)
 CONFIGURE_ARGS+=	--with-parmetis=0
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/lib/parmetis/libparmetis.a:${PORTSDIR}/math/parmetis
-LIBPARMETIS=	-L${LOCALBASE}/lib/parmetis -lparmetis -lmetis -lm
+LIBPARMETIS=	"${LOCALBASE}/lib/parmetis/libparmetis.a	${LOCALBASE}/lib/parmetis/libmetis.a"
 CONFIGURE_ARGS+=	--with-parmetis=1					\
 			--with-parmetis-include=${LOCALBASE}/include/parmetis	\
-			--with-parmetis-lib="${LIBPARMETIS}"
+			--with-parmetis-lib=[${LOCALBASE}/lib/parmetis/libparmetis.a,${LOCALBASE}/lib/parmetis/libmetis.a,${LIBDIR}/libm.a]
 .endif
 
 #.if exists(${LIBBLACS})
@@ -168,7 +169,7 @@ BROKEN=	"Please deinstall spooles and reinstall spooles-mpich"
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libspooles.a:${PORTSDIR}/math/spooles-mpich
 . endif
 CONFIGURE_ARGS+=	--with-spooles-include=${LOCALBASE}/include/spooles	\
-			--with-spooles-lib="-L${LOCALBASE}/lib -lspooles -lm"
+			--with-spooles-lib=[${LOCALBASE}/lib/libspooles.a,${LIBDIR}/libm.a]
 .endif
 
 pre-everything::
@@ -203,11 +204,10 @@ pre-everything::
 	@${ECHO_MSG}
 
 pre-configure:
-	@${RM} ${WRKSRC}/bmake/common/rules.shared.basic.orig	\
-		${WRKSRC}/bmake/common/variables.orig
+	@${RM} ${WRKSRC}/bmake/common/rules.shared.basic.orig
 	@${REINPLACE_CMD} -e "s|AMD/Include|include/AMD|"	\
 			-e "s|AMD/Lib|${LOCALBASE}/lib|"	\
-		${WRKSRC}/python/PETSc/packages/Umfpack.py
+		${WRKSRC}/python/PETSc/packages/UMFPACK.py
 
 post-install:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/${PFX}/bin
@@ -218,9 +218,9 @@ post-install:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS}	\
 		${MAKEFILE} ${MAKE_ARGS} install_docs)
 .endif
-	@${SED} -e 's|%%PETSC_DIR%%|${PREFIX}/${PFX}|;s|%%PETSC_ARCH%%|${TARGET}|'	\
-		${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
 .if defined(MAINTAINER_MODE)
 test:	build
diff --git a/math/petsc/distinfo b/math/petsc/distinfo
index 8c4d84695200..e58ea91be861 100644
--- a/math/petsc/distinfo
+++ b/math/petsc/distinfo
@@ -1,2 +1,2 @@
-MD5 (v2.2.1-23.petsc.tar.gz) = 627f67283826279e8001e999643ff43e
-SIZE (v2.2.1-23.petsc.tar.gz) = 9103324
+MD5 (v2.3.0.petsc.tar.gz) = a6cc59cab0562afdae90fb6951f37fca
+SIZE (v2.3.0.petsc.tar.gz) = 9403490
diff --git a/math/petsc/files/patch-bmake::common::rules.shared.basic b/math/petsc/files/patch-bmake::common::rules.shared.basic
index c41739226ead..0b999dfd67ca 100644
--- a/math/petsc/files/patch-bmake::common::rules.shared.basic
+++ b/math/petsc/files/patch-bmake::common::rules.shared.basic
@@ -1,11 +1,10 @@
---- bmake/common/rules.shared.basic.orig	Tue Nov 16 18:08:11 2004
-+++ bmake/common/rules.shared.basic	Tue Aug 30 22:21:17 2005
-@@ -10,6 +10,8 @@
+--- bmake/common/rules.shared.basic.orig	Thu Aug 11 01:08:40 2005
++++ bmake/common/rules.shared.basic	Wed Sep 14 21:27:05 2005
+@@ -9,6 +9,7 @@
  
  shared_solaris2: shared_solaris
  
 +shared_freebsd7: shared_freebsd
-+shared_freebsd6: shared_freebsd
+ shared_freebsd6: shared_freebsd
  shared_freebsd5: shared_freebsd
  shared_freebsd4: shared_freebsd
- shared_freebsd3: shared_freebsd
diff --git a/math/petsc/files/patch-bmake::common::variables b/math/petsc/files/patch-bmake::common::variables
deleted file mode 100644
index ce3c2697254e..000000000000
--- a/math/petsc/files/patch-bmake::common::variables
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./bmake/common/variables.orig	Sat Oct  2 09:13:28 2004
-+++ ./bmake/common/variables	Thu Oct  7 22:58:14 2004
-@@ -32,7 +32,7 @@
- #
- # The following variables define PETSc compile procedures
- #
--PETSC_COMPILE         = ${CC} -c ${COPTFLAGS} ${CFLAGS} ${CCPPFLAGS} ${SOURCEC} ${SSOURCE}
-+PETSC_COMPILE         = ${CC} -c ${COPTFLAGS} ${CFLAGS} ${CCPPFLAGS} ${CPPFLAGS} ${SOURCEC} ${SSOURCE}
- PETSC_COMPILE_SINGLE  = ${CC} -c ${COPTFLAGS} ${CFLAGS} ${CCPPFLAGS} 
- PETSC_COMPILE_LIBTOOL = files="${SOURCEC} ${SSOURCE}"; \
-                         for filename in $$files; do \
-@@ -122,7 +122,7 @@
-                 ${PETSC_HAVE_PNETCDF}     ${PETSC_HAVE_HDF4}       ${PETSC_HAVE_ML}\
-                 ${PETSC_HAVE_CHACO}       ${PETSC_HAVE_JOSTLE}     ${PETSC_HAVE_PARTY}   ${PETSC_HAVE_SCOTCH}
- 
--EXTERNAL_LIB  = ${MPE_LIB}                ${BLOCKSOLVE_LIB}        ${PVODE_LIB}          ${PARMETIS_LIB} \
-+EXTERNAL_LIB  = ${MPE_LIB}                ${PARMETIS_LIB}          ${PVODE_LIB}          ${BLOCKSOLVE_LIB} \
-                 ${AMS_LIB}                ${SPAI_LIB}              ${X11_LIB}            ${MATLAB_LIB}   \
-                                                                    ${LUSOL_LIB}          ${DSCPACK_LIB} \
-                 ${RAMG_LIB}               ${TAU_LIB}                                     ${ADIFOR_LIB} \
diff --git a/math/petsc/files/patch-makefile b/math/petsc/files/patch-makefile
index 29cc50265d3e..df0143182fbb 100644
--- a/math/petsc/files/patch-makefile
+++ b/math/petsc/files/patch-makefile
@@ -1,42 +1,15 @@
---- makefile.orig	Wed Sep 22 02:57:28 2004
-+++ makefile	Sun Oct  3 00:26:00 2004
+--- makefile.orig	Thu Aug 11 01:33:48 2005
++++ makefile	Sun Aug 21 22:58:52 2005
 @@ -6,6 +6,7 @@
  ALL: all
- LOCDIR = . 
- DIRS   = src include 
+ LOCDIR	 = . 
+ DIRS	 = src include 
 +DOCS_DIR = ${INSTALL_DIR}/../share/doc/petsc
+ CFLAGS	 = 
+ FFLAGS	 = 
  
- include ${PETSC_DIR}/bmake/common/base
- include ${PETSC_DIR}/bmake/common/test
-@@ -224,7 +225,7 @@
- 	  echo "BOPT=$$BOPT" > ${PETSC_DIR}/bmake/common/bopt_ ;\
- 	fi
- install:
--	-@if [ "${INSTALL_DIR}" == "${PETSC_DIR}" ]; then \
-+	-@if [ "${INSTALL_DIR}" = "${PETSC_DIR}" ]; then \
- 	  echo "Install directory is current directory; nothing needs to be done";\
-         else \
- 	  echo Installing PETSc at ${INSTALL_DIR};\
-@@ -258,11 +259,11 @@
-           done;\
-           echo "sh/bash: PETSC_DIR="${INSTALL_DIR}"; export PETSC_DIR";\
-           echo "csh/tcsh: setenv PETSC_DIR "${INSTALL_DIR} ;\
--          echo "The do make test to verify correct install";\
-+          echo "Then do make test to verify correct install";\
-         fi;
- 
- install_src:
--	-@if [ "${INSTALL_DIR}" == "${PETSC_DIR}" ]; then \
-+	-@if [ "${INSTALL_DIR}" = "${PETSC_DIR}" ]; then \
- 	  echo "You did not set a directory to install to";\
-         else \
- 	  echo Installing PETSc source at ${INSTALL_DIR};\
-@@ -276,17 +277,17 @@
-         fi;
- 
- install_docs:
--	-@if [ "${INSTALL_DIR}" == "${PETSC_DIR}" ]; then \
-+	-@if [ "${INSTALL_DIR}" = "${PETSC_DIR}" ]; then \
+@@ -247,14 +248,14 @@
+ 	-@if [ "${INSTALL_DIR}" = "${PETSC_DIR}" ]; then \
  	  echo "You did not set a directory to install to";\
          else \
 -	  echo Installing PETSc documentation at ${INSTALL_DIR};\
diff --git a/math/petsc/files/patch-python::PETSc::packages::Spooles.py b/math/petsc/files/patch-python::PETSc::packages::Spooles.py
deleted file mode 100644
index 2b4d626472c8..000000000000
--- a/math/petsc/files/patch-python::PETSc::packages::Spooles.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./python/PETSc/packages/Spooles.py.orig	Wed Sep 22 02:45:51 2004
-+++ ./python/PETSc/packages/Spooles.py	Tue Sep 28 23:09:00 2004
-@@ -71,7 +71,8 @@
-       if 'with-'+self.package+'-lib' in self.framework.argDB: #~spooles-2.2/MPI/src/spoolesMPI.a ~spooles-2.2/spooles.a
-         lib = self.framework.argDB['with-'+self.package+'-lib']
-         (lib_mpi,dummy) = os.path.split(lib)
--        lib_mpi = os.path.join(lib_mpi,'MPI/src/spoolesMPI.a')
-+	# FreeBSD: MPI is included in our spooles.a
-+        #lib_mpi = os.path.join(lib_mpi,'MPI/src/spoolesMPI.a')
-         yield ('User specified '+self.PACKAGE+' library',lib_mpi,lib)
-       elif 'with-'+self.package+'-include' in self.framework.argDB:
-         dir = self.framework.argDB['with-'+self.package+'-include'] #~spooles-2.2
diff --git a/math/petsc/files/patch-python::PETSc::packages::X11.py b/math/petsc/files/patch-python::PETSc::packages::X11.py
index 3ecac3113c25..981840edbf20 100644
--- a/math/petsc/files/patch-python::PETSc::packages::X11.py
+++ b/math/petsc/files/patch-python::PETSc::packages::X11.py
@@ -1,5 +1,5 @@
---- python/PETSc/packages/X11.py.orig	Wed Sep 22 02:45:51 2004
-+++ python/PETSc/packages/X11.py	Sat Oct  2 00:27:14 2004
+--- 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'))
@@ -8,20 +8,4 @@
 +    help.addArgument('X11', '-with-x-library=<X11 lib>',         nargs.Arg(None, None,    'Specify X11 library file'))
      return
  
-   def generateGuesses(self):
-@@ -123,6 +123,7 @@
-       if not os.path.isdir(self.framework.argDB['with-x-include']):
-         raise RuntimeError('Invalid X include directory specified by --with-x-include='+os.path.abspath(self.framework.argDB['with-x-include']))
-       includeDir = self.framework.argDB['with-x-include']
-+      foundInclude = 1
-     else:
-       testInclude  = 'X11/Intrinsic.h'
- 
-@@ -144,6 +145,7 @@
-       if not os.path.isfile(self.framework.argDB['with-x-library']):
-         raise RuntimeError('Invalid X library specified by --with-x-library='+os.path.abspath(self.framework.argDB['with-x-library']))
-       libraryDir = os.path.dirname(self.framework.argDB['with-x-library'])
-+      foundLibrary = 1
-     else:
-       testLibrary  = 'Xt'
-       testFunction = 'XtMalloc'
+   def setupDependencies(self, framework):
diff --git a/math/petsc/files/patch-python_PETSc_packages_spooles.py b/math/petsc/files/patch-python_PETSc_packages_spooles.py
new file mode 100644
index 000000000000..9184ce43136b
--- /dev/null
+++ b/math/petsc/files/patch-python_PETSc_packages_spooles.py
@@ -0,0 +1,12 @@
+--- ./python/PETSc/packages/spooles.py.orig	Thu Aug 11 01:08:42 2005
++++ ./python/PETSc/packages/spooles.py	Sun Aug 21 23:04:09 2005
+@@ -11,7 +11,8 @@
+     self.download   = ['ftp://ftp.mcs.anl.gov/pub/petsc/externalpackages/spooles-2.2.tar.gz']
+     self.functions  = ['InpMtx_init']
+     self.includes   = ['MPI/spoolesMPI.h']
+-    self.liblist    = [[os.path.join('MPI','src','spoolesMPI.a'),'spooles.a']]
++    # FreeBSD: MPI is included in our spooles.a
++    # self.liblist    = [[os.path.join('MPI','src','spoolesMPI.a'),'spooles.a']]
+     self.libdir     = ''
+     self.includedir = ''
+     return
diff --git a/math/petsc/pkg-plist b/math/petsc/pkg-plist
index 318a83a917f4..68b080bb67a9 100644
--- a/math/petsc/pkg-plist
+++ b/math/petsc/pkg-plist
@@ -12,10 +12,8 @@
 %%PFX%%/bin/config/findftnlibs
 %%PFX%%/bin/config/install-sh
 %%PFX%%/bin/configarch
-%%PFX%%/bin/fixtags.py
-%%PFX%%/bin/fixtags.pyc
-%%PFX%%/bin/fixtags.pyo
 %%PFX%%/bin/hostnames.chiba
+%%PFX%%/bin/matlab/PetscBagRead.m
 %%PFX%%/bin/matlab/PetscBinaryRead.m
 %%PFX%%/bin/matlab/PetscBinaryWrite.m
 %%PFX%%/bin/mpiexec.valgrind
@@ -29,7 +27,6 @@
 %%PFX%%/bin/parseargs.pyc
 %%PFX%%/bin/parseargs.pyo
 %%PFX%%/bin/petsc_libtool
-%%PFX%%/bin/petscarch
 %%PFX%%/bin/petscmpirun
 %%PFX%%/bin/popup
 %%PFX%%/bin/taucc.py
@@ -47,43 +44,26 @@
 %%PFX%%/bmake/adic.init
 %%PFX%%/bmake/adicmf.init
 %%PFX%%/bmake/common/base
-%%PFX%%/bmake/common/bopt_
-%%PFX%%/bmake/common/bopt_0
-%%PFX%%/bmake/common/bopt_0_c++
-%%PFX%%/bmake/common/bopt_O
-%%PFX%%/bmake/common/bopt_O_c++
-%%PFX%%/bmake/common/bopt_O_c++_single
-%%PFX%%/bmake/common/bopt_O_complex
-%%PFX%%/bmake/common/bopt_O_matsingle
-%%PFX%%/bmake/common/bopt_O_single
-%%PFX%%/bmake/common/bopt_g
-%%PFX%%/bmake/common/bopt_g_c++
-%%PFX%%/bmake/common/bopt_g_c++_single
-%%PFX%%/bmake/common/bopt_g_complex
-%%PFX%%/bmake/common/bopt_g_matsingle
-%%PFX%%/bmake/common/bopt_g_single
 %%PFX%%/bmake/common/rules
 %%PFX%%/bmake/common/rules.fortran.cpp
 %%PFX%%/bmake/common/rules.fortran.nocpp
 %%PFX%%/bmake/common/rules.fortran.none
 %%PFX%%/bmake/common/rules.shared.basic
-%%PFX%%/bmake/common/rules.shared.darwin7
-%%PFX%%/bmake/common/sedcmdforfortranstubs
 %%PFX%%/bmake/common/test
 %%PFX%%/bmake/common/variables
+%%PFX%%/bmake/%%TARGET%%/RDict.db
 %%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%%/packages
+%%PFX%%/bmake/%%TARGET%%/petscconf
 %%PFX%%/bmake/%%TARGET%%/petscconf.h
 %%PFX%%/bmake/%%TARGET%%/petscfix.h
 %%PFX%%/bmake/%%TARGET%%/petscmachineinfo.h
+%%PFX%%/bmake/%%TARGET%%/petscrules
 %%PFX%%/bmake/%%TARGET%%/rjobs
-%%PFX%%/bmake/%%TARGET%%/rules
-%%PFX%%/bmake/%%TARGET%%/variables
-%%PFX%%/bmake/variables
+%%PFX%%/bmake/petscconf
 %%PFX%%/include/adic/ad_deriv.h
 %%PFX%%/include/adic/ad_deriv.h.html
 %%PFX%%/include/adic/ad_grad.h
@@ -115,6 +95,7 @@
 %%PFX%%/include/f90impl/f90_alpha.h
 %%PFX%%/include/f90impl/f90_alpha.h.html
 %%PFX%%/include/f90impl/f90_cray_x1.h
+%%PFX%%/include/f90impl/f90_g95.h
 %%PFX%%/include/f90impl/f90_hpux.h
 %%PFX%%/include/f90impl/f90_hpux.h.html
 %%PFX%%/include/f90impl/f90_intel.h
@@ -187,15 +168,27 @@
 %%PFX%%/include/mpiuni/mpif.h.html
 %%PFX%%/include/petsc.h
 %%PFX%%/include/petsc.h.html
+%%PFX%%/include/petsc/petsc.h
+%%PFX%%/include/petsc/vec.h
 %%PFX%%/include/petscadic.h
 %%PFX%%/include/petscao.h
 %%PFX%%/include/petscao.h.html
+%%PFX%%/include/petscbag.h
+%%PFX%%/include/petscbag.h.html
 %%PFX%%/include/petscblaslapack.h
 %%PFX%%/include/petscblaslapack.h.html
+%%PFX%%/include/petscblaslapack_c.h
+%%PFX%%/include/petscblaslapack_caps.h
+%%PFX%%/include/petscblaslapack_cptofcd.h
+%%PFX%%/include/petscblaslapack_stdcall.h
+%%PFX%%/include/petscblaslapack_uscore.h
 %%PFX%%/include/petscbt.h
 %%PFX%%/include/petscbt.h.html
+%%PFX%%/include/petscctable.h
 %%PFX%%/include/petscda.h
 %%PFX%%/include/petscda.h.html
+%%PFX%%/include/petscdmmg.h
+%%PFX%%/include/petscdmmg.h.html
 %%PFX%%/include/petscdraw.h
 %%PFX%%/include/petscdraw.h.html
 %%PFX%%/include/petscerror.h
@@ -238,25 +231,18 @@
 %%PFX%%/include/petscviewer.h.html
 %%PFX%%/include/vecimpl.h
 %%PFX%%/include/vecimpl.h.html
-%%PFX%%/lib/libO/%%TARGET%%/libmpiuni.a
-%%PFX%%/lib/libO/%%TARGET%%/libpetsc.a
-%%PFX%%/lib/libO/%%TARGET%%/libpetsc.so
-%%PFX%%/lib/libO/%%TARGET%%/libpetscdm.a
-%%PFX%%/lib/libO/%%TARGET%%/libpetscdm.so
-%%MPI%%%%PFX%%/lib/libO/%%TARGET%%/libpetscfortran.a
-%%PFX%%/lib/libO/%%TARGET%%/libpetscksp.a
-%%PFX%%/lib/libO/%%TARGET%%/libpetscksp.so
-%%PFX%%/lib/libO/%%TARGET%%/libpetscmat.a
-%%PFX%%/lib/libO/%%TARGET%%/libpetscmat.so
-%%PFX%%/lib/libO/%%TARGET%%/libpetscsnes.a
-%%PFX%%/lib/libO/%%TARGET%%/libpetscsnes.so
-%%PFX%%/lib/libO/%%TARGET%%/libpetscts.a
-%%PFX%%/lib/libO/%%TARGET%%/libpetscts.so
-%%PFX%%/lib/libO/%%TARGET%%/libpetscvec.a
-%%PFX%%/lib/libO/%%TARGET%%/libpetscvec.so
-@dirrm %%PFX%%/lib/libO/%%TARGET%%
-@dirrm %%PFX%%/lib/libO
+%%PFX%%/lib/%%TARGET%%/libmpiuni.a
+%%PFX%%/lib/%%TARGET%%/libpetsc.a
+%%PFX%%/lib/%%TARGET%%/libpetscdm.a
+%%MPI%%%%PFX%%/lib/%%TARGET%%/libpetscfortran.a
+%%PFX%%/lib/%%TARGET%%/libpetscksp.a
+%%PFX%%/lib/%%TARGET%%/libpetscmat.a
+%%PFX%%/lib/%%TARGET%%/libpetscsnes.a
+%%PFX%%/lib/%%TARGET%%/libpetscts.a
+%%PFX%%/lib/%%TARGET%%/libpetscvec.a
+@dirrm %%PFX%%/lib/%%TARGET%%
 @dirrm %%PFX%%/lib
+@dirrm %%PFX%%/include/petsc
 @dirrm %%PFX%%/include/mpiuni
 @dirrm %%PFX%%/include/finclude
 @dirrm %%PFX%%/include/f90impl