Date: Sun, 28 Jul 2013 09:46:15 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323817 - head/science/fastcap Message-ID: <201307280946.r6S9kFRY092943@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sun Jul 28 09:46:15 2013 New Revision: 323817 URL: http://svnweb.freebsd.org/changeset/ports/323817 Log: - Tighten Makefile header and COMMENT - Convert to OptionsNG (docs, examples) - Unbreak parallel builds (-jX) - Minor Makefile and pkg-descr cleanups Reported by: pointyhat-west Modified: head/science/fastcap/Makefile head/science/fastcap/pkg-descr Modified: head/science/fastcap/Makefile ============================================================================== --- head/science/fastcap/Makefile Sun Jul 28 09:22:46 2013 (r323816) +++ head/science/fastcap/Makefile Sun Jul 28 09:46:15 2013 (r323817) @@ -1,9 +1,5 @@ -# New ports collection makefile for: FastCap -# Date created: 5 Jan 2006 -# Whom: Pedro Giffuni <giffunip@asme.org> -# +# Created by: Pedro Giffuni <giffunip@asme.org> # $FreeBSD$ -# PORTNAME= fastcap DISTVERSION= 2.0wr-011109 @@ -11,7 +7,7 @@ CATEGORIES= science cad MASTER_SITES= http://www.wrcad.com/ftp/pub/ LOCAL/bf MAINTAINER= bf@FreeBSD.org -COMMENT= A three-dimensional capacitance extraction program +COMMENT= Three-dimensional capacitance extraction program HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config @@ -19,31 +15,38 @@ WRKSRC = ${WRKDIR}/fastcap-2.0wr BINFILES= busgen capgen cubegen fastcap pipedgen pyragen +OPTIONS_DEFINE= DOCS EXAMPLES + +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -e 's,TYPE=other,TYPE=4,' \ ${WRKSRC}/config @${REINPLACE_CMD} -Ee '/CFLAGS =/{s/=/+=/;s/-O[[:digit:]]*//;}' \ ${WRKSRC}/src/Makefile.4 -#minimal changes to fix the clang build (there should be a more thorough -#clean-up, to correct types of functions, remove implicit declarations, fix -#formatting, add missing returns, etc.) +# Minimal changes to fix the Clang build (there should be a more thorough +# clean-up, to correct types of functions, remove implicit declarations, fix +# formatting, add missing returns, etc.) @${REINPLACE_CMD} -E -e 's,^mul(Up|Down),void &,' \ ${WRKSRC}/src/mulDo.c @${REINPLACE_CMD} -e 's,^mulMatUp,void &,' \ ${WRKSRC}/src/mulMats.c @${REINPLACE_CMD} -e 's,^static getnbrs,static void getnbrs,' \ ${WRKSRC}/src/mulSetup.c +# Change "cd foo ; $(MAKE)" into "$(MAKE) -C foo" to unbreak parallel builds + @${REINPLACE_CMD} -E 's,cd (.+) ; (\$$\(MAKE\)),\2 -C \1,' \ + ${WRKSRC}/Makefile +# Avoid clashing of generated temporary files, crucial for parallel builds + @${REINPLACE_CMD} -e 's,temp\.out,$$@.&,' ${WRKSRC}/src/Makefile* do-install: -.for b in ${BINFILES} - @${INSTALL_PROGRAM} ${WRKSRC}/bin/${b} ${PREFIX}/bin/ -.endfor -.if !defined(NOPORTEXAMPLES) - ${MKDIR} ${EXAMPLESDIR} + ${INSTALL_PROGRAM} ${BINFILES:S,^,${WRKSRC}/bin/,} ${PREFIX}/bin +.if ${PORT_OPTIONS:MEXAMPLES} + @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR} .endif -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} ${CAT} ${WRKSRC}/README ${WRKSRC}/README.mit > ${DOCSDIR}/readme ${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${DOCSDIR} ${GZIP_CMD} ${DOCSDIR}/* Modified: head/science/fastcap/pkg-descr ============================================================================== --- head/science/fastcap/pkg-descr Sun Jul 28 09:22:46 2013 (r323816) +++ head/science/fastcap/pkg-descr Sun Jul 28 09:46:15 2013 (r323817) @@ -12,9 +12,9 @@ from the boundary-element discretization generalized conjugate residual algorithm with a fast multipole algorithm to efficiently compute the iterates. ---------------------- +--------------------- This version of fastcap has been cleaned up and enhanced by Stephen R. Whiteley of Whitleley Research Inc. ---------------------- +--------------------- -WWW: http://www.rle.mit.edu/cpg/research_codes.htm +WWW: http://www.rle.mit.edu/cpg/research_codes.htm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307280946.r6S9kFRY092943>