From nobody Sun Jul 10 22:37:56 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A8CC31D08F42; Sun, 10 Jul 2022 22:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lh2382yvpz3GYp; Sun, 10 Jul 2022 22:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657492676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z1EOGAJB/JqhBzc7KNhROclzr7IuZC/MjtFFvHYXh5g=; b=wjGkwOQpb7wpIM5rN59adEuBoqYjrDfAUQ6e9vONLhd3C9BqTlB5p8JQQo+Bbom+t65NVT S8I44iSdE679WghPCa3FNpW31rGoMo7yPZDYTdQrSJP/99GtZpY9rQphfrIUR7VbdZT22P 2I+uPRLi9lRnZbbGC2iJcUbeI9Q5BpgE8o5fs6R/56UXBH9B224zdDcMlgt3lpn2ej0MSA deBk74rt/Zsok2VBWlpGl7FxRJzp3DCyNtvvSQ4K9MbANUta7MFCDh30nAaqGYiqtf5XA2 EuhIXjueRgVxCWOSxy853fx5u98XrcShUu0L1WWcNMJp4HTzLBbAoaYWitWVBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lh238246GzhQm; Sun, 10 Jul 2022 22:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26AMbu4t066680; Sun, 10 Jul 2022 22:37:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26AMbuAq066679; Sun, 10 Jul 2022 22:37:56 GMT (envelope-from git) Date: Sun, 10 Jul 2022 22:37:56 GMT Message-Id: <202207102237.26AMbuAq066679@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 4054c13798a5 - main - cad/xyce: Change to GNU tools build; Add missing test dependencies List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4054c13798a5c74e89f5258fd2eb23d1eb72a67d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657492676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z1EOGAJB/JqhBzc7KNhROclzr7IuZC/MjtFFvHYXh5g=; b=GejChBWux+X2MWtQprBu0hozuxEeZyN9K1jSXnygO+fqw4k+7yiyJ8vy83h7SPT82wLTDW XtemtR21gvQHMyVRdYYJJu1babl8twMm9SRAt8Av6inW8e3EvPQhJ1qOvzVKBmXRkAulAR sm/YyOOqNmbcDorplGBU94NgYzroHthxT7sR7nkvy8U6uW37ryyPhZHub5KXSbKxTKi+Yh eUjUaQkOhJjh1A7E3H46AyBksUsXGO+lnQ86K6E95QAyf4/70rNKCmmAlzVAgGuFVsI0Nx lRvttinYqSTyMJD1a6KeCLChycZ5XEtTOXQGNyL4qDMVeTPzRI1L4n53uyQJDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657492676; a=rsa-sha256; cv=none; b=kVNmGwfvKXC77JkVCW6w3SEkoJumE6J1G5SCFtWbEoM3wTuUPyCIUB1RwCY/m8jM6wSrtd 5TtCIe+cOcydD+sAcoEthEi3Sv7gtKzRwUwL27tWOUi+P3cJoUSOPzA/ArfSqe8RH2Vf8D T+jm8TSgJPIupEOgbilMprTmejMwWD0vsuWPiMbgCR01YlL665fx5yG+wK1+wiBM2vZyvF FkoZHRVYNZv1army7vyJyr1X/1AYgZF/tGr6ojuigviMYAWUOVvzs/yp//O1r9EgWIrnm9 M2ab2bgOCBAH6LtgXAoI0e3cj8c2orkAC6BN5la7b5ErjHFzdH/VNoij5lFPPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4054c13798a5c74e89f5258fd2eb23d1eb72a67d commit 4054c13798a5c74e89f5258fd2eb23d1eb72a67d Author: Yuri Victorovich AuthorDate: 2022-07-10 22:25:07 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-10 22:37:53 +0000 cad/xyce: Change to GNU tools build; Add missing test dependencies GNU tools build is stable, and cmake build isn't yet considered to be stable. --- cad/xyce/Makefile | 40 ++++++++++++++++++++++++++++------------ cad/xyce/pkg-plist | 12 ++++++++++++ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/cad/xyce/Makefile b/cad/xyce/Makefile index 558dca5707a6..b9e2a23955d0 100644 --- a/cad/xyce/Makefile +++ b/cad/xyce/Makefile @@ -1,9 +1,10 @@ PORTNAME= xyce DISTVERSION= 7.5.0 +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= https://github.com/Xyce/Xyce/archive/refs/tags/ DISTNAME= Release-${DISTVERSION} -DIST_SUBDIR= xyce-${DISTVERSION} +DIST_SUBDIR= ${PORTNAME}-${DISTVERSION} MAINTAINER= yuri@FreeBSD.org COMMENT= Xyce electronic simulator @@ -11,24 +12,39 @@ COMMENT= Xyce electronic simulator LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libamd.so:math/suitesparse-amd \ - libblas.so:math/blas \ +LIB_DEPENDS= libblas.so:math/blas \ libfftw3.so:math/fftw3 \ liblapack.so:math/lapack \ libtpetra.so:science/trilinos \ + \ + libamd.so:math/suitesparse-amd \ + libcholmod.so:math/suitesparse-cholmod \ + libcolamd.so:math/suitesparse-colamd \ + libsuitesparseconfig.so:math/suitesparse-config \ libumfpack.so:math/suitesparse-umfpack -TEST_DEPENDS= git:devel/git +TEST_DEPENDS= git:devel/git \ + ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ + # also needs pycompadre -USES= bison cmake localbase - -CMAKE_ON= BUILD_SHARED_LIBS +USES= autoreconf bison gmake fortran libtool localbase perl5 python:test # GNU tools should be used for 7.5 and on until the cmake cbuild is declared stable +USE_CXXSTD= c++14 # otherwise configure fails because of c++14 features like std::conditional_t +USE_LDCONFIG= yes +USE_PERL5= test WRKSRC= ${WRKDIR}/Xyce-Release-${DISTVERSION} -post-install: - @cd ${STAGEDIR}${PREFIX} && \ - ${RM} ${STAGEDIR}${PREFIX}/doc/README.TXT && \ - ${RMDIR} ${STAGEDIR}${PREFIX}/doc +GNU_CONFIGURE= yes +CONFIGURE_ARGS= LEX=/usr/bin/flex \ + --enable-stokhos \ + --enable-amesos \ + --enable-shared \ + --disable-static + +INSTALL_TARGET= install-strip + +BINARY_ALIAS= python=${PYTHON_CMD} # only for tests do-test: # checkout tests @@ -43,7 +59,7 @@ do-test: @cd ${TEST_WRKSRC} && ( \ ${ECHO} "running tests ..."; \ eval `${WRKDIR}/Xyce_Regression/TestScripts/suggestXyceTagList.sh ${STAGEDIR}${PREFIX}/bin/Xyce` ; \ - ${WRKDIR}/Xyce_Regression/TestScripts/run_xyce_regression \ + ${SETENV} ${TEST_ENV} ${WRKDIR}/Xyce_Regression/TestScripts/run_xyce_regression \ --output=${WRKDIR}/Xyce_Test \ --xyce_test="${WRKDIR}/Xyce_Regression" \ --resultfile=${WRKDIR}/serial_results \ diff --git a/cad/xyce/pkg-plist b/cad/xyce/pkg-plist index 390f7b41e0f2..2f8ee5043571 100644 --- a/cad/xyce/pkg-plist +++ b/cad/xyce/pkg-plist @@ -83,3 +83,15 @@ include/N_UTL_Xyce.h include/N_UTL_fwd.h include/Xyce_config.h lib/libxyce.so +lib/libxyce.so.0 +lib/libxyce.so.0.0.0 +share/xml/adms.implicit.xml +share/xml/html_params.xml +share/xml/xyceAnalogFunction_nosac.xml +share/xml/xyceBasicTemplates_nosac.xml +share/xml/xyceBootstrapFile.xml +share/xml/xyceHeaderFile_nosac.xml +share/xml/xyceImplementationFile_nosac.xml +share/xml/xyceMakefile.am.xml +share/xml/xyceOutVarsDoc.xml +share/xml/xyceVersion_nosac.xml