5 files changed, 36 insertions, 34 deletions

diff --git a/math/taucs/Makefile b/math/taucs/Makefile
index c230ac67a6dd..6b465dcd8cd4 100644
--- a/math/taucs/Makefile
+++ b/math/taucs/Makefile
@@ -12,10 +12,15 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C library of sparse linear solvers
 
+LICENSE=        TAUCS
+LICENSE_NAME=   TAUCS License
+LICENSE_FILE=   ${FILESDIR}/TAUCS-license.txt
+LICENSE_PERMS=  dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 LIB_DEPENDS=	libmetis.so:math/metis4
 
 HAS_CONFIGURE=	yes
-USES=		fortran tar:tgz
+USES=		blaslapack fortran tar:tgz
 USE_LDCONFIG=	yes
 NO_WRKSUBDIR=	yes
 
@@ -25,27 +30,10 @@ OPTIONS_DEFINE=	DOCS
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 LIBMETIS?=	-lmetis
-MAKE_ENV+=	LIBBLAS="${BLAS}" LIBLAPACK="${LAPACK}" LIBMETIS="${LIBMETIS}"
+MAKE_ENV+=	LIBBLAS="${BLASLIB}" LIBLAPACK="${LAPACKLIB}" LIBMETIS="${LIBMETIS}"
 
 BINS?=		direct iter taucs_run
-TESTS ?=	complex stack timer linsolve memory
-
-.if exists(${LOCALBASE}/lib/libatlas.so)
-WITH_BLAS?=	atlas
-.else
-WITH_BLAS?=	reference
-.endif
-
-.if ${WITH_BLAS} == atlas
-LIB_DEPENDS+=	libatlas.so:math/atlas
-BLAS=		-lf77blas
-LAPACK=		-lalapack -lcblas
-.elif ${WITH_BLAS} == reference
-LIB_DEPENDS+=	liblapack.so:math/lapack
-LIB_DEPENDS+=	libblas.so:math/blas
-BLAS=		-lblas
-LAPACK=		-llapack
-.endif
+TESTS?=		complex stack timer linsolve memory
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
@@ -59,9 +47,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's/SUCCEDD/SUCCEED/' \
 		${WRKSRC}/progs/test_linsolve.c
 
-do-configure:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} ./configure)
-
 post-configure:
 	@${CP} -r ${WRKSRC} ${WRKSRC}_SHARED
 
@@ -75,7 +60,7 @@ archives: configure
 lib: archives
 	@${PRINTF} "\n\n%s\n\n\n" "Building shared library:"
 	(cd ${WRKSRC}_SHARED/lib/FreeBSD && \
-		${FC} ${FFLAGS} ${PICFLAG} ${LDFLAGS} -shared \
+		${FC} ${CFLAGS} ${PICFLAG} ${LDFLAGS} -shared \
 		-o libtaucs.so.1 -Wl,-x -Wl,-soname,libtaucs.so.1 \
 		-Wl,--whole-archive libtaucs.a -Wl,--no-whole-archive)
 	${STRIP_CMD} ${WRKSRC}_SHARED/lib/FreeBSD/libtaucs.so.1
@@ -114,7 +99,7 @@ check test: build
 	${LDFLAGS} -o bin/FreeBSD/test_${t} \
 	`${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} -V STDDEFS` \
 	`${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} -V STDINCS` \
-	progs/test_${t}.c -ltaucs ${LAPACK} ${BLAS} ${LIBMETIS}
+	progs/test_${t}.c -ltaucs ${LAPACKLIB} ${BLASLIB} ${LIBMETIS}
 	@${PRINTF} "\n%s\n\n\n" "Running test_${t}:"
 	-@cd ${WRKSRC}_SHARED ; \
 	${SETENV} LD_LIBRARY_PATH="lib/FreeBSD:/lib:/usr/lib:${LOCALBASE}/lib" \
diff --git a/math/taucs/files/TAUCS-license.txt b/math/taucs/files/TAUCS-license.txt
new file mode 100644
index 000000000000..ec1f23f8a668
--- /dev/null
+++ b/math/taucs/files/TAUCS-license.txt
@@ -0,0 +1,17 @@
+Copyright and License
+
+TAUCS Version 2.0, November 29, 2001. Copyright (c) 2001, 2002, 2003 by Sivan Toledo, Tel-Aviv Univesity, stoledo@tau.ac.il. All Rights Reserved.
+
+TAUCS License:
+
+Your use or distribution of TAUCS or any derivative code implies that you agree to this License.
+
+THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
+
+Permission is hereby granted to use or copy this program, provided that the Copyright, this License, and the Availability of the original version is retained on all copies. User documentation of any code that uses this code or any derivative code must cite the Copyright, this License, the Availability note, and "Used by permission." If this code or any derivative code is accessible from within MATLAB, then typing "help taucs" must cite the Copyright, and "type taucs" must also cite this License and the Availability note. Permission to modify the code and to distribute modified code is granted, provided the Copyright, this License, and the Availability note are retained, and a notice that the code was modified is included. This software is provided to you free of charge.
+
+Availability
+
+As of version 2.1, we distribute the code in 4 formats: zip and tarred-gzipped (tgz), with or without binaries for external libraries. The bundled external libraries should allow you to build the test programs on Linux, Windows, and MacOS X without installing additional software. We recommend that you download the full distributions, and then perhaps replace the bundled libraries by higher performance ones (e.g., with a BLAS library that is specifically optimized for your machine). If you want to conserve bandwidth and you want to install the required libraries yourself, download the lean distributions. The zip and tgz files are identical, except that on Linux, Unix, and MacOS, unpacking the tgz file ensures that the configure script is marked as executable (unpack with tar zxvpf), otherwise you will have to change its permissions manually.
+
+http://www.tau.ac.il/~stoledo/taucs/
diff --git a/math/taucs/files/patch-config+FreeBSD.mk b/math/taucs/files/patch-config+FreeBSD.mk
index cc925a60ce4d..eee96b4b77c2 100644
--- a/math/taucs/files/patch-config+FreeBSD.mk
+++ b/math/taucs/files/patch-config+FreeBSD.mk
@@ -1,6 +1,6 @@
---- config/FreeBSD.mk.orig	2003-08-28 11:13:38.000000000 -0400
-+++ config/FreeBSD.mk	2012-07-10 07:43:24.000000000 -0400
-@@ -9,30 +9,24 @@
+--- config/FreeBSD.mk.orig	2003-08-28 15:13:38 UTC
++++ config/FreeBSD.mk
+@@ -9,30 +9,24 @@ PATHSEP=/
  DEFFLG=-D
  
  FC        ?= f77
diff --git a/math/taucs/files/patch-configure b/math/taucs/files/patch-configure
index 9a63a4723c96..4a9ae2f495c8 100644
--- a/math/taucs/files/patch-configure
+++ b/math/taucs/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Aug 24 10:11:33 2003
-+++ configure	Sat Feb 26 22:24:56 2005
-@@ -29,7 +29,7 @@
+--- configure.orig	2003-08-24 10:11:33 UTC
++++ configure
+@@ -29,7 +29,7 @@ fi
  # Solaris, OSTYPE=solaris but uname returns SunOS.
  
  if [ ${OSTYPE:-fail} = "fail" ] ; then
diff --git a/math/taucs/files/patch-src__taucs_timer.c b/math/taucs/files/patch-src__taucs_timer.c
index 468b8e3f03a2..f92aa7752ea0 100644
--- a/math/taucs/files/patch-src__taucs_timer.c
+++ b/math/taucs/files/patch-src__taucs_timer.c
@@ -1,6 +1,6 @@
---- src/taucs_timer.c.orig	2003-09-01 06:28:54.000000000 -0400
-+++ src/taucs_timer.c	2012-07-10 07:24:08.000000000 -0400
-@@ -245,36 +245,35 @@
+--- src/taucs_timer.c.orig	2003-09-01 10:28:54 UTC
++++ src/taucs_timer.c
+@@ -245,36 +245,35 @@ double timer()
  #include <sys/time.h>
  #include <sys/resource.h>
  #include <sys/types.h>