respect CC and related variables [1]; add a test target; update WWW;

minor simplifications; shorten a few long lines

PR:		163232 [1]
Submitted by:	J. Beich (partial patch) [1]
Feature safe:	yes

7 files changed, 46 insertions, 94 deletions

diff --git a/math/metis4/Makefile b/math/metis4/Makefile
index 323efb774195..2175f2209ac9 100644
--- a/math/metis4/Makefile
+++ b/math/metis4/Makefile
@@ -16,7 +16,6 @@ COMMENT=	A package for unstructured graph partitioning
 
 CONFLICTS=	metis-edf-[0-9]*
 
-ALL_TARGET=
 USE_LDCONFIG=	yes
 
 PROGRAMS=	graphchk kmetis mesh2dual mesh2nodal	\
@@ -30,16 +29,23 @@ PICFLAG?=	-fpic
 .endif
 
 post-patch:
-	${MKDIR} ${WRKSRC}_SHARED ; ${CP} -r ${WRKSRC}/* ${WRKSRC}_SHARED
+	${CP} -R ${WRKSRC} ${WRKSRC}_SHARED
 
 do-build:
-	cd ${WRKSRC} ; ${MAKE}
-	cd ${WRKSRC}_SHARED ; ${SETENV} CFLAGS="${CFLAGS} ${PICFLAG}" ${MAKE} ; ld -Bshareable -o libmetis.so.1 -x -soname libmetis.so.1 --whole-archive libmetis.a
+	@cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} \
+	COPTIONS="${CFLAGS}" LDOPTIONS="${LDFLAGS}" \
+	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS}
+	@cd ${WRKSRC}_SHARED ; ${SETENV} ${MAKE_ENV} \
+	COPTIONS="${CFLAGS} ${PICFLAG}" LDOPTIONS="${LDFLAGS} ${PICFLAG}" \
+	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ; \
+	${LD} -Bshareable -o libmetis.so.1 -x -soname libmetis.so.1 \
+	--whole-archive libmetis.a --no-whole-archive
+
+check regression-test test: build
+	cd ${WRKSRC}/Graphs ; ./mtest 4elt.graph
 
 do-install:
-.for p in ${PROGRAMS}
-	${INSTALL_PROGRAM} ${WRKSRC}/${p} ${PREFIX}/bin
-.endfor
+	cd ${WRKSRC} ; ${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/include/metis
 	${INSTALL_DATA} ${WRKSRC}/Lib/*.h    ${PREFIX}/include/metis
 	${INSTALL_DATA} ${WRKSRC}/libmetis.a ${PREFIX}/lib
diff --git a/math/metis4/files/patch-Makefile.in b/math/metis4/files/patch-Makefile.in
new file mode 100644
index 000000000000..3cafe0fbbea9
--- /dev/null
+++ b/math/metis4/files/patch-Makefile.in
@@ -0,0 +1,25 @@
+--- Makefile.in.orig	2006-08-31 08:22:01.000000000 -0400
++++ Makefile.in	2012-03-15 12:48:32.000000000 -0400
+@@ -1,21 +1,16 @@
+ 
+ # Which compiler to use
+-CC = cc
+ 
+ # What optimization level to use
+-OPTFLAGS = -O2 
+ 
+ # What options to be used by the compiler
+-COPTIONS = 
+ 
+ # What options to be used by the loader
+-LDOPTIONS = 
+ 
+ # What archiving to use
+-AR = ar rv
++AR += ${ARFLAGS}
+ 
+ # What to use for indexing the archive
+-RANLIB = ranlib
+ #RANLIB = ar -ts
+ #RANLIB = 
+ 
diff --git a/math/metis4/files/patch-aa b/math/metis4/files/patch-aa
deleted file mode 100644
index ecee4b3c3833..000000000000
--- a/math/metis4/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-*** Makefile.in.orig	Fri Oct  2 16:28:35 1998
---- Makefile.in	Wed Jan 27 21:48:36 1999
-***************
-*** 1,9 ****
-  
-  # Which compiler to use
-! CC = cc
-  
-  # What optimization level to use
-! OPTFLAGS = -O2 
-  
-  # What options to be used by the compiler
-  COPTIONS = 
---- 1,9 ----
-  
-  # Which compiler to use
-! CC ?= cc
-  
-  # What optimization level to use
-! OPTFLAGS += -O2 
-  
-  # What options to be used by the compiler
-  COPTIONS = 
diff --git a/math/metis4/files/patch-ab b/math/metis4/files/patch-ab
deleted file mode 100644
index 133b607e0b18..000000000000
--- a/math/metis4/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Lib/Makefile.orig	Fri Oct  9 20:19:01 1998
---- Lib/Makefile	Fri Oct  9 20:20:32 1998
-***************
-*** 2,8 ****
-  
-  INCLUDES = -I.
-  
-! CFLAGS = $(COPTIONS) $(OPTFLAGS) $(INCLUDES)
-  LD = $(CC) -L. 
-  
-  
---- 2,8 ----
-  
-  INCLUDES = -I.
-  
-! CFLAGS += $(COPTIONS) $(OPTFLAGS) $(INCLUDES)
-  LD = $(CC) -L. 
-  
-  
diff --git a/math/metis4/files/patch-ac b/math/metis4/files/patch-ac
deleted file mode 100644
index 1bb1f4662175..000000000000
--- a/math/metis4/files/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Programs/Makefile.orig	Fri Oct  9 20:21:48 1998
---- Programs/Makefile	Fri Oct  9 20:22:16 1998
-***************
-*** 3,9 ****
-  BINDIR = ..
-  
-  INCLUDES = -I../Lib 
-! CFLAGS = $(COPTIONS) $(OPTFLAGS) $(INCLUDES)
-  
-  LIBS = -lmetis -lm
-  LD = $(CC) $(LDOPTIONS) -L. -L..
---- 3,9 ----
-  BINDIR = ..
-  
-  INCLUDES = -I../Lib 
-! CFLAGS += $(COPTIONS) $(OPTFLAGS) $(INCLUDES)
-  
-  LIBS = -lmetis -lm
-  LD = $(CC) $(LDOPTIONS) -L. -L..
diff --git a/math/metis4/files/patch-ad b/math/metis4/files/patch-ad
deleted file mode 100644
index 0e0032718205..000000000000
--- a/math/metis4/files/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Test/Makefile.orig	Fri Oct  9 20:23:24 1998
---- Test/Makefile	Fri Oct  9 20:23:40 1998
-***************
-*** 3,9 ****
-  BINDIR = ../Graphs
-  
-  INCLUDES = -I../Lib 
-! CFLAGS = $(COPTIONS) $(OPTFLAGS) $(INCLUDES)
-  
-  LIBS = -lmetis -lm
-  LD = $(CC) $(LDOPTIONS) -L. -L..
---- 3,9 ----
-  BINDIR = ../Graphs
-  
-  INCLUDES = -I../Lib 
-! CFLAGS += $(COPTIONS) $(OPTFLAGS) $(INCLUDES)
-  
-  LIBS = -lmetis -lm
-  LD = $(CC) $(LDOPTIONS) -L. -L..
diff --git a/math/metis4/pkg-descr b/math/metis4/pkg-descr
index 3268fab747bb..5b4615380726 100644
--- a/math/metis4/pkg-descr
+++ b/math/metis4/pkg-descr
@@ -1,9 +1,10 @@
-METIS is a set of programs for partitioning graphs and for producing fill
-reducing orderings for sparse matrices. The algorithms implemented by METIS
-are based on the multilevel graph partitioning scheme described in [KK95a]
-and [KK95e].
+METIS is a set of serial programs for partitioning graphs,
+partitioning finite element meshes, and producing fill reducing
+orderings for sparse matrices. The algorithms implemented in METIS are
+based on the multilevel recursive-bisection, multilevel k-way, and
+multi-constraint partitioning schemes developed in our lab.
 
-METIS provides high quality partitions, is extremely fast, and produces
-low fill orderings.
+METIS provides high quality partitions, is extremely fast, and
+produces low fill orderings.
 
-WWW: http://www-users.cs.umn.edu/~karypis/metis/metis/
+WWW: http://glaros.dtc.umn.edu/gkhome/metis/metis/overview