The name of this port has been changed from UFsparse to SuiteSparse

and will be renamed soon.
Update to SuiteSparse version 2.1.1.
This commit is contained in:
Maho Nakata 2006-09-17 13:42:45 +00:00
parent 41a8cea837
commit a996c3134b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=173243
18 changed files with 154 additions and 108 deletions

View file

@ -6,11 +6,11 @@
#
PORTNAME= ufsparse
PORTVERSION= 2.0.0.b
PORTVERSION= 2.1.1
CATEGORIES= math
MASTER_SITES= http://www.cise.ufl.edu/research/sparse/UFsparse/v2.0.0beta/
DISTNAME= UFsparse
DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}
MASTER_SITES= http://www.cise.ufl.edu/research/sparse/SuiteSparse/current/
DISTNAME= SuiteSparse
DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}
MAINTAINER= maho@FreeBSD.org
COMMENT= UFspace is a set of packages for sparse matrices calculation
@ -29,8 +29,8 @@ LAPACK= -L${LOCALBASE}/lib -lalapack -lcblas
CONFLICTS= umfpack-*
ALL_TARGET= default
USE_GMAKE= yes
ALL_TARGET=
post-patch:
@${REINPLACE_CMD} -e 's,%%CC%%,${CC},g' \
@ -39,6 +39,7 @@ post-patch:
-e 's,%%FFLAGS%%,${FFLAGS},g' \
-e 's,%%BLAS%%,${BLAS},g' \
-e 's,%%LAPACK%%,${LAPACK},g' \
-e 's,%%LOCALBASE%%,${LOCALBASE},g' \
${WRKSRC}/UFconfig/UFconfig.mk
do-install:
${MKDIR} ${PREFIX}/include/ufsparse

View file

@ -1,3 +1,3 @@
MD5 (ufsparse/2.0.0.b/UFsparse.tar.gz) = 9267081abf635b581a8ae4ba4309a79d
SHA256 (ufsparse/2.0.0.b/UFsparse.tar.gz) = fdb59e8deb0a40bb5c311a0d9be406494ec6427eff7276c3fd3f650a96951341
SIZE (ufsparse/2.0.0.b/UFsparse.tar.gz) = 7765937
MD5 (ufsparse/2.1.1/SuiteSparse.tar.gz) = bc01ef2f26e6ad3eed83b4ad62e46a68
SHA256 (ufsparse/2.1.1/SuiteSparse.tar.gz) = 200f970f2dc596fffe5c9ff9fe6b9f11d3ce9d28a963df1e209942b3f4012ce1
SIZE (ufsparse/2.1.1/SuiteSparse.tar.gz) = 7839523

View file

@ -1,5 +1,5 @@
--- CHOLMOD/Lib/Makefile~ Tue May 2 09:12:16 2006
+++ CHOLMOD/Lib/Makefile Tue Jul 4 11:52:37 2006
--- CHOLMOD/Lib/Makefile~ Fri Aug 25 22:44:11 2006
+++ CHOLMOD/Lib/Makefile Sun Sep 17 21:18:07 2006
@@ -116,7 +116,7 @@
$(OBJ): $(INC)

View file

@ -1,11 +0,0 @@
--- KLU/Demo/Makefile~ Fri Apr 28 06:22:19 2006
+++ KLU/Demo/Makefile Tue Jul 4 11:58:10 2006
@@ -9,7 +9,7 @@
I = -I../Include -I../../AMD/Include -I../../COLAMD -I../../BTF/Include \
-I../User -I../../CHOLMOD/Include -I$(METIS_PATH) -I../../CCOLAMD \
- -I../../CAMD
+ -I../../CAMD -I../../UFconfig
LIBS = ../Lib/libklu.a ../../AMD/Lib/libamd.a ../../COLAMD/libcolamd.a \
../../BTF/Lib/libbtf.a ../User/libklu_cholmod.a \

View file

@ -1,11 +0,0 @@
--- KLU/Lib/Makefile~ Wed Mar 22 06:32:09 2006
+++ KLU/Lib/Makefile Tue Jul 4 11:36:37 2006
@@ -12,7 +12,7 @@
INC = ../Include/klu.h ../Include/klu_internal.h ../Include/klu_version.h
I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD -I../../BTF/Include \
- -I../Include
+ -I../Include -I../../UFconfig
all: library

View file

@ -1,11 +0,0 @@
--- KLU/User/Makefile~ Tue Jan 31 01:48:15 2006
+++ KLU/User/Makefile Tue Jul 4 11:56:34 2006
@@ -4,7 +4,7 @@
all: libklu_cholmod.a
-I = -I../../CHOLMOD/Include
+I = -I../../CHOLMOD/Include -I../../UFconfig
libklu_cholmod.a: library klu_cholmod.c klu_cholmod.h
$(CC) $(CFLAGS) $(I) -c klu_cholmod.c

View file

@ -0,0 +1,11 @@
--- Makefile~ Fri Jul 28 04:49:43 2006
+++ Makefile Sun Sep 17 22:33:10 2006
@@ -19,7 +19,7 @@
( cd CSparse ; $(MAKE) )
( cd CXSparse ; $(MAKE) )
# ( cd LPDASA ; $(MAKE) )
- ( cd metis-4.0 ; $(MAKE) )
+# ( cd metis-4.0 ; $(MAKE) )
# ( cd PARAKLETE ; $(MAKE) )
library: default

View file

@ -1,5 +1,5 @@
--- UFconfig/UFconfig.mk Tue May 2 22:34:57 2006
+++ UFconfig/UFconfig.mk Tue Jul 4 11:44:40 2006
--- UFconfig/UFconfig.mk.orig Tue Sep 12 03:23:15 2006
+++ UFconfig/UFconfig.mk Sun Sep 17 21:24:36 2006
@@ -31,8 +31,8 @@
# C compiler and compiler flags: These will normally not give you optimal
# performance. You should select the optimization parameters that are best
@ -22,25 +22,43 @@
F77LIB =
# C and Fortran libraries
@@ -76,8 +76,8 @@
@@ -77,8 +77,8 @@
# These settings will probably not work, since there is no fixed convention for
# naming the BLAS and LAPACK library (*.a or *.so) files.
-BLAS = -lblas -lg2c
# naming the BLAS and LAPACK library (*.a or *.so) files. Assume the Goto
# BLAS are available.
-BLAS = -lgoto -lgfortran
-LAPACK = -llapack
+BLAS = %%BLAS%%
+LAPACK = %%LAPACK%%
# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
# the BLAS. Also, the standard xerbla requires the Fortran I/O library, and
@@ -101,8 +101,8 @@
@@ -106,8 +106,8 @@
# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
# You may wish to use an absolute path. METIS is optional. Compile
# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
-METIS_PATH = ../../metis-4.0
-METIS = ../../metis-4.0/libmetis.a
+METIS_PATH = /usr/local/include/metis
+METIS = /usr/local/lib/libmetis.a
+METIS_PATH = %%LOCALBASE%%/include/metis
+METIS = %%LOCALBASE%%/lib/libmetis.a
# If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following
# options:
--- UFconfig/UFconfig.mk~ Sun Sep 17 21:45:24 2006
+++ UFconfig/UFconfig.mk Sun Sep 17 22:08:33 2006
@@ -180,11 +180,11 @@
# alternatives:
# CFLAGS = -g -fexceptions \
- -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
- -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
+# -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
# CFLAGS = -O3 -fexceptions \
- -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
- -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
+# -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
# CFLAGS = -g -fexceptions
# CFLAGS = -O3
# If you use CHOLMOD_CONFIG = -DNPARTITION then use the following options:
# METIS_PATH =

View file

@ -0,0 +1,26 @@
--- AMD/Include/amd_internal.h.old Tue May 2 20:11:29 2006
+++ AMD/Include/amd_internal.h Sun Sep 17 22:20:26 2006
@@ -153,7 +153,9 @@
#define NULL 0
/* largest value of size_t */
-#define SIZE_T_MAX ((size_t) (-1))
+#if !defined SIZE_T_MAX
+#define SIZE_T_MAX ((size_t) (-1)) */
+#endif
/* ------------------------------------------------------------------------- */
/* integer type for AMD: int or UF_long */
--- CAMD/Include/camd_internal.h~ Wed Jun 28 06:43:39 2006
+++ CAMD/Include/camd_internal.h Sun Sep 17 22:22:07 2006
@@ -154,8 +154,9 @@
#define NULL 0
/* largest value of size_t */
+#if !defined SIZE_T_MAX
#define SIZE_T_MAX ((size_t) (-1))
-
+#endif
/* ------------------------------------------------------------------------- */
/* integer type for CAMD: int or UF_long */
/* ------------------------------------------------------------------------- */

View file

@ -6,11 +6,11 @@
#
PORTNAME= ufsparse
PORTVERSION= 2.0.0.b
PORTVERSION= 2.1.1
CATEGORIES= math
MASTER_SITES= http://www.cise.ufl.edu/research/sparse/UFsparse/v2.0.0beta/
DISTNAME= UFsparse
DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}
MASTER_SITES= http://www.cise.ufl.edu/research/sparse/SuiteSparse/current/
DISTNAME= SuiteSparse
DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}
MAINTAINER= maho@FreeBSD.org
COMMENT= UFspace is a set of packages for sparse matrices calculation
@ -29,8 +29,8 @@ LAPACK= -L${LOCALBASE}/lib -lalapack -lcblas
CONFLICTS= umfpack-*
ALL_TARGET= default
USE_GMAKE= yes
ALL_TARGET=
post-patch:
@${REINPLACE_CMD} -e 's,%%CC%%,${CC},g' \
@ -39,6 +39,7 @@ post-patch:
-e 's,%%FFLAGS%%,${FFLAGS},g' \
-e 's,%%BLAS%%,${BLAS},g' \
-e 's,%%LAPACK%%,${LAPACK},g' \
-e 's,%%LOCALBASE%%,${LOCALBASE},g' \
${WRKSRC}/UFconfig/UFconfig.mk
do-install:
${MKDIR} ${PREFIX}/include/ufsparse

View file

@ -1,3 +1,3 @@
MD5 (ufsparse/2.0.0.b/UFsparse.tar.gz) = 9267081abf635b581a8ae4ba4309a79d
SHA256 (ufsparse/2.0.0.b/UFsparse.tar.gz) = fdb59e8deb0a40bb5c311a0d9be406494ec6427eff7276c3fd3f650a96951341
SIZE (ufsparse/2.0.0.b/UFsparse.tar.gz) = 7765937
MD5 (ufsparse/2.1.1/SuiteSparse.tar.gz) = bc01ef2f26e6ad3eed83b4ad62e46a68
SHA256 (ufsparse/2.1.1/SuiteSparse.tar.gz) = 200f970f2dc596fffe5c9ff9fe6b9f11d3ce9d28a963df1e209942b3f4012ce1
SIZE (ufsparse/2.1.1/SuiteSparse.tar.gz) = 7839523

View file

@ -1,5 +1,5 @@
--- CHOLMOD/Lib/Makefile~ Tue May 2 09:12:16 2006
+++ CHOLMOD/Lib/Makefile Tue Jul 4 11:52:37 2006
--- CHOLMOD/Lib/Makefile~ Fri Aug 25 22:44:11 2006
+++ CHOLMOD/Lib/Makefile Sun Sep 17 21:18:07 2006
@@ -116,7 +116,7 @@
$(OBJ): $(INC)

View file

@ -1,11 +0,0 @@
--- KLU/Demo/Makefile~ Fri Apr 28 06:22:19 2006
+++ KLU/Demo/Makefile Tue Jul 4 11:58:10 2006
@@ -9,7 +9,7 @@
I = -I../Include -I../../AMD/Include -I../../COLAMD -I../../BTF/Include \
-I../User -I../../CHOLMOD/Include -I$(METIS_PATH) -I../../CCOLAMD \
- -I../../CAMD
+ -I../../CAMD -I../../UFconfig
LIBS = ../Lib/libklu.a ../../AMD/Lib/libamd.a ../../COLAMD/libcolamd.a \
../../BTF/Lib/libbtf.a ../User/libklu_cholmod.a \

View file

@ -1,11 +0,0 @@
--- KLU/Lib/Makefile~ Wed Mar 22 06:32:09 2006
+++ KLU/Lib/Makefile Tue Jul 4 11:36:37 2006
@@ -12,7 +12,7 @@
INC = ../Include/klu.h ../Include/klu_internal.h ../Include/klu_version.h
I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD -I../../BTF/Include \
- -I../Include
+ -I../Include -I../../UFconfig
all: library

View file

@ -1,11 +0,0 @@
--- KLU/User/Makefile~ Tue Jan 31 01:48:15 2006
+++ KLU/User/Makefile Tue Jul 4 11:56:34 2006
@@ -4,7 +4,7 @@
all: libklu_cholmod.a
-I = -I../../CHOLMOD/Include
+I = -I../../CHOLMOD/Include -I../../UFconfig
libklu_cholmod.a: library klu_cholmod.c klu_cholmod.h
$(CC) $(CFLAGS) $(I) -c klu_cholmod.c

View file

@ -0,0 +1,11 @@
--- Makefile~ Fri Jul 28 04:49:43 2006
+++ Makefile Sun Sep 17 22:33:10 2006
@@ -19,7 +19,7 @@
( cd CSparse ; $(MAKE) )
( cd CXSparse ; $(MAKE) )
# ( cd LPDASA ; $(MAKE) )
- ( cd metis-4.0 ; $(MAKE) )
+# ( cd metis-4.0 ; $(MAKE) )
# ( cd PARAKLETE ; $(MAKE) )
library: default

View file

@ -1,5 +1,5 @@
--- UFconfig/UFconfig.mk Tue May 2 22:34:57 2006
+++ UFconfig/UFconfig.mk Tue Jul 4 11:44:40 2006
--- UFconfig/UFconfig.mk.orig Tue Sep 12 03:23:15 2006
+++ UFconfig/UFconfig.mk Sun Sep 17 21:24:36 2006
@@ -31,8 +31,8 @@
# C compiler and compiler flags: These will normally not give you optimal
# performance. You should select the optimization parameters that are best
@ -22,25 +22,43 @@
F77LIB =
# C and Fortran libraries
@@ -76,8 +76,8 @@
@@ -77,8 +77,8 @@
# These settings will probably not work, since there is no fixed convention for
# naming the BLAS and LAPACK library (*.a or *.so) files.
-BLAS = -lblas -lg2c
# naming the BLAS and LAPACK library (*.a or *.so) files. Assume the Goto
# BLAS are available.
-BLAS = -lgoto -lgfortran
-LAPACK = -llapack
+BLAS = %%BLAS%%
+LAPACK = %%LAPACK%%
# The BLAS might not contain xerbla, an error-handling routine for LAPACK and
# the BLAS. Also, the standard xerbla requires the Fortran I/O library, and
@@ -101,8 +101,8 @@
@@ -106,8 +106,8 @@
# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
# You may wish to use an absolute path. METIS is optional. Compile
# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
-METIS_PATH = ../../metis-4.0
-METIS = ../../metis-4.0/libmetis.a
+METIS_PATH = /usr/local/include/metis
+METIS = /usr/local/lib/libmetis.a
+METIS_PATH = %%LOCALBASE%%/include/metis
+METIS = %%LOCALBASE%%/lib/libmetis.a
# If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following
# options:
--- UFconfig/UFconfig.mk~ Sun Sep 17 21:45:24 2006
+++ UFconfig/UFconfig.mk Sun Sep 17 22:08:33 2006
@@ -180,11 +180,11 @@
# alternatives:
# CFLAGS = -g -fexceptions \
- -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
- -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
+# -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
# CFLAGS = -O3 -fexceptions \
- -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
- -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
+# -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
# CFLAGS = -g -fexceptions
# CFLAGS = -O3
# If you use CHOLMOD_CONFIG = -DNPARTITION then use the following options:
# METIS_PATH =

View file

@ -0,0 +1,26 @@
--- AMD/Include/amd_internal.h.old Tue May 2 20:11:29 2006
+++ AMD/Include/amd_internal.h Sun Sep 17 22:20:26 2006
@@ -153,7 +153,9 @@
#define NULL 0
/* largest value of size_t */
-#define SIZE_T_MAX ((size_t) (-1))
+#if !defined SIZE_T_MAX
+#define SIZE_T_MAX ((size_t) (-1)) */
+#endif
/* ------------------------------------------------------------------------- */
/* integer type for AMD: int or UF_long */
--- CAMD/Include/camd_internal.h~ Wed Jun 28 06:43:39 2006
+++ CAMD/Include/camd_internal.h Sun Sep 17 22:22:07 2006
@@ -154,8 +154,9 @@
#define NULL 0
/* largest value of size_t */
+#if !defined SIZE_T_MAX
#define SIZE_T_MAX ((size_t) (-1))
-
+#endif
/* ------------------------------------------------------------------------- */
/* integer type for CAMD: int or UF_long */
/* ------------------------------------------------------------------------- */