[49818] trunk/dports/x11/gtk2

[nox at macports.org]

Revision: 49818
          http://trac.macports.org/changeset/49818
Author:   nox at macports.org
Date:     2009-04-18 06:43:41 -0700 (Sat, 18 Apr 2009)
Log Message:
-----------
gtk2:
 * Update to 2.16.1 (closes #19334).
 * Check cairo variants (closes #19350).

Modified Paths:
--------------
    trunk/dports/x11/gtk2/Portfile

Removed Paths:
-------------
    trunk/dports/x11/gtk2/files/patch-configure.diff

Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile	2009-04-18 13:41:27 UTC (rev 49817)
+++ trunk/dports/x11/gtk2/Portfile	2009-04-18 13:43:41 UTC (rev 49818)
@@ -4,8 +4,7 @@
 PortSystem      1.0
 
 name            gtk2
-version         2.14.7
-revision        2
+version         2.16.1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      x11
 maintainers     nox openmaintainer
@@ -25,8 +24,7 @@
                 ftp://ftp.gtk.org/pub/gtk/v${branch}/ \
                 http://ftp.gtk.org/pub/gtk/v${branch}/
 
-patchfiles      patch-configure.diff \
-                patch-modules-gail.diff \
+patchfiles      patch-modules-gail.diff \
                 patch-modules-printbackends.diff
 
 if {[variant_isset no_x11]} {
@@ -59,11 +57,19 @@
             error "Please update Xcode."
         }
     }
+
+    if {[variant_isset quartz]} {
+        if {![file exists ${prefix}/include/cairo/cairo-quartz.h]} {
+            error "cairo must be built with the +quartz variant enabled."
+        }
+    } elseif {![file exists ${prefix}/include/cairo/cairo-xlib.h]} {
+        error "cairo must not be build with the +no_x11 variant enabled."
+    }
 }
 
-checksums       md5     fb1614d4b2adba7b078e2e799b5db604 \
-                sha1    f4b9c65dbdc78cad6fc9b601640cbad1d3abb57f \
-                rmd160  2ed6451d3de050e9b2423f6509d15e39ba69a6ab
+checksums       md5     74e35ff3e6e02c960fe2117a4b6b102f \
+                sha1    01cba21f12e6fa3762fe47437eb4dc335a2fb841 \
+                rmd160  41bdf85d93a38236eea12f4882289efb671e16af
 
 depends_build   port:pkgconfig \
                 port:gtk-doc

Deleted: trunk/dports/x11/gtk2/files/patch-configure.diff
===================================================================
--- trunk/dports/x11/gtk2/files/patch-configure.diff	2009-04-18 13:41:27 UTC (rev 49817)
+++ trunk/dports/x11/gtk2/files/patch-configure.diff	2009-04-18 13:43:41 UTC (rev 49818)
@@ -1,30 +0,0 @@
---- ./configure.in.orig	2008-09-19 06:44:47.000000000 +0200
-+++ ./configure.in	2008-09-29 14:20:44.000000000 +0200
-@@ -1163,8 +1163,11 @@ if $dynworks ; then
-   if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
-     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
-   fi
-+  if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
-+    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
-+  fi
- else
--  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
-+  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
- fi
- 
- # Checks to see whether we should include mediaLib
---- ./configure.orig	2008-09-24 05:11:45.000000000 +0200
-+++ ./configure	2008-09-29 14:20:57.000000000 +0200
-@@ -29764,8 +29764,11 @@ if $dynworks ; then
-   if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
-     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
-   fi
-+  if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
-+    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
-+  fi
- else
--  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
-+  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
- fi
- 
- # Checks to see whether we should include mediaLib
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090418/5933e377/attachment.html>