[85337] trunk/dports/graphics/gimp2-devel/Portfile

[devans at macports.org]

Revision: 85337
          http://trac.macports.org/changeset/85337
Author:   devans at macports.org
Date:     2011-10-12 13:27:09 -0700 (Wed, 12 Oct 2011)
Log Message:
-----------
gimp2-devel: reconcile differences between this Portfile and that of gimp2.

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

Modified: trunk/dports/graphics/gimp2-devel/Portfile
===================================================================
--- trunk/dports/graphics/gimp2-devel/Portfile	2011-10-12 20:23:37 UTC (rev 85336)
+++ trunk/dports/graphics/gimp2-devel/Portfile	2011-10-12 20:27:09 UTC (rev 85337)
@@ -11,7 +11,6 @@
 homepage        http://www.gimp.org/
 platforms       darwin
 
-
 description     The GNU Image Manipulation Program
 long_description \
 	The GNU Image Manipulation Program (GIMP) is a powerful \
@@ -65,14 +64,21 @@
                 patch-plug-ins-twain-tw_mac.c.diff \
                 patch-app-gui-ige-mac-menu.c.diff
 
+platform darwin 9 {
+    post-patch {
+        reinplace "s|-export-symbols-regex.*||g" ${worksrcpath}/plug-ins/pygimp/Makefile.am
+        reinplace "s|-export-symbols-regex.*||g" ${worksrcpath}/plug-ins/pygimp/Makefile.in
+    }
+}
+
 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 "+quartz variant is not selected, but gtk2+quartz is installed"
+            error "+quartz variant selected, but gtk2+x11 is installed. Install gtk2+quartz."
+        } elseif {![variant_isset quartz] && ${gtk_not_x11}} {
+            error "+quartz variant is not selected, but gtk2+quartz is installed. Install gtk2+x11."
         }
     } else {
             error "Cannot find gdkconfig.h"
@@ -83,6 +89,8 @@
                 --enable-mp \
                 --with-pdbgen \
                 --with-x \
+                --x-includes=${prefix}/include \
+                --x-libraries=${prefix}/lib \
                 --without-alsa \
                 --without-gudev \
                 --without-gvfs \
@@ -141,13 +149,19 @@
 }
 
 variant quartz {
-    configure.args-delete --with-x
+    configure.args-delete --with-x \
+                          --x-includes=${prefix}/include \
+                          --x-libraries=${prefix}/lib
     configure.args-append --without-x
     configure.ldflags-append   -framework Carbon
 }
 
 default_variants +debug
 
+post-activate {
+        system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
+}
+
 livecheck.type  regex
 livecheck.url   http://gimp.mirrors.hoobly.com/gimp/v${branch}/
 livecheck.regex "gimp-(${branch}(?:\\.\\d+)*)${extract.suffix}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111012/dff09d5d/attachment.html>