[109578] users/mojca/wxports/cross/usbprog

[mojca at macports.org]

Revision: 109578
          https://trac.macports.org/changeset/109578
Author:   mojca at macports.org
Date:     2013-08-17 12:26:29 -0700 (Sat, 17 Aug 2013)
Log Message:
-----------
mojca/usbprog: patch the patch again, remove variants (it seems that the program works fine with wxWidgets 2.9)

Modified Paths:
--------------
    users/mojca/wxports/cross/usbprog/Portfile
    users/mojca/wxports/cross/usbprog/files/patch-gui-usbprogFrm.cc.diff

Modified: users/mojca/wxports/cross/usbprog/Portfile
===================================================================
--- users/mojca/wxports/cross/usbprog/Portfile	2013-08-17 18:18:33 UTC (rev 109577)
+++ users/mojca/wxports/cross/usbprog/Portfile	2013-08-17 19:26:29 UTC (rev 109578)
@@ -2,8 +2,8 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           wxwidgets 1.0
 PortGroup           bitbucket 1.0
+PortGroup           wxwidgets 1.0
 
 bitbucket.setup     bwalle usbprog-tools-classic 7751c98
 name                usbprog
@@ -16,65 +16,27 @@
 platforms           darwin
 license             GPL-2+
 
-depends_build	    port:autoconf port:automake
+wxWidgets.use       wxWidgets-3.0
 
-depends_lib-append  port:libusb-compat \
+depends_build       port:autoconf port:automake
+
+depends_lib-append  port:curl \
+                    port:libusb-compat \
                     port:libxml2 \
                     port:readline \
-                    port:curl
+                    port:${wxWidgets.port}
 
 checksums           rmd160  4e65113a0b2a61395275df6e4bef1dfce6c71e03 \
                     sha256  f47f7413758cac08a761595ed8ce2bfc6f0637ce0a767018c242ab0b2f0ec72e
 
 patchfiles          patch-gui-usbprogFrm.cc.diff
 
-# 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}
-
-    # 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"
-    }
+pre-configure {
+    system "mkdir ${worksrcpath}/m4"
+    # TODO: if needed, an additional variable could be added to wxwidgets PortGroup
+    #       for easier access to wxwin.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
-    }
-}
+configure.args      --with-wxdir=${wxWidgets.wxdir}

Modified: users/mojca/wxports/cross/usbprog/files/patch-gui-usbprogFrm.cc.diff
===================================================================
--- users/mojca/wxports/cross/usbprog/files/patch-gui-usbprogFrm.cc.diff	2013-08-17 18:18:33 UTC (rev 109577)
+++ users/mojca/wxports/cross/usbprog/files/patch-gui-usbprogFrm.cc.diff	2013-08-17 19:26:29 UTC (rev 109578)
@@ -5,7 +5,7 @@
      // file dialog
  	m_fileDialog = new wxFileDialog(m_panel, wxT("Choose a file"),
 -            wxT(""), wxT(""), wxT("*.bin"), wxOPEN);
-+            wxT(""), wxT(""), wxT("*.bin"), wxFD_wxOPEN);
++            wxT(""), wxT(""), wxT("*.bin"), wxFD_OPEN);
  
      m_topBox->Add(topSizer, wxEXPAND, wxALL, 10);
  
@@ -14,7 +14,7 @@
      } else {
          wxFileDialog fdg(m_panel, wxT("Choose a file"),
 -            wxT(""), wxT(""), wxT("*.log"), wxSAVE);
-+            wxT(""), wxT(""), wxT("*.log"), wxFD_wxSAVE);
++            wxT(""), wxT(""), wxT("*.log"), wxFD_SAVE);
          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/79daf05c/attachment.html>