<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[125874] trunk/dports/science/qucs</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/125874">125874</a></dd>
<dt>Author</dt> <dd>rowue@macports.org</dd>
<dt>Date</dt> <dd>2014-09-28 14:55:52 -0700 (Sun, 28 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>qucs: update to 0.0.18 - see #44852</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencequcsPortfile">trunk/dports/science/qucs/Portfile</a></li>
<li><a href="#trunkdportssciencequcsfilespatchconfigurediff">trunk/dports/science/qucs/files/patch-configure.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencequcsfilesInfoplist">trunk/dports/science/qucs/files/Info.plist</a></li>
<li><a href="#trunkdportssciencequcsfilespatchMakefileindiff">trunk/dports/science/qucs/files/patch-Makefile.in.diff</a></li>
<li><a href="#trunkdportssciencequcsfilespatchascoconfigurediff">trunk/dports/science/qucs/files/patch-asco-configure.diff</a></li>
<li><a href="#trunkdportssciencequcsfilespatchqucsfilterqf_filtercppdiff">trunk/dports/science/qucs/files/patch-qucs-filter-qf_filter.cpp.diff</a></li>
<li><a href="#trunkdportssciencequcsfilespatchqucsmaincppdiff">trunk/dports/science/qucs/files/patch-qucs-main.cpp.diff</a></li>
<li><a href="#trunkdportssciencequcsfilespatchqucsmainhdiff">trunk/dports/science/qucs/files/patch-qucs-main.h.diff</a></li>
<li><a href="#trunkdportssciencequcsfilespatchqucsqucs_actionscppdiff">trunk/dports/science/qucs/files/patch-qucs-qucs_actions.cpp.diff</a></li>
<li><a href="#trunkdportssciencequcsfilesqucsicns">trunk/dports/science/qucs/files/qucs.icns</a></li>
<li><a href="#trunkdportssciencequcsfilesqucsattenuatoricns">trunk/dports/science/qucs/files/qucsattenuator.icns</a></li>
<li><a href="#trunkdportssciencequcsfilesqucsediticns">trunk/dports/science/qucs/files/qucsedit.icns</a></li>
<li><a href="#trunkdportssciencequcsfilesqucsfiltericns">trunk/dports/science/qucs/files/qucsfilter.icns</a></li>
<li><a href="#trunkdportssciencequcsfilesqucshelpicns">trunk/dports/science/qucs/files/qucshelp.icns</a></li>
<li><a href="#trunkdportssciencequcsfilesqucslibicns">trunk/dports/science/qucs/files/qucslib.icns</a></li>
<li><a href="#trunkdportssciencequcsfilesqucstransicns">trunk/dports/science/qucs/files/qucstrans.icns</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencequcsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/qucs/Portfile (125873 => 125874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/qucs/Portfile 2014-09-28 20:01:35 UTC (rev 125873)
+++ trunk/dports/science/qucs/Portfile 2014-09-28 21:55:52 UTC (rev 125874)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name qucs
</span><del>-version 0.0.17
</del><ins>+version 0.0.18
</ins><span class="cx"> categories science electronics
</span><span class="cx"> license GPL-2+
</span><span class="cx"> maintainers rowue openmaintainer
</span><span class="lines">@@ -17,10 +17,11 @@
</span><span class="cx"> homepage http://qucs.sourceforge.net/
</span><span class="cx"> master_sites sourceforge:project/qucs/qucs/${version}
</span><span class="cx">
</span><del>-checksums rmd160 4ac2056bd097155ec73bb119f6ffcaeb6848ba69 \
- sha256 1fa0e6f2e8068c0800aa4dd3a25b41d18a6060619914c9787a20d21934089a70
</del><ins>+checksums rmd160 c0d31bede22f0670ec707eaf41286107af2ced89 \
+ sha256 3609a18b57485dc9f19886ac6694667f3251702175bd1cbbbea37981b2c482a7
</ins><span class="cx">
</span><del>-depends_build port:pkgconfig
</del><ins>+depends_build port:pkgconfig \
+ port:bison
</ins><span class="cx">
</span><span class="cx"> depends_lib port:qt4-mac \
</span><span class="cx"> port:freehdl \
</span><span class="lines">@@ -28,42 +29,28 @@
</span><span class="cx"> port:iverilog \
</span><span class="cx"> port:asco
</span><span class="cx">
</span><ins>+configure.args --disable-sdk --disable-asco
+
</ins><span class="cx"> # iverilog is not universal
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><del>-patchfiles patch-Makefile.in.diff \
- patch-configure.diff \
</del><ins>+patchfiles patch-configure.diff \
</ins><span class="cx"> patch-qucs_qucsdigi.diff \
</span><del>- patch-qucs_qucsveri.diff \
- patch-qucs-main.cpp.diff \
- patch-qucs-filter-qf_filter.cpp.diff \
- patch-asco-configure.diff \
- patch-qucs-main.h.diff \
- patch-qucs-qucs_actions.cpp.diff
</del><ins>+ patch-qucs_qucsveri.diff
</ins><span class="cx">
</span><span class="cx"> variant shipped_asco description { Use shipped asco } {
</span><del>- patchfiles-delete patch-configure.diff
- depends_lib-delete port:asco
</del><ins>+ configure.args-delete --disable-asco
+ depends_lib-delete port:asco
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> post-patch {
</span><del>- reinplace "s|@APPDIR@|${applications_dir}|g" ${worksrcpath}/qucs/main.cpp
- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/qucs/main.cpp
</del><span class="cx"> reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/qucs/qucsdigi ${worksrcpath}/qucs/qucsveri
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><del>- foreach Program {qucs qucsedit qucsfilter qucshelp qucslib qucstrans qucsattenuator} {
- xinstall -m 755 -d ${destroot}${applications_dir}/${Program}.app/Contents/MacOS
- move ${destroot}${prefix}/bin/${Program} ${destroot}${applications_dir}/${Program}.app/Contents/MacOS/
- xinstall -m 755 -d ${destroot}${applications_dir}/${Program}.app/Contents/Resources
- xinstall -m 0644 ${filespath}/${Program}.icns ${destroot}${applications_dir}/${Program}.app/Contents/Resources
- xinstall -m 0644 ${filespath}/Info.plist ${destroot}${applications_dir}/${Program}.app/Contents/
- reinplace "s|@VERSION@|${version}|" ${destroot}${applications_dir}/${Program}.app/Contents/Info.plist
- reinplace "s|@EXECUTABLE@|${Program}|" ${destroot}${applications_dir}/${Program}.app/Contents/Info.plist
- system "printf 'APPL????' > ${destroot}${applications_dir}/${Program}.app/Contents/PkgInfo"
</del><ins>+ foreach Program {qucs qucsedit qucsfilter qucshelp qucslib qucsrescodes qucstrans qucsattenuator} {
+ ln -s ${prefix}/bin/${Program}.app ${destroot}${applications_dir}/${Program}.app
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportssciencequcsfilesInfoplist"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/qucs/files/Info.plist (125873 => 125874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/qucs/files/Info.plist 2014-09-28 20:01:35 UTC (rev 125873)
+++ trunk/dports/science/qucs/files/Info.plist 2014-09-28 21:55:52 UTC (rev 125874)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>@EXECUTABLE@</string>
- <key>CFBundleGetInfoString</key>
- <string>Qucs @VERSION@ by the Qucs team. This program is licensed under the GNU GPL.</string>
- <key>CFBundleIconFile</key>
- <string>@EXECUTABLE@.icns</string>
- <key>CFBundleIdentifier</key>
- <string>org.qucs</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>@EXECUTABLE@</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>Qucs @VERSION@</string>
- <key>CFBundleSignature</key>
- <string>@EXECUTABLE@</string>
- <key>CFBundleVersion</key>
- <string>@VERSION@</string>
- <key>CSResourcesFileMapped</key>
- <true/>
-</dict>
-</plist>
</del></span></pre></div>
<a id="trunkdportssciencequcsfilespatchMakefileindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/qucs/files/patch-Makefile.in.diff (125873 => 125874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/qucs/files/patch-Makefile.in.diff 2014-09-28 20:01:35 UTC (rev 125873)
+++ trunk/dports/science/qucs/files/patch-Makefile.in.diff 2014-09-28 21:55:52 UTC (rev 125874)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>---- Makefile.in.orig 2013-10-07 20:43:47.000000000 +0200
-+++ Makefile.in 2013-10-07 20:45:52.000000000 +0200
-@@ -795,54 +795,6 @@
- tags-recursive uninstall uninstall-am uninstall-hook
-
-
--@COND_MACOSX_TRUE@install-exec-hook: mac-install-apps mac-deploy-framework
--
--@COND_MACOSX_TRUE@mac-install-apps:
--@COND_MACOSX_TRUE@ @echo "Creating MacOSX applications...";
--@COND_MACOSX_TRUE@ @list='$(app_PROGS)'; for file in $$list; do \
--@COND_MACOSX_TRUE@ app=`basename $$file` && \
--@COND_MACOSX_TRUE@ $(mkinstalldirs) $(bindir)/$$app.app/Contents && \
--@COND_MACOSX_TRUE@ $(mkinstalldirs) $(bindir)/$$app.app/Contents/Resources && \
--@COND_MACOSX_TRUE@ $(mkinstalldirs) $(bindir)/$$app.app/Contents/MacOS && \
--@COND_MACOSX_TRUE@ $(install_sh_PROGRAM) $$file $(bindir)/$$app.app/Contents/MacOS/ && \
--@COND_MACOSX_TRUE@ strip $(bindir)/$$app.app/Contents/MacOS/$$app && \
--@COND_MACOSX_TRUE@ case $$app in \
--@COND_MACOSX_TRUE@ qucs) desc="Qucs";; \
--@COND_MACOSX_TRUE@ qucsattenuator) desc="Qucs Attenuator";; \
--@COND_MACOSX_TRUE@ qucsfilter) desc="Qucs Filter";; \
--@COND_MACOSX_TRUE@ qucshelp) desc="Qucs Help";; \
--@COND_MACOSX_TRUE@ qucslib) desc="Qucs Library";; \
--@COND_MACOSX_TRUE@ qucsedit) desc="Qucs Editor";; \
--@COND_MACOSX_TRUE@ qucstrans) desc="Qucs Transcalc";; \
--@COND_MACOSX_TRUE@ esac && \
--@COND_MACOSX_TRUE@ cat $(srcdir)/Info.plist | \
--@COND_MACOSX_TRUE@ sed -e "s/@version@/$(PACKAGE_VERSION)/g" | \
--@COND_MACOSX_TRUE@ sed -e "s/@name@/$$desc/g" | \
--@COND_MACOSX_TRUE@ sed -e "s/@exec@/$$app/g" > \
--@COND_MACOSX_TRUE@ $(bindir)/$$app.app/Contents/Info.plist && \
--@COND_MACOSX_TRUE@ $(install_sh_DATA) $(srcdir)/qucs/bitmaps/$$app.icns \
--@COND_MACOSX_TRUE@ $(bindir)/$$app.app/Contents/Resources/application.icns && \
--@COND_MACOSX_TRUE@ echo "#!/bin/sh\n$(bindir)/$$app.app/Contents/MacOS/$$app \$$*\n" > \
--@COND_MACOSX_TRUE@ $(bindir)/$$app && \
--@COND_MACOSX_TRUE@ chmod +x $(bindir)/$$app; \
--@COND_MACOSX_TRUE@ done
--
--@COND_MACOSX_TRUE@mac-deploy-framework:
--@COND_MACOSX_TRUE@ @echo "Copying and setting up MacOSX/Qt framework...";
--@COND_MACOSX_TRUE@ @list='$(app_PROGS)'; for file in $$list; do \
--@COND_MACOSX_TRUE@ app=`basename $$file`; \
--@COND_MACOSX_TRUE@ echo "running: macdeployqt $(bindir)/$${app}.app"; \
--@COND_MACOSX_TRUE@ macdeployqt $(bindir)/$$app.app; \
--@COND_MACOSX_TRUE@ done
--
--@COND_MACOSX_TRUE@uninstall-hook:
--@COND_MACOSX_TRUE@ @list='$(app_PROGS)'; for file in $$list; do \
--@COND_MACOSX_TRUE@ app=`basename $$file` && \
--@COND_MACOSX_TRUE@ rm -rf $(bindir)/$$app.app; \
--@COND_MACOSX_TRUE@ done
--@COND_MACOSX_FALSE@install-exec-hook:
--@COND_MACOSX_FALSE@uninstall-hook:
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
</del></span></pre></div>
<a id="trunkdportssciencequcsfilespatchascoconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/qucs/files/patch-asco-configure.diff (125873 => 125874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/qucs/files/patch-asco-configure.diff 2014-09-28 20:01:35 UTC (rev 125873)
+++ trunk/dports/science/qucs/files/patch-asco-configure.diff 2014-09-28 21:55:52 UTC (rev 125874)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>-https://sourceforge.net/p/qucs/bugs/126/
---- asco/configure 2013-10-07 19:16:20.000000000 +0200
-+++ asco/configure 2013-10-07 19:16:30.000000000 +0200
-@@ -4042,6 +4211,12 @@
- fi
- fi
-
-+case $host_os in
-+ *darwin*)
-+ CFLAGS="$CFLAGS -DUNIX -I/usr/include/malloc"
-+ ;;
-+esac
-+
- # Extract the first word of "mpicc", so it can be a program name with args.
- set dummy mpicc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</del></span></pre></div>
<a id="trunkdportssciencequcsfilespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/qucs/files/patch-configure.diff (125873 => 125874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/qucs/files/patch-configure.diff 2014-09-28 20:01:35 UTC (rev 125873)
+++ trunk/dports/science/qucs/files/patch-configure.diff 2014-09-28 21:55:52 UTC (rev 125874)
</span><span class="lines">@@ -1,27 +1,36 @@
</span><del>---- configure.orig 2013-10-13 14:36:47.000000000 +0200
-+++ configure 2013-10-13 14:37:10.000000000 +0200
-@@ -791,7 +791,6 @@
- CXXCPP'
- ac_subdirs_all='qucs-core
- qucs-doc
--asco
- examples'
</del><ins>+--- configure.orig 2014-09-27 21:03:27.000000000 +0200
++++ configure 2014-09-27 21:06:51.000000000 +0200
+@@ -6136,7 +6136,7 @@
+ 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; }
+- paths="$QTDIR/lib /Library/Frameworks /opt/local/lib /usr/local/lib"
++ paths="$QTDIR/lib ${prefix}/Library/Frameworks /opt/local/lib /usr/local/lib"
+ for path in $paths; do
+ if test -f "$path/QtGui.framework/Headers/QApplication"; then
+ with_qt=yes
+@@ -6157,13 +6157,14 @@
+ CPPFLAGS="$CPPFLAGS -I$path/QtSvg.framework/Headers"
+ CPPFLAGS="$CPPFLAGS -I$path/QtScript.framework/Headers"
+ CPPFLAGS="$CPPFLAGS -I$path/Qt3Support.framework/Headers"
++ QT_LDFLAGS="$QT_LDFLAGS -F$path"
+ else
+ as_fn_error $? "not found" "$LINENO" 5
+ fi
</ins><span class="cx">
</span><del>- # Initialize some variables set by options.
-@@ -4699,8 +4698,6 @@
</del><ins>+ QT_DEF="-DQT_SHARED -DQT3_SUPPORT"
+ CPPFLAGS="$CPPFLAGS $QT_DEF"
+- QT_LDFLAGS="-headerpad_max_install_names"
++ QT_LDFLAGS="$QT_LDFLAGS -headerpad_max_install_names"
</ins><span class="cx">
</span><del>- # AC_CONFIG_SUBDIRS(freehdl)
- # AC_CONFIG_SUBDIRS(verilog)
--subdirs="$subdirs asco"
--
- subdirs="$subdirs examples"
</del><ins>+ if test $USE_MAINTAINER_MODE = yes; then
+ CPPFLAGS="$CPPFLAGS -W -Wall"
+@@ -6314,7 +6315,7 @@
+ DEVELOPER_DIR="${MACOSX_SDK_PATH%/SDKs*}"
+ DEVELOPER_DIR="${DEVELOPER_DIR%/Platforms*}"
+ export DEVELOPER_DIR
+- FRAMEWORKSHOME="$MACOSX_SDK_PATH/System/Library/Frameworks"
++ FRAMEWORKSHOME="${prefix}/Library/Frameworks"
+ MACOSX_DEPLOYMENT_TARGET="$with_macosx_version_min_required"
</ins><span class="cx">
</span><del>-
-@@ -4708,7 +4705,6 @@
- RELEASEDIRS="$RELEASEDIRS qucs-doc"
- # RELEASEDIRS="$RELEASEDIRS freehdl"
- # RELEASEDIRS="$RELEASEDIRS verilog"
--RELEASEDIRS="$RELEASEDIRS asco"
- RELEASEDIRS="$RELEASEDIRS examples"
-
-
</del><ins>+ case "$with_macosx_version_min_required" in
</ins></span></pre></div>
<a id="trunkdportssciencequcsfilespatchqucsfilterqf_filtercppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/qucs/files/patch-qucs-filter-qf_filter.cpp.diff (125873 => 125874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/qucs/files/patch-qucs-filter-qf_filter.cpp.diff 2014-09-28 20:01:35 UTC (rev 125873)
+++ trunk/dports/science/qucs/files/patch-qucs-filter-qf_filter.cpp.diff 2014-09-28 21:55:52 UTC (rev 125874)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>---- qucs-filter/qf_filter.cpp
-+++ qucs-filter/qf_filter.cpp
-@@ -43,19 +43,19 @@ qf_filter::qf_filter () :
- ncomp (0), Comp (NULL) {
- }
-
--qf_filter::qf_filter (int n = 3, qfk k = UNDEF, qft t = LOWPASS) :
-+qf_filter::qf_filter (int n, qfk k, qft t) :
- type (t), kind (k), ord (n), fc (0), bw (0), imp (1),
- ncomp (0), Comp (NULL) {
- }
-
--qf_filter::qf_filter (qfk k = UNDEF, qft t = LOWPASS, qf_double_t r = 1,
-+qf_filter::qf_filter (qfk k, qft t, qf_double_t r,
- qf_double_t f = 1, qf_double_t b = 0) :
- type (t), kind (k), fc (f), bw (b), imp (r), ncomp (0), Comp (NULL) {
- fstart = fc - bw / 2;
- fstop = fc + bw / 2;
- }
-
--qf_filter::qf_filter (qfk k = UNDEF, qft t = LOWPASS) :
-+qf_filter::qf_filter (qfk k, qft t) :
- type (t), kind (k), ord (0), fc (0), bw (0), imp (1),
- ncomp (0), Comp (NULL) {
- }
</del></span></pre></div>
<a id="trunkdportssciencequcsfilespatchqucsmaincppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/qucs/files/patch-qucs-main.cpp.diff (125873 => 125874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/qucs/files/patch-qucs-main.cpp.diff 2014-09-28 20:01:35 UTC (rev 125873)
+++ trunk/dports/science/qucs/files/patch-qucs-main.cpp.diff 2014-09-28 21:55:52 UTC (rev 125874)
</span><span class="lines">@@ -1,32 +0,0 @@
</span><del>---- qucs/main.cpp.orig 2013-10-13 15:31:35.000000000 +0200
-+++ qucs/main.cpp 2013-10-13 15:34:34.000000000 +0200
-@@ -571,6 +571,7 @@
- if (var != NULL) {
- QDir QucsDir = QDir (var);
- QString QucsDirStr = QucsDir.canonicalPath ();
-+ QucsSettings.AppDir = QDir::convertSeparators("@APPDIR@/");
- QucsSettings.BinDir =
- QDir::convertSeparators (QucsDirStr + "/bin/");
- QucsSettings.BitmapDir =
-@@ -594,7 +595,7 @@
- QucsSettings.ExamplesDir = QDir(DOCDIR).canonicalPath()+"/examples/";
- QucsSettings.DocDir = DOCDIR;
- }
-- QucsSettings.Editor = QucsSettings.BinDir + "qucsedit";
-+ QucsSettings.Editor = QucsSettings.AppDir + "qucsedit.app/Contents/MacOS/qucsedit";
- QucsWorkDir.setPath(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs"));
- QucsHomeDir.setPath(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs"));
- loadSettings();
-@@ -630,10 +631,10 @@
- QDir::convertSeparators (AscoDirStr + "/bin/");
- }
- else {
-- QFile file("/usr/local/bin/asco");
-+ QFile file("@PREFIX@/bin/asco");
- if ( file.exists() ){
- QucsSettings.AscoDir =
-- QDir::convertSeparators ("/usr/local/bin/");
-+ QDir::convertSeparators ("@PREFIX@/bin/");
- file.close();
- }
- else
</del></span></pre></div>
<a id="trunkdportssciencequcsfilespatchqucsmainhdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/qucs/files/patch-qucs-main.h.diff (125873 => 125874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/qucs/files/patch-qucs-main.h.diff 2014-09-28 20:01:35 UTC (rev 125873)
+++ trunk/dports/science/qucs/files/patch-qucs-main.h.diff 2014-09-28 21:55:52 UTC (rev 125874)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>---- qucs/main.h.orig 2009-03-24 22:32:09.000000000 +0100
-+++ qucs/main.h 2009-03-24 22:32:40.000000000 +0100
-@@ -50,6 +50,7 @@
- unsigned int maxUndo; // size of undo stack
- QString Editor;
- QString BinDir;
-+ QString AppDir;
- QString BitmapDir;
- QString LangDir;
- QString LibDir;
</del></span></pre></div>
<a id="trunkdportssciencequcsfilespatchqucsqucs_actionscppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/qucs/files/patch-qucs-qucs_actions.cpp.diff (125873 => 125874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/qucs/files/patch-qucs-qucs_actions.cpp.diff 2014-09-28 20:01:35 UTC (rev 125873)
+++ trunk/dports/science/qucs/files/patch-qucs-qucs_actions.cpp.diff 2014-09-28 21:55:52 UTC (rev 125874)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>---- qucs/qucs_actions.cpp.orig 2013-06-23 00:59:40.000000000 -0500
-+++ qucs/qucs_actions.cpp 2013-10-01 01:57:16.000000000 -0500
-@@ -622,7 +622,7 @@
- void QucsApp::slotCallFilter()
- {
- Q3Process *QucsFilter =
-- new Q3Process(QString(QucsSettings.BinDir + "qucsfilter"));
-+ new Q3Process(QString(QucsSettings.AppDir + "qucsfilter.app/Contents/MacOS/qucsfilter"));
- if(!QucsFilter->start()) {
- QMessageBox::critical(this, tr("Error"),
- tr("Cannot start filter synthesis program!"));
-@@ -639,7 +639,7 @@
- void QucsApp::slotCallLine()
- {
- Q3Process *QucsLine =
-- new Q3Process(QString(QucsSettings.BinDir + "qucstrans"));
-+ new Q3Process(QString(QucsSettings.AppDir + "qucstrans.app/Contents/MacOS/qucstrans"));
- if(!QucsLine->start()) {
- QMessageBox::critical(this, tr("Error"),
- tr("Cannot start line calculation program!"));
-@@ -656,7 +656,7 @@
- void QucsApp::slotCallLibrary()
- {
- Q3Process *QucsLibrary =
-- new Q3Process(QString(QucsSettings.BinDir + "qucslib"));
-+ new Q3Process(QString(QucsSettings.AppDir + "qucslib.app/Contents/MacOS/qucslib"));
- if(!QucsLibrary->start()) {
- QMessageBox::critical(this, tr("Error"),
- tr("Cannot start library program!"));
-@@ -681,7 +681,7 @@
- void QucsApp::slotCallAtt()
- {
- Q3Process *QucsAtt =
-- new Q3Process(QString(QucsSettings.BinDir + "qucsattenuator"));
-+ new Q3Process(QString(QucsSettings.AppDir + "qucsattenuator.app/Contents/MacOS/qucsattenuator"));
- if(!QucsAtt->start()) {
- QMessageBox::critical(this, tr("Error"),
- tr("Cannot start attenuator calculation program!"));
-@@ -709,7 +709,7 @@
- void QucsApp::showHTML(const QString& Page)
- {
- QStringList com;
-- com << QucsSettings.BinDir + "qucshelp" << Page;
-+ com << QucsSettings.AppDir + "qucshelp.app/Contents/MacOS/qucshelp" << Page;
- Q3Process *QucsHelp = new Q3Process(com);
- QucsHelp->setCommunication(0);
- if(!QucsHelp->start()) {
</del></span></pre></div>
<a id="trunkdportssciencequcsfilesqucsicns"></a>
<div class="binary"><h4>Deleted: trunk/dports/science/qucs/files/qucs.icns</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkdportssciencequcsfilesqucsattenuatoricns"></a>
<div class="binary"><h4>Deleted: trunk/dports/science/qucs/files/qucsattenuator.icns</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkdportssciencequcsfilesqucsediticns"></a>
<div class="binary"><h4>Deleted: trunk/dports/science/qucs/files/qucsedit.icns</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkdportssciencequcsfilesqucsfiltericns"></a>
<div class="binary"><h4>Deleted: trunk/dports/science/qucs/files/qucsfilter.icns</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkdportssciencequcsfilesqucshelpicns"></a>
<div class="binary"><h4>Deleted: trunk/dports/science/qucs/files/qucshelp.icns</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkdportssciencequcsfilesqucslibicns"></a>
<div class="binary"><h4>Deleted: trunk/dports/science/qucs/files/qucslib.icns</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkdportssciencequcsfilesqucstransicns"></a>
<div class="binary"><h4>Deleted: trunk/dports/science/qucs/files/qucstrans.icns</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
</div>
</body>
</html>