git: 715850068772 - main - cad/qucs-s: Update 24.1.0 => 25.1.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 24 Mar 2025 01:19:00 UTC
The branch main has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=715850068772c53709ffadc3cda5715f44a0eed9
commit 715850068772c53709ffadc3cda5715f44a0eed9
Author: Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-03-24 01:00:22 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-03-24 01:18:51 +0000
cad/qucs-s: Update 24.1.0 => 25.1.1
Changelogs:
https://github.com/ra3xdh/qucs_s/blob/25.1.1/NEWS.md
Based on patch from Älven <alster@vinterdalen.se>
PR: 284974 282568
Tested by: Älven <alster@vinterdalen.se>
Approved by: yuri (maintainer)
---
cad/qucs-s/Makefile | 43 +++++++++++----------
cad/qucs-s/distinfo | 6 +--
cad/qucs-s/files/patch-CMakeLists.txt | 14 -------
cad/qucs-s/files/patch-qucs_main.cpp | 34 ----------------
cad/qucs-s/files/patch-qucs_settings.cpp | 22 +++++++++++
cad/qucs-s/pkg-plist | 66 +++++++++++++++++++++++++++++++-
6 files changed, 112 insertions(+), 73 deletions(-)
diff --git a/cad/qucs-s/Makefile b/cad/qucs-s/Makefile
index 48692d44fb55..84ccf394228c 100644
--- a/cad/qucs-s/Makefile
+++ b/cad/qucs-s/Makefile
@@ -1,45 +1,46 @@
PORTNAME= qucs-s
-DISTVERSION= 24.1.0
+DISTVERSION= 25.1.1
CATEGORIES= cad
MASTER_SITES= https://github.com/ra3xdh/qucs_s/releases/download/${DISTVERSION}/
MAINTAINER= yuri@FreeBSD.org
COMMENT= Quite Universal Circuit Simulator: GUI for circuit simulation kernels
-WWW= https://ra3xdh.github.io/
+WWW= https://ra3xdh.github.io/ \
+ https://github.com/ra3xdh/qucs_s/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+BUILD_DEPENDS= dos2unix:converters/dos2unix \
+ gperf:devel/gperf \
+ vulkan-headers>0:graphics/vulkan-headers
+
USES= bison cmake gl localbase qt:6
-USE_QT= base svg tools:build
-USE_GL= gl opengl
+USE_GL= opengl
+USE_QT= base charts svg tools:build
+OPTIONS_DEFAULT= NGSPICE
OPTIONS_GROUP= BACKENDS RTDEPENDS
-OPTIONS_GROUP_BACKENDS= NGSPICE XYCE QUCSATOR
+OPTIONS_GROUP_BACKENDS= NGSPICE QUCSATOR XYCE
OPTIONS_GROUP_RTDEPENDS= OCTAVE ADMS
-OPTIONS_DEFAULT= NGSPICE
+ADMS_DESC= ADMS model generator used for some non-essential features
BACKENDS_DESC= Simulation backends
-RTDEPENDS_DESC= Optional run-time dependencies
-
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 \
- mpich>0:net/mpich # mpich for the mpirun executable
-
-QUCSATOR_DESC= Circuit simulator of the Qucs project
-QUCSATOR_RUN_DEPENDS= qucsator:cad/qucsator
-
OCTAVE_DESC= Octave is used for some non-essential features
-OCTAVE_RUN_DEPENDS= octave:math/octave
+QUCSATOR_DESC= Circuit simulator of the Qucs project
+RTDEPENDS_DESC= Optional run-time dependencies
+XYCE_DESC= Xyce electronic simulator
-ADMS_DESC= ADMS model generator used for some non-essential features
ADMS_RUN_DEPENDS= admsXml:cad/adms
+NGSPICE_RUN_DEPENDS= ngspice:cad/ngspice_rework
+OCTAVE_RUN_DEPENDS= octave:math/octave
+QUCSATOR_RUN_DEPENDS= qucsator:cad/qucsator
+XYCE_RUN_DEPENDS= Xyce:cad/xyce \
+ mpirun:net/mpich
post-patch:
- # first the patch under files/ introduces %%PREFIX%%, and now we fix it here
- @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/qucs/main.cpp
+ # first the patch under files/ introduces %%LOCALBASE%%, and now we fix it here
+ ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/qucs/settings.cpp
.include <bsd.port.mk>
diff --git a/cad/qucs-s/distinfo b/cad/qucs-s/distinfo
index 377c21e6e0cc..8275afe5b645 100644
--- a/cad/qucs-s/distinfo
+++ b/cad/qucs-s/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708273970
-SHA256 (qucs-s-24.1.0.tar.gz) = ce6e03e26fddbe107d1749329423214c2714d3103f9a528bbcccd228eb14bac0
-SIZE (qucs-s-24.1.0.tar.gz) = 3843381
+TIMESTAMP = 1742327652
+SHA256 (qucs-s-25.1.1.tar.gz) = 2aefd4bb8faef5ce13623b0b7daf5264cc6fa252c9bf69e46bc48256535e10dd
+SIZE (qucs-s-25.1.1.tar.gz) = 4717517
diff --git a/cad/qucs-s/files/patch-CMakeLists.txt b/cad/qucs-s/files/patch-CMakeLists.txt
deleted file mode 100644
index a4cb00b766ac..000000000000
--- a/cad/qucs-s/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-- workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25691
-- also see https://github.com/ra3xdh/qucs_s/issues/592#issuecomment-1952967356
-
---- CMakeLists.txt.orig 2024-02-18 17:40:43 UTC
-+++ CMakeLists.txt
-@@ -35,7 +35,7 @@ set(QT_DEFAULT_MAJOR_VERSION 6)
- message(STATUS "${PROJECT_NAME} ${CMAKE_INSTALL_PREFIX} ${qucs-suite_BINARY_DIR}" )
-
- set(QT_DEFAULT_MAJOR_VERSION 6)
--find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Gui Widgets LinguistTools)
-+find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core Gui Widgets LinguistTools)
- find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets LinguistTools)
- message(STATUS "QT Major Version: " ${QT_VERSION_MAJOR})
-
diff --git a/cad/qucs-s/files/patch-qucs_main.cpp b/cad/qucs-s/files/patch-qucs_main.cpp
deleted file mode 100644
index ffe058a7dcb9..000000000000
--- a/cad/qucs-s/files/patch-qucs_main.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-- this patch works together with post-patch: %%PREFIX%% are substituted there
-
---- 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";
- #else
-- QucsSettings.XyceExecutable = "/usr/local/Xyce-Release-6.8.0-OPENSOURCE/bin/Xyce";
-+ QucsSettings.XyceExecutable = "%%PREFIX%%/bin/Xyce";
- #endif
- }
- if(settings.contains("XyceParExecutable")) QucsSettings.XyceParExecutable = settings.value("XyceParExecutable").toString();
-- else QucsSettings.XyceParExecutable = "mpirun -np %p /usr/local/Xyce-Release-6.8.0-OPENMPI-OPENSOURCE/bin/Xyce";
-+ else QucsSettings.XyceParExecutable = "mpirun -np %p %%PREFIX%%/bin/Xyce";
- if(settings.contains("SpiceOpusExecutable")) QucsSettings.SpiceOpusExecutable = settings.value("SpiceOpusExecutable").toString();
-- else QucsSettings.SpiceOpusExecutable = "spiceopus";
-+ else QucsSettings.SpiceOpusExecutable = "%%PREFIX%%/bin/spiceopus";
- if(settings.contains("Nprocs")) QucsSettings.NProcs = settings.value("Nprocs").toInt();
- else QucsSettings.NProcs = 4;
- if(settings.contains("S4Q_workdir")) QucsSettings.S4Qworkdir = settings.value("S4Q_workdir").toString();
diff --git a/cad/qucs-s/files/patch-qucs_settings.cpp b/cad/qucs-s/files/patch-qucs_settings.cpp
new file mode 100644
index 000000000000..a782a14e0e57
--- /dev/null
+++ b/cad/qucs-s/files/patch-qucs_settings.cpp
@@ -0,0 +1,22 @@
+- this patch works together with post-patch: %%LOCALBASE%% are substituted there
+
+--- qucs/settings.cpp.orig 2025-03-14 13:47:08 UTC
++++ qucs/settings.cpp
+@@ -62,7 +62,7 @@ void settingsManager::initDefaults()
+ #else
+ m_Defaults["NgspiceExecutable"] = "ngspice";
+ #ifndef Q_OS_MACOS
+- m_Defaults["XyceExecutable"] = "/usr/local/Xyce-Release-6.8.0-OPENSOURCE/bin/Xyce";
++ m_Defaults["XyceExecutable"] = "%%LOCALBASE%%/bin/Xyce";
+ #else
+ m_Defaults["XyceExecutable"] = "Xyce";
+ #endif
+@@ -70,7 +70,7 @@ void settingsManager::initDefaults()
+ m_Defaults["OctaveExecutable"] = "octave";
+ #endif
+
+- m_Defaults["XyceParExecutable"] = "mpirun -np %p /usr/local/Xyce-Release-6.8.0-OPENMPI-OPENSOURCE/bin/Xyce";
++ m_Defaults["XyceParExecutable"] = "mpirun -np %p %%LOCALBASE%%/bin/Xyce";
+ m_Defaults["S4Q_workdir"] = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
+ m_Defaults["Nprocs"] = 4;
+ m_Defaults["SpiceOpusExecutable"] = "spiceopus";
diff --git a/cad/qucs-s/pkg-plist b/cad/qucs-s/pkg-plist
index 82a0f8951fdd..7a907e4ba315 100644
--- a/cad/qucs-s/pkg-plist
+++ b/cad/qucs-s/pkg-plist
@@ -3,11 +3,13 @@ bin/qucs-sactivefilter
bin/qucs-sattenuator
bin/qucs-sfilter
bin/qucs-spowercombining
+bin/qucs-sspar-viewer
bin/qucs-strans
bin/qucs_mkdigilib
bin/qucs_run_hdl
bin/qucs_run_verilog
-bin/vcd2qucsdat
+bin/qucsator_rf
+bin/qucsconv_rf
share/applications/qucs-s.desktop
share/icons/hicolor/128x128/apps/qucs-s.png
share/icons/hicolor/16x16/apps/qucs-s.png
@@ -19,6 +21,9 @@ share/icons/hicolor/512x512/apps/qucs-s.png
share/icons/hicolor/64x64/apps/qucs-s.png
share/icons/hicolor/scalable/apps/qucs-s.svg
share/man/man1/qucs-s.1.gz
+share/man/man1/qucsator_rf.1.gz
+share/man/man1/qucsconv_rf.1.gz
+share/metainfo/io.github.ra3xdh.qucs_s.metainfo.xml
%%DATADIR%%/examples/README
%%DATADIR%%/examples/external_interface/cpp-interface/boostconverter.net
%%DATADIR%%/examples/external_interface/cpp-interface/main.cpp
@@ -44,6 +49,8 @@ share/man/man1/qucs-s.1.gz
%%DATADIR%%/examples/ngspice/BJT-swp.sch
%%DATADIR%%/examples/ngspice/BJT.sch
%%DATADIR%%/examples/ngspice/BJT_Phase_Shift_Osc.sch
+%%DATADIR%%/examples/ngspice/BJT_TEMPER_swp.sch
+%%DATADIR%%/examples/ngspice/BJT_T_swp.sch
%%DATADIR%%/examples/ngspice/BJT_dc.sch
%%DATADIR%%/examples/ngspice/BSIM4/BSIM4_Ring_Osc.sch
%%DATADIR%%/examples/ngspice/BSIM4/BSIM4_inv.sch
@@ -154,6 +161,7 @@ share/man/man1/qucs-s.1.gz
%%DATADIR%%/examples/ngspice/time_resistor.sch
%%DATADIR%%/examples/qucsator/Amp_Baseband_Low-noise.sch
%%DATADIR%%/examples/qucsator/Amp_Two_Tone.sch
+%%DATADIR%%/examples/qucsator/BJT_T_swp_qucs.sch
%%DATADIR%%/examples/qucsator/BPF_1550_edge_cpld.sch
%%DATADIR%%/examples/qucsator/BPF_2000_Co-ax.sch
%%DATADIR%%/examples/qucsator/Comb_Gen.sch
@@ -238,8 +246,11 @@ share/man/man1/qucs-s.1.gz
%%DATADIR%%/examples/templates_ngspice/AC_TRAN_Active_Filter_analysis.sch
%%DATADIR%%/examples/templates_ngspice/AC_TRAN_FOUR_OpAmp.sch
%%DATADIR%%/examples/templates_ngspice/AC_TRAN_OpAmp.sch
+%%DATADIR%%/examples/templates_ngspice/Monte_Carlo.sch
%%DATADIR%%/examples/templates_ngspice/Pass_Parameters_Subcircuit.sch
+%%DATADIR%%/examples/templates_ngspice/Pwr-Amp_DC_analysis.sch
%%DATADIR%%/examples/templates_ngspice/Pwr-Amp_wingspread_analysis.sch
+%%DATADIR%%/examples/templates_ngspice/PwrAmpTHD.sch
%%DATADIR%%/examples/templates_ngspice/S-parameter_active_analysis.sch
%%DATADIR%%/examples/templates_ngspice/S-parameter_passive_analysis.sch
%%DATADIR%%/examples/templates_ngspice/TRAN_FFT_OpAmp.sch
@@ -324,25 +335,43 @@ share/man/man1/qucs-s.1.gz
%%DATADIR%%/lang/qucs_uk.qm
%%DATADIR%%/lang/qucs_zh_CN.qm
%%DATADIR%%/library/555_timer.lib
+%%DATADIR%%/library/Analog.lib
%%DATADIR%%/library/AudioIC.lib
%%DATADIR%%/library/BF998.lib
%%DATADIR%%/library/BJT_Extended.lib
%%DATADIR%%/library/Bridges.lib
%%DATADIR%%/library/Cores.lib
%%DATADIR%%/library/Crystal.lib
+%%DATADIR%%/library/Digital_AUX.lib
+%%DATADIR%%/library/Digital_CD.lib
+%%DATADIR%%/library/Digital_HC.lib
+%%DATADIR%%/library/Digital_LV.lib
+%%DATADIR%%/library/Digital_XSPICE.lib
%%DATADIR%%/library/Diodes.lib
%%DATADIR%%/library/DiodesSchottky.lib
+%%DATADIR%%/library/Diodes_Extended.lib
+%%DATADIR%%/library/DualGateMOSFET.lib
+%%DATADIR%%/library/DualGateMOSFET/DualGateMos.cir
+%%DATADIR%%/library/GeDiodes.lib
%%DATADIR%%/library/Ideal.lib
%%DATADIR%%/library/JFETs.lib
%%DATADIR%%/library/LEDs.lib
+%%DATADIR%%/library/LaserDiodes.lib
%%DATADIR%%/library/Loudspeaker.lib
%%DATADIR%%/library/MOSFETs.lib
+%%DATADIR%%/library/MixerIC.lib
%%DATADIR%%/library/NMOSFETs.lib
+%%DATADIR%%/library/Neon.lib
%%DATADIR%%/library/OpAmps.lib
%%DATADIR%%/library/Optocoupler.lib
+%%DATADIR%%/library/Optocoupler/moc3052_3062.cir
+%%DATADIR%%/library/PIN_Diodes.lib
%%DATADIR%%/library/PMOSFETs.lib
+%%DATADIR%%/library/PWM_Controller.lib
%%DATADIR%%/library/PhotovoltaicRelay.lib
+%%DATADIR%%/library/RC.lib
%%DATADIR%%/library/Regulators.lib
+%%DATADIR%%/library/SPICE_TLine.lib
%%DATADIR%%/library/SpiceOpamp.lib
%%DATADIR%%/library/Substrates.lib
%%DATADIR%%/library/Thermistor.lib
@@ -350,6 +379,17 @@ share/man/man1/qucs-s.1.gz
%%DATADIR%%/library/Transformers.lib
%%DATADIR%%/library/Transistors.lib
%%DATADIR%%/library/Tubes.lib
+%%DATADIR%%/library/TubesExtended.lib
+%%DATADIR%%/library/TubesExtended/2P2.CIR
+%%DATADIR%%/library/TubesExtended/2P3.CIR
+%%DATADIR%%/library/TubesExtended/5899.CIR
+%%DATADIR%%/library/TubesExtended/6F12P.CIR
+%%DATADIR%%/library/TubesExtended/6K1J.CIR
+%%DATADIR%%/library/TubesExtended/EF183.CIR
+%%DATADIR%%/library/TubesExtended/EF184.cir
+%%DATADIR%%/library/TubesExtended/tube.lib
+%%DATADIR%%/library/Varactor.lib
+%%DATADIR%%/library/Varactor_RF.lib
%%DATADIR%%/library/Varistors.lib
%%DATADIR%%/library/VoltageComparators.lib
%%DATADIR%%/library/VoltageReferences.lib
@@ -409,10 +449,34 @@ share/man/man1/qucs-s.1.gz
%%DATADIR%%/python/parse_result_example.py
%%DATADIR%%/python/rc_ac_sweep.dat
%%DATADIR%%/python/rc_ac_sweep.net
+%%DATADIR%%/symbols/and2.sym
+%%DATADIR%%/symbols/buf.sym
+%%DATADIR%%/symbols/darlington_npn.sym
+%%DATADIR%%/symbols/darlington_pnp.sym
+%%DATADIR%%/symbols/diac.sym
+%%DATADIR%%/symbols/diode.sym
+%%DATADIR%%/symbols/inv.sym
+%%DATADIR%%/symbols/led.sym
+%%DATADIR%%/symbols/nand2.sym
%%DATADIR%%/symbols/nmos4.sym
+%%DATADIR%%/symbols/nor2.sym
%%DATADIR%%/symbols/opamp3t.sym
%%DATADIR%%/symbols/opamp5t.sym
+%%DATADIR%%/symbols/opamp6t.sym
+%%DATADIR%%/symbols/opamp7t.sym
+%%DATADIR%%/symbols/opto_bjt4.sym
+%%DATADIR%%/symbols/opto_bjt5.sym
+%%DATADIR%%/symbols/or2.sym
%%DATADIR%%/symbols/pmos4.sym
+%%DATADIR%%/symbols/schottky.sym
+%%DATADIR%%/symbols/thyristor.sym
+%%DATADIR%%/symbols/triac.sym
+%%DATADIR%%/symbols/tube_penthode.sym
+%%DATADIR%%/symbols/tube_triode.sym
+%%DATADIR%%/symbols/varactor.sym
+%%DATADIR%%/symbols/xor.sym
+%%DATADIR%%/symbols/zener.sym
+%%DATADIR%%/symbols/zener3.sym
%%DATADIR%%/tline/cstrip_kj_1.trc
%%DATADIR%%/tline/cstrip_kj_2.trc
%%DATADIR%%/tline/hp.trc