- Unbreak parallel builds by USES'ing gmake

- Respect CFLAGS in a better, less intrusive way
- Correctly separate DOCS and EXAMPLES
- Trim Makefile header, miscellaneous cleanups
- Reformat port description text

Reported by:	pointyhat-west

3 files changed, 41 insertions, 40 deletions

diff --git a/math/chaco/Makefile b/math/chaco/Makefile
index 2514bcdc16bb..35d6ac159fab 100644
--- a/math/chaco/Makefile
+++ b/math/chaco/Makefile
@@ -1,35 +1,36 @@
-# New ports collection makefile for:	Chaco
-# Date created:         26 April 2006
-# Whom:                 Pedro Giffuni <giffunip@asme.org>
-#
+# Created by: Pedro Giffuni <giffunip@asme.org>
 # $FreeBSD$
-#
 
 PORTNAME=	chaco
 PORTVERSION=	2.2
 CATEGORIES=	math
-MASTER_SITES=	http://www.cs.sandia.gov/downloads/papers/bahendr/	\
-		http://bsd1.csme.ru/myports/	\
-		http://bsd2.csme.ru/myports/	\
+MASTER_SITES=	http://www.cs.sandia.gov/downloads/papers/bahendr/ \
+		http://bsd1.csme.ru/myports/ \
+		http://bsd2.csme.ru/myports/ \
 		http://bsd3.csme.ru/myports/
 DISTNAME=	Chaco-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Software for Partitioning Graphs
+COMMENT=	Software for partitioning graphs
 
+USES=		gmake
+MAKE_ARGS=	CFLAGS="${CFLAGS}"
+ALL_TARGET=	#
 WRKSRC=		${WRKDIR}/${DISTNAME}/code
-ALL_TARGET=
 
-do-configure:
-	@${REINPLACE_CMD} -e 's+@CFLAGS@+${CFLAGS}+g' ${WRKSRC}/Makefile
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+.include <bsd.port.options.mk>
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/exec/chaco ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/exec/libchaco.a ${PREFIX}/lib
-.ifndef NOPORTDOCS
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/*.ps ${DOCSDIR}
 	${GZIP_CMD} ${DOCSDIR}/*.ps
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/exec/*.graph ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/exec/*.coords ${EXAMPLESDIR}
diff --git a/math/chaco/pkg-descr b/math/chaco/pkg-descr
index 33fdf3d90756..4f439ac7bf75 100644
--- a/math/chaco/pkg-descr
+++ b/math/chaco/pkg-descr
@@ -1,22 +1,22 @@
-Before a calculation can be performed on a parallel computer, it must first be
-decomposed into tasks which are assigned to different processors. Efficient use
-of the machine requires that each processor have about the same amount of work
-to do and that the quantity of interprocessor communication is kept small.
-Finding an optimal decomposition is provably hard, but due to its practical
-importance, a great deal of effort has been devoted to developing heuristics
-for this problem.
-The decomposition problem can be addressed in terms of graph partitioning. Rob
-Leland and I have developed a variety of algorithms for graph partitioning and
-implemented them into a package we call Chaco. The code is being used at most
-of the major parallel computing centers around the world to simplify the
-development of parallel applications, and to ensure that high performance is
-obtained. Chaco has contributed to a wide variety of computational studies
-including investigation of the molecular structure of liquid crystals,
-evaluating the design of a chemical vapor deposition reactor and modeling
-automobile collisions.
+Before a calculation can be performed on a parallel computer, it must
+first be decomposed into tasks which are assigned to different processors.
 
-WWW:  http://www.cs.sandia.gov/~bahendr/chaco.html
-___
-Bruce Hendrickson
+Efficient use of the machine requires that each processor have about the
+same amount of work to do and that the quantity of interprocessor
+communication is kept small.  Finding an optimal decomposition is provably
+hard, but due to its practical importance, a great deal of effort has been
+devoted to developing heuristics for this problem.  The decomposition
+problem can be addressed in terms of graph partitioning.
 
-Note: this port includes a patch provided by Walter Landry for use within MBDyn
+Chaco implements a variety of algorithms for graph partitioning and is
+used at most of the major parallel computing centers around the world to
+simplify the development of parallel applications, and to ensure that high
+performance is obtained.  Chaco has contributed to a wide variety of
+computational studies including investigation of the molecular structure
+of liquid crystals, evaluating the design of a chemical vapor deposition
+reactor and modeling automobile collisions.
+
+Note: this port includes a patch provided by Walter Landry for use within
+MBDyn.
+
+WWW: http://www.cs.sandia.gov/~bahendr/chaco.html
diff --git a/math/chaco/pkg-plist b/math/chaco/pkg-plist
index 1b3f72a019df..ad572512ce3f 100644
--- a/math/chaco/pkg-plist
+++ b/math/chaco/pkg-plist
@@ -7,10 +7,10 @@ lib/libchaco.a
 %%PORTDOCS%%%%DOCSDIR%%/Term_Prop.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/Users_Guide.ps.gz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/film.coords
-%%PORTDOCS%%%%EXAMPLESDIR%%/film.graph
-%%PORTDOCS%%%%EXAMPLESDIR%%/grid20x20.coords
-%%PORTDOCS%%%%EXAMPLESDIR%%/grid20x20.graph
-%%PORTDOCS%%%%EXAMPLESDIR%%/hammond.coords
-%%PORTDOCS%%%%EXAMPLESDIR%%/hammond.graph
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/film.coords
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/film.graph
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grid20x20.coords
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grid20x20.graph
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hammond.coords
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hammond.graph
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%