[99040] trunk/dports/gnome/gobject-introspection/Portfile

[ryandesign at macports.org]

Revision: 99040
          http://trac.macports.org//changeset/99040
Author:   ryandesign at macports.org
Date:     2012-10-24 15:30:54 -0700 (Wed, 24 Oct 2012)
Log Message:
-----------
gobject-introspection: remove glib2_devel variant and use its patch always, now that a new stable version of glib2 is out (#36702)

Modified Paths:
--------------
    trunk/dports/gnome/gobject-introspection/Portfile

Modified: trunk/dports/gnome/gobject-introspection/Portfile
===================================================================
--- trunk/dports/gnome/gobject-introspection/Portfile	2012-10-24 21:44:22 UTC (rev 99039)
+++ trunk/dports/gnome/gobject-introspection/Portfile	2012-10-24 22:30:54 UTC (rev 99040)
@@ -5,7 +5,7 @@
 
 name                gobject-introspection
 version             1.32.1
-revision            3
+revision            4
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          gnome
 platforms           darwin
@@ -29,15 +29,10 @@
 depends_lib         path:lib/pkgconfig/cairo.pc:cairo \
                     port:libffi \
                     port:python27 \
-                    port:glib2
-                    # disabled, because a different set of patches needs to be
-                    # applied depending on the glib2 version used and doing so
-                    # without specifying a variant would give different results
-                    # for the same configuration (i.e. non-reproducible build)
-                    #path:lib/pkgconfig/glib-2.0.pc:glib2 \
+                    path:lib/pkgconfig/glib-2.0.pc:glib2
 
-
-patchfiles          patch-giscanner-scannerlexer.l-support-__inline__.patch \
+patchfiles          patch-gir-gio-2.0.c-fix-wrong-naming.patch \
+                    patch-giscanner-scannerlexer.l-support-__inline__.patch \
                     patch-giscanner-shlib.py-use-absolute-linkage-paths.patch \
                     patch-giscanner-utils.py-use-absolute-linkage-paths.patch
 
@@ -59,14 +54,3 @@
 livecheck.type      regex
 livecheck.url       http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/
 livecheck.regex     {LATEST-IS-(\d+(?:\.\d+)*)}
-
-if {[catch {registry_active glib2-devel}] == 0} {
-    # if the user has installed glib2-devel, use that by default
-    default_variants +glib2_devel
-}
-
-variant glib2_devel description {Build against glib2-devel rather than glib2} {
-    patchfiles-append patch-gir-gio-2.0.c-fix-wrong-naming.patch
-    depends_lib-delete port:glib2
-    depends_lib-append port:glib2-devel
-}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121024/0a3332ba/attachment.html>