Index: head/math/superlu/Makefile
===================================================================
--- head/math/superlu/Makefile	(revision 215426)
+++ head/math/superlu/Makefile	(revision 215427)
@@ -1,81 +1,79 @@
 # New ports collection makefile for:	SuperLU
 # Date created:		31 Oct 97
 # Whom:			Pedro Giffuni <giffunip@asme.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	superlu
 PORTREVISION=	1
 DISTVERSION=	${P_VERSION}.20060201
 CATEGORIES=	math
 MASTER_SITES=	http://crd.lbl.gov/~xiaoye/SuperLU/ \
 		http://crd.lbl.gov/~xiaoye/:doc
 DISTNAME=	${PORTNAME}_${P_VERSION}
 .ifndef NOPORTDOCS
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} superlu_ug.pdf SLU_general.ps.gz:doc simax95.ps.gz:doc
 .endif
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	A library of routines for performing sparse factorization
 
-.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
-WITH_ATLAS=	yes
+USE_BLAS?=	reference
+
+.if exists(${LOCALBASE}/lib/libgoto.so)
+USE_BLAS=	gotoblas
+.elif exists(${LOCALBASE}/lib/libatlas_r.so)
+USE_BLAS=	atlas
 .endif
-.if defined(WITH_ATLAS)
-LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
-BLAS=		-lf77blas -latlas
-LAPACK=		-lalapack
-.else
-LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
+
+. if ${USE_BLAS} == reference
 LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
-BLAS=		-lblas
-LAPACK=		-llapack
+BLAS_LIBS=		-lblas
+.elif ${USE_BLAS} == gotoblas
+LIB_DEPENDS+=	goto:${PORTSDIR}/math/gotoblas
+BLAS_LIBS=		-lgotop
+.elif ${USE_BLAS} == atlas
+LIB_DEPENDS+=	atlas:${PORTSDIR}/math/atlas
+BLAS_LIBS=		-lptf77blas -lptcblas -latlas_r
 .endif
 
 USE_FORTRAN=	yes
 
 P_VERSION=	3.0
 WRKSRC=		${WRKDIR}/SuperLU_${P_VERSION}
-ALL_TARGET=	superlulib
+ALL_TARGET=	lib
 
 ARCH2FIX=	SRC/Makefile TESTING/MATGEN/Makefile CBLAS/Makefile make.inc	\
 		MAKE_INC/make.alpha MAKE_INC/make.inc
 
-post-patch:
-	@${REINPLACE_CMD} -e 's+%%BLAS_LIBS%%+-L${LOCALBASE}/lib ${BLAS_LIBS}+' \
+pre-build:
+	@${REINPLACE_CMD} -e 's+%%BLAS_LIBS%%+-L${LOCALBASE}/lib ${BLAS_LIBS}+ ; \
+			s+%%CC%%+${CC}+; s+%%FC%%+${FC}+; \
+			s+%%CFLAGS%%+${CFLAGS}+; \
+			s+%%FFLAGS%%+${FFLAGS}+' \
 	${WRKSRC}/make.inc
-	@${REINPLACE_CMD} -e 's+%%CC%%+${CC}+' \
-	${WRKSRC}/make.inc
-	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+' \
-	${WRKSRC}/make.inc
-	@${REINPLACE_CMD} -e 's+%%CFLAGS%%+${CFLAGS}+' \
-	${WRKSRC}/make.inc
-	@${REINPLACE_CMD} -e 's+%%FFLAGS%%+${FFLAGS}+' \
-	${WRKSRC}/make.inc
 .for fmk in ${ARCH2FIX}
 	@${REINPLACE_CMD} -e 's|^ARCH *.= ar|ARCMD = ar| ; \
 		s|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC}/${fmk}
 .endfor
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libsuperlu_${P_VERSION}.a \
 		${PREFIX}/lib/libsuperlu.a
 	@${MKDIR} ${PREFIX}/include/superlu
 	${INSTALL_DATA} ${WRKSRC}/SRC/*.h ${PREFIX}/include/superlu
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/SLU_general.ps.gz ${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/simax95.ps.gz ${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/superlu_ug.pdf ${DOCSDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CFLAGS+=	-fPIC
-.endif
-
-.include <bsd.port.post.mk>
+regression-test: build
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} testing )
+	@(cd ${WRKSRC}/TESTING && ${CAT} *.out )
+	
+.include <bsd.port.mk>

Property changes on: head/math/superlu/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.37
\ No newline at end of property
+1.38
\ No newline at end of property
Index: head/math/superlu/files/patch-make.inc
===================================================================
--- head/math/superlu/files/patch-make.inc	(revision 215426)
+++ head/math/superlu/files/patch-make.inc	(revision 215427)
@@ -1,21 +1,30 @@
---- make.inc.orig	Sun Jan  1 18:52:00 2006
-+++ make.inc	Sat Feb  4 19:25:37 2006
+--- make.inc.orig	2006-01-01 18:52:00.000000000 -0500
++++ make.inc	2008-06-19 22:08:49.000000000 -0500
+@@ -19,7 +19,7 @@
+ #
+ TMGLIB       = libtmglib.a
+ SUPERLULIB   = libsuperlu_3.0.a
+-BLASLIB      = ../libblas.a
++BLASLIB      = %%BLAS_LIBS%%
+ 
+ #
+ #  The archiver and the flag(s) to use when building archive (library)
 @@ -29,12 +29,12 @@
  ARCHFLAGS    = cr
  RANLIB       = ranlib
  
 -CC           = cc
 -CFLAGS       = -xO3 -xcg92
 -FORTRAN	     = f77
 -FFLAGS       = -O
 -LOADER       = cc
 -LOADOPTS     = -xO3
 +CC           = %%CC%%
 +CFLAGS       = %%CFLAGS%%
 +FORTRAN	     = %%FC%%
 +FFLAGS       = %%FFLAGS%%
-+LOADER       = %%CC%%
++LOADER       = %%FC%%
 +LOADOPTS     = 
  
  #
  #  C preprocessor defs for compilation (-DNoChange, -DAdd_, or -DUpCase)

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