Index: head/math/mumps/Makefile
===================================================================
--- head/math/mumps/Makefile	(revision 182257)
+++ head/math/mumps/Makefile	(revision 182258)
@@ -1,149 +1,154 @@
 # New ports collection makefile for:	MUMPS
 # Date created:		5 Mar 2006
 # Whom:			Pedro Giffuni
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mumps
 PORTVERSION=	4.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://www.enseeiht.fr/apo/MUMPS/	\
 		http://www.enseeiht.fr/irit/apo/MUMPS/	\
 		http://graal.ens-lyon.fr/MUMPS/
 DISTNAME=	MUMPS_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MUltifrontal Massively Parallel sparse direct Solver
 
 #-----------------------------------------------------------------------
 
 # WARNING: Non-serviceable parts inside, can break other ports
 # You may define these options/knobs:
 #
 # FFLAGS: Fortran compiler flags for gfortran
 # WITH_OPTIMIZED_FLAGS:Try to use agressive (non-CPU) FFLAGS
 # BLAS_LIBS: specify other version of BLAS
 # WITH_ATLAS: Use ATLAS instead of the regular BLAS
 # WITH_METIS: Add METIS ordering
 # WITH_MPI: Use mpich for the parallel version
 #-----------------------------------------------------------------------
 
 WANT_FORTRAN=yes #dummy but future use
 BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42
 FC=	gfortran42
 F77=	gfortran42
+FORTRANLIBS=	-lgfortranbegin -lgfortran
+GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
 
 .if defined(WITH_OPTIMIZED_FLAGS)
 FFLAGS+=	-O3 -ffast-math
 .endif
 
 .if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
 WITH_ATLAS=     yes
 .endif
 .if defined(WITH_ATLAS)
 LIB_DEPENDS+=   atlas.2:${PORTSDIR}/math/atlas
-BLAS_LIBS=	-lptf77blas -latlas_r
+BLAS_LIBS=	-lf77blas -latlas
 .else
 LIB_DEPENDS+=   blas.2:${PORTSDIR}/math/blas
 BLAS_LIBS=	-lblas
 .endif
 
 .ifdef WITH_METIS
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libmetis.a:${PORTSDIR}/math/metis
 MAKE_ENV+=	ORDERINGSF=-Dmetis
 .endif
 
 PLIST_SUB+=	MUMPSVERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/mpich2/bin/mpicc) && !defined(WITHOUT_MPI)
 WITH_MPI=	yes
 .endif
 .ifdef WITH_MPI
 PKGNAMESUFFIX+=		-mpich
 BUILD_DEPENDS+=	${LOCALBASE}/mpich2/include/mpif.h:${PORTSDIR}/net/mpich2 \
 		${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs \
 		${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack
 # Note: -l?mumps still requires to be linked with -lblacs + -lscalapack
 RUN_DEPENDS+=	${LOCALBASE}/mpich2/bin/mpirun:${PORTSDIR}/net/mpich2 \
 		${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs \
 		${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack
 CONFLICTS=	mumps-4*
 .else
 CONFLICTS=	mumps-mpich-4*
 .endif
 
 .ifndef WITH_MPI
 PLIST_SUB+=	WITH_LIBSEQ=""
 .else
 PLIST_SUB+=	WITH_LIBSEQ="@comment "
 .endif
 
 post-patch:
 .ifdef WITH_MPI
 	@${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.inc.generic \
 		${WRKSRC}/Makefile.inc
 .else
 	@${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.inc.generic.SEQ \
 		${WRKSRC}/Makefile.inc
 .endif
 
 pre-build:
+	@${DIRNAME} `${FC} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 	@${REINPLACE_CMD} -e 's+@CC@+${CC}+g ; s+@FC@+${FC}+g ; \
 	s+@CFLAGS@+${CFLAGS}+g; \
 	s+@FCFLAGS@+${FCFLAGS}+g; \
+	s+@GCCLIBDIR@+${GCCLIBDIR}+g; \
+	s+@FORTRANLIBS@+${FORTRANLIBS}+g; \
 	s+@PTHREAD_LIBS@+${PTHREAD_LIBS}+g; \
 	s+@BLAS_LIBS@+${BLAS_LIBS}+ ; \
 	s+@LOCALBASE@+${LOCALBASE}+g;' \
 		${WRKSRC}/Makefile.inc
 .ifdef WITH_METIS
 	@${REINPLACE_CMD} -e 's+#LMETIS+LMETIS+' ${WRKSRC}/Makefile.inc
 .endif
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/lib/lib*.a ${PREFIX}/lib
 .ifndef WITH_MPI
 	${INSTALL_DATA} ${WRKSRC}/libseq/libmpiseq.a ${PREFIX}/lib
 .endif
 .ifndef NOPORTDOCS
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/userguide_${PORTVERSION}.pdf ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/userguide_${PORTVERSION}.ps ${DOCSDIR}
 	${GZIP_CMD} ${DOCSDIR}/userguide_${PORTVERSION}.ps
 .endif
 
 .if defined(MAINTAINER_MODE)
 regression-test:
 . if defined (WITH_MPI)
 .  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}/mpich2/bin/mpd &
 	(cd ${WRKSRC}/test &&	\
 	${LOCALBASE}/mpich2/bin/mpirun -np 2 ./ssimpletest < input_simpletest_real ;	\
 	${LOCALBASE}/mpich2/bin/mpirun -np 2 ./dsimpletest < input_simpletest_real ;	\
 	${LOCALBASE}/mpich2/bin/mpirun -np 2 ./csimpletest < input_simpletest_cmplx ;	\
 	${LOCALBASE}/mpich2/bin/mpirun -np 2 ./zsimpletest < input_simpletest_cmplx ;	\
 	${ECHO_MSG} "The solution should be (1,2,3,4,5)" ;	\
 	${LOCALBASE}/mpich2/bin/mpirun -np 3 ./c_example ;	\
 	${ECHO_MSG} "The solution should be (1,2)")
 	${LOCALBASE}/mpich2/bin/mpdallexit
 . else
 	(cd ${WRKSRC}/test &&	\
 	./ssimpletest < input_simpletest_real ;			\
 	./dsimpletest < input_simpletest_real ;			\
 	./csimpletest < input_simpletest_cmplx ;		\
 	./zsimpletest < input_simpletest_cmplx ;		\
 	${ECHO_MSG} "The solution should be (1,2,3,4,5)" ;	\
 	./c_example ;						\
 	${ECHO_MSG} "The solution should be (1,2)")
 . endif
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/math/mumps/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/math/mumps/files/patch-Make.inc+Makefile.inc.generic
===================================================================
--- head/math/mumps/files/patch-Make.inc+Makefile.inc.generic	(revision 182257)
+++ head/math/mumps/files/patch-Make.inc+Makefile.inc.generic	(revision 182258)
@@ -1,86 +1,86 @@
 --- Make.inc/Makefile.inc.generic.orig	Fri Apr 14 08:00:50 2006
 +++ Make.inc/Makefile.inc.generic	Fri May 26 10:28:02 2006
 @@ -39,20 +39,20 @@
  #          Metis is now available as an internal ordering for MUMPS.
  
  
 -#LSCOTCHDIR = $(HOME)/JY/emilio/bin/generic
 +#LSCOTCHDIR = @LOCALBASE@/lib
  #LSCOTCH   = -L$(LSCOTCHDIR) -lesmumps  -lfax -lorder -lscotch -lsymbol -ldof -lgraph -lcommon -lm
  
  LPORDDIR = ../PORD/lib/
  IPORD    = -I../PORD/include/
  LPORD    = -L$(LPORDDIR) -lpord
  
 -#LMETISDIR = Directory containing Metis library
 +LMETISDIR = @LOCALBASE@/lib
  #IMETIS    = # Metis doesn't need include files (Fortran interface avail.)
  #LMETIS    = -L$(LMETISDIR) -lmetis
  
  # Corresponding variables reused later
  #ORDERINGS = -Dmetis -Dpord
 -ORDERINGSF  = -Dpord
 +ORDERINGSF  += -Dpord
  ORDERINGSC  = $(ORDERINGSF)
  LORDERINGS = $(LMETIS) $(LPORD) $(LSCOTCH)
  IORDERINGS = $(IMETIS) $(IPORD) $(ISCOTCH)
 @@ -66,11 +66,11 @@
  # RM : remove files
  RM      = /bin/rm -f
  # CC : C compiler
 -CC      = cc
 +CC      = @CC@
  # FC : Fortran 90 compiler
 -FC      = f90
 +FC      = @FC@
  # FL : Fortran linker
 -FL      = f90
 +FL      = @FC@
  # AR : Archive object in a library
  AR      = ar vr
  # RANLIB : generate index of an archive file
 @@ -79,13 +79,13 @@
  #RANLIB  = echo
  
  # SCALAP should define the SCALAPACK and  BLACS libraries.
 -SCALAP  = -lscalapack -lblacs
 +SCALAP  = -L@LOCALBASE@/lib -lscalapack -lblacs -lblacsc -lblacsf77 -lblacs
  
  # INCLUDE DIRECTORY FOR MPI
 -INCPAR  = -I/usr/include
 +INCPAR  = -I@LOCALBASE@/mpich2/include
  
  # LIBRARIES USED BY THE PARALLEL VERSION OF MUMPS: $(SCALAP) and MPI
 -LIBPAR  = $(SCALAP) -L/usr/lib -lmpi
 +LIBPAR  = $(SCALAP) -L@LOCALBASE@/mpich2/lib -lfmpich -lmpich
  
  # The parallel version is not concerned by the next two lines.
  # They are related to the sequential library provided by MUMPS,
 @@ -95,10 +95,10 @@
  
  # DEFINE HERE YOUR BLAS LIBRARY
  
 -LIBBLAS = -lblas
 +LIBBLAS = -L@LOCALBASE@/lib @BLAS_LIBS@
  
  # DEFINE YOUR PTHREAD LIBRARY
 -LIBOTHERS = -lpthread
-+LIBOTHERS = @PTHREAD_LIBS@ -lg2c
++LIBOTHERS = @PTHREAD_LIBS@ @GCCLIBDIR@ @FORTRANLIBS@
  
  # FORTRAN/C COMPATIBILITY:
  #  Use:
 @@ -111,11 +111,11 @@
  #     leave empty if your Fortran compiler does not change the symbols.
  #
  
 -CDEFS = -DAdd_
 +CDEFS ?= -DAdd_
  
  #COMPILER OPTIONS
 -OPTF    = -O
 -OPTC    = -O -I.
 +OPTF    = @FCFLAGS@
 +OPTC    = @CFLAGS@
  OPTL    = -O
  
  # CHOOSE BETWEEN USING THE SEQUENTIAL OR THE PARALLEL VERSION.

Property changes on: head/math/mumps/files/patch-Make.inc+Makefile.inc.generic
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property