[108775] users/mojca/wxports

1 Aug 2013

Revision: 108775
          https://trac.macports.org/changeset/108775
Author:   mojca@macports.org
Date:     2013-08-01 11:34:50 -0700 (Thu, 01 Aug 2013)
Log Message:
-----------
users/mojca: rename wxWidgets

Modified Paths:
--------------
    users/mojca/wxports/graphics/wxWidgets-2.8/Portfile
    users/mojca/wxports/graphics/wxWidgets-3.0/Portfile
    users/mojca/wxports/math/gnuplot/Portfile

Added Paths:
-----------
    users/mojca/wxports/graphics/wxWidgets/
    users/mojca/wxports/graphics/wxWidgets/Portfile
    users/mojca/wxports/graphics/wxWidgets-2.8/
    users/mojca/wxports/graphics/wxWidgets-2.8/files/wxWidgets-2.8
    users/mojca/wxports/graphics/wxWidgets-3.0/
    users/mojca/wxports/graphics/wxWidgets-3.0/files/wxWidgets-3.0
    users/mojca/wxports/graphics/wxWidgets-devel/
    users/mojca/wxports/graphics/wxWidgets-devel/Portfile
    users/mojca/wxports/graphics/wxWidgets30/
    users/mojca/wxports/graphics/wxWidgets30/Portfile

Removed Paths:
-------------
    users/mojca/wxports/graphics/wxWidgets-2.8/files/wxWidgets28
    users/mojca/wxports/graphics/wxWidgets-3.0/files/wxWidgets30
    users/mojca/wxports/graphics/wxWidgets28/
    users/mojca/wxports/graphics/wxWidgets30/

Added: users/mojca/wxports/graphics/wxWidgets/Portfile
===================================================================

--- users/mojca/wxports/graphics/wxWidgets/Portfile	                        (rev 0)
+++ users/mojca/wxports/graphics/wxWidgets/Portfile	2013-08-01 18:34:50 UTC (rev 108775)
@@ -0,0 +1,15 @@
+# -*- 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
+# $Id$
+
+PortSystem          1.0
+
+replaced_by         wxWidgets-2.8
+PortGroup           obsolete 1.0
+
+name                wxWidgets_devel
+version             2.8.12
+revision            1
+
+homepage            http://www.wxwidgets.org/
+categories          graphics devel
+license             wxwidgets-3.1


Property changes on: users/mojca/wxports/graphics/wxWidgets/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Modified: users/mojca/wxports/graphics/wxWidgets-2.8/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxWidgets28/Portfile	2013-08-01 17:44:52 UTC (rev 108772)
+++ users/mojca/wxports/graphics/wxWidgets-2.8/Portfile	2013-08-01 18:34:50 UTC (rev 108775)
@@ -5,12 +5,10 @@
 PortGroup           archcheck 1.0
 PortGroup           select 1.0
 
-name                wxWidgets28
+name                wxWidgets-2.8
 # What is the wxWidgets-python conflict?
 conflicts           wxgtk wxWidgets-python
-epoch               3
 version             2.8.12
-revision            3
 set branch          [join [lrange [split ${version} .] 0 1] .]
 
 categories          graphics devel

Copied: users/mojca/wxports/graphics/wxWidgets-2.8/files/wxWidgets-2.8 (from rev 108772, users/mojca/wxports/graphics/wxWidgets28/files/wxWidgets28)
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-2.8/files/wxWidgets-2.8	                        (rev 0)
+++ users/mojca/wxports/graphics/wxWidgets-2.8/files/wxWidgets-2.8	2013-08-01 18:34:50 UTC (rev 108775)
@@ -0,0 +1,2 @@
+libexec/wxWidgets/2.8/wx-config
+bin/wxrc-2.8

Deleted: users/mojca/wxports/graphics/wxWidgets-2.8/files/wxWidgets28
===================================================================
--- users/mojca/wxports/graphics/wxWidgets28/files/wxWidgets28	2013-08-01 17:44:52 UTC (rev 108772)
+++ users/mojca/wxports/graphics/wxWidgets-2.8/files/wxWidgets28	2013-08-01 18:34:50 UTC (rev 108775)
@@ -1,2 +0,0 @@
-libexec/wxWidgets/2.8/wx-config
-bin/wxrc-2.8

Modified: users/mojca/wxports/graphics/wxWidgets-3.0/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxWidgets30/Portfile	2013-08-01 17:44:52 UTC (rev 108772)
+++ users/mojca/wxports/graphics/wxWidgets-3.0/Portfile	2013-08-01 18:34:50 UTC (rev 108775)
@@ -4,10 +4,9 @@
 PortSystem          1.0
 PortGroup           select 1.0
 
-name                wxWidgets30
+name                wxWidgets-3.0
 conflicts           wxgtk
 version             2.9.5
-epoch               20130717
 set branch          [join [lrange [split ${version} .] 0 1] .]
 
 license             wxwidgets-3.1

Copied: users/mojca/wxports/graphics/wxWidgets-3.0/files/wxWidgets-3.0 (from rev 108772, users/mojca/wxports/graphics/wxWidgets30/files/wxWidgets30)
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-3.0/files/wxWidgets-3.0	                        (rev 0)
+++ users/mojca/wxports/graphics/wxWidgets-3.0/files/wxWidgets-3.0	2013-08-01 18:34:50 UTC (rev 108775)
@@ -0,0 +1,2 @@
+libexec/wxWidgets/2.9/wx-config
+bin/wxrc-2.9

Deleted: users/mojca/wxports/graphics/wxWidgets-3.0/files/wxWidgets30
===================================================================
--- users/mojca/wxports/graphics/wxWidgets30/files/wxWidgets30	2013-08-01 17:44:52 UTC (rev 108772)
+++ users/mojca/wxports/graphics/wxWidgets-3.0/files/wxWidgets30	2013-08-01 18:34:50 UTC (rev 108775)
@@ -1,2 +0,0 @@
-libexec/wxWidgets/2.9/wx-config
-bin/wxrc-2.9

Added: users/mojca/wxports/graphics/wxWidgets-devel/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-devel/Portfile	                        (rev 0)
+++ users/mojca/wxports/graphics/wxWidgets-devel/Portfile	2013-08-01 18:34:50 UTC (rev 108775)
@@ -0,0 +1,14 @@
+# -*- 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
+# $Id$
+
+PortSystem          1.0
+
+replaced_by         wxWidgets-3.0
+PortGroup           obsolete 1.0
+
+name                wxWidgets_devel
+version             2.9.5
+
+homepage            http://www.wxwidgets.org/
+categories          graphics devel
+license             wxwidgets-3.1


Property changes on: users/mojca/wxports/graphics/wxWidgets-devel/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: users/mojca/wxports/graphics/wxWidgets30/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxWidgets30/Portfile	                        (rev 0)
+++ users/mojca/wxports/graphics/wxWidgets30/Portfile	2013-08-01 18:34:50 UTC (rev 108775)
@@ -0,0 +1,15 @@
+# -*- 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
+# $Id$
+
+PortSystem          1.0
+
+replaced_by         wxWidgets-3.0
+PortGroup           obsolete 1.0
+
+name                wxWidgets30
+version             2.9.5
+epoch               20130801
+
+homepage            http://www.wxwidgets.org/
+categories          graphics devel
+license             wxwidgets-3.1


Property changes on: users/mojca/wxports/graphics/wxWidgets30/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Modified: users/mojca/wxports/math/gnuplot/Portfile
===================================================================
--- users/mojca/wxports/math/gnuplot/Portfile	2013-08-01 18:02:25 UTC (rev 108774)
+++ users/mojca/wxports/math/gnuplot/Portfile	2013-08-01 18:34:50 UTC (rev 108775)
@@ -113,12 +113,14 @@
     configure.args-delete   --without-cairo
 }
 
+# TODO: possibly rename variants (there is no need for a variant that depends on 2.8)
+
 # One can in principle choose between wxWidgets, wxwidgets30 and wxWidgets-devel,
 # but only 2.9 allows building 64-bit binaries.
 # If it is acceptable to depend on wxWidgets-devel only,
 # one could delete the variant that depends on wxWidgets 2.8.
-variant wxwidgets conflicts wxwidgets30 wxwidgets_devel description "Enable wxt terminal (wxWidgets 2.8, 32-bit only)" {
-    depends_lib-append      port:wxWidgets path:lib/pkgconfig/pango.pc:pango
+variant wxwidgets conflicts wxwidgets30 description "Enable wxt terminal (wxWidgets 2.8, 32-bit only)" {
+    depends_lib-append      port:wxWidgets-2.8 path:lib/pkgconfig/pango.pc:pango
     configure.args-delete   --disable-wxwidgets
     configure.args-append   --with-wx-config=${prefix}/bin/wx-config
 }
@@ -128,19 +130,13 @@
     supported_archs         i386 ppc
 }
 
-variant wxwidgets30 conflicts wxwidgets wxwidgets_devel description "Enable wxt terminal (using wxWidgets 2.9, supports 64-bit)" {
+variant wxwidgets30 conflicts wxwidgets description "Enable wxt terminal (using wxWidgets 2.9, supports 64-bit)" {
     wxWidgets.use_version   3.0
-    depends_lib-append      port:wxWidgets30 path:lib/pkgconfig/pango.pc:pango
+    depends_lib-append      port:wxWidgets-3.0 path:lib/pkgconfig/pango.pc:pango
     configure.args-delete   --disable-wxwidgets
     configure.args-append   --with-wx-config=${wxWidgets.confpath}
 }
 
-variant wxwidgets_devel conflicts wxwidgets wxwidgets30 description "Enable wxt terminal (using wxWidgets devel, supports 64-bit)" {
-    depends_lib-append      port:wxWidgets-devel path:lib/pkgconfig/pango.pc:pango
-    configure.args-delete   --disable-wxwidgets
-    configure.args-append   --with-wx-config=${prefix}/bin/wx-config
-}
-
 variant qt description "Enable qt terminal" {
     depends_lib-append      port:qt4-mac
     configure.args-append   --enable-qt

    

mojca＠macports.org

tags

participants (1)