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

[cal at macports.org]

Revision: 93282
          https://trac.macports.org/changeset/93282
Author:   cal at macports.org
Date:     2012-05-18 16:16:50 -0700 (Fri, 18 May 2012)
Log Message:
-----------
gobject-introspection: Make build reproducable by recording the set of patches into a variant

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

Modified: trunk/dports/gnome/gobject-introspection/Portfile
===================================================================
--- trunk/dports/gnome/gobject-introspection/Portfile	2012-05-18 22:31:37 UTC (rev 93281)
+++ trunk/dports/gnome/gobject-introspection/Portfile	2012-05-18 23:16:50 UTC (rev 93282)
@@ -5,6 +5,7 @@
 
 name                gobject-introspection
 version             1.32.1
+revision            1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          gnome
 platforms           darwin
@@ -26,16 +27,18 @@
 depends_build       port:pkgconfig
 
 depends_lib         path:lib/pkgconfig/cairo.pc:cairo \
-                    path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:libffi \
-                    port:python27
+                    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 \
 
+
 patchfiles          patch-giscanner-scannerlexer.l-support-__inline__.patch
 
-if {[catch {[registry_active glib2_devel]}]} {
-    patchfiles-append patch-gir-gio-2.0.c-fix-wrong-naming.patch
-}
-
 post-patch {
     reinplace "s|'cc'|'${configure.cc}'|g" ${worksrcpath}/giscanner/sourcescanner.py
 }
@@ -48,3 +51,14 @@
 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/20120518/6634190b/attachment.html>