Update to libggi-2.2.2.

No NEWS entry, but does not need the vidmodeproto fix.

7 files changed, 47 insertions, 68 deletions

diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index a877dbf5952..835e3c12ee0 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2010/01/30 14:58:33 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2010/01/30 15:19:26 tnn Exp $
 #
 
-DISTNAME=	libggi-2.1.1.src
+DISTNAME=	libggi-2.2.2.src
 PKGNAME=	${DISTNAME:S/.src//}
-PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ggi-project.org/ftp/ggi/v2.1/ \
 		${MASTER_SITE_SOURCEFORGE:=ggi/}
diff --git a/graphics/libggi/PLIST b/graphics/libggi/PLIST
index 7a7ad8c4a0f..22702b60c69 100644
--- a/graphics/libggi/PLIST
+++ b/graphics/libggi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2009/06/14 17:59:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.16 2010/01/30 15:19:26 tnn Exp $
 bin/cube3d
 bin/ggiteleserver
 bin/monitest
@@ -19,6 +19,7 @@ include/ggi/display/modelist.h
 include/ggi/display/monotext.h
 include/ggi/display/multi.h
 include/ggi/display/palemu.h
+include/ggi/display/quartz.h
 include/ggi/display/sub.h
 include/ggi/display/svgalib.h
 include/ggi/display/tele.h
@@ -35,7 +36,6 @@ include/ggi/ggi-defs.h
 include/ggi/ggi-unix.h
 include/ggi/ggi.h
 include/ggi/ggi_ext.h
-include/ggi/internal/debug.h
 include/ggi/internal/dltypes.h
 include/ggi/internal/ggi-dl.h
 include/ggi/internal/ggidlinit.h
@@ -79,7 +79,6 @@ ${PLIST.terminfo}lib/ggi/display/terminfo.la
 lib/ggi/display/tile.la
 lib/ggi/display/trueemu.la
 ${PLIST.libvgl}lib/ggi/display/vgl.la
-${PLIST.xf86dga}lib/ggi/display/xf86dga.la
 lib/ggi/helper/helper_x_dbe.la
 ${PLIST.xf86dga}lib/ggi/helper/helper_x_dga.la
 lib/ggi/helper/helper_x_evi.la
@@ -193,9 +192,31 @@ man/man3/ggi_pixellinearbuffer.3
 man/man3/ggi_pixelplanarbuffer.3
 man/man3/ggi_samplelinearbuffer.3
 man/man3/ggi_sampleplanarbuffer.3
+man/man3/ggidev-abs_3.3
+man/man3/ggidev-add_3.3
+man/man3/ggidev-assign_3.3
+man/man3/ggidev-assign_int_3.3
+man/man3/ggidev-assign_unsigned_3.3
+man/man3/ggidev-bits_3.3
+man/man3/ggidev-dec_3.3
+man/man3/ggidev-divmod_3.3
+man/man3/ggidev-eq0_3.3
+man/man3/ggidev-eq_3.3
+man/man3/ggidev-ge0_3.3
+man/man3/ggidev-ge_3.3
+man/man3/ggidev-gt0_3.3
+man/man3/ggidev-inc_3.3
+man/man3/ggidev-invert_3.3
+man/man3/ggidev-le0_3.3
+man/man3/ggidev-lshift_3.3
+man/man3/ggidev-lt0_3.3
+man/man3/ggidev-mul_3.3
+man/man3/ggidev-negate_3.3
+man/man3/ggidev-rshift_3.3
+man/man3/ggidev-sign_3.3
+man/man3/ggidev-sub_3.3
 man/man7/display-aa.7
 man/man7/display-auto.7
-man/man7/display-dga.7
 man/man7/display-directx.7
 man/man7/display-fbdev.7
 man/man7/display-file.7
@@ -205,6 +226,7 @@ man/man7/display-memory.7
 man/man7/display-monotext.7
 man/man7/display-multi.7
 man/man7/display-palemu.7
+man/man7/display-quartz.7
 man/man7/display-sub.7
 man/man7/display-svgalib.7
 man/man7/display-tele.7
@@ -214,5 +236,8 @@ man/man7/display-trueemu.7
 man/man7/display-vcsa.7
 man/man7/display-vgl.7
 man/man7/display-x.7
+man/man7/ggidev-triple-int.7
 man/man7/libggi.7
 share/examples/ggi/libggi.conf
+@pkgdir lib/ggi/default/kgi
+@pkgdir lib/ggi/default/fbdev
diff --git a/graphics/libggi/distinfo b/graphics/libggi/distinfo
index e8c0dc5af6d..290369618ea 100644
--- a/graphics/libggi/distinfo
+++ b/graphics/libggi/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.15 2010/01/30 14:58:33 joerg Exp $
+$NetBSD: distinfo,v 1.16 2010/01/30 15:19:26 tnn 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) = 9839da5a9125193eaf2d9ec8b9c405e8c5edda62
+SHA1 (libggi-2.2.2.src.tar.bz2) = aa439b21fb040b5b52ae18099a0c3cb02e50110f
+RMD160 (libggi-2.2.2.src.tar.bz2) = e76d22f06231e0aa1f752e33951802f243b7f0aa
+Size (libggi-2.2.2.src.tar.bz2) = 1071939 bytes
+SHA1 (patch-aa) = e09aa0c5e6f2a09ba08b94ea37154f5f25f67006
+SHA1 (patch-ab) = 5ab8c53bf89a1527a0e01311d48b93af61d54a1b
 SHA1 (patch-ad) = 0764cbec555ea68fa55952be8b21fc8508fe97f5
-SHA1 (patch-ae) = fdb08db44a939f9fd1b9b3feaf8d063dc9faadd5
diff --git a/graphics/libggi/patches/patch-aa b/graphics/libggi/patches/patch-aa
index de3f5a6f04a..500f51f99ac 100644
--- a/graphics/libggi/patches/patch-aa
+++ b/graphics/libggi/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.7 2005/03/25 02:47:31 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2010/01/30 15:19:26 tnn Exp $
 
---- configure.orig	2004-11-30 22:11:36.000000000 +0100
+--- configure.orig	2007-01-26 20:28:56.000000000 +0000
 +++ configure
-@@ -18455,7 +18455,7 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
+@@ -22245,7 +22245,7 @@ _ACEOF
+ 
  
  cat >>confdefs.h <<_ACEOF
 -#define GGICONFDIR "$PATHTAG$static_sysconfdir/$ggi_subdir"
diff --git a/graphics/libggi/patches/patch-ab b/graphics/libggi/patches/patch-ab
index 9319b41665f..60200cf9fad 100644
--- a/graphics/libggi/patches/patch-ab
+++ b/graphics/libggi/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.7 2005/03/25 02:47:31 wiz Exp $
+$NetBSD: patch-ab,v 1.8 2010/01/30 15:19:26 tnn Exp $
 
---- Makefile.in.orig	2004-11-30 22:11:32.000000000 +0100
+--- Makefile.in.orig	2007-01-26 20:28:51.000000000 +0000
 +++ Makefile.in
-@@ -260,7 +260,7 @@ x_helper_xf86dga_libs = @x_helper_xf86dg
+@@ -343,7 +343,7 @@ x_helper_xf86dga_libs = @x_helper_xf86dg
  x_helper_xf86vm_libs = @x_helper_xf86vm_libs@
  AUTOMAKE_OPTIONS = 1.4 foreign
- SUBDIRS = include ggi display default extensions programs doc m4 dist
+ SUBDIRS = include display default ggi display-shared default-shared extensions programs doc m4 dist
 -ggiconfdatadir = $(sysconfdir)/$(ggi_subdir)
 +ggiconfdatadir = $(datadir)/examples/ggi
  ggiconfdata_DATA = libggi.conf
- DISTCLEANFILES = libggi.conf
- EXTRA_DIST = ChangeLog.1999 ChangeLog FAQ INSTALL.autoconf \
+ DISTCLEANFILES = libggi.conf config.lt
+ MAINTAINERCLEANFILES = Makefile.in acinclude.m4 aclocal.m4 config.h.in \
diff --git a/graphics/libggi/patches/patch-ac b/graphics/libggi/patches/patch-ac
deleted file mode 100644
index a0e87059c33..00000000000
--- a/graphics/libggi/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2010/01/30 14:58:33 joerg Exp $
-
---- 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.
- 
- /* THIS IS NOT AN X CONSORTIUM STANDARD */
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #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"
- 
diff --git a/graphics/libggi/patches/patch-ae b/graphics/libggi/patches/patch-ae
deleted file mode 100644
index 1fd8f35ba48..00000000000
--- a/graphics/libggi/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2008/07/13 15:00:48 obache Exp $
-
---- display/vgl/visual.c.orig	2008-06-05 08:54:51 +0300
-+++ display/vgl/visual.c	2008-06-05 08:55:35 +0300
-@@ -210,13 +210,12 @@ static int GGIopen(ggi_visual *vis, stru
- 		error = GGI_ENOMEM;
- 		goto error;
- 	}
--	VGL_PRIV(vis) = malloc(sizeof(struct vgl_priv));
--	if (VGL_PRIV(vis) == NULL) {
-+	LIBGGI_PRIVATE(vis) = priv = malloc(sizeof(struct vgl_priv));
-+	if (priv == NULL) {
- 		do_cleanup(vis);
- 		error = GGI_ENOMEM;
- 		goto error;
- 	}
--	priv = VGL_PRIV(vis);
- 	memset(priv, 0, sizeof(*priv));
- 
- 	memset(priv->vgl_palred, 0, sizeof(priv->vgl_palred));