Index: head/math/petsc/Makefile
===================================================================
--- head/math/petsc/Makefile	(revision 297082)
+++ head/math/petsc/Makefile	(revision 297083)
@@ -1,313 +1,313 @@
 # New ports collection makefile for:  petsc
 # Date created:               25 September 2004
 # Whom:                       Thierry Thomas <thierry@pompo.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	petsc
 DISTVERSION=	2.3.3-p0
 PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	math parallel
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/petsc/release-snapshots/
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Portable, Extensible Toolkit for Scientific computation
 
 RUN_DEPENDS=	ksh:${PORTSDIR}/shells/pdksh	\
 		qsub:${PORTSDIR}/sysutils/torque
 
 DEPRECATED=	BROKEN for more than 6 month
-EXPIRATION_DATE=	2012-05-20
+EXPIRATION_DATE=	2012-05-27
 
 BROKEN=		does not configure
 
 SLAVEDIRS=	math/petsc-mpich
 
 HAS_CONFIGURE=		yes
 USE_PYTHON=		yes
 CONFIGURE_SCRIPT=	config/configure.py
 CONFIGURE_LOG=		configure.log
 CONFIGURE_ENV=		PETSC_ARCH=${TARGET}	\
 			PETSC_DIR=${WRKSRC}
 CONFIGURE_ARGS=		--prefix=${PREFIX}/${PFX} --COPTFLAGS="${CFLAGS}"	\
 			--CXXOPTFLAGS="${CXXFLAGS}" --FOPTFLAGS="${FFLAGS}"	\
 			--with-shared=1 --with-cc=${CC} --with-fc=${FC}		\
 			--CPPFLAGS="-I${LOCALBASE}/include" --LDFLAGS=${PTHREAD_LIBS}
 ALL_TARGET=		all
 MAKEFILE=		makefile
 MAKE_ENV=		PETSC_DIR=${WRKSRC}
 
 SUB_FILES=		pkg-message
 SUB_LIST=		PETSC_ARCH=${TARGET} PETSC_DIR=${PREFIX}/${PFX}
 PKGMESSAGE=		${WRKDIR}/pkg-message
 
 .if !defined(WITHOUT_X11)
 USE_XORG=		x11
 CONFIGURE_ARGS+=	--with-x-include=${LOCALBASE}/include	\
 			--with-x-lib=${LOCALBASE}/lib/libX11.so
 .endif
 
 USE_FORTRAN=	yes
 FFLAGS+=	-O2
 PFX=		${PORTNAME}
 TARGET=		${OPSYS:L}
 PLIST_SUB=	PFX=${PFX} TARGET=${TARGET}
 
 .if !defined(WITHOUT_UMFPACK)
 LIB_DEPENDS+=		umfpack.1:${PORTSDIR}/math/suitesparse
 CONFIGURE_ARGS+=	--with-umfpack-include="${LOCALBASE}/include/suitesparse"	\
 			--with-umfpack-lib=[${LOCALBASE}/lib/libumfpack.so,${LOCALBASE}/lib/libamd.so]
 .endif
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
 #BUILD_DEPENDS+=	c2html:${PORTSDIR}/textproc/c2html	\
 #		pdflatex:${PORTSDIR}/print/teTeX-base	\
 #		doc2lt:${PORTSDIR}/textproc/sowing
 .endif
 
 LIBSCALAPACK=	${LOCALBASE}/lib/libscalapack.a
 LIBBLACS=	${LOCALBASE}/lib/libblacs.a
 MPIDIR=		${LOCALBASE}
 
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/mpi/openmpi/bin/mpirun)
 WITH_OPENMPI=	yes
 MPIDIR=		${LOCALBASE}/mpi/openmpi
 .endif
 
 .if ${ARCH} == "amd64"
 WITHOUT_SUPERLU=	yes
 .endif
 
 .if exists(${MPIDIR}/bin/mpicc) && !defined(WITHOUT_MPI)
 WITH_MPI=	yes
 .endif
 .if defined(WITH_MPI)
 . if exists(${LOCALBASE}/bin/lamboot)
 BROKEN=		Cannot build with MPI when lam-7 is installed - set WITHOUT_MPI or deinstall net/lam
 . endif
 .if defined(WITH_OPENMPI)
 MPIDIR=			${LOCALBASE}/mpi/openmpi
 BUILD_DEPENDS+=		${MPIDIR}/lib/libmpi.so:${PORTSDIR}/net/openmpi
 RUN_DEPENDS+=		${MPIDIR}/lib/libmpi.so:${PORTSDIR}/net/openmpi
 PKGNAMESUFFIX+=		-openmpi
 MAKE_ENV+=		PATH=${MPIDIR}/bin:${PATH}
 # math/blocksolve95 does not pass regression test when compiled with OpenMPI.
 WITHOUT_BS95=		yes
 WITHOUT_SPOOLES=	yes
 WITHOUT_PARMETIS=	yes
 CONFIGURE_ARGS+=	--with-cc=${MPIDIR}/bin/mpicc --with-fc=${MPIDIR}/bin/mpif77
 .else
 BUILD_DEPENDS+=		${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
 RUN_DEPENDS+=		${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
 PKGNAMESUFFIX+=		-mpich
 WITHOUT_SPOOLES=	yes
 .endif
 
 CONFIGURE_ARGS+=	--with-mpi-dir=${MPIDIR}
 CONFLICTS=		petsc-2*
 PLIST_SUB+=		MPIUNI="@comment "
 .else
 CONFIGURE_ARGS+=	--with-mpi=0
 CONFLICTS=		petsc-mpich-2*
 WITHOUT_BS95=		yes
 WITHOUT_PARMETIS=	yes
 WITHOUT_SPOOLES=	yes
 WITHOUT_SUPERLU=	yes
 PLIST_SUB+=		MPIUNI=""
 .endif
 
 .if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS)
 WITH_ATLAS=	yes
 .endif
 .if defined(WITH_ATLAS)
 LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
 LIBBLASLAPACK=	-L${LOCALBASE}/lib -lalapack -lcblas -lf77blas
 CONFIGURE_ARGS+=	--with-blas-lapack-lib="${LIBBLASLAPACK}"
 .else
 LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
 LIBBLASLAPACK=	-L${LOCALBASE}/lib -llapack -lblas
 CONFIGURE_ARGS+=	--with-blas-lapack-lib="${LIBBLASLAPACK}"
 .endif
 
 .if !defined(WITHOUT_SUPERLU) && !defined(WITHOUT_BLASLAPACK)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libsuperlu.a:${PORTSDIR}/math/superlu
 CONFIGURE_ARGS+=	--with-superlu-include=${LOCALBASE}/include/superlu	\
 			--with-superlu-lib=${LOCALBASE}/lib/libsuperlu.a
 .endif
 
 .if defined(WITHOUT_BS95)
 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=${LOCALBASE}/lib/libBS95.a
 .endif
 
 .if defined(WITHOUT_PARMETIS) || exists(${LOCALBASE}/lib/libmetis.so)
 # parmetis cannot be built with suitesparse
 CONFIGURE_ARGS+=	--with-parmetis=0
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/lib/parmetis/libparmetis.a:${PORTSDIR}/math/parmetis
 CONFIGURE_ARGS+=	--with-parmetis=1					\
 			--with-parmetis-include=${LOCALBASE}/include/parmetis	\
 			--with-parmetis-lib=[${LOCALBASE}/lib/parmetis/libparmetis.a,${LOCALBASE}/lib/parmetis/libmetis.a]
 CONFLICTS+=		metis-4*
 .endif
 
 .if exists(${LIBBLACS})
 WITH_BLACS=	yes
 .endif
 .if defined(WITH_BLACS) && defined(WITH_MPI)
 LIB_DEPENDS+=		blacs.1:${PORTSDIR}/math/blacs
 CONFIGURE_ARGS+=	--with_blacs=1	\
 			--with-blacs-include=${LOCALBASE}/include	\
 			--with-blacs-lib=[${LOCALBASE}/lib/libblacsc.a,${LOCALBASE}/lib/libblacsf77.a,${LOCALBASE}/lib/libblacs.a]
 . if exists(${LIBSCALAPACK}) && defined(WITH_MPI)
 WITH_SCALAPACK=	yes
 . endif
 . if defined(WITH_SCALAPACK)
 LIB_DEPENDS+=		scalapack.1:${PORTSDIR}/math/scalapack
 CONFIGURE_ARGS+=	--with-scalapack=1	\
 			--with-scalapack-dir=${LOCALBASE}
 . endif
 .endif
 
 #.if exists(${LOCALBASE}/bin/lgrind)
 #WITH_LGRIND=	yes
 #.endif
 #.if defined(WITH_LGRIND)
 #BUILD_DEPENDS+=	lgrind:${PORTSDIR}/print/lgrind
 #RUN_DEPENDS+=	lgrind:${PORTSDIR}/print/lgrind
 #.endif
 
 .if exists(${LOCALBASE}/lib/libnetcdf.so)
 WITH_NETCDF=	yes
 .endif
 .if defined(WITH_NETCDF)
 LIB_DEPENDS+=	netcdf.4:${PORTSDIR}/science/netcdf
 CONFIGURE_ENV+=	PNETCDF_INCLUDE=${LOCALBASE}/include	\
 		PNETCDF_LIB=${LOCALBASE}/lib
 .endif
 
 .if exists(${LOCALBASE}/bin/svn)
 WITH_SVN=	yes
 .endif
 .if defined(WITH_SVN)
 BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 .endif
 
 #.if exists(${LOCALBASE}/bin/valgrind)
 #WITH_VALGRIND=	yes
 #.endif
 #.if defined(WITH_VALGRIND)
 #BUILD_DEPENDS+=	valgrind:${PORTSDIR}/devel/valgrind
 #RUN_DEPENDS+=	valgrind:${PORTSDIR}/devel/valgrind
 #.endif
 
 .if !defined(WITHOUT_SPOOLES)
 . if exists(${LOCALBASE}/lib/libspooles.a)	\
   && !exists(${LOCALBASE}/include/spooles/MPI/spoolesMPI.h)
 BROKEN=		Please deinstall spooles and reinstall spooles-mpich
 . else
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libspooles.a:${PORTSDIR}/math/spooles-mpich
 . endif
 CONFIGURE_ARGS+=	--with-spooles-include=${LOCALBASE}/include/spooles	\
 			--with-spooles-lib=[${LOCALBASE}/lib/libspooles.a,${LIBDIR}/libm.a]
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 .if !defined (WITH_MPI)
 	@${ECHO_MSG} "Define WITH_MPI to use MPI."
 	@${ECHO_MSG} "Note: this is not compatible with Python bindings!"
 .elif !defined (WITHOUT_MPI)
 	@${ECHO_MSG} "Define WITHOUT_MPI to not use MPI."
 .endif
 .if !defined (WITH_SVN)
 	@${ECHO_MSG} "Define WITH_SVN to use subversion."
 .endif
 .if !defined (WITHOUT_X11)
 	@${ECHO_MSG} "Define WITHOUT_X11 to remove X11 support."
 .endif
 .if !defined (WITH_ATLAS)
 	@${ECHO_MSG} "Define WITH_ATLAS to replace Blas / Lapack support by Atlas."
 .endif
 .if !defined (WITHOUT_BS95)
 	@${ECHO_MSG} "Define WITHOUT_BS95 to remove BlockSolve95 support."
 .endif
 .if !defined (WITHOUT_PARMETIS)
 	@${ECHO_MSG} "Define WITHOUT_PARMETIS to remove ParMETIS support."
 .endif
 .if !defined (WITHOUT_SPOOLES)
 	@${ECHO_MSG} "Define WITHOUT_SPOOLES to remove SPOOLES support."
 .endif
 #.if !defined (WITHOUT_SUPERLU)
 #	@${ECHO_MSG} "Define WITHOUT_SUPERLU to remove SuperLU support."
 #.endif
 .if !defined (WITHOUT_UMFPACK)
 	@${ECHO_MSG} "Define WITHOUT_UMFPACK to remove UMFPACK support."
 .endif
 	@${ECHO_MSG}
 
 pre-configure:
 	@${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
 	${REINPLACE_CMD} -e "s|/bin/ksh|${LOCALBASE}/bin/ksh|"	\
 		${WRKSRC}/bin/popup
 	@${RM} ${WRKSRC}/bin/popup.bak
 .if defined (WITH_MPI)
 . for ps in ml.py MPE.py
 	${REINPLACE_CMD} -e "s|-lpmpich|-lmpl|"	\
 		${WRKSRC}/python/PETSc/packages/${ps}
 . endfor
 	${REINPLACE_CMD} -e "s|libpmpich|libmpl|"	\
 		${WRKSRC}/python/BuildSystem/config/packages/MPI.py
 .endif
 .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
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/${PFX}/bin
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/${PFX}/bmake
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/${PFX}/bmake
 .if !defined(NOPORTDOCS)
 	(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS}	\
 		${MAKEFILE} ${MAKE_ARGS} install_docs)
 .endif
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
 .if defined(MAINTAINER_MODE)
 regression-test:
 . if defined (WITH_MPI) && !defined(WITH_OPENMPI)
 .  if !exists(${HOME}/.mpd.conf)
 	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf
 	${CHMOD} go-r ${HOME}/.mpd.conf
 	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
 .  endif
 	${LOCALBASE}/bin/mpd &
 . endif
 	(cd ${BUILD_WRKSRC};	\
 	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
 . if defined (WITH_MPI) && !defined(WITH_OPENMPI)
 	${LOCALBASE}/bin/mpdallexit
 . endif
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/math/petsc/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.39
\ No newline at end of property
+1.40
\ No newline at end of property
Index: head/net-p2p/gnunet/Makefile
===================================================================
--- head/net-p2p/gnunet/Makefile	(revision 297082)
+++ head/net-p2p/gnunet/Makefile	(revision 297083)
@@ -1,121 +1,121 @@
 # ex:ts=8
 # Ports collection makefile for:	GNUnet
 # Date created:			Mar 23, 2002
 # Whom:				ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gnunet
 PORTVERSION=	0.8.1b
 PORTREVISION=	12
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	GNU \
 		http://gnunet.org/download/
 DISTNAME=	GNUnet-${PORTVERSION}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	An anonymous, distributed, reputation-based network
 
 LIB_DEPENDS=	adns.1:${PORTSDIR}/dns/adns \
 		cares.2:${PORTSDIR}/dns/c-ares \
 		curl.6:${PORTSDIR}/ftp/curl \
 		guile.21:${PORTSDIR}/lang/guile \
 		esmtp.6:${PORTSDIR}/mail/libesmtp \
 		gmp.10:${PORTSDIR}/math/gmp \
 		gcrypt.18:${PORTSDIR}/security/libgcrypt \
 		extractor.3:${PORTSDIR}/textproc/libextractor \
 		microhttpd.23:${PORTSDIR}/www/libmicrohttpd
 
 DEPRECATED=	BROKEN for more than 6 month
-EXPIRATION_DATE=	2012-05-20
+EXPIRATION_DATE=	2012-05-27
 
 BROKEN=		does not configure
 
 OPTIONS=	MYSQL	"Enable MySQL support"		on \
 		PGSQL	"Enable PostgreSQL support"	off \
 		SQLITE	"Enable SQLite support"		off
 
 USE_GNOME=	gnomehack libglade2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libltdl libtool
 CONFIGURE_ARGS=	--with-dialog=no \
 		--with-cdialog=no \
 		--with-qt=no \
 		--with-daemon-home-dir=${DBDIR} \
 		--with-daemon-config-dir=${PREFIX}/etc
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	DBDIR="${DBDIR}"
 
 MAN1=		gnunet-auto-share.1 gnunet-chat.1 gnunet-directory.1 \
 		gnunet-download.1 gnunet-insert.1 gnunet-peer-info.1 \
 		gnunet-pseudonym.1 gnunet-search.1 gnunet-setup.1 \
 		gnunet-stats.1 gnunet-tbench.1 gnunet-testbed.1 \
 		gnunet-tracekit.1 gnunet-transport-check.1 gnunet-unindex.1 \
 		gnunet-update.1 gnunet-vpn.1 gnunetd.1
 MAN5=		gnunet.conf.5 gnunetd.conf.5
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 DBDIR=		/var/db/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_MYSQL)
 CONFIGURE_ARGS+=	--without-mysql
 PLIST_SUB+=		MYSQL="@comment "
 .else
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 PLIST_SUB+=		MYSQL=""
 .endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
 PLIST_SUB+=		PGSQL=""
 .else
 
 CONFIGURE_ARGS+=	--without-postgres
 PLIST_SUB+=		PGSQL="@comment "
 .endif
 
 .if defined(WITH_SQLITE)
 USE_SQLITE=		yes
 CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 PLIST_SUB+=		SQLITE=""
 .else
 CONFIGURE_ARGS+=	--without-sqlite
 PLIST_SUB+=		SQLITE="@comment "
 .endif
 
 post-patch:
 .for i in configure src/applications/sqstore_postgres/postgres.c
 	@${REINPLACE_CMD} -e 's|postgresql/||g' ${WRKSRC}/${i}
 .endfor
 .for i in src/util/crypto/Makefile.in
 	@${REINPLACE_CMD} -e 's|)[[:space:]]-O3|)|g' ${WRKSRC}/${i}
 .endfor
 
 post-install:
 	@${MKDIR} ${DBDIR}
 .for i in gnunet.conf gnunetd.conf
 	${INSTALL_DATA}	${WRKSRC}/contrib/${i} ${PREFIX}/etc/${i}-dist
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in AUTHORS ChangeLog HACKING README UPDATING
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/*.cgi ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/*.php ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/*.sh ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/net-p2p/gnunet/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.92
\ No newline at end of property
+1.93
\ No newline at end of property