[103212] trunk/dports/x11

[ryandesign at macports.org]

Revision: 103212
          https://trac.macports.org/changeset/103212
Author:   ryandesign at macports.org
Date:     2013-02-18 16:53:20 -0800 (Mon, 18 Feb 2013)
Log Message:
-----------
pango, pango-devel: set default_variants before checking whether the variant is set, to fix incorrect variant conflict message (#38094)

Modified Paths:
--------------
    trunk/dports/x11/pango/Portfile
    trunk/dports/x11/pango-devel/Portfile

Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile	2013-02-19 00:27:03 UTC (rev 103211)
+++ trunk/dports/x11/pango/Portfile	2013-02-19 00:53:20 UTC (rev 103212)
@@ -102,14 +102,15 @@
     configure.args-append   --x-include=${prefix}/include \
                             --x-lib=${prefix}/lib
 }
+
+default_variants        +x11
+
 if {[variant_isset x11]} {
     require_active_variants cairo x11
 } else {
     require_active_variants cairo "" x11
 }
 
-default_variants        +x11
-
 post-destroot {
     xinstall -d ${destroot}${prefix}/etc/pango
     if {![variant_isset builtin_modules]} {

Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile	2013-02-19 00:27:03 UTC (rev 103211)
+++ trunk/dports/x11/pango-devel/Portfile	2013-02-19 00:53:20 UTC (rev 103212)
@@ -101,14 +101,15 @@
     configure.args-append   --x-include=${prefix}/include \
                             --x-lib=${prefix}/lib
 }
+
+default_variants        +x11
+
 if {[variant_isset x11]} {
     require_active_variants cairo x11
 } else {
     require_active_variants cairo "" x11
 }
 
-default_variants        +x11
-
 post-destroot {
     xinstall -d ${destroot}${prefix}/etc/pango
     if {![variant_isset builtin_modules]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130218/9464ee45/attachment-0001.html>