From nobody Sat Jul 09 20:23:20 2022 X-Original-To: dev-commits-ports-main@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 EB76C18085E1; Sat, 9 Jul 2022 20:23:20 +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 4LgM6J6MY9z49kk; Sat, 9 Jul 2022 20:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657398200; 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=5GGcp0l/mCr/y2K/MOaw+OCnnE5sZd4l2Kq4p99Nu6o=; b=vwLCGJbJErdiB/72XqnlJdb/BMRL3LQCmIxr5UrWjo5AJXH+TvaDTWHAF/jJLa0q5OLTs0 nJqtQHH7jMeEqbyveLkCNbG+okvD4WALvBpgYbKKNWuKHgpV3wmXcrywotab72vsSH3dK7 OUfmhTX0ADuE+oMtSFdTw67dAddhqYMB0ZRZPMfQknZtqcgIp+y8O16EYk2XGtlM2brYRX Cc2Z+VPINofrZLi7gIe4aYmGWsXSqvNphpoYPy7Y1UHaPoj1OgdfLZCOn8EE1q+DrptX5n MVuYdCpG31gl0GApR4Lr0RpwewuG53Fr/o17ZhfnsPbpG18ysrWgm3F4sde7zQ== 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 4LgM6J5QThzyJ6; Sat, 9 Jul 2022 20:23:20 +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 269KNKZO044069; Sat, 9 Jul 2022 20:23:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 269KNKbt044068; Sat, 9 Jul 2022 20:23:20 GMT (envelope-from git) Date: Sat, 9 Jul 2022 20:23:20 GMT Message-Id: <202207092023.269KNKbt044068@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: 8241f67b4f59 - main - cad/qucs-s: Add NGSPICE and QUCSATOR options List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 8241f67b4f592d847ec7d99c92d87ff0d479a074 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657398200; 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=5GGcp0l/mCr/y2K/MOaw+OCnnE5sZd4l2Kq4p99Nu6o=; b=R9wc7z/ClZ/QCfWVWvdBJbn8mzg2VyndM4CID5ycdAxZf85v3POtHDLNVx6XLNG2JDw0FU 22bDCiZxxzqTBLzypm2eD+5G2B9LgaR4srPoOCaLEQ3mHDDDm4nXayzwInJSjBdtp57Rbe wN0P8ObEGApBD0qm14KS3pNPsNXRLZ0qd+/6JrwVUNScgsTZE5Y6oyQSo7p3am5dL3zp9N eElYVhccYCFo7/cjCRB4YiUpGZvLLreIo+zxvv3dyPPk72QGBWBVxlbLfFhRzTnxSivE4D FRdWg999oteXZ6K7rdL6IjkUPmNYQ4TUsHW48TrQWuGcEhetYDMsS1LZ61TqJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657398200; a=rsa-sha256; cv=none; b=RFz8LfVaIML6ijezFqshI/No2qUO3rNY40TDTNAX3Ad8RdyQHRo6aVCt8GaooISgZkZIE8 GVUeanT+Aibu9ocQ2PykY0rdrxI1AJIwcEjh1QzpATh/Q6+/wXw405mECncONuTTmCfYmW 16w7OGsZ0cRoqxyNDufLnjvOhSbN6/zmaTSMi3y8s4tttUF1Eg6S0Fzn+NDduvRHdjrCA2 lII3fN+mFGYsmxjptFl0jBiRNmvY7MVPAUSupOqnJDq2RPmZ2ocSNI77wzvrY96XccZ+ST nbLmZ8hPKvEs2p32Nu67t8AgmTyIJjYNcCj8TaNpFGKObGROxi0zk9ZftP+cww== 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=8241f67b4f592d847ec7d99c92d87ff0d479a074 commit 8241f67b4f592d847ec7d99c92d87ff0d479a074 Author: Yuri Victorovich AuthorDate: 2022-07-09 20:22:25 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-09 20:23:18 +0000 cad/qucs-s: Add NGSPICE and QUCSATOR options --- cad/qucs-s/Makefile | 19 +++++++++++++------ cad/qucs-s/files/patch-qucs_main.cpp | 13 +++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/cad/qucs-s/Makefile b/cad/qucs-s/Makefile index 712c8dcdac25..b55be84a0e8c 100644 --- a/cad/qucs-s/Makefile +++ b/cad/qucs-s/Makefile @@ -1,6 +1,6 @@ PORTNAME= qucs-s DISTVERSION= 0.0.24 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org @@ -9,8 +9,7 @@ COMMENT= Quite Universal Circuit Simulator: GUI for circuit simulation kernels LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ngspice:cad/ngspice_rework \ - octave:math/octave +RUN_DEPENDS= octave:math/octave USES= cmake qt:5 USE_QT= core gui printsupport svg widgets buildtools_build linguisttools_build qmake_build @@ -20,12 +19,20 @@ GH_ACCOUNT= ra3xdh GH_PROJECT= qucs_s OPTIONS_GROUP= BACKENDS -OPTIONS_GROUP_BACKENDS= XYCE +OPTIONS_GROUP_BACKENDS= NGSPICE XYCE QUCSATOR +OPTIONS_DEFAULT= NGSPICE -BACKENDS_DESC= Additional backends (in addition to ngspice) +BACKENDS_DESC= Simulation backends + +NGSPICE_DESC= ngspice mixed-signal circuit simulator +NGSPICE_RUN_DEPENDS= ngspice:cad/ngspice_rework XYCE_DESC= Xyce electronic simulator -XYCE_RUN_DEPENDS= Xyce:cad/xyce +XYCE_RUN_DEPENDS= Xyce:cad/xyce \ + mpich>0:net/mpich # mpich for the mpirun executable + +QUCSATOR_DESC= Circuit simulator of the Qucs project +QUCSATOR_RUN_DEPENDS= qucsator:cad/qucsator post-patch: # first the patch under files/ introduces %%PREFIX%%, and now we fix it here diff --git a/cad/qucs-s/files/patch-qucs_main.cpp b/cad/qucs-s/files/patch-qucs_main.cpp index e30cdf8d7d3f..ffe058a7dcb9 100644 --- a/cad/qucs-s/files/patch-qucs_main.cpp +++ b/cad/qucs-s/files/patch-qucs_main.cpp @@ -2,6 +2,19 @@ --- qucs/main.cpp.orig 2022-06-30 18:34:40 UTC +++ qucs/main.cpp +@@ -114,10 +114,10 @@ bool loadSettings() + if (QucsSettings.Qucsconv.isEmpty()) + QucsSettings.Qucsconv = QucsSettings.QucsatorDir + QDir::separator() + "qucsconv" + executableSuffix; + } else { +- QucsSettings.Qucsator = QucsSettings.BinDir + "qucsator" + executableSuffix; ++ QucsSettings.Qucsator = "%%PREFIX%%/bin/qucsator"; + QucsSettings.QucsatorDir = QucsSettings.BinDir; + if (QucsSettings.Qucsconv.isEmpty()) +- QucsSettings.Qucsconv = QucsSettings.BinDir + "qucsconv" + executableSuffix; ++ QucsSettings.Qucsconv = "%%PREFIX%%/bin/qucsconv"; + } + //if(settings.contains("BinDir"))QucsSettings.BinDir = settings.value("BinDir").toString(); + //if(settings.contains("LangDir"))QucsSettings.LangDir = settings.value("LangDir").toString(); @@ -139,13 +139,13 @@ bool loadSettings() #ifdef Q_OS_WIN QucsSettings.XyceExecutable = "Xyce.exe";