From owner-svn-ports-all@FreeBSD.ORG Sun May 11 10:04:03 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09A348EC; Sun, 11 May 2014 10:04:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E01BE2540; Sun, 11 May 2014 10:04:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4BA42JD088957; Sun, 11 May 2014 10:04:02 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4BA42qL088955; Sun, 11 May 2014 10:04:02 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201405111004.s4BA42qL088955@svn.freebsd.org> From: Thierry Thomas Date: Sun, 11 May 2014 10:04:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353667 - head/cad/scotch X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 May 2014 10:04:03 -0000 Author: thierry Date: Sun May 11 10:04:02 2014 New Revision: 353667 URL: http://svnweb.freebsd.org/changeset/ports/353667 QAT: https://qat.redports.org/buildarchive/r353667/ Log: - Stagify; - since I'm there, don't reinstall the license files. Modified: head/cad/scotch/Makefile head/cad/scotch/pkg-plist Modified: head/cad/scotch/Makefile ============================================================================== --- head/cad/scotch/Makefile Sun May 11 10:03:32 2014 (r353666) +++ head/cad/scotch/Makefile Sun May 11 10:04:02 2014 (r353667) @@ -19,7 +19,8 @@ LICENSE_PERMS= dist-mirror dist-sell pkg CONFLICTS= gbase-0.* gmap-2006.* USES= gmake -MAKE_JOBS_UNSAFE= yes + +MAKE_JOBS_UNSAFE=yes .if defined(MAINTAINER_MODE) USES+= fortran @@ -38,18 +39,10 @@ BINS= acpl amk_ccc amk_fft2 amk_grf amk mord mtst INCS= esmumps.h scotch.h scotchf.h LIBS= libesmumps.a libscotch.a libscotcherr.a libscotcherrexit.a libscotchmetis.a -LICDOCS= CeCILL-C_V1-en.txt CeCILL-C_V1-fr.txt DOCVER= ${PORTVERSION:R:R:R} PORTDOCS= ptscotch_user${DOCVER}.pdf scotch_user${DOCVER}.pdf EXAMPLES= scotch_example_1.f scotch_example_2.f90 -MAN1= acpl.1 amk_ccc.1 amk_fft2.1 amk_grf.1 amk_hy.1 amk_m2.1 amk_p2.1 \ - atst.1 dggath.1 dgmap.1 dgord.1 dgpart.1 dgscat.1 dgtst.1 gbase.1 gcv.1 \ - gmap.1 gmk_hy.1 gmk_m2.1 gmk_m3.1 gmk_msh.1 gmk_ub2.1 gmtst.1 gord.1 \ - gotst.1 gout.1 gpart.1 gtst.1 mcv.1 mmk_m2.1 mmk_m3.1 mord.1 mtst.1 - -PKGMESSAGE= ${WRKSRC}/LICENSE_en.txt - .if !defined(WITHOUT_MPI) LIB_DEPENDS+= libmpich.so:${PORTSDIR}/net/mpich2 @@ -66,7 +59,6 @@ PLIST_SUB+= MPI="" PLIST_SUB+= MPI="@comment " .endif -NO_STAGE= yes .include .if ${ARCH} == "i386" @@ -83,47 +75,38 @@ pre-everything:: .endif pre-configure: - ${REINPLACE_CMD} -e 's/-lthread/-pthread/;s/-lpthread/-pthread/' \ + ${REINPLACE_CMD} -e 's/-lthread/-pthread/;s/-lpthread/-pthread/'\ -e 's/CLIBFLAGS =/CLIBFLAGS = -fPIC/' \ ${WRKSRC}/src/Make.inc/Makefile.inc.${MF}_pc_freebsd ${LN} -sf ${WRKSRC}/src/Make.inc/Makefile.inc.${MF}_pc_freebsd \ ${WRKSRC}/src/Makefile.inc - ${REINPLACE_CMD} -e 's|in subdirectory "doc"|under ${DATADIR}|' \ - ${WRKSRC}/LICENSE_en.txt + ${REINPLACE_CMD} -E -e 's|cd (.*) ; * \$$\(MAKE\)|\$$(MAKE) -C \1|' \ + -e 's|\&\& \$$\(MAKE\)||' ${WRKSRC}/src/Makefile do-install: - ${INSTALL_PROGRAM} ${BINS:S|^|${WRKSRC}/bin/|} ${PREFIX}/bin - ${INSTALL_DATA} ${INCS:S|^|${WRKSRC}/include/|} ${PREFIX}/include - ${INSTALL_DATA} ${LIBS:S|^|${WRKSRC}/lib/|} ${PREFIX}/lib - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${LICDOCS:S|^|${WRKSRC}/doc/|} ${DATADIR} - ${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/man/man1/|} ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${BINS:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${INCS:S|^|${WRKSRC}/include/|} ${STAGEDIR}${PREFIX}/include + ${INSTALL_DATA} ${LIBS:S|^|${WRKSRC}/lib/|} ${STAGEDIR}${PREFIX}/lib + ${INSTALL_MAN} ${WRKSRC}/man/man1/* ${STAGEDIR}${MANPREFIX}/man/man1 .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR} - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR}/grf ${EXAMPLESDIR}/tgt - ${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/examples/|} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/grf/* ${EXAMPLESDIR}/grf - ${INSTALL_DATA} ${WRKSRC}/tgt/* ${EXAMPLESDIR}/tgt - @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}." + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/grf ${STAGEDIR}${EXAMPLESDIR}/tgt + ${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/examples/|} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/grf/* ${STAGEDIR}${EXAMPLESDIR}/grf + ${INSTALL_DATA} ${WRKSRC}/tgt/* ${STAGEDIR}${EXAMPLESDIR}/tgt .endif -post-install: - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} - .if defined(MAINTAINER_MODE) regression-test: install (amk_ccc 3 | acpl - ${WRKDIR}/ccc3.tgt && \ ${GUNZIP_CMD} -c ${EXAMPLESDIR}/grf/bump.grf.gz | \ gmap - ${WRKDIR}/ccc3.tgt ${WRKDIR}/brol.map) (cd ${WRKSRC}/examples && \ - ${FC} -o scotch_test scotch_example_1.f \ - -I${PREFIX}/include -L${PREFIX}/lib -lscotch -lscotcherr -lm \ + ${FC} -o scotch_test scotch_example_1.f ${FCFLAGS} \ + -I${PREFIX}/include ${LDFLAGS} -L${PREFIX}/lib -lscotch -lscotcherr -lm \ && ./scotch_test) . if !defined(WITHOUT_MPI) (${GUNZIP_CMD} -c ${EXAMPLESDIR}/grf/bump.grf.gz | dgtst) Modified: head/cad/scotch/pkg-plist ============================================================================== --- head/cad/scotch/pkg-plist Sun May 11 10:03:32 2014 (r353666) +++ head/cad/scotch/pkg-plist Sun May 11 10:04:02 2014 (r353667) @@ -126,9 +126,39 @@ lib/libscotchmetis.a %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vcmplt.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vhcub.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/void.tgt -%%DATADIR%%/CeCILL-C_V1-en.txt -%%DATADIR%%/CeCILL-C_V1-fr.txt -@dirrm %%DATADIR%% +man/man1/acpl.1.gz +man/man1/amk_ccc.1.gz +man/man1/amk_fft2.1.gz +man/man1/amk_grf.1.gz +man/man1/amk_hy.1.gz +man/man1/amk_m2.1.gz +man/man1/amk_p2.1.gz +man/man1/atst.1.gz +man/man1/dggath.1.gz +man/man1/dgmap.1.gz +man/man1/dgord.1.gz +man/man1/dgpart.1.gz +man/man1/dgscat.1.gz +man/man1/dgtst.1.gz +man/man1/gbase.1.gz +man/man1/gcv.1.gz +man/man1/gmap.1.gz +man/man1/gmk_hy.1.gz +man/man1/gmk_m2.1.gz +man/man1/gmk_m3.1.gz +man/man1/gmk_msh.1.gz +man/man1/gmk_ub2.1.gz +man/man1/gmtst.1.gz +man/man1/gord.1.gz +man/man1/gotst.1.gz +man/man1/gout.1.gz +man/man1/gpart.1.gz +man/man1/gtst.1.gz +man/man1/mcv.1.gz +man/man1/mmk_m2.1.gz +man/man1/mmk_m3.1.gz +man/man1/mord.1.gz +man/man1/mtst.1.gz %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tgt %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/grf %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%