Cosmetic updates

- Clean up a malloc() call to get rid of some warnings.
- Pet portlint by using "makepatch" for the patches, added the license,
  changed a tab after the WWW line.

PR: 208295
Submitted by: pfg@
This commit is contained in:
Maho Nakata
2016-04-18 11:28:17 +00:00
parent 0b16afafb0
commit f18cdd2f47
14 changed files with 64 additions and 33 deletions

View File

@@ -5,7 +5,8 @@ PORTNAME= spooles
PORTVERSION= 2.2
PORTREVISION= 12
CATEGORIES= math
MASTER_SITES= http://www.netlib.org/linalg/spooles/
MASTER_SITES= ${MASTER_SITE_NETLIB}
MASTER_SITE_SUBDIR=linalg/spooles
.ifdef WITH_MPI
PKGNAMESUFFIX= -mpich
.endif
@@ -16,6 +17,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= maho@FreeBSD.org
COMMENT= SParse Object Oriented Linear Equations Solver
LICENSE= PD
.if defined(WITH_MPI)
BUILD_DEPENDS= ${LOCALBASE}/lib/libmpich.a:net/mpich2
.endif

View File

@@ -1,6 +1,6 @@
--- ETree/src/makeGlobalLib~ Fri Sep 18 04:25:01 1998
+++ ETree/src/makeGlobalLib Tue Jan 9 16:20:19 2007
@@ -8,6 +8,7 @@
--- ETree/src/makeGlobalLib.orig 1998-09-17 19:25:01 UTC
+++ ETree/src/makeGlobalLib
@@ -8,6 +8,7 @@ SRC = IO.c \
basics.c \
compress.c \
init.c \

View File

@@ -1,6 +1,6 @@
--- I2Ohash/src/util.c 1998-05-31 07:45:12.000000000 +0900
+++ I2Ohash/src/util.c 2013-03-06 14:59:43.000000000 +0900
@@ -39,7 +39,9 @@
--- 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 ;
@@ -11,7 +11,7 @@
#if MYDEBUG > 0
fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ;
fflush(stdout) ;
@@ -158,7 +160,9 @@
@@ -158,7 +160,9 @@ fflush(stdout) ;
#endif
loc1 = (key1 + 1) % hashtable->nlist ;
loc2 = (key2 + 1) % hashtable->nlist ;
@@ -22,7 +22,7 @@
#if MYDEBUG > 0
fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ;
fflush(stdout) ;
@@ -229,7 +233,9 @@
@@ -229,7 +233,9 @@ if ( hashtable == NULL || pvalue == NULL
}
loc1 = (key1 + 1) % hashtable->nlist ;
loc2 = (key2 + 1) % hashtable->nlist ;

View File

@@ -1,6 +1,6 @@
--- IVL/src/makeGlobalLib~ Fri Sep 18 04:25:30 1998
+++ IVL/src/makeGlobalLib Tue Jan 9 16:26:55 2007
@@ -9,6 +9,7 @@
--- IVL/src/makeGlobalLib.orig 1998-09-17 19:25:30 UTC
+++ IVL/src/makeGlobalLib
@@ -9,6 +9,7 @@ SRC = IO.c \
init.c \
instance.c \
listmanip.c \

View File

@@ -1,5 +1,5 @@
--- MPI/makefile.orig Mon Feb 20 16:41:10 2006
+++ MPI/makefile Mon Feb 20 16:42:02 2006
--- MPI/makefile.orig 1998-12-17 15:47:44 UTC
+++ MPI/makefile
@@ -1,8 +1,8 @@
all_drivers :
- cd drivers ; make drivers

View File

@@ -1,6 +1,6 @@
--- MPI/src/makeGlobalLib.orig Sat Nov 21 23:52:01 1998
+++ MPI/src/makeGlobalLib Fri Oct 1 00:17:01 2004
@@ -29,7 +29,7 @@
--- MPI/src/makeGlobalLib.orig 1998-11-21 22:52:01 UTC
+++ MPI/src/makeGlobalLib
@@ -29,7 +29,7 @@ SRC = aggListMPI.c \
utilities.c
OBJ_FILES = ${SRC:.c=.o}

View File

@@ -1,6 +1,6 @@
--- MT/drivers/allInOneMT.c.orig Sat Aug 9 14:06:19 2003
+++ MT/drivers/allInOneMT.c Sat Aug 9 14:13:07 2003
@@ -35,7 +35,7 @@
--- MT/drivers/allInOneMT.c.orig 1999-01-21 16:51:22 UTC
+++ MT/drivers/allInOneMT.c
@@ -35,7 +35,7 @@ DenseMtx *mtxY, *mtxX ;
Chv *rootchv ;
ChvManager *chvmanager ;
double droptol = 0.0, tau = 100. ;

View File

@@ -1,5 +1,5 @@
--- MT/makefile.orig Mon Feb 20 16:39:12 2006
+++ MT/makefile Mon Feb 20 16:43:07 2006
--- MT/makefile.orig 1998-12-17 15:47:48 UTC
+++ MT/makefile
@@ -1,8 +1,8 @@
all_drivers :
- cd drivers ; make drivers

View File

@@ -1,5 +1,5 @@
--- Make.inc.orig Tue Jan 19 06:48:55 1999
+++ Make.inc Tue Jan 9 12:57:18 2007
--- Make.inc.orig 1999-01-18 21:48:55 UTC
+++ Make.inc
@@ -12,7 +12,7 @@
# for solaris
#

View File

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

View File

@@ -0,0 +1,28 @@
--- 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) ; }
/*

View File

@@ -1,6 +1,6 @@
--- Utilities/src/makeGlobalLib.orig Thu Sep 17 21:26:39 1998
+++ Utilities/src/makeGlobalLib Thu Sep 30 23:34:16 2004
@@ -14,6 +14,7 @@
--- Utilities/src/makeGlobalLib.orig 1998-09-17 19:26:39 UTC
+++ Utilities/src/makeGlobalLib
@@ -14,6 +14,7 @@ SRC = CV.c \
PIV.c \
IP.c \
I2OP.c \

View File

@@ -1,5 +1,5 @@
--- makefile.orig Tue Jan 26 05:39:39 1999
+++ makefile Mon May 5 08:30:58 2003
--- makefile.orig 1999-01-25 20:39:39 UTC
+++ makefile
@@ -1,169 +1,169 @@
drivers :
- cd A2 ; make all_drivers

View File

@@ -17,4 +17,4 @@
methods. The preconditioner is a drop tolerance factorization,
with or without pivoting for stability.
WWW: http://www.netlib.org/linalg/spooles/spooles.2.2.html
WWW: http://www.netlib.org/linalg/spooles/spooles.2.2.html