From b5b99d486fd7166321a8c7a47b639ef5af8e5fbe Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Sat, 30 Jan 2010 14:58:33 +0000
Subject: Fix fallout from xf86vidmodeproto update. Not MAKE_JOBS_SAFE.

---
 graphics/libggi/Makefile         |  3 ++-
 graphics/libggi/distinfo         |  4 ++--
 graphics/libggi/patches/patch-ac | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'graphics/libggi')

diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 1aed061c284..a877dbf5952 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2008/07/14 12:56:05 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2010/01/30 14:58:33 joerg Exp $
 #
 
 DISTNAME=	libggi-2.1.1.src
@@ -14,6 +14,7 @@ HOMEPAGE=	http://www.ggi-project.org/
 COMMENT=	General Graphics Interface library is a flexible drawing library
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+MAKE_JOBS_SAFE=		no
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_LIBTOOL=		yes
diff --git a/graphics/libggi/distinfo b/graphics/libggi/distinfo
index 5d6eefdff3b..e8c0dc5af6d 100644
--- a/graphics/libggi/distinfo
+++ b/graphics/libggi/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.14 2008/07/13 15:00:48 obache Exp $
+$NetBSD: distinfo,v 1.15 2010/01/30 14:58:33 joerg Exp $
 
 SHA1 (libggi-2.1.1.src.tar.bz2) = 38b5deeb161d2b923104138bf4fe8e0e72c4601d
 RMD160 (libggi-2.1.1.src.tar.bz2) = 69bbe53775465774b93213bf9e8aa13cf3d93148
 Size (libggi-2.1.1.src.tar.bz2) = 927060 bytes
 SHA1 (patch-aa) = 52163f169a9581b0cf0295cd173136660e1639b9
 SHA1 (patch-ab) = 025f85629f7713323fc67d84237d519d32bf810b
-SHA1 (patch-ac) = db9a3b4cabb264ace844d1a32d833c45caa5dd20
+SHA1 (patch-ac) = 9839da5a9125193eaf2d9ec8b9c405e8c5edda62
 SHA1 (patch-ad) = 0764cbec555ea68fa55952be8b21fc8508fe97f5
 SHA1 (patch-ae) = fdb08db44a939f9fd1b9b3feaf8d063dc9faadd5
diff --git a/graphics/libggi/patches/patch-ac b/graphics/libggi/patches/patch-ac
index 6a7b3b32766..a0e87059c33 100644
--- a/graphics/libggi/patches/patch-ac
+++ b/graphics/libggi/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2005/10/10 16:54:22 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2010/01/30 14:58:33 joerg Exp $
 
---- display/xf86dga/XF86VMode.c.orig	2005-07-31 00:44:11.000000000 +0000
+--- display/xf86dga/XF86VMode.c.orig	2005-01-29 09:35:12.000000000 +0000
 +++ display/xf86dga/XF86VMode.c
 @@ -34,7 +34,7 @@ from Kaleb S. KEITHLEY.
  
@@ -11,3 +11,13 @@ $NetBSD: patch-ac,v 1.3 2005/10/10 16:54:22 joerg Exp $
  #include <sys/types.h>
  #include <sys/time.h>
  #include <unistd.h>
+@@ -55,7 +55,8 @@ from Kaleb S. KEITHLEY.
+ #define NEED_EVENTS
+ #define NEED_REPLIES
+ #include <X11/Xlibint.h>
+-#include <X11/extensions/xf86vmstr.h>
++#include <X11/extensions/xf86vmproto.h>
++#include <X11/extensions/xf86vmode.h>
+ #include <X11/extensions/Xext.h>
+ #include "extutil.h"
+ 
-- 
cgit v1.2.3