From 500e2b25d50b1f7f1a1498ce9593ba87ea959cb1 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Wed, 15 Sep 2010 12:02:27 +0000
Subject: Remove comma at end of enumeration -- breaks e.g. snes9x-gtk
 compilation.

Bump PKGREVISION.
---
 graphics/cairo/Makefile         |  3 ++-
 graphics/cairo/distinfo         |  3 ++-
 graphics/cairo/patches/patch-ac | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 graphics/cairo/patches/patch-ac

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index b7023a7f15f..7a8d38a10d2 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2010/09/14 19:08:29 tron Exp $
+# $NetBSD: Makefile,v 1.84 2010/09/15 12:02:27 wiz Exp $
 
 DISTNAME=	cairo-1.10.0
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 88ff9c211b2..e3effba00ec 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.52 2010/09/13 12:23:01 wiz Exp $
+$NetBSD: distinfo,v 1.53 2010/09/15 12:02:27 wiz Exp $
 
 SHA1 (cairo-1.10.0.tar.gz) = efe7e47408d5188690228ccadc8523652f6bf702
 RMD160 (cairo-1.10.0.tar.gz) = fa65d4f3926308857d13f3ed0c100f89f075dc01
 Size (cairo-1.10.0.tar.gz) = 24022822 bytes
 SHA1 (patch-aa) = f211b2a5fce4ff65f280f79fbb78e1a530b9b165
 SHA1 (patch-ab) = cf6031bdbda5162ac6929be5cd2b8313882c75ed
+SHA1 (patch-ac) = 864f903d5fd9d290a6887a8d44c227fda74f52c9
diff --git a/graphics/cairo/patches/patch-ac b/graphics/cairo/patches/patch-ac
new file mode 100644
index 00000000000..c696a19eef0
--- /dev/null
+++ b/graphics/cairo/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.14 2010/09/15 12:02:27 wiz Exp $
+
+Enumerations shouldn't end with a comma.
+
+--- src/cairo.h.orig	2010-09-06 12:11:22.000000000 +0000
++++ src/cairo.h
+@@ -1973,7 +1973,7 @@ typedef enum _cairo_device_type {
+     CAIRO_DEVICE_TYPE_SCRIPT,
+     CAIRO_DEVICE_TYPE_XCB,
+     CAIRO_DEVICE_TYPE_XLIB,
+-    CAIRO_DEVICE_TYPE_XML,
++    CAIRO_DEVICE_TYPE_XML
+ } cairo_device_type_t;
+ 
+ cairo_public cairo_device_type_t
-- 
cgit v1.2.3