1) Adding missing symbols in the library

2) Makefile Cleanups.

PR:		72216
Submitted by:	thierry@

4 files changed, 51 insertions, 25 deletions

diff --git a/math/spooles/Makefile b/math/spooles/Makefile
index 6d943b4236b6..7cdaff214b93 100644
--- a/math/spooles/Makefile
+++ b/math/spooles/Makefile
@@ -7,9 +7,12 @@
 
 PORTNAME=	spooles
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://www.netlib.org/linalg/spooles/
+.ifdef WITH_MPI
+PKGNAMESUFFIX=	-mpich
+.endif
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 .ifndef NOPORTDOCS
@@ -23,7 +26,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	SParse Object Oriented Linear Equations Solver
 
-.if defined(USE_MPI)
+.if defined(WITH_MPI)
 BUILD_DEPENDS=	${LOCALBASE}/mpich/lib/libmpich.a:${PORTSDIR}/net/mpich
 .endif
 
@@ -33,59 +36,61 @@ NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	global
 
-.if defined(USE_THREADS)
+.if defined(WITH_THREADS)
 PLIST_SUB+=	MT=""
 CFLAGS+=	${PTHREAD_CFLAGS}
 .else
 PLIST_SUB+=	MT="@comment "
 .endif
-.if defined(USE_MPI)
+.if defined(WITH_MPI)
 PLIST_SUB+=	MPI=""
+CONFLICTS=	spooles-2*
 .else
 PLIST_SUB+=	MPI="@comment "
+CONFLICTS=	spooles-mpich-2*
 .endif
 
 .SILENT:
 
 pre-everything::
-.if !defined(USE_THREADS)
-	${ECHO_MSG} "make USE_THREADS=yes for threaded version"
+.if !defined(WITH_THREADS)
+	${ECHO_MSG} "make WITH_THREADS=yes for threaded version"
 .endif
-.if !defined(USE_MPI)
-	${ECHO_MSG} "make USE_MPI=yes for mpich version"
+.if !defined(WITH_MPI)
+	${ECHO_MSG} "make WITH_MPI=yes for mpich version"
 .endif
 
-.if defined (USE_THREADS) && (USE_MPI)
+.if defined (WITH_THREADS) && (WITH_MPI)
 BROKEN=	mpich is *NOT* threadsafe at the moment
 .endif
 
 post-patch:
-.if defined(USE_THREADS)
+.if defined(WITH_THREADS)
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' ${WRKSRC}/Make.inc
 .else
 	@${REINPLACE_CMD} -e 's+%%PTHREAD_LIBS%%++g;' ${WRKSRC}/Make.inc
 	@${REINPLACE_CMD} -e 's+THREAD_TYPE TT_POSIX+THREAD_TYPE TT_NONE+;' ${WRKSRC}/Lock/Lock.h
 .endif
-.if defined(USE_MPI)
+.if defined(WITH_MPI)
 	@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+g;' ${WRKSRC}/Make.inc
 .endif
 
 post-build:
-.if defined(USE_THREADS)
-	@(cd ${WRKSRC}/MT/src; $(GMAKE) -f makeGlobalLib)
+.if defined(WITH_THREADS)
+	@(cd ${WRKSRC}/MT/src; ${GMAKE} -f makeGlobalLib)
 .endif
-.if defined(USE_MPI)
-	@(cd ${WRKSRC}/MPI/src; $(GMAKE) -f makeGlobalLib)
+.if defined(WITH_MPI)
+	@(cd ${WRKSRC}/MPI/src; ${GMAKE} -f makeGlobalLib)
 .endif
 
 do-install:
 	${MKDIR} ${PREFIX}/include/spooles
 	${INSTALL} ${WRKSRC}/spooles.a ${PREFIX}/lib/libspooles.a
-.if defined(USE_THREADS)
+.if defined(WITH_THREADS)
 	${MKDIR} ${PREFIX}/include/spooles/MT
 	${INSTALL_DATA} ${WRKSRC}/MT/*.h ${PREFIX}/include/spooles/MT
 .endif
-.if defined(USE_MPI)
+.if defined(WITH_MPI)
 	${MKDIR} ${PREFIX}/include/spooles/MPI
 	${INSTALL_DATA} ${WRKSRC}/MPI/*.h ${PREFIX}/include/spooles/MPI
 .endif
diff --git a/math/spooles/files/patch-MPI+src+makeGlobalLib b/math/spooles/files/patch-MPI+src+makeGlobalLib
new file mode 100644
index 000000000000..05a4292e571c
--- /dev/null
+++ b/math/spooles/files/patch-MPI+src+makeGlobalLib
@@ -0,0 +1,11 @@
+--- 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 @@
+       utilities.c
+ 
+ OBJ_FILES = ${SRC:.c=.o}
+-OBJ_FILES = MMM.o makeSendRecvIVLs.o
++#OBJ_FILES = MMM.o makeSendRecvIVLs.o
+ 
+ .c.o :
+ 	$(PURIFY) $(CC) -c $(CFLAGS) $(MPI_INCLUDE_DIR) $*.c -o $(OBJ)_$*.o
diff --git a/math/spooles/files/patch-Utilities+src+makeGlobalLib b/math/spooles/files/patch-Utilities+src+makeGlobalLib
new file mode 100644
index 000000000000..a39cbf0812b7
--- /dev/null
+++ b/math/spooles/files/patch-Utilities+src+makeGlobalLib
@@ -0,0 +1,10 @@
+--- 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 @@
+       PIV.c \
+       IP.c \
+       I2OP.c \
++      axpy.c \
+       iohb.c \
+       newsort.c \
+       sortAndCompress.c \
diff --git a/math/spooles/pkg-plist b/math/spooles/pkg-plist
index 687c6514c660..8881f69fc6d6 100644
--- a/math/spooles/pkg-plist
+++ b/math/spooles/pkg-plist
@@ -137,11 +137,11 @@ lib/libspooles.a
 @dirrm include/spooles/ZV
 @dirrm include/spooles/misc
 @dirrm include/spooles
-%%PORTDOCS%%share/doc/spooles/AllInOne.ps.gz
-%%PORTDOCS%%share/doc/spooles/Eigen.ps.gz
-%%PORTDOCS%%share/doc/spooles/Install.ps.gz
-%%PORTDOCS%%share/doc/spooles/LinSol.ps.gz
-%%PORTDOCS%%share/doc/spooles/Ordering.ps.gz
-%%PORTDOCS%%share/doc/spooles/PP99.ps.gz
-%%PORTDOCS%%share/doc/spooles/ReferenceManual.ps.gz
-%%PORTDOCS%%@dirrm share/doc/spooles
+%%PORTDOCS%%%%DOCSDIR%%/AllInOne.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/Eigen.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/Install.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/LinSol.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/Ordering.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/PP99.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ReferenceManual.ps.gz
+%%PORTDOCS%%@dirrm %%DOCSDIR%%