Upgrade to 2.7-1.

svn path=/head/; revision=162489

math/freefem++/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	freefem++
-PORTVERSION=	2.7
-PORTREVISION=	2
+DISTVERSION=	2.7-1
 CATEGORIES=	math science
 MASTER_SITES=	http://www.freefem.org/ff++/ftp/
 
@@ -42,7 +41,7 @@ CONFIGURE_ARGS=		--disable-download					\
 			--with-umfpack="-lumfpack"				\
 			--with-arpack="${LIBARPACK}"
 CONFIGURE_ENV=		CPPFLAGS="${MPICFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"	\
-			LDFLAGS="${MPILDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+			LDFLAGS="${MPILDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 
 LIBBLAS=	-lf2c -lf77blas -latlas -lgslcblas
 LIBARPACK=	-larpack -lalapack ${LIBBLAS}
@@ -70,6 +69,7 @@ RUN_DEPENDS+=	${LOCALBASE}/mpich/bin/mpiCC:${PORTSDIR}/net/mpich
 MPICFLAGS=	-I${LOCALBASE}/mpich/include
 MPILDFLAGS=	-L${LOCALBASE}/mpich/lib
 CONFIGURE_ENV+=	PATH="$$PATH:${LOCALBASE}/mpich/bin"
+CONFIGURE_ARGS+=	--with-mpi=yes
 PLIST_SUB+=	MPI=""
 .else
 PLIST_SUB+=	MPI="@comment "
@@ -77,7 +77,7 @@ PLIST_SUB+=	MPI="@comment "
 
 pre-configure:
 	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g"		\
-		-e "s|mpiCC.|${LOCALBASE}/mpich/bin/mpiCC|"		\
+		-e "s|=mpiCC|=${LOCALBASE}/mpich/bin/mpiCC|"		\
 		-e "s|/usr/X11R6|${X11BASE}|g"				\
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e "s|mpiCC|${LOCALBASE}/mpich/bin/mpiCC|"	\

math/freefem++/distinfo

@@ -1,3 +1,3 @@
-MD5 (freefem++-2.7.tar.gz) = 56a32247ae73165b3fd8be5fd3754bc5
-SHA256 (freefem++-2.7.tar.gz) = 3b6f257f856d7471b2957149bbc02ce4ab033467ea4a44ec0186e0408fe0f060
-SIZE (freefem++-2.7.tar.gz) = 10596982
+MD5 (freefem++-2.7-1.tar.gz) = 0ee89b009e8c53c24f2c044b0f77cbd5
+SHA256 (freefem++-2.7-1.tar.gz) = 9af01881489bb0eaaa7e59f45171df3c643a62490ce8aba50429d57f3672efc7
+SIZE (freefem++-2.7-1.tar.gz) = 10569329

math/freefem++/files/patch-src_Makefile.in

@@ -1,13 +1,13 @@
---- src/Makefile.in.orig	Tue Apr 11 23:08:53 2006
-+++ src/Makefile.in	Tue Apr 11 23:58:23 2006
-@@ -208,8 +208,9 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- src/Makefile.in.orig	Mon May 15 19:03:38 2006
++++ src/Makefile.in	Mon May 15 21:13:28 2006
+@@ -150,8 +150,9 @@
+ ff_wget = @ff_wget@
+ install_sh = @install_sh@
+ 
 +# FreeBSD patch: don't install bamg, which is available as math/bamg
  SUBDIRS = bamglib femlib iml Graphics Algo umfpack lglib fflib std x11	\
 -nw mpi agl glx ide bamg bin-win32 
-+nw mpi agl glx ide bin-win32
++nw mpi agl glx ide bin-win32 
  
  EXTRA_DIST = FreeFem++-CoCoa Carbon.r
- all: all-recursive
+ subdir = src