[109567] users/mojca/wxports
mojca at macports.org
mojca at macports.org
Sat Aug 17 09:57:20 PDT 2013
Revision: 109567
https://trac.macports.org/changeset/109567
Author: mojca at macports.org
Date: 2013-08-17 09:57:19 -0700 (Sat, 17 Aug 2013)
Log Message:
-----------
mojca/usbprog: update to version 0.2.1, adapt for different wxWidgets versions, take sources from bitbucket, update url
Modified Paths:
--------------
users/mojca/wxports/cross/usbprog/Portfile
Added Paths:
-----------
users/mojca/wxports/cross/
users/mojca/wxports/cross/usbprog/
users/mojca/wxports/cross/usbprog/files/patch-gui-usbprogFrm.cc.diff
Removed Paths:
-------------
users/mojca/wxports/cross/usbprog/files/patch-gui-usbprogApp.cc.diff
Modified: users/mojca/wxports/cross/usbprog/Portfile
===================================================================
--- trunk/dports/cross/usbprog/Portfile 2013-08-17 15:55:19 UTC (rev 109564)
+++ users/mojca/wxports/cross/usbprog/Portfile 2013-08-17 16:57:19 UTC (rev 109567)
@@ -2,30 +2,79 @@
# $Id$
PortSystem 1.0
+PortGroup wxwidgets 1.0
+PortGroup bitbucket 1.0
+bitbucket.setup bwalle usbprog-tools-classic 7751c98
name usbprog
+version 0.2.1
categories cross
-version 0.1.8
-revision 2
maintainers lilalinux.net:macports
description Tool for uploading and downloading firmwares to the usbprog device
long_description Tool for uploading and downloading firmwares to the usbprog device.
-homepage http://www.embedded-projects.net/index.php?page_id=191
+homepage https://bitbucket.org/bwalle/usbprog-tools-classic
platforms darwin
+license GPL-2+
+depends_build port:autoconf port:automake
+
depends_lib-append port:libusb-compat \
- port:libxml \
+ port:libxml2 \
port:readline \
- port:wxWidgets \
port:curl
-master_sites http://download.berlios.de/usbprog/ \
- http://download2.berlios.de/usbprog/
+checksums rmd160 4e65113a0b2a61395275df6e4bef1dfce6c71e03 \
+ sha256 f47f7413758cac08a761595ed8ce2bfc6f0637ce0a767018c242ab0b2f0ec72e
-patchfiles patch-gui-usbprogApp.cc.diff
+patchfiles patch-gui-usbprogFrm.cc.diff
-checksums md5 fd38b14ad532cc4317bd169ab1c65495 \
- sha1 275727fa2310dd4e104c8b4bb5f443da647e2d33 \
- rmd160 ec8f2d0efa1c69e8136e64933afb04ef2d546798
+# TODO: if wxWidgets 2.9 seem to work fine, just delete all the variants
+variant wxwidgets30 conflicts wxwidgets28 wxgtk28 description {Use wxWidgets 2.9 (migt not be fully functional yet)} {
+ wxWidgets.use wxWidgets-3.0
+ depends_lib-append port:${wxWidgets.port}
+ configure.args-append --with-wxdir=${wxWidgets.wxdir}
+ configure.env-append WXRC=${wxWidgets.wxrc}
-use_configure yes
+ # TODO: not sure how to prevent duplication of the following code
+ # TODO: if needed, an additional variable could be added to wxwidgets PortGroup for easier access to wxwin.m4
+ pre-configure {
+ system "mkdir ${worksrcpath}/m4"
+ system "cp ${wxWidgets.prefix}/share/aclocal/wxwin.m4 ${worksrcpath}/m4/"
+ system "cd ${worksrcpath} && ./bootstrap"
+ }
+}
+
+variant wxwidgets28 conflicts wxwidgets30 wxgtk28 description {Use 32-bit Carbon-based wxWidgets 2.8} {
+ wxWidgets.use wxWidgets-2.8
+ depends_lib-append port:${wxWidgets.port}
+ configure.args-append --with-wxdir=${wxWidgets.wxdir}
+ configure.env-append WXRC=${wxWidgets.wxrc}
+
+ pre-configure {
+ system "mkdir ${worksrcpath}/m4"
+ system "cp ${wxWidgets.prefix}/share/aclocal/wxwin.m4 ${worksrcpath}/m4/"
+ system "cd ${worksrcpath} && ./bootstrap"
+ }
+}
+
+variant wxgtk28 conflicts wxwidgets30 wxwidgets28 description {Use wxWidgets 2.8 with GTK} {
+ wxWidgets.use wxGTK-2.8
+ depends_lib-append port:${wxWidgets.port}
+ configure.args-append --with-wxdir=${wxWidgets.wxdir}
+ configure.env-append WXRC=${wxWidgets.wxrc}
+
+ pre-configure {
+ system "mkdir ${worksrcpath}/m4"
+ system "cp ${wxWidgets.prefix}/share/aclocal/wxwin.m4 ${worksrcpath}/m4"
+ system "cd ${worksrcpath} && ./bootstrap"
+ }
+}
+
+
+if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
+ if {[vercmp $xcodeversion 4.4] >= 0} {
+ default_variants +wxgtk28
+ } else {
+ default_variants +wxwidgets28
+ }
+}
Deleted: users/mojca/wxports/cross/usbprog/files/patch-gui-usbprogApp.cc.diff
===================================================================
--- trunk/dports/cross/usbprog/files/patch-gui-usbprogApp.cc.diff 2013-08-17 15:55:19 UTC (rev 109564)
+++ users/mojca/wxports/cross/usbprog/files/patch-gui-usbprogApp.cc.diff 2013-08-17 16:57:19 UTC (rev 109567)
@@ -1,24 +0,0 @@
---- gui/usbprogApp.cc.orig 2008-11-09 19:48:32.000000000 +0100
-+++ gui/usbprogApp.cc 2009-04-04 00:40:51.000000000 +0200
-@@ -20,6 +20,9 @@
-
- #include "usbprogApp.h"
- #include "usbprogFrm.h"
-+#ifdef __APPLE__
-+#include <ApplicationServices/ApplicationServices.h>
-+#endif
-
- using std::cerr;
- using std::endl;
-@@ -74,6 +75,11 @@
- usbprogFrm* frame = new usbprogFrm(NULL);
- frame->Show(true);
- SetTopWindow(frame);
-+#ifdef __APPLE__
-+ProcessSerialNumber PSN;
-+GetCurrentProcess(&PSN);
-+TransformProcessType(&PSN,kProcessTransformToForegroundApplication);
-+#endif
- return true;
- }
-
Added: users/mojca/wxports/cross/usbprog/files/patch-gui-usbprogFrm.cc.diff
===================================================================
--- users/mojca/wxports/cross/usbprog/files/patch-gui-usbprogFrm.cc.diff (rev 0)
+++ users/mojca/wxports/cross/usbprog/files/patch-gui-usbprogFrm.cc.diff 2013-08-17 16:57:19 UTC (rev 109567)
@@ -0,0 +1,22 @@
+diff --git a/gui/usbprogFrm.cc b/gui/usbprogFrm.cc
+index bc1acbf..14e7ff0 100644
+--- a/gui/usbprogFrm.cc
++++ b/gui/usbprogFrm.cc
+@@ -296,7 +296,7 @@ void usbprogFrm::CreateGUIControls()
+
+ // file dialog
+ m_fileDialog = new wxFileDialog(m_panel, wxT("Choose a file"),
+- wxT(""), wxT(""), wxT("*.bin"), wxOPEN);
++ wxT(""), wxT(""), wxT("*.bin"), wxFD_wxOPEN);
+
+ m_topBox->Add(topSizer, wxEXPAND, wxALL, 10);
+
+@@ -670,7 +670,7 @@ void usbprogFrm::enableDisableDebug(wxCommandEvent &evt)
+ dbg->setFileHandle(NULL);
+ } else {
+ wxFileDialog fdg(m_panel, wxT("Choose a file"),
+- wxT(""), wxT(""), wxT("*.log"), wxSAVE);
++ wxT(""), wxT(""), wxT("*.log"), wxFD_wxSAVE);
+ if (fdg.ShowModal() != wxID_OK)
+ dbg->setFileHandle(stderr);
+ else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130817/e9b79d35/attachment-0001.html>
More information about the macports-changes
mailing list