cad/qucs-s: update 2.1.0 → 24.1.0

PR:	277130
Reported by:	kunda <luzpaz@pm.me>

5 files changed, 47 insertions, 24 deletions

diff --git a/cad/qucs-s/Makefile b/cad/qucs-s/Makefile
index 43afedcc0944..48692d44fb55 100644
--- a/cad/qucs-s/Makefile
+++ b/cad/qucs-s/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	qucs-s
-DISTVERSION=	2.1.0
+DISTVERSION=	24.1.0
 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
@@ -13,10 +14,6 @@ USES=		bison cmake gl localbase qt:6
 USE_QT=		base svg tools:build
 USE_GL=		gl opengl
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	ra3xdh
-GH_PROJECT=	qucs_s
-
 OPTIONS_GROUP=		BACKENDS RTDEPENDS
 OPTIONS_GROUP_BACKENDS=	NGSPICE XYCE QUCSATOR
 OPTIONS_GROUP_RTDEPENDS=	OCTAVE ADMS
diff --git a/cad/qucs-s/distinfo b/cad/qucs-s/distinfo
index dcb30d269754..377c21e6e0cc 100644
--- a/cad/qucs-s/distinfo
+++ b/cad/qucs-s/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698523607
-SHA256 (ra3xdh-qucs_s-2.1.0_GH0.tar.gz) = 732694ca6a23119eedf9c898f2015778429f7896e450c230fb589d5c1aa91d89
-SIZE (ra3xdh-qucs_s-2.1.0_GH0.tar.gz) = 3749913
+TIMESTAMP = 1708273970
+SHA256 (qucs-s-24.1.0.tar.gz) = ce6e03e26fddbe107d1749329423214c2714d3103f9a528bbcccd228eb14bac0
+SIZE (qucs-s-24.1.0.tar.gz) = 3843381
diff --git a/cad/qucs-s/files/patch-CMakeLists.txt b/cad/qucs-s/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..a4cb00b766ac
--- /dev/null
+++ b/cad/qucs-s/files/patch-CMakeLists.txt
@@ -0,0 +1,14 @@
+- 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_diagrams_marker.h b/cad/qucs-s/files/patch-qucs_diagrams_marker.h
deleted file mode 100644
index bbd6ba89f18a..000000000000
--- a/cad/qucs-s/files/patch-qucs_diagrams_marker.h
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix build with Qt 6.6.x
-
-https://github.com/ra3xdh/qucs_s/issues/375
-https://github.com/ra3xdh/qucs_s/pull/376
-
---- qucs/diagrams/marker.h.orig	2023-10-26 12:53:59 UTC
-+++ qucs/diagrams/marker.h
-@@ -18,6 +18,8 @@
- #ifndef MARKER_H
- #define MARKER_H
- 
-+#include <vector>
-+
- #include "element.h"
- #include "viewpainter.h"
- 
diff --git a/cad/qucs-s/pkg-plist b/cad/qucs-s/pkg-plist
index fd2ba771d0e1..82a0f8951fdd 100644
--- a/cad/qucs-s/pkg-plist
+++ b/cad/qucs-s/pkg-plist
@@ -60,9 +60,16 @@ share/man/man1/qucs-s.1.gz
 %%DATADIR%%/examples/ngspice/Full_Wave_Bridge_Rectifier_PS.sch
 %%DATADIR%%/examples/ngspice/Full_wave.sch
 %%DATADIR%%/examples/ngspice/IRFZ44_switch.sch
+%%DATADIR%%/examples/ngspice/JCM-800.sch
 %%DATADIR%%/examples/ngspice/JFET_Cascode.sch
 %%DATADIR%%/examples/ngspice/LCR-1.sch
 %%DATADIR%%/examples/ngspice/LM317_test.sch
+%%DATADIR%%/examples/ngspice/MESFETs/NE3509.cir
+%%DATADIR%%/examples/ngspice/MESFETs/NE3509_sub.sch
+%%DATADIR%%/examples/ngspice/MESFETs/NE3509_sub_Id_Vg.sch
+%%DATADIR%%/examples/ngspice/MESFETs/Statz_dc_mod.cir
+%%DATADIR%%/examples/ngspice/MESFETs/Statz_sub.sch
+%%DATADIR%%/examples/ngspice/MESFETs/Statz_sub_Id_Vg.sch
 %%DATADIR%%/examples/ngspice/MESFETs/testACMESFETCL1.sch
 %%DATADIR%%/examples/ngspice/MESFETs/testDCIdsVgs.sch
 %%DATADIR%%/examples/ngspice/MESFETs/testDCMESFETCL1.sch
@@ -87,6 +94,7 @@ share/man/man1/qucs-s.1.gz
 %%DATADIR%%/examples/ngspice/SmithChartTest.sch
 %%DATADIR%%/examples/ngspice/Test_tran_coup.sch
 %%DATADIR%%/examples/ngspice/Triangle_Wave_Generator.sch
+%%DATADIR%%/examples/ngspice/Tube_amp6V6.sch
 %%DATADIR%%/examples/ngspice/Tunnel_Diode_EDD.sch
 %%DATADIR%%/examples/ngspice/VoltageDoubler.sch
 %%DATADIR%%/examples/ngspice/X2_100_Bipolar.sch
@@ -99,6 +107,7 @@ share/man/man1/qucs-s.1.gz
 %%DATADIR%%/examples/ngspice/active_bp.sch
 %%DATADIR%%/examples/ngspice/active_mixer.sch
 %%DATADIR%%/examples/ngspice/audio_amp.sch
+%%DATADIR%%/examples/ngspice/audio_amp_thd.sch
 %%DATADIR%%/examples/ngspice/charac.sch
 %%DATADIR%%/examples/ngspice/chargepump.sch
 %%DATADIR%%/examples/ngspice/classic_osci_2.sch
@@ -121,6 +130,7 @@ share/man/man1/qucs-s.1.gz
 %%DATADIR%%/examples/ngspice/lc_osc.sch
 %%DATADIR%%/examples/ngspice/multiplier.sch
 %%DATADIR%%/examples/ngspice/notch.sch
+%%DATADIR%%/examples/ngspice/nutmeg_script.sch
 %%DATADIR%%/examples/ngspice/opamp_gyrator.sch
 %%DATADIR%%/examples/ngspice/par_sweep_test.sch
 %%DATADIR%%/examples/ngspice/preregulator.sch
@@ -224,6 +234,18 @@ share/man/man1/qucs-s.1.gz
 %%DATADIR%%/examples/symbols/symbols_blank.sch
 %%DATADIR%%/examples/symbols/symbols_optos.sch
 %%DATADIR%%/examples/symbols/symbols_transformers.sch
+%%DATADIR%%/examples/templates_ngspice/AC_Passive_analysis.sch
+%%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/Pass_Parameters_Subcircuit.sch
+%%DATADIR%%/examples/templates_ngspice/Pwr-Amp_wingspread_analysis.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
+%%DATADIR%%/examples/templates_ngspice/TRAN_FOUR_OpAmp.sch
+%%DATADIR%%/examples/templates_ngspice/genericopa.cir
+%%DATADIR%%/examples/templates_ngspice/genericopa_sub.sch
 %%DATADIR%%/examples/xyce/BJT_DC_xyce.sch
 %%DATADIR%%/examples/xyce/Xyce2ToneTest.sch
 %%DATADIR%%/examples/xyce/Xyce2ToneTest_mod.sch
@@ -302,6 +324,7 @@ 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/AudioIC.lib
 %%DATADIR%%/library/BF998.lib
 %%DATADIR%%/library/BJT_Extended.lib
 %%DATADIR%%/library/Bridges.lib
@@ -312,6 +335,7 @@ share/man/man1/qucs-s.1.gz
 %%DATADIR%%/library/Ideal.lib
 %%DATADIR%%/library/JFETs.lib
 %%DATADIR%%/library/LEDs.lib
+%%DATADIR%%/library/Loudspeaker.lib
 %%DATADIR%%/library/MOSFETs.lib
 %%DATADIR%%/library/NMOSFETs.lib
 %%DATADIR%%/library/OpAmps.lib
@@ -321,11 +345,15 @@ share/man/man1/qucs-s.1.gz
 %%DATADIR%%/library/Regulators.lib
 %%DATADIR%%/library/SpiceOpamp.lib
 %%DATADIR%%/library/Substrates.lib
+%%DATADIR%%/library/Thermistor.lib
 %%DATADIR%%/library/Thyristor.lib
 %%DATADIR%%/library/Transformers.lib
 %%DATADIR%%/library/Transistors.lib
 %%DATADIR%%/library/Tubes.lib
 %%DATADIR%%/library/Varistors.lib
+%%DATADIR%%/library/VoltageComparators.lib
+%%DATADIR%%/library/VoltageReferences.lib
+%%DATADIR%%/library/VoltageRegulators.lib
 %%DATADIR%%/library/Xanalogue.lib
 %%DATADIR%%/library/XyceDigital.lib
 %%DATADIR%%/library/XyceDigital/A2DBRIDGE.sym