[142843] trunk/dports/gnome/gtk3

devans at macports.org devans at macports.org
Sat Dec 12 07:28:16 PST 2015


Revision: 142843
          https://trac.macports.org/changeset/142843
Author:   devans at macports.org
Date:     2015-11-24 11:02:50 -0800 (Tue, 24 Nov 2015)
Log Message:
-----------
gtk3: reformat/reorganize, no functional change.

Modified Paths:
--------------
    trunk/dports/gnome/gtk3/Portfile

Property Changed:
----------------
    trunk/dports/gnome/gtk3/


Property changes on: trunk/dports/gnome/gtk3
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gtk3:119527-142604
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375
/users/rmstonecipher/gnome/gtk3:102363-103172
   + /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gtk3:119527-142842
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375
/users/rmstonecipher/gnome/gtk3:102363-103172

Modified: trunk/dports/gnome/gtk3/Portfile
===================================================================
--- trunk/dports/gnome/gtk3/Portfile	2015-11-24 19:01:40 UTC (rev 142842)
+++ trunk/dports/gnome/gtk3/Portfile	2015-11-24 19:02:50 UTC (rev 142843)
@@ -19,11 +19,10 @@
 
 description         GTK+ widget toolkit
 
-long_description    \
-    GTK+ is a highly usable, feature-rich toolkit for creating graphical user \
-    interfaces, which boasts cross-platform compatibility and an easy-to-use \
-    API. GTK+ is written in C, but has bindings to many other popular \
-    programming languages, such as C++, Python and C#, among others.
+long_description    GTK+ is a highly usable, feature-rich toolkit for creating graphical user \
+                    interfaces, which boasts cross-platform compatibility and an easy-to-use \
+                    API. GTK+ is written in C, but has bindings to many other popular \
+                    programming languages, such as C++, Python and C#, among others.
 
 homepage            http://www.gtk.org/
 distname            ${real_name}-${version}
@@ -35,12 +34,9 @@
                     sha256  107aeb9a4244ce3c044becdd6dffc32d83202595181597180d4c736302a71852
 
 minimum_xcodeversions {9 3.1}
+
 depends_build       port:pkgconfig
 
-# cloudprint backend requires rest, json-glib
-# but this causes a circular dependency on libsoup
-# explicitly disable cloudprint for now
-
 depends_lib         port:atk \
                     path:lib/pkgconfig/pango.pc:pango \
                     port:gdk-pixbuf2 \
@@ -51,25 +47,17 @@
 depends_run         port:shared-mime-info \
                     port:hicolor-icon-theme
 
-archcheck.files \
-    lib/libatk-1.0.dylib \
-    lib/libintl.dylib \
-    lib/libjasper.dylib \
-    lib/libpango-1.0.dylib \
-    lib/libtiff.dylib
+archcheck.files     lib/libatk-1.0.dylib \
+                    lib/libintl.dylib \
+                    lib/libjasper.dylib \
+                    lib/libpango-1.0.dylib \
+                    lib/libtiff.dylib
 
 patchfiles          nawk.patch
 
-configure.args      --enable-static \
-                    --disable-glibtest \
-                    --enable-introspection \
-                    --disable-cloudprint \
-                    --disable-mir-backend \
-                    --disable-wayland-backend \
-                    --disable-schemas-compile \
-                    gio_can_sniff=yes
 
 # gobject-introspection uses g-ir-scanner, which uses $CC from env
+
 if {[variant_isset universal]} {
     foreach arch ${configure.universal_archs} {
         lappend merger_build_args(${arch})  CC='${configure.cc} -arch ${arch}'
@@ -84,19 +72,36 @@
                             CC_FOR_BUILD="${configure.cc} ${configure.cc_archflags}"
 }
 
-build.args-append   V=1 \
-                    CPP_FOR_BUILD="${configure.cpp}"
-
-configure.ccache    no
-configure.cppflags-append   -DX_LOCALE
-configure.cflags-append     -fstrict-aliasing
-
 pre-configure {
     if {![variant_isset quartz] && ![variant_isset x11]} {
         error "Either +x11 or +quartz is required"
     }
 }
 
+configure.ccache    no
+
+configure.cppflags-append \
+                    -DX_LOCALE
+
+configure.cflags-append \
+                    -fstrict-aliasing
+
+# cloudprint backend requires rest, json-glib
+# but this causes a circular dependency on libsoup
+# explicitly disable cloudprint for now
+
+configure.args      --enable-static \
+                    --disable-glibtest \
+                    --enable-introspection \
+                    --disable-cloudprint \
+                    --disable-mir-backend \
+                    --disable-wayland-backend \
+                    --disable-schemas-compile \
+                    gio_can_sniff=yes
+
+build.args-append   V=1 \
+                    CPP_FOR_BUILD="${configure.cpp}"
+
 test.run            yes
 test.target         check
 
@@ -118,15 +123,6 @@
     reinplace "s|${destroot}||" ${destroot}${prefix}/etc/gtk-3.0/gtk.immodules
 }
 
-post-activate {
-    ui_debug "Updating gdk-pixbuf.loaders..."
-    system "${prefix}/bin/gdk-pixbuf-query-loaders \
-        >${prefix}/etc/gtk-3.0/gdk-pixbuf.loaders"
-    ui_debug "Updating GLib schemas..."
-    system "${prefix}/bin/glib-compile-schemas \
-        ${prefix}/share/glib-2.0/schemas"
-}
-
 platform darwin 8 {
     # The rules enabled by gobject-introspection require GNU make 3.81+
     depends_build-append    port:gmake
@@ -141,10 +137,6 @@
     configure.args-append --disable-cups
 }
 
-if {![variant_isset quartz]} {
-    default_variants +x11
-}
-
 if {[variant_isset universal]} {
     set cups /usr/bin/cups-config
     if {[info exists universal_sysroot]} {
@@ -231,20 +223,31 @@
     require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
     require_active_variants path:lib/pkgconfig/pango.pc:pango x11
 
-    depends_lib-append \
-        port:xorg-libXi \
-        port:xorg-libXrandr \
-        port:xorg-libXcursor \
-        port:xorg-libXinerama \
-        port:xorg-libXdamage \
-        port:xorg-libXcomposite \
-        port:xorg-libXfixes \
-        port:at-spi2-atk
+    depends_lib-append      port:xorg-libXi \
+                            port:xorg-libXrandr \
+                            port:xorg-libXcursor \
+                            port:xorg-libXinerama \
+                            port:xorg-libXdamage \
+                            port:xorg-libXcomposite \
+                            port:xorg-libXfixes \
+                            port:at-spi2-atk
 
-    configure.args-append      --enable-xinerama \
-                               --x-include=${prefix}/include --x-lib=${prefix}/lib \
-                               --enable-x11-backend
+    configure.args-append   --enable-xinerama \
+                            --x-include=${prefix}/include \
+                            --x-lib=${prefix}/lib \
+                            --enable-x11-backend
 }
 
+if {![variant_isset quartz]} {
+    default_variants +x11
+}
+
+post-activate {
+    ui_debug "Updating gdk-pixbuf.loaders..."
+    system "${prefix}/bin/gdk-pixbuf-query-loaders >${prefix}/etc/gtk-3.0/gdk-pixbuf.loaders"
+    ui_debug "Updating GLib schemas..."
+    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
+}
+
 livecheck.type      gnome
 livecheck.name      gtk+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/33af1c44/attachment.html>


More information about the macports-changes mailing list