Index: head/math/umfpack/Makefile
===================================================================
--- head/math/umfpack/Makefile	(revision 182261)
+++ head/math/umfpack/Makefile	(revision 182262)
@@ -1,80 +1,90 @@
 # New ports collection makefile for:	UMFPACK
 # Date created:		5 Nov 97
 # Whom:			Pedro Giffuni <giffunip@asme.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	umfpack
 PORTVERSION=	4.4
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.cise.ufl.edu/research/sparse/umfpack/v${PORTVERSION}/
 DISTNAME=	UMFPACKv${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unsymmetric-pattern MultiFrontal Package
 
-.ifdef WITH_ATLAS
-LIB_DEPENDS=	atlas.1:${PORTSDIR}/math/atlas
+.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=		-lf77blas -latlas
 .else
-LIB_DEPENDS=	blas.1:${PORTSDIR}/math/blas
+LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
+BLAS=		-lblas
 .endif
 
+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`/../../..
+
 CONFLICTS=	elmer-umfpack-4*
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/UMFPACK
 ALL_TARGET=	lib
 
-.ifdef WITH_ATLAS
-BLAS_LIBS=	-lf77blas -latlas
-.else
-BLAS_LIBS?=	-lblas
-.endif
-
 post-extract:
 	${CP}	${WRKDIR}/${DISTNAME}/AMD/Make/Make.linux	\
 		${WRKDIR}/${DISTNAME}/AMD/Make/Make.freebsd
 
 pre-build:
+	@${DIRNAME} `${FC} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 	@${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g ;	\
 	s+%%CFLAGS%%+${CFLAGS}+ ;		\
 	s+%%LOCALBASE%%+${LOCALBASE}+ ;		\
-	s+%%BLAS_LIBS%%+${BLAS_LIBS}+ ;'	\
+	s+%%GCCLIBDIR%%+${GCCLIBDIR}+ ;         \
+	s+%%FORTRANLIBS%%+${FORTRANLIBS}+ ;         \
+	s+%%BLAS%%+${BLAS}+ ;'	\
 	 ${WRKDIR}/${DISTNAME}/AMD/Make/Make.freebsd
 
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/AMD/Lib/libamd.a ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/Lib/libumfpack.a ${PREFIX}/lib
 .for mod in AMD UMFPACK
 	@${MKDIR} ${PREFIX}/include/${mod}
 	@for inc in `${LS} ${WRKSRC}/../${mod}/Include` ; do \
 		${INSTALL_DATA} ${WRKSRC}/../${mod}/Include/$$inc ${PREFIX}/include/${mod}; \
 	done
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/AMD/Doc/*.pdf ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
 	${GZIP_CMD} ${DOCSDIR}/README.txt
 	${INSTALL_DATA} ${WRKSRC}/Doc/*.pdf  ${DOCSDIR}
 	@${FIND} ${DOCSDIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
 	@${FIND} ${DOCSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 	@${MKDIR} ${EXAMPLESDIR}
 	@${TAR} --exclude tmp -C ${WRKSRC}/Demo -cf - . | \
 		${TAR} -C ${EXAMPLESDIR} -xf -
 	@${FIND} ${EXAMPLESDIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
 	@${FIND} ${EXAMPLESDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 .endif
 
 .if defined(MAINTAINER_MODE)
 regression-test:	build
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} hb )
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 CFLAGS+=	-fPIC
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/math/umfpack/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.22
\ No newline at end of property
+1.23
\ No newline at end of property
Index: head/math/umfpack/files/patch-Make+Make.freebsd
===================================================================
--- head/math/umfpack/files/patch-Make+Make.freebsd	(revision 182261)
+++ head/math/umfpack/files/patch-Make+Make.freebsd	(revision 182262)
@@ -1,36 +1,36 @@
 --- Make/Make.freebsd.orig	Sun May 28 22:27:24 2006
 +++ Make/Make.freebsd	Sun May 28 22:35:56 2006
 @@ -6,8 +6,8 @@
  # if you use the Intel compiler and the Fortran BLAS.
  
  # Using GNU gcc and f77 compilers:
 -  CC = gcc
 -  CFLAGS = -O3 -fPIC
 +  CC = %%CC%%
 +  CFLAGS = %%CFLAGS%%
  
  # Using Intel's icc and ifc compilers:
  # F77 = ifc
 @@ -36,16 +36,16 @@
  # LIB = -lm
  
  # 2: with the ATLAS C-BLAS (http://www.netlib.org/atlas).
 -# CONFIG = -DCBLAS -I../ATLAS/include
 -# LIB = -lcblas -latlas -lm
 +# CONFIG = -DGETRUSAGE -DCBLAS -I../ATLAS/include -I%%LOCALBASE%%/include
 +# LIB = %%CBLAS_LIBS%% -lm
  
  # 3: with Fortran interface to the ATLAS BLAS
 -# CONFIG =
 -# LIB = -lf77blas -latlas -lfrtbegin -lg2c -lm
 +CONFIG =  -DGETRUSAGE
-+LIB = -L%%LOCALBASE%%/lib %%BLAS_LIBS%% -lg2c -lm
++LIB = -L%%LOCALBASE%%/lib %%BLAS%% %%GCCLIBDIR%% %%FORTRANLIBS%% -lm
  
  # 4: with Fortran interface to the BLAS, and Goto's BLAS
 -  CONFIG =
 -  LIB = -lgoto -lxerbla -lfrtbegin -lg2c -lm
 +#  CONFIG =
 +#  LIB = -lgoto -lxerbla -lfrtbegin -lg2c -lm
  
  # 5: with Fortran interface to the BLAS, and Goto's BLAS, and no divide-by-zero
  # CONFIG = -DNO_DIVIDE_BY_ZERO

Property changes on: head/math/umfpack/files/patch-Make+Make.freebsd
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property