[48551] trunk/dports/science/qucs

rowue at macports.org rowue at macports.org
Tue Mar 24 16:55:51 PDT 2009


Revision: 48551
          http://trac.macports.org/changeset/48551
Author:   rowue at macports.org
Date:     2009-03-24 16:55:51 -0700 (Tue, 24 Mar 2009)
Log Message:
-----------
Complete App-Bundle setup for qucs using qt3-mac

Modified Paths:
--------------
    trunk/dports/science/qucs/Portfile
    trunk/dports/science/qucs/files/Info.plist

Added Paths:
-----------
    trunk/dports/science/qucs/files/patch-qucs-main.cpp.diff
    trunk/dports/science/qucs/files/patch-qucs-main.h.diff
    trunk/dports/science/qucs/files/patch-qucs-qucs_actions.cpp.diff
    trunk/dports/science/qucs/files/qucs.icns
    trunk/dports/science/qucs/files/qucsattenuator.icns
    trunk/dports/science/qucs/files/qucsedit.icns
    trunk/dports/science/qucs/files/qucsfilter.icns
    trunk/dports/science/qucs/files/qucshelp.icns
    trunk/dports/science/qucs/files/qucslib.icns
    trunk/dports/science/qucs/files/qucstrans.icns

Removed Paths:
-------------
    trunk/dports/science/qucs/files/application.icns

Modified: trunk/dports/science/qucs/Portfile
===================================================================
--- trunk/dports/science/qucs/Portfile	2009-03-24 21:52:29 UTC (rev 48550)
+++ trunk/dports/science/qucs/Portfile	2009-03-24 23:55:51 UTC (rev 48551)
@@ -20,14 +20,26 @@
                     rmd160 3962ca9e893f828d7e1bb033815f07e651c83e49
 depends_lib         port:qt3-mac \
                     port:freehdl
-patchfiles          patch-configure.diff
+use_parallel_build  yes
+patchfiles          patch-configure.diff \
+                    patch-qucs-main.cpp.diff \
+                    patch-qucs-main.h.diff \
+                    patch-qucs-qucs_actions.cpp.diff
+
+post-patch {
+        reinplace "s|@APPDIR@|${applications_dir}|g" ${worksrcpath}/qucs/main.cpp
+}
+
 post-destroot {
-    xinstall -m 755 -d ${destroot}${applications_dir}/Qucs.app/Contents/MacOS
-    ln -s ${prefix}/bin/qucs ${destroot}${applications_dir}/Qucs.app/Contents/MacOS/qucs
-    xinstall -m 755 -d ${destroot}${applications_dir}/Qucs.app/Contents/Resources
-    xinstall -m 0644 ${filespath}/application.icns ${destroot}${applications_dir}/Qucs.app/Contents/Resources
-    xinstall -m 0644 ${filespath}/Info.plist ${destroot}${applications_dir}/Qucs.app/Contents/
-    reinplace "s|@VERSION@|${version}|" ${destroot}${applications_dir}/Qucs.app/Contents/Info.plist
-    system "echo 'APPL????' > ${destroot}${applications_dir}/Qucs.app/Contents/PkgInfo"
+    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 "echo 'APPL????' > ${destroot}${applications_dir}/${Program}.app/Contents/PkgInfo"
+    }
 }
 

Modified: trunk/dports/science/qucs/files/Info.plist
===================================================================
--- trunk/dports/science/qucs/files/Info.plist	2009-03-24 21:52:29 UTC (rev 48550)
+++ trunk/dports/science/qucs/files/Info.plist	2009-03-24 23:55:51 UTC (rev 48551)
@@ -5,23 +5,23 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>qucs</string>
+	<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>application.icns</string>
+	<string>@EXECUTABLE at .icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.qucs</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Qucs</string>
+	<string>@EXECUTABLE@</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>Qucs @VERSION@</string>
 	<key>CFBundleSignature</key>
-	<string>qucs</string>
+	<string>@EXECUTABLE@</string>
 	<key>CFBundleVersion</key>
 	<string>@VERSION@</string>
 	<key>CSResourcesFileMapped</key>

Deleted: trunk/dports/science/qucs/files/application.icns
===================================================================
(Binary files differ)

Added: trunk/dports/science/qucs/files/patch-qucs-main.cpp.diff
===================================================================
--- trunk/dports/science/qucs/files/patch-qucs-main.cpp.diff	                        (rev 0)
+++ trunk/dports/science/qucs/files/patch-qucs-main.cpp.diff	2009-03-24 23:55:51 UTC (rev 48551)
@@ -0,0 +1,17 @@
+--- qucs/main.cpp.orig	2009-03-24 22:33:05.000000000 +0100
++++ qucs/main.cpp	2009-03-24 23:53:40.000000000 +0100
+@@ -496,12 +496,13 @@
+     QucsSettings.LibDir =
+       QDir::convertSeparators (QucsDirStr + "/share/qucs/library/");
+   } else {
++    QucsSettings.AppDir = QDir::convertSeparators("@APPDIR@/");
+     QucsSettings.BinDir = BINARYDIR;
+     QucsSettings.BitmapDir = BITMAPDIR;
+     QucsSettings.LangDir = LANGUAGEDIR;
+     QucsSettings.LibDir = LIBRARYDIR;
+   }
+-  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"));

Added: trunk/dports/science/qucs/files/patch-qucs-main.h.diff
===================================================================
--- trunk/dports/science/qucs/files/patch-qucs-main.h.diff	                        (rev 0)
+++ trunk/dports/science/qucs/files/patch-qucs-main.h.diff	2009-03-24 23:55:51 UTC (rev 48551)
@@ -0,0 +1,10 @@
+--- 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;

Added: trunk/dports/science/qucs/files/patch-qucs-qucs_actions.cpp.diff
===================================================================
--- trunk/dports/science/qucs/files/patch-qucs-qucs_actions.cpp.diff	                        (rev 0)
+++ trunk/dports/science/qucs/files/patch-qucs-qucs_actions.cpp.diff	2009-03-24 23:55:51 UTC (rev 48551)
@@ -0,0 +1,47 @@
+--- qucs/qucs_actions.cpp.orig	2009-03-24 23:02:53.000000000 +0100
++++ qucs/qucs_actions.cpp	2009-03-25 00:09:46.000000000 +0100
+@@ -609,7 +609,7 @@
+ void QucsApp::slotCallFilter()
+ {
+   QProcess *QucsFilter =
+-    new QProcess(QString(QucsSettings.BinDir + "qucsfilter"));
++    new QProcess(QString(QucsSettings.AppDir + "qucsfilter.app/Contents/MacOS/qucsfilter"));
+   if(!QucsFilter->start()) {
+     QMessageBox::critical(this, tr("Error"),
+                           tr("Cannot start filter synthesis program!"));
+@@ -626,7 +626,7 @@
+ void QucsApp::slotCallLine()
+ {
+   QProcess *QucsLine =
+-    new QProcess(QString(QucsSettings.BinDir + "qucstrans"));
++    new QProcess(QString(QucsSettings.AppDir + "qucstrans.app/Contents/MacOS/qucstrans"));
+   if(!QucsLine->start()) {
+     QMessageBox::critical(this, tr("Error"),
+                           tr("Cannot start line calculation program!"));
+@@ -643,7 +643,7 @@
+ void QucsApp::slotCallLibrary()
+ {
+   QProcess *QucsLibrary =
+-    new QProcess(QString(QucsSettings.BinDir + "qucslib"));
++    new QProcess(QString(QucsSettings.AppDir + "qucslib.app/Contents/MacOS/qucslib"));
+   if(!QucsLibrary->start()) {
+     QMessageBox::critical(this, tr("Error"),
+                           tr("Cannot start library program!"));
+@@ -668,7 +668,7 @@
+ void QucsApp::slotCallAtt()
+ {
+   QProcess *QucsAtt =
+-    new QProcess(QString(QucsSettings.BinDir + "qucsattenuator"));
++    new QProcess(QString(QucsSettings.AppDir + "qucsattenuator.app/Contents/MacOS/qucsattenuator"));
+   if(!QucsAtt->start()) {
+     QMessageBox::critical(this, tr("Error"),
+                           tr("Cannot start attenuator calculation program!"));
+@@ -696,7 +696,7 @@
+ void QucsApp::showHTML(const QString& Page)
+ {
+   QStringList com;
+-  com << QucsSettings.BinDir + "qucshelp" << Page;
++  com << QucsSettings.AppDir + "qucshelp.app/Contents/MacOS/qucshelp" << Page;
+   QProcess *QucsHelp = new QProcess(com);
+   QucsHelp->setCommunication(0);
+   if(!QucsHelp->start()) {

Copied: trunk/dports/science/qucs/files/qucs.icns (from rev 48544, trunk/dports/science/qucs/files/application.icns)
===================================================================
(Binary files differ)

Added: trunk/dports/science/qucs/files/qucsattenuator.icns
===================================================================
(Binary files differ)


Property changes on: trunk/dports/science/qucs/files/qucsattenuator.icns
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/dports/science/qucs/files/qucsedit.icns
===================================================================
(Binary files differ)


Property changes on: trunk/dports/science/qucs/files/qucsedit.icns
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/dports/science/qucs/files/qucsfilter.icns
===================================================================
(Binary files differ)


Property changes on: trunk/dports/science/qucs/files/qucsfilter.icns
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/dports/science/qucs/files/qucshelp.icns
===================================================================
(Binary files differ)


Property changes on: trunk/dports/science/qucs/files/qucshelp.icns
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/dports/science/qucs/files/qucslib.icns
===================================================================
(Binary files differ)


Property changes on: trunk/dports/science/qucs/files/qucslib.icns
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/dports/science/qucs/files/qucstrans.icns
===================================================================
(Binary files differ)


Property changes on: trunk/dports/science/qucs/files/qucstrans.icns
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090324/70711eef/attachment.html>


More information about the macports-changes mailing list