Date: Sat, 19 Mar 2005 04:21:21 GMT From: "Pedro F. Giffuni" <giffunip@asme.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/79004: Update math/umfpack to version 4.4 Message-ID: <200503190421.j2J4LLYs068586@www.freebsd.org> Resent-Message-ID: <200503190430.j2J4U5ir073736@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 79004
>Category: ports
>Synopsis: Update math/umfpack to version 4.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 19 04:30:04 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Pedro F. Giffuni
>Release: 5.3R
>Organization:
>Environment:
FreeBSD giffuni.etb.net.co 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov 5 04:19:18 UTC 2004 root@harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Unimodal Frontal Pack, new version fixes some bugs and adds a new feature. I also changed the build procedure slightly: we will be using a copy of the linux configuration instead of including it in the port.
>How-To-Repeat:
>Fix:
patch follows:
diff -ruN umfpack.orig/Makefile umfpack/Makefile
--- umfpack.orig/Makefile Tue Jan 11 20:37:21 2005
+++ umfpack/Makefile Fri Mar 18 23:11:15 2005
@@ -6,7 +6,7 @@
#
PORTNAME= umfpack
-PORTVERSION= 4.3
+PORTVERSION= 4.4
CATEGORIES= math
MASTER_SITES= http://www.cise.ufl.edu/research/sparse/umfpack/v${PORTVERSION}/
DISTNAME= UMFPACKv${PORTVERSION}
@@ -20,7 +20,8 @@
ALL_TARGET= lib
post-extract:
- ${CP} ${FILESDIR}/Make.freebsd ${WRKDIR}/${DISTNAME}/AMD/Make
+ ${CP} ${WRKDIR}/${DISTNAME}/AMD/Make/Make.linux \
+ ${WRKDIR}/${DISTNAME}/AMD/Make/Make.freebsd
do-install:
${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/AMD/Lib/libamd.a ${PREFIX}/lib
@@ -34,8 +35,8 @@
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/AMD/Doc/*.pdf ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
- ${GZIP_CMD} ${DOCSDIR}/README
+ ${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}
diff -ruN umfpack.orig/distinfo umfpack/distinfo
--- umfpack.orig/distinfo Tue Jan 11 20:37:21 2005
+++ umfpack/distinfo Fri Mar 18 11:05:43 2005
@@ -1,2 +1,2 @@
-MD5 (UMFPACKv4.3.tar.gz) = f9d753fbd1922ec7f3d04157970182ab
-SIZE (UMFPACKv4.3.tar.gz) = 1195462
+MD5 (UMFPACKv4.4.tar.gz) = 6f4de37ec711c406a50f5d6760ea9f06
+SIZE (UMFPACKv4.4.tar.gz) = 1226870
diff -ruN umfpack.orig/files/Make.freebsd umfpack/files/Make.freebsd
--- umfpack.orig/files/Make.freebsd Tue Jan 11 20:37:21 2005
+++ umfpack/files/Make.freebsd Thu Jan 1 00:00:00 1970
@@ -1,45 +0,0 @@
-#-------------------------------------------------------------------------------
-# FreeBSD configuration (for both AMD and UMFPACK)
-#-------------------------------------------------------------------------------
-
-# Using GNU gcc and f77 compilers:
-CC ?= gcc
-CFLAGS ?= -O3 -fPIC
-
-# Using Intel's icc and ifc compilers:
-# F77 = ifc
-# CC = icc
-# CFLAGS = -ansi -O3 -ip -tpp7 -xW -vec_report0
-# CFLAGS = -pg -g
-
-# Using gcc compiler with picky tests
-# CC = gcc
-# CFLAGS = -ansi -pedantic -W -Wall -Wno-parentheses -Wshadow -Wcast-align -Winline -Wstrict-prototypes -Wno-unknown-pragmas -O3 -fPIC
-
-# for gcc and gcov:
-# CC = gcc
-# CFLAGS = -pg -ftest-coverage -fprofile-arcs
-
-# Running splint
-# CC = - splint
-# CFLAGS = -weak -fixedformalarray -badflag -fileextensions +relaxtypes +posixlib -unrecog
-
-#-------------------------------------------------------------------------------
-# BLAS options (for UMFPACK only)
-#-------------------------------------------------------------------------------
-
-# 1: with no BLAS (this will be slow)
-# CONFIG = -DNBLAS
-# LIB = -lm
-
-# 2: with the ATLAS C-BLAS (http://www.netlib.org/atlas).
-CONFIG = -DCBLAS -I../ATLAS/include -I${LOCALBASE}/include
-LIB = -L${LOCALBASE}/lib -lcblas -latlas -lm
-
-# 3: with Fortran interface to the ATLAS BLAS
-# CONFIG = -I${LOCALBASE}/include
-# LIB = -L${LOCALBASE}/lib -lf77blas -latlas -lg2c -lm
-
-# 4: with Fortran interface to the BLAS, and Goto's BLAS (untested)
-# CONFIG =
-# LIB = -lgoto -lxerbla -lfrtbegin -lg2c -lm -lunwind -lcprts
diff -ruN umfpack.orig/files/patch-Make+Make.freebsd umfpack/files/patch-Make+Make.freebsd
--- umfpack.orig/files/patch-Make+Make.freebsd Thu Jan 1 00:00:00 1970
+++ umfpack/files/patch-Make+Make.freebsd Fri Mar 18 22:30:53 2005
@@ -0,0 +1,36 @@
+--- Make/Make.freebsd.orig Fri Mar 18 22:29:13 2005
++++ Make/Make.freebsd Fri Mar 18 22:30:13 2005
+@@ -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 ?= -O3 -fPIC
+
+ # 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 = -DCBLAS -I../ATLAS/include -I${LOCALBASE}/include
++LIB = -L${LOCALBASE}/lib -lcblas -latlas -lm
+
+ # 3: with Fortran interface to the ATLAS BLAS
+-# CONFIG =
+-# LIB = -lf77blas -latlas -lfrtbegin -lg2c -lm
++# CONFIG = -I${LOCALBASE}/include
++# LIB = -L${LOCALBASE}/lib -lf77blas -latlas -lfrtbegin -lg2c -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
diff -ruN umfpack.orig/pkg-plist umfpack/pkg-plist
--- umfpack.orig/pkg-plist Tue Jan 11 20:37:21 2005
+++ umfpack/pkg-plist Fri Mar 18 23:09:26 2005
@@ -4,6 +4,7 @@
include/UMFPACK/umfpack_defaults.h
include/UMFPACK/umfpack_free_numeric.h
include/UMFPACK/umfpack_free_symbolic.h
+include/UMFPACK/umfpack_get_determinant.h
include/UMFPACK/umfpack_get_lunz.h
include/UMFPACK/umfpack_get_numeric.h
include/UMFPACK/umfpack_get_symbolic.h
@@ -34,7 +35,7 @@
lib/libumfpack.a
%%PORTDOCS%%%%DOCSDIR%%/AMD_UserGuide.pdf
%%PORTDOCS%%%%DOCSDIR%%/QuickStart.pdf
-%%PORTDOCS%%%%DOCSDIR%%/README.gz
+%%PORTDOCS%%%%DOCSDIR%%/README.txt.gz
%%PORTDOCS%%%%DOCSDIR%%/UserGuide.pdf
%%PORTDOCS%%%%EXAMPLESDIR%%/HB/arc130.rua
%%PORTDOCS%%%%EXAMPLESDIR%%/HB/can_24.psa
@@ -50,6 +51,7 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/readhb.f
%%PORTDOCS%%%%EXAMPLESDIR%%/readhb_nozeros.f
%%PORTDOCS%%%%EXAMPLESDIR%%/readhb_size.f
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple_compile
%%PORTDOCS%%%%EXAMPLESDIR%%/symbolic.umf
%%PORTDOCS%%%%EXAMPLESDIR%%/umf4.c
%%PORTDOCS%%%%EXAMPLESDIR%%/umf4.out
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503190421.j2J4LLYs068586>