Update to 2.0.4, closes PR pkg/23820.

Changes:

	o build fix: cygwin has no sys/shm.h and sys/ipc.h, so configure
	  disables all targets requiring them, if not present.
	o cbconsist demo: sync with devel tree
	o gcc 3.3 compiling fix for default/linear_16/crossbuild.c
	  (fixes Debian bug #197214)
	o merged build fix from FreeBSD's ports tree to make the xf86dga
	  target compile on FreeBSD (fixes FreeBSD PR ports/52380)

	o X-target
        	+ minor mode initialization fix from Argo Vessmann
        	+ shm helper checks return code, when setting up the
		  directbuffer
        	+ release locking on failure. (Threadsafety fix)
        	+ fixed geometry check. Opening (very) small windows is now
		  possible.

4 files changed, 17 insertions, 29 deletions

diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index f988485052f..84570247096 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2003/09/28 09:13:57 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/05 00:27:24 xtraeme Exp $
 #
 
-DISTNAME=	libggi-2.0.3.src
+DISTNAME=	libggi-2.0.4.src
 PKGNAME=	${DISTNAME:S/.src//}
-PKGREVISION=			1
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.ggi-project.org/pub/ggi/ggi/v2.0/ \
+MASTER_SITES=	ftp://ftp.ggi-project.org/pub/packages/ggi \
 		http://www.ggi-project.org/ftp/ggi/v2.0/ \
 		${MASTER_SITE_SOURCEFORGE:=ggi/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/libggi/PLIST b/graphics/libggi/PLIST
index 5acca04e6c4..206a6560fb2 100644
--- a/graphics/libggi/PLIST
+++ b/graphics/libggi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/04/02 12:05:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/01/05 00:27:24 xtraeme Exp $
 bin/cube3d
 bin/ggiteleserver
 bin/monitest
@@ -145,7 +145,7 @@ lib/libggi.a
 lib/libggi.la
 lib/libggi.so
 lib/libggi.so.2
-lib/libggi.so.2.3
+lib/libggi.so.2.4
 man/man1/cube3d.1
 man/man1/ggiteleserver.1
 man/man1/monitest.1
diff --git a/graphics/libggi/distinfo b/graphics/libggi/distinfo
index da85439a00f..31c5201e544 100644
--- a/graphics/libggi/distinfo
+++ b/graphics/libggi/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2003/04/02 12:05:26 wiz Exp $
+$NetBSD: distinfo,v 1.7 2004/01/05 00:27:24 xtraeme Exp $
 
-SHA1 (libggi-2.0.3.src.tar.bz2) = 9ce2e713f628fae3b6d169f14739f00a980404bf
-Size (libggi-2.0.3.src.tar.bz2) = 739525 bytes
-SHA1 (patch-aa) = ee9a07dcd8231e9744638b92f1f2de3cb7299ea5
+SHA1 (libggi-2.0.4.src.tar.bz2) = 2d15fe15f13f9f0926e88a4eb2df87a103e99da9
+Size (libggi-2.0.4.src.tar.bz2) = 811176 bytes
+SHA1 (patch-aa) = c11133425f97fb6fe2e57a5773198394c89fb1a5
 SHA1 (patch-ab) = 609563e974d17de0ecbd7d102012cea8935e6b54
diff --git a/graphics/libggi/patches/patch-aa b/graphics/libggi/patches/patch-aa
index 41dcb661b26..a5e0579376f 100644
--- a/graphics/libggi/patches/patch-aa
+++ b/graphics/libggi/patches/patch-aa
@@ -1,24 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2003/04/02 12:05:26 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2004/01/05 00:27:24 xtraeme Exp $
 
---- configure.orig	Wed Mar 19 22:33:59 2003
-+++ configure
-@@ -11602,8 +11602,8 @@ fi
+--- configure.orig	2003-12-28 20:29:10.000000000 +0100
++++ configure	2003-12-28 20:29:22.000000000 +0100
+@@ -16144,7 +16144,7 @@
+ _ACEOF
  
-     cflags_old="$CFLAGS"
-     cppflags_old="$CPPFLAGS"
--    CFLAGS="$CFLAGS -I$ac_x_includes"
--    CPPFLAGS="$CPPFLAGS -I$ac_x_includes"
-+    CFLAGS="$CFLAGS -I$x_includes"
-+    CPPFLAGS="$CPPFLAGS -I$x_includes"
- 
- for ac_header in X11/extensions/xf86dga.h	\
- 		X11/extensions/Xdbe.h		\
-@@ -13370,7 +13370,7 @@ cat >>confdefs.h <<EOF
- EOF
- 
- cat >>confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
 -#define GGICONFDIR "$PATHTAG$static_sysconfdir/$ggi_subdir"
 +#define GGICONFDIR "$PATHTAG$static_sysconfdir"
- EOF
+ _ACEOF
+ 
  
- if test "x$use_threads" = "xpthread"; then