<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fb333de0a1cebb632cec4955b303cf0220e8fa92">https://github.com/macports/macports-ports/commit/fb333de0a1cebb632cec4955b303cf0220e8fa92</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fb333de0a1cebb632cec4955b303cf0220e8fa92
</span>Author: Davide Gerhard <rainbow@irh.it>
AuthorDate: Wed Sep 25 10:19:11 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> qucs: update version to 0.0.20-rc2
</span>---
science/qucs/Portfile | 81 ++++++++++++++++++---------
science/qucs/files/patch-configure.diff | 37 ++++--------
science/qucs/files/patch-qucs_Info.plist.diff | 12 ++++
science/qucs/files/patch-qucs_qucsdigi.diff | 6 +-
science/qucs/files/patch-qucs_qucsveri.diff | 6 +-
5 files changed, 86 insertions(+), 56 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/qucs/Portfile b/science/qucs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 41e104f7950..fc7368b6a9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/qucs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/qucs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qt4 1.0
</span>
name qucs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.0.18
</span> categories science electronics
license GPL-2+
maintainers {rowue @rowue} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,46 +14,75 @@ long_description Qucs is an integrated circuit simulator. \
</span> You can set up a circuit with a graphical user interface.
homepage http://qucs.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/qucs/qucs/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c0d31bede22f0670ec707eaf41286107af2ced89 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3609a18b57485dc9f19886ac6694667f3251702175bd1cbbbea37981b2c482a7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.0.20-rc2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3374cf6f2a90d084c23f670a4193a11d42c1c842 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 66cfa0b9f8baa8468feb81b3a15f165e1946511893fa9cfee7009167daa04d19 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20643591
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bison
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:qt4-mac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:iverilog \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:asco
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qucs_qucsdigi.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qucs_qucsveri.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qucs_Info.plist.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bison \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:iverilog \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:asco \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ADMS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# doc by default is online and to build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# it requires many large dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-sdk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-asco \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-doc
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-sdk --disable-asco
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # iverilog is not universal
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +freehdl
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# all is not available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qucs_qucsdigi.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qucs_qucsveri.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/qucs/qucs/qucsdigi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/qucs/qucs/qucsveri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant shipped_asco description { Use shipped asco } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-asco
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:asco
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-asco
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:asco
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant freehdl description { Use freehdl } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:freehdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freehdl
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/qucs/qucsdigi ${worksrcpath}/qucs/qucsveri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant octave description { Add Octave support } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:octave
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +freehdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach Program {qucs qucsedit qucsfilter qucshelp qucslib qucsrescodes qucstrans qucsattenuator} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/bin/${Program}.app ${destroot}${applications_dir}/${Program}.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach program {qucs qucsactivefilter qucsattenuator qucsfilter qucslib qucspowercombining qucsrescodes qucstrans} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/bin/${program}.app ${destroot}${applications_dir}/${program}.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/bin/${program}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${applications_dir}/${program}.app/Contents/MacOS/${program} ${destroot}${prefix}/bin/${program}
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/qucs/files/patch-configure.diff b/science/qucs/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 76e1c1d3eec..09b30c8753b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/qucs/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/qucs/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2014-09-27 21:03:27.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2014-09-27 21:06:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6136,7 +6136,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git qucs/configure qucs/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 647a72e..2e60bd1 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qucs/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qucs/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18566,7 +18566,7 @@ fi
</span> with_qt=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt OS X framework" >&5
$as_echo_n "checking for Qt OS X framework... " >&6; }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- paths="$QTDIR/lib /Library/Frameworks /opt/local/lib /usr/local/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ paths="$QTDIR/lib ${prefix}/Library/Frameworks /opt/local/lib /usr/local/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- paths="$QTDIR/lib ${prefix}/Library/Frameworks /Library/Frameworks /opt/local/lib /usr/local/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ paths="$QTDIR/lib ${prefix}/libexec/qt4/Library/Frameworks /Library/Frameworks /opt/local/lib /usr/local/lib"
</span> for path in $paths; do
if test -f "$path/QtGui.framework/Headers/QApplication"; then
with_qt=yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6157,13 +6157,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$CPPFLAGS -I$path/QtSvg.framework/Headers"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18589,6 +18589,7 @@ $as_echo "found in $path" >&6; }
</span> CPPFLAGS="$CPPFLAGS -I$path/QtScript.framework/Headers"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="$CPPFLAGS -I$path/QtTest.framework/Headers"
</span> CPPFLAGS="$CPPFLAGS -I$path/Qt3Support.framework/Headers"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QT_LDFLAGS="$QT_LDFLAGS -F$path"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CPPFLAGS="$CPPFLAGS -I$prefix/libexec/qt4/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_LDFLAGS="$QT_LDFLAGS -F$path"
</span> else
as_fn_error $? "not found" "$LINENO" 5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_DEF="-DQT_SHARED -DQT3_SUPPORT"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$CPPFLAGS $QT_DEF"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QT_LDFLAGS="-headerpad_max_install_names"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QT_LDFLAGS="$QT_LDFLAGS -headerpad_max_install_names"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $USE_MAINTAINER_MODE = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$CPPFLAGS -W -Wall"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6314,7 +6315,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEVELOPER_DIR="${MACOSX_SDK_PATH%/SDKs*}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEVELOPER_DIR="${DEVELOPER_DIR%/Platforms*}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export DEVELOPER_DIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FRAMEWORKSHOME="$MACOSX_SDK_PATH/System/Library/Frameworks"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FRAMEWORKSHOME="${prefix}/Library/Frameworks"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MACOSX_DEPLOYMENT_TARGET="$with_macosx_version_min_required"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "$with_macosx_version_min_required" in
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/qucs/files/patch-qucs_Info.plist.diff b/science/qucs/files/patch-qucs_Info.plist.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..757c84eca78
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/qucs/files/patch-qucs_Info.plist.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git qucs/Info.plist qucs/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3dd1e0d..20d7d32 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qucs/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qucs/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,5 +26,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>@version@</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CSResourcesFileMapped</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <true/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <key>NSHighResolutionCapable</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <true/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </plist>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/qucs/files/patch-qucs_qucsdigi.diff b/science/qucs/files/patch-qucs_qucsdigi.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8be05fc4c78..23dd775338f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/qucs/files/patch-qucs_qucsdigi.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/qucs/files/patch-qucs_qucsdigi.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qucs/qucsdigi.orig 2009-03-27 19:49:55.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qucs/qucsdigi 2009-03-27 21:08:35.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git qucs/qucs/qucsdigi qucs/qucs/qucsdigi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f1d31c6..a735731 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qucs/qucs/qucsdigi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qucs/qucs/qucsdigi
</span> @@ -21,6 +21,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
# Boston, MA 02110-1301, USA.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/qucs/files/patch-qucs_qucsveri.diff b/science/qucs/files/patch-qucs_qucsveri.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 17be58c6e81..08eac42307c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/qucs/files/patch-qucs_qucsveri.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/qucs/files/patch-qucs_qucsveri.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qucs/qucsveri.orig 2009-03-27 21:07:51.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qucs/qucsveri 2009-03-27 21:08:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git qucs/qucs/qucsveri qucs/qucs/qucsveri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index aad9a21..bbf28f5 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qucs/qucs/qucsveri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qucs/qucs/qucsveri
</span> @@ -19,6 +19,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
# Boston, MA 02110-1301, USA.
</pre><pre style='margin:0'>
</pre>