[128926] trunk/dports/x11

[ryandesign at macports.org]

Revision: 128926
          https://trac.macports.org/changeset/128926
Author:   ryandesign at macports.org
Date:     2014-11-29 21:49:57 -0800 (Sat, 29 Nov 2014)
Log Message:
-----------
pango, pango-devel: allow x11 and quartz variants to be enabled at the same time and enable Quartz support by default on OS X (#44414)

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

Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile	2014-11-30 05:48:19 UTC (rev 128925)
+++ trunk/dports/x11/pango/Portfile	2014-11-30 05:49:57 UTC (rev 128926)
@@ -11,6 +11,7 @@
 set my_name             pango
 epoch                   1
 version                 1.36.8
+revision                1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              x11
 maintainers             ryandesign openmaintainer
@@ -47,20 +48,6 @@
 
 configure.ccache        no
 
-platform macosx {
-variant quartz {
-    # Although this variant does nothing, pango will automatically build
-    # itself differently depending on whether or not cairo is installed with
-    # the quartz variant. Therefore this variant is necessary to be able to
-    # distinguish whether an installed pango has quartz support or not.
-}
-    if {[variant_isset quartz]} {
-        require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
-    } else {
-        require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" quartz
-    }
-}
-
 pre-configure {
     set fontconfig_minimum_version 2.10.91
     set fontconfig_installed_version [exec ${prefix}/bin/pkg-config fontconfig --modversion]
@@ -104,6 +91,24 @@
     configure.args-append   --with-included-modules
 }
 
+platform macosx {
+    variant quartz {
+        # Although this variant does nothing, pango will automatically build
+        # itself differently depending on whether or not cairo is installed with
+        # the quartz variant. Therefore this variant is necessary to be able to
+        # distinguish whether an installed pango has Quartz support or not.
+    }
+
+    default_variants    +quartz
+    # Don't allow Quartz support to be disabled. Keep the variant for awhile in
+    # case any dependents are using the active_variants portgroup to check for it.
+    variant_set         quartz
+
+    if {[variant_isset quartz]} {
+        require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
+    }
+}
+
 variant x11 {
     depends_lib-append      port:Xft2
     configure.args-delete   --without-x
@@ -112,11 +117,14 @@
 }
 
 default_variants        +x11
+if {${os.platform} ne "darwin" || ${os.subplatform} ne "macosx"} {
+    # When not on OS X, don't allow X11 support to be disabled, since it is the
+    # only available option.
+    variant_set         x11
+}
 
 if {[variant_isset x11]} {
     require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
-} else {
-    require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" x11
 }
 
 post-destroot {

Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile	2014-11-30 05:48:19 UTC (rev 128925)
+++ trunk/dports/x11/pango-devel/Portfile	2014-11-30 05:49:57 UTC (rev 128926)
@@ -10,6 +10,7 @@
 conflicts               pango
 set my_name             pango
 version                 1.36.8
+revision                1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              x11
 maintainers             ryandesign openmaintainer
@@ -46,20 +47,6 @@
 
 configure.ccache        no
 
-platform macosx {
-variant quartz {
-    # Although this variant does nothing, pango will automatically build
-    # itself differently depending on whether or not cairo is installed with
-    # the quartz variant. Therefore this variant is necessary to be able to
-    # distinguish whether an installed pango has quartz support or not.
-}
-    if {[variant_isset quartz]} {
-        require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
-    } else {
-        require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" quartz
-    }
-}
-
 pre-configure {
     set fontconfig_minimum_version 2.10.91
     set fontconfig_installed_version [exec ${prefix}/bin/pkg-config fontconfig --modversion]
@@ -103,6 +90,24 @@
     configure.args-append   --with-included-modules
 }
 
+platform macosx {
+    variant quartz {
+        # Although this variant does nothing, pango will automatically build
+        # itself differently depending on whether or not cairo is installed with
+        # the quartz variant. Therefore this variant is necessary to be able to
+        # distinguish whether an installed pango has Quartz support or not.
+    }
+
+    default_variants    +quartz
+    # Don't allow Quartz support to be disabled. Keep the variant for awhile in
+    # case any dependents are using the active_variants portgroup to check for it.
+    variant_set         quartz
+
+    if {[variant_isset quartz]} {
+        require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
+    }
+}
+
 variant x11 {
     depends_lib-append      port:Xft2
     configure.args-delete   --without-x
@@ -111,11 +116,14 @@
 }
 
 default_variants        +x11
+if {${os.platform} ne "darwin" || ${os.subplatform} ne "macosx"} {
+    # When not on OS X, don't allow X11 support to be disabled, since it is the
+    # only available option.
+    variant_set         x11
+}
 
 if {[variant_isset x11]} {
     require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
-} else {
-    require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" x11
 }
 
 post-destroot {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141129/c3e14ef2/attachment.html>