Attachment #168630 for bug #208295

View | Details | Raw Unified | Return to bug 208295
Collapse All | Expand All

Lines 5-11 Link Here

(-)math/spooles/Makefile (-1 / +4 lines)
5	PORTVERSION= 2.2	5	PORTVERSION= 2.2
6	PORTREVISION= 12	6	PORTREVISION= 12
7	CATEGORIES= math	7	CATEGORIES= math
8	MASTER_SITES= http://www.netlib.org/linalg/spooles/	8	MASTER_SITES= ${MASTER_SITE_NETLIB}
		9	MASTER_SITE_SUBDIR=linalg/spooles
9	.ifdef WITH_MPI	10	.ifdef WITH_MPI
10	PKGNAMESUFFIX= -mpich	11	PKGNAMESUFFIX= -mpich
11	.endif	12	.endif
Lines 16-21 Link Here
16	MAINTAINER= maho@FreeBSD.org	17	MAINTAINER= maho@FreeBSD.org
17	COMMENT= SParse Object Oriented Linear Equations Solver	18	COMMENT= SParse Object Oriented Linear Equations Solver
18		19
		20	LICENSE= PD
		21
19	.if defined(WITH_MPI)	22	.if defined(WITH_MPI)
20	BUILD_DEPENDS= ${LOCALBASE}/lib/libmpich.a:${PORTSDIR}/net/mpich2	23	BUILD_DEPENDS= ${LOCALBASE}/lib/libmpich.a:${PORTSDIR}/net/mpich2
21	.endif	24	.endif

Lines 1-6 Link Here

(-)math/spooles/files/patch-ETree+src+makeGlobalLib (-3 / +3 lines)
1	--- ETree/src/makeGlobalLib~ Fri Sep 18 04:25:01 1998	1	--- ETree/src/makeGlobalLib.orig 1998-09-17 19:25:01 UTC
2	+++ ETree/src/makeGlobalLib Tue Jan 9 16:20:19 2007	2	+++ ETree/src/makeGlobalLib
3	@@ -8,6 +8,7 @@	3	@@ -8,6 +8,7 @@ SRC = IO.c \
4	basics.c \	4	basics.c \
5	compress.c \	5	compress.c \
6	init.c \	6	init.c \




--- I2Ohash/src/util.c.orig	1998-05-30 22:45:12 UTC
+++ I2Ohash/src/util.c
@@ -39,7 +39,9 @@ fflush(stdout) ;
 */
 loc1 = (key1 + 1) % hashtable->nlist ;
 loc2 = (key2 + 1) % hashtable->nlist ;

 #if MYDEBUG > 0
 fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ;
 fflush(stdout) ;
@@ -158,7 +160,9 @@ fflush(stdout) ;
 #endif
 loc1 = (key1 + 1) % hashtable->nlist ;
 loc2 = (key2 + 1) % hashtable->nlist ;

 #if MYDEBUG > 0
 fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ;
 fflush(stdout) ;
@@ -229,7 +233,9 @@ if ( hashtable == NULL || pvalue == NULL
 }
 loc1 = (key1 + 1) % hashtable->nlist ;
 loc2 = (key2 + 1) % hashtable->nlist ;

Lines 1-6 Link Here

(-)math/spooles/files/patch-IVL+src+makeGlobalLib (-3 / +3 lines)
1	--- IVL/src/makeGlobalLib~ Fri Sep 18 04:25:30 1998	1	--- IVL/src/makeGlobalLib.orig 1998-09-17 19:25:30 UTC
2	+++ IVL/src/makeGlobalLib Tue Jan 9 16:26:55 2007	2	+++ IVL/src/makeGlobalLib
3	@@ -9,6 +9,7 @@	3	@@ -9,6 +9,7 @@ SRC = IO.c \
4	init.c \	4	init.c \
5	instance.c \	5	instance.c \
6	listmanip.c \	6	listmanip.c \

Lines 1-5 Link Here

(-)math/spooles/files/patch-MPI+makefile (-2 / +2 lines)
1	--- MPI/makefile.orig Mon Feb 20 16:41:10 2006	1	--- MPI/makefile.orig 1998-12-17 15:47:44 UTC
2	+++ MPI/makefile Mon Feb 20 16:42:02 2006	2	+++ MPI/makefile
3	@@ -1,8 +1,8 @@	3	@@ -1,8 +1,8 @@
4	all_drivers :	4	all_drivers :
5	- cd drivers ; make drivers	5	- cd drivers ; make drivers

Lines 1-6 Link Here

(-)math/spooles/files/patch-MPI+src+makeGlobalLib (-3 / +3 lines)
1	--- MPI/src/makeGlobalLib.orig Sat Nov 21 23:52:01 1998	1	--- MPI/src/makeGlobalLib.orig 1998-11-21 22:52:01 UTC
2	+++ MPI/src/makeGlobalLib Fri Oct 1 00:17:01 2004	2	+++ MPI/src/makeGlobalLib
3	@@ -29,7 +29,7 @@	3	@@ -29,7 +29,7 @@ SRC = aggListMPI.c \
4	utilities.c	4	utilities.c
5		5
6	OBJ_FILES = ${SRC:.c=.o}	6	OBJ_FILES = ${SRC:.c=.o}

Lines 1-6 Link Here

(-)math/spooles/files/patch-MT+drivers+AllInOneMT.c (-3 / +3 lines)
1	--- MT/drivers/allInOneMT.c.orig Sat Aug 9 14:06:19 2003	1	--- MT/drivers/allInOneMT.c.orig 1999-01-21 16:51:22 UTC
2	+++ MT/drivers/allInOneMT.c Sat Aug 9 14:13:07 2003	2	+++ MT/drivers/allInOneMT.c
3	@@ -35,7 +35,7 @@	3	@@ -35,7 +35,7 @@ DenseMtx mtxY, mtxX ;
4	Chv *rootchv ;	4	Chv *rootchv ;
5	ChvManager *chvmanager ;	5	ChvManager *chvmanager ;
6	double droptol = 0.0, tau = 100. ;	6	double droptol = 0.0, tau = 100. ;

Lines 1-5 Link Here

(-)math/spooles/files/patch-MT+makefile (-2 / +2 lines)
1	--- MT/makefile.orig Mon Feb 20 16:39:12 2006	1	--- MT/makefile.orig 1998-12-17 15:47:48 UTC
2	+++ MT/makefile Mon Feb 20 16:43:07 2006	2	+++ MT/makefile
3	@@ -1,8 +1,8 @@	3	@@ -1,8 +1,8 @@
4	all_drivers :	4	all_drivers :
5	- cd drivers ; make drivers	5	- cd drivers ; make drivers

Lines 1-5 Link Here

(-)math/spooles/files/patch-Make.inc (-2 / +2 lines)
1	--- Make.inc.orig Tue Jan 19 06:48:55 1999	1	--- Make.inc.orig 1999-01-18 21:48:55 UTC
2	+++ Make.inc Tue Jan 9 12:57:18 2007	2	+++ Make.inc
3	@@ -12,7 +12,7 @@	3	@@ -12,7 +12,7 @@
4	# for solaris	4	# for solaris
5	#	5	#

Lines 1-6 Link Here

(-)math/spooles/files/patch-Tree+src+makeGlobalLib (-3 / +3 lines)
1	--- Tree/src/makeGlobalLib.orig Fri Sep 18 04:26:35 1998	1	--- Tree/src/makeGlobalLib.orig 1998-09-17 19:26:35 UTC
2	+++ Tree/src/makeGlobalLib Mon May 5 08:30:58 2003	2	+++ Tree/src/makeGlobalLib
3	@@ -6,7 +6,8 @@	3	@@ -6,7 +6,8 @@ OBJ = Tree
4		4
5	SRC = basics.c \	5	SRC = basics.c \
6	compress.c \	6	compress.c \




--- Utilities/MM.h.orig	1998-05-30 22:45:00 UTC
+++ Utilities/MM.h
@@ -30,21 +30,21 @@
 */
 #define ALLOCATE(ptr, type, count) \
 if ( (count) > 0 ) { \
-   if ( (ptr = (type *)malloc((unsigned long)((count)*sizeof(type)))) \
+   if ( (ptr = malloc((unsigned long)(count)*sizeof(type))) \
         == NULL ) {\
       fprintf(stderr, \
-              "\n ALLOCATE failure : bytes %d, line %d, file %s", \
+              "\n ALLOCATE failure : bytes %lu, line %d, file %s", \
               (count)*sizeof(type), __LINE__, __FILE__) ; \
       exit(-1) ; } \
    else if ( MEMORY_DEBUG > 0 ) { \
       fprintf(stderr, \
-              "\n ALLOCATE : address %p, bytes %d, line %d, file %s", \
+              "\n ALLOCATE : address %p, bytes %lu, line %d, file %s", \
               ptr, (count)*sizeof(type), __LINE__, __FILE__) ; } } \
 else if ( (count) == 0 ) { \
    ptr = NULL ; } \
 else { \
    fprintf(stderr, \
-           "\n ALLOCATE error : bytes %d, line %d, file %s", \
+           "\n ALLOCATE error : bytes %lu, line %d, file %s", \
            (count)*sizeof(type), __LINE__, __FILE__) ; \
    exit(-1) ; }
 /*

Lines 1-6 Link Here

(-)math/spooles/files/patch-Utilities+src+makeGlobalLib (-3 / +3 lines)
1	--- Utilities/src/makeGlobalLib.orig Thu Sep 17 21:26:39 1998	1	--- Utilities/src/makeGlobalLib.orig 1998-09-17 19:26:39 UTC
2	+++ Utilities/src/makeGlobalLib Thu Sep 30 23:34:16 2004	2	+++ Utilities/src/makeGlobalLib
3	@@ -14,6 +14,7 @@	3	@@ -14,6 +14,7 @@ SRC = CV.c \
4	PIV.c \	4	PIV.c \
5	IP.c \	5	IP.c \
6	I2OP.c \	6	I2OP.c \

Lines 1-5 Link Here

(-)math/spooles/files/patch-makefile (-2 / +2 lines)
1	--- makefile.orig Tue Jan 26 05:39:39 1999	1	--- makefile.orig 1999-01-25 20:39:39 UTC
2	+++ makefile Mon May 5 08:30:58 2003	2	+++ makefile
3	@@ -1,169 +1,169 @@	3	@@ -1,169 +1,169 @@
4	drivers :	4	drivers :
5	- cd A2 ; make all_drivers	5	- cd A2 ; make all_drivers

Lines 17-20 Link Here

(-)math/spooles/pkg-descr (-1 / +1 lines)
17	methods. The preconditioner is a drop tolerance factorization,	17	methods. The preconditioner is a drop tolerance factorization,
18	with or without pivoting for stability.	18	with or without pivoting for stability.
19		19
20	WWW: http://www.netlib.org/linalg/spooles/spooles.2.2.html	20	WWW: http://www.netlib.org/linalg/spooles/spooles.2.2.html

Return to bug 208295

Lines 1-6 Link Here

(-)math/spooles/files/patch-I2Ohash-large-input (-5 / +5 lines)
1	--- I2Ohash/src/util.c 1998-05-31 07:45:12.000000000 +0900	1	--- I2Ohash/src/util.c.orig 1998-05-30 22:45:12 UTC
2	+++ I2Ohash/src/util.c 2013-03-06 14:59:43.000000000 +0900	2	+++ I2Ohash/src/util.c
3	@@ -39,7 +39,9 @@	3	@@ -39,7 +39,9 @@ fflush(stdout) ;
4	*/	4	*/
5	loc1 = (key1 + 1) % hashtable->nlist ;	5	loc1 = (key1 + 1) % hashtable->nlist ;
6	loc2 = (key2 + 1) % hashtable->nlist ;	6	loc2 = (key2 + 1) % hashtable->nlist ;
Lines 11-17 Link Here
11	#if MYDEBUG > 0	11	#if MYDEBUG > 0
12	fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ;	12	fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ;
13	fflush(stdout) ;	13	fflush(stdout) ;
14	@@ -158,7 +160,9 @@	14	@@ -158,7 +160,9 @@ fflush(stdout) ;
15	#endif	15	#endif
16	loc1 = (key1 + 1) % hashtable->nlist ;	16	loc1 = (key1 + 1) % hashtable->nlist ;
17	loc2 = (key2 + 1) % hashtable->nlist ;	17	loc2 = (key2 + 1) % hashtable->nlist ;
Lines 22-28 Link Here
22	#if MYDEBUG > 0	22	#if MYDEBUG > 0
23	fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ;	23	fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ;
24	fflush(stdout) ;	24	fflush(stdout) ;
25	@@ -229,7 +233,9 @@	25	@@ -229,7 +233,9 @@ if ( hashtable == NULL \|\| pvalue == NULL
26	}	26	}
27	loc1 = (key1 + 1) % hashtable->nlist ;	27	loc1 = (key1 + 1) % hashtable->nlist ;
28	loc2 = (key2 + 1) % hashtable->nlist ;	28	loc2 = (key2 + 1) % hashtable->nlist ;

Line 0 Link Here

(-)math/spooles/files/patch-Utilities+MM.h (+28 lines)
	1	--- Utilities/MM.h.orig 1998-05-30 22:45:00 UTC
	2	+++ Utilities/MM.h
	3	@@ -30,21 +30,21 @@
	4	*/
	5	#define ALLOCATE(ptr, type, count) \
	6	if ( (count) > 0 ) { \
	7	- if ( (ptr = (type )malloc((unsigned long)((count)sizeof(type)))) \
	8	+ if ( (ptr = malloc((unsigned long)(count)*sizeof(type))) \
	9	== NULL ) {\
	10	fprintf(stderr, \
	11	- "\n ALLOCATE failure : bytes %d, line %d, file %s", \
	12	+ "\n ALLOCATE failure : bytes %lu, line %d, file %s", \
	13	(count)*sizeof(type), __LINE__, __FILE__) ; \
	14	exit(-1) ; } \
	15	else if ( MEMORY_DEBUG > 0 ) { \
	16	fprintf(stderr, \
	17	- "\n ALLOCATE : address %p, bytes %d, line %d, file %s", \
	18	+ "\n ALLOCATE : address %p, bytes %lu, line %d, file %s", \
	19	ptr, (count)*sizeof(type), __LINE__, __FILE__) ; } } \
	20	else if ( (count) == 0 ) { \
	21	ptr = NULL ; } \
	22	else { \
	23	fprintf(stderr, \
	24	- "\n ALLOCATE error : bytes %d, line %d, file %s", \
	25	+ "\n ALLOCATE error : bytes %lu, line %d, file %s", \
	26	(count)*sizeof(type), __LINE__, __FILE__) ; \
	27	exit(-1) ; }
	28	/*