[55438] trunk/dports/gnome

[devans at macports.org]

Revision: 55438
          http://trac.macports.org/changeset/55438
Author:   devans at macports.org
Date:     2009-08-10 08:38:19 -0700 (Mon, 10 Aug 2009)
Log Message:
-----------
gnome-doc-utils, gtk-doc:

  * assume maintainership openmaintainer
  * remove default variant python26, just make python26 the default
  * variant python25 is retained
  * increment revision to ensure build uniformity

Modified Paths:
--------------
    trunk/dports/gnome/gnome-doc-utils/Portfile
    trunk/dports/gnome/gtk-doc/Portfile

Modified: trunk/dports/gnome/gnome-doc-utils/Portfile
===================================================================
--- trunk/dports/gnome/gnome-doc-utils/Portfile	2009-08-10 15:35:33 UTC (rev 55437)
+++ trunk/dports/gnome/gnome-doc-utils/Portfile	2009-08-10 15:38:19 UTC (rev 55438)
@@ -5,6 +5,7 @@
 
 name           gnome-doc-utils
 version        0.16.1
+revision       1
 set branch     [join [lrange [split ${version} .] 0 1] .]
 description    GNOME document utils.
 long_description \
@@ -13,7 +14,7 @@
     documentation andall auxiliary files in your source tree, and it \
     contains the DocBookXSLT stylesheets that were once distributed \
     with Yelp.
-maintainers    nomaintainer
+maintainers    devans openmaintainer
 categories     gnome
 platforms      darwin
 homepage       http://www.gnome.org/
@@ -31,39 +32,37 @@
 
 depends_lib    \
     port:gettext \
-    port:libxslt
+    port:libxslt \
+    port:python26
 
+
 depends_run    \
     port:docbook-xml \
     port:docbook-xsl \
     port:rarian \
-    port:iso-codes
+    port:iso-codes \
+    port:py26-libxml2
 
 configure.env-append  INTLTOOL_PERL=${prefix}/bin/perl
 configure.args         --disable-scrollkeeper \
                        --mandir=${prefix}/share/man
 
+# Default to 2.6 since 2.5 fails universal on Leopard... Ticket #17501
+
+configure.python        ${prefix}/bin/python2.6
+
 post-activate  {
     system "${prefix}/bin/scrollkeeper-update"
 }
 
-variant python25 conflicts python26 description {Use python 2.5} {
+variant python25 description {Configure to use python 2.5 instead of default 2.6} {
+    depends_lib-delete      port:python26
     depends_lib-append      port:python25
+    depends_run-delete      port:py26-libxml2
     depends_run-append      port:py25-libxml2
     configure.python        ${prefix}/bin/python2.5
 }
 
-variant python26 conflicts python25 description {Use python 2.6} {
-    depends_lib-append      port:python26
-    depends_run-append      port:py26-libxml2
-    configure.python        ${prefix}/bin/python2.6
-}
-
-# Default to 2.6 since 2.5 fails universal for me on Leopard... Ticket #17501
-if {![variant_isset python25]} {
-    default_variants +python26
-}
-
 universal_variant   no
 
 livecheck.check     regex

Modified: trunk/dports/gnome/gtk-doc/Portfile
===================================================================
--- trunk/dports/gnome/gtk-doc/Portfile	2009-08-10 15:35:33 UTC (rev 55437)
+++ trunk/dports/gnome/gtk-doc/Portfile	2009-08-10 15:38:19 UTC (rev 55438)
@@ -5,9 +5,10 @@
 
 name            gtk-doc
 version         1.11
+revision        1
 categories      gnome devel
 platforms       darwin freebsd linux
-maintainers     nomaintainer
+maintainers     devans openmaintainer
 description     GTK+/GNOME API documentation generator
 
 long_description \
@@ -32,6 +33,10 @@
 depends_lib     port:libxml2 \
                 path:bin/perl:perl5
 
+# Default to python 2.6, the current production version of python
+
+configure.python ${prefix}/bin/python2.6
+
 configure.perl ${prefix}/bin/perl
 configure.args  --with-xml-catalog=${prefix}/etc/xml/catalog
 
@@ -42,23 +47,15 @@
     system "${prefix}/bin/scrollkeeper-update"
 }
 
-variant python25 conflicts python26 description {Use python 2.5} {
+
+variant python25 description {Configure to use python 2.5 instead of default 2.6} {
+    depends_lib-delete      port:python26
     depends_lib-append      port:python25
+    depends_run-delete      port:py26-libxml2
     depends_run-append      port:py25-libxml2
     configure.python        ${prefix}/bin/python2.5
 }
 
-variant python26 conflicts python25 description {Use python 2.6} {
-    depends_lib-append      port:python26
-    depends_run-append      port:py26-libxml2
-    configure.python        ${prefix}/bin/python2.6
-}
-
-# Default to python 2.6, the current production version of python
-if {![variant_isset python25]} {
-    default_variants +python26
-}
-
 livecheck.check regex
 livecheck.url   http://ftp.gnome.org/pub/gnome/sources/${name}/?C=M&O=D
 livecheck.regex {(\d+(?:\.\d+)*)/}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090810/3f9c7aff/attachment.html>