1 files changed, 18 insertions, 18 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