[84859] trunk/dports/graphics/gimp2/Portfile

[devans at macports.org]

Revision: 84859
          http://trac.macports.org/changeset/84859
Author:   devans at macports.org
Date:     2011-10-03 11:19:24 -0700 (Mon, 03 Oct 2011)
Log Message:
-----------
gimp2: reorder elements to more closely match gimp2-devel, cosmetic changes only.

Modified Paths:
--------------
    trunk/dports/graphics/gimp2/Portfile

Modified: trunk/dports/graphics/gimp2/Portfile
===================================================================
--- trunk/dports/graphics/gimp2/Portfile	2011-10-03 18:06:29 UTC (rev 84858)
+++ trunk/dports/graphics/gimp2/Portfile	2011-10-03 18:19:24 UTC (rev 84859)
@@ -8,8 +8,8 @@
 # please remember to update the gimp metapackage to match
 version         2.6.11
 revision        6
+license         {GPL-2+ LGPL}
 categories      graphics
-license         {GPL-2+ LGPL}
 maintainers     devans
 homepage        http://www.gimp.org/
 platforms       darwin
@@ -35,11 +35,9 @@
                 rmd160  a116377499e58dc2bfe231ab3c057d0be94091ff
 
 distname        gimp-${version}
+
 use_bzip2       yes
 
-patchfiles      patch-etc-gimprc.diff \
-                patch-plug-ins-twain-tw_mac.c.diff
-
 depends_build   port:pkgconfig \
                 port:intltool
 
@@ -55,6 +53,15 @@
                 port:libwmf \
                 port:lcms
 
+pre-fetch {
+    if {![variant_isset quartz] && ![variant_isset x11]} {
+        error "Either +x11 or +quartz is required"
+    }
+}
+
+patchfiles      patch-etc-gimprc.diff \
+                patch-plug-ins-twain-tw_mac.c.diff
+
 platform darwin 9 {
     post-patch {
         reinplace "s|-export-symbols-regex.*||g" ${worksrcpath}/plug-ins/pygimp/Makefile.am
@@ -62,6 +69,20 @@
     }
 }
 
+pre-configure {
+    if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
+        set gtk_not_quartz [catch {exec grep -q GDK_WINDOWING_QUARTZ ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
+        set gtk_not_x11 [catch {exec grep -q GDK_WINDOWING_X11 ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
+        if {[variant_isset quartz] && ${gtk_not_quartz}} {
+            error "+quartz variant selected, but gtk2+x11 is installed"
+        } elseif {[variant_isset x11] && ${gtk_not_x11}} {
+            error "+x11 variant selected, but gtk2+quartz is installed"
+        }
+    } else {
+            error "Cannot find gdkconfig.h"
+    }
+}
+
 configure.args  --build=${configure.build_arch}-apple-${os.platform}${os.version} \
                 --enable-mp \
                 --with-pdbgen \
@@ -131,26 +152,6 @@
     default_variants    +x11
 }
 
-pre-fetch {
-    if {![variant_isset quartz] && ![variant_isset x11]} {
-        error "Either +x11 or +quartz is required"
-    }
-}
-
-pre-configure {
-    if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
-        set gtk_not_quartz [catch {exec grep -q GDK_WINDOWING_QUARTZ ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
-        set gtk_not_x11 [catch {exec grep -q GDK_WINDOWING_X11 ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
-        if {[variant_isset quartz] && ${gtk_not_quartz}} {
-            error "+quartz variant selected, but gtk2+x11 is installed"
-        } elseif {[variant_isset x11] && ${gtk_not_x11}} {
-            error "+x11 variant selected, but gtk2+quartz is installed"
-        }
-    } else {
-            error "Cannot find gdkconfig.h"
-    }
-}
-
 variant quartz requires no_x11 conflicts x11 {
     configure.ldflags-append   -framework Carbon
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111003/3f9adc8a/attachment-0001.html>