Update to 2.0.3:

 New in libggi 2.0.3:
 * X-target:
     * Fixed a bug, where a ggiFlush() call was missed, which makes
       directbuffer content visible when releasing it.
     * Fixed a clipping bug, causing to let disappear characters or
       whole strings.
     * Fixed clipping on multiple frames.
     * Add -keepcursor option, which keeps the default cursor.
     * Fixed crash when used 8bit characters
     * Fixed endless loop when X11 server provides only and only
       the same sort of X visuals
 * Demo: Improved pageflip demo to test all primitives in a
   multi-frame environment
 * merged some compiler fixes from the OpenBSD ports tree
 * fixed a crash, when a drawing primitive (i.e. a line) crossed
   two borders of the clipping rectangle
 * added 64bit fixes to wrap and cube3d demos
 * minor improvements to checkmode and struct check tool
   (important for target developers though)
 * manpage fixes

New in 2:2:0 (2.0.2): 2002-12-26
* Misc bugfixes (see ChangeLog)
* Huge documentation updates
* Major build system update
  - adds builds fixes for many platforms
* memory-target
  - add -pixfmt option
  - added missing support for reporting physical screen sizes.
* X-target
  - rewritten (x/xlib splitting is obselete now)
  - added dirty region management
* xlib-target
  - disabled. Will be removed later
* fbdev-target
  - DirectFB driver works with directfb 0.9.13
  - added mach64 accelerator
* KGI-target
  - big update (works with KGI-0.9 now)
  - added mach64 accelerator
  - added radeon accelerator
  - still experimental, thus disabled in configure

New in 2:1:0 (2.0.1): 2001-08-26
* More documentation updates.
* Prelimiary support for using DirectFB drivers under display-fbdev
* Many corrections/improvements to build files
* Started move towards using libtool versioning, as interface is stable.

New in 2.0: 2001-08-11
* Huge documentation updates.
* svgalib-target
  - added frame support
  - misc bug-fixes

New in 2.0beta4: 2001-07-10
* Misc bugfixes (see ChangeLog).
* Huge documentation updates.
* finished support for reporting physical screen sizes.
* splitted libggimisc off
* New API: ggiDetachInput()
* fbdev-target
  - Acceleration of Matrox G400 (matrox fb)
* directX-target
  - Update
  - Highly experimental target for Win ... Use at your own risk !
* ipc-target
  - New target for interprocess communication (experimental)

New in 2.0beta3: 2000-12-18
* Misc bugfixes (see ChangeLog).
* Minor documentation updates.
* Major rewrite of the internal sublib handling.
* Some fixes for PowerPC compatibility.
* preliminary support for reporting physical screen sizes.
* Made all headers C++ compatible.

* lcd823-target
  - Target for the Motorola MPC823 builtin LCD controler, using
    the /dev/lcd823 Linux kernel device.
* fbdev-target
  - Better detection of kgicon-type fb-devices and old fb implementations.
  - Better usage of fbdev mode infos in fb.modes
  - Better acceleration for the Matrox fb.
* glide-target
  - Added directbuffer support.
* aalib-target
  - Better mode handling.
* X-target
  - Propagated X dpi values to give physical screen dimensions.
  - Various fixes to properly init several values.
* tele-target
  - Updated much to make it work again.
* vgl-target
  - New target for FreeBSD's VGL library.
* directX-target
  - Highly experimental target for Win ... Use at your own risk !

10 files changed, 135 insertions, 154 deletions

diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 5f117cabe36..8594a177401 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.19 2003/01/28 22:03:24 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2003/04/02 12:05:25 wiz Exp $
 #
 
-DISTNAME=	libggi-2.0b2.1
-PKGREVISION=	1
+DISTNAME=	libggi-2.0.3.src
+PKGNAME=	${DISTNAME:S/.src//}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.ggi-project.org/pub/ggi/ggi/current/
+MASTER_SITES=	ftp://ftp.ggi-project.org/pub/ggi/ggi/v2.0/ \
+		http://www.ggi-project.org/ftp/ggi/v2.0/ \
+		${MASTER_SITE_SOURCEFORGE:=ggi/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.ggi-project.org/
@@ -25,17 +29,19 @@ CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
 PKG_SYSCONFSUBDIR=	ggi
 EGDIR=			${PREFIX}/share/examples/ggi
 CONF_FILES=		${EGDIR}/libggi.conf ${PKG_SYSCONFDIR}/libggi.conf
-CONF_FILES+=		${EGDIR}/libggimisc.conf ${PKG_SYSCONFDIR}/libggimisc.conf
 
-PLIST_SRC=	${WRKDIR}/PLIST
+.include "../../mk/bsd.prefs.mk"
 
-post-configure:
-	@if [ -f ${X11BASE}/include/X11/extensions/xf86dga.h ]; then	\
-		${CP} ${PKGDIR}/PLIST ${PLIST_SRC};			\
-	else								\
-		${GREP} -v lib.ggi.display.xf86dga ${PKGDIR}/PLIST	\
-			> ${PLIST_SRC};					\
-	fi
+.if exists(${X11BASE}/include/X11/extensions/xf86dga.h)
+#
+# it would be more logical to set PLIST_SRC to PLIST first and then add
+# PLIST.dga to it, but @dirrm lib/ggi/display will fail while processing
+# pkg/PLIST, because the directory still contains files (they are listed in
+# PLIST.dga) and isn't empty, thus can't be removed
+#
+PLIST_SRC=              ${PKGDIR}/PLIST.dga
+PLIST_SRC+=             ${PKGDIR}/PLIST
+.endif
 
 .include "../../devel/ncurses/buildlink2.mk"
 .include "../../graphics/libgii/buildlink2.mk"
diff --git a/graphics/libggi/PLIST b/graphics/libggi/PLIST
index ccf3a860fac..5acca04e6c4 100644
--- a/graphics/libggi/PLIST
+++ b/graphics/libggi/PLIST
@@ -1,10 +1,16 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/02 23:54:55 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/04/02 12:05:25 wiz Exp $
 bin/cube3d
+bin/ggiteleserver
 bin/monitest
 include/ggi/display/aa.h
+include/ggi/display/directx.h
 include/ggi/display/fbdev.h
 include/ggi/display/file.h
 include/ggi/display/glide.h
+include/ggi/display/ipc.h
+include/ggi/display/kgi.h
+include/ggi/display/lcd823.h
+include/ggi/display/libkgi.h
 include/ggi/display/linvtsw.h
 include/ggi/display/mansync.h
 include/ggi/display/memory.h
@@ -18,8 +24,10 @@ include/ggi/display/tele.h
 include/ggi/display/tile.h
 include/ggi/display/trueemu.h
 include/ggi/display/vcsa.h
+include/ggi/display/vgl.h
 include/ggi/display/x.h
 include/ggi/display/xcommon.h
+include/ggi/display/xevi.h
 include/ggi/display/xf86dga.h
 include/ggi/display/xlib.h
 include/ggi/ggi-unix.h
@@ -31,10 +39,9 @@ include/ggi/internal/ggi-dl.h
 include/ggi/internal/ggidlinit.h
 include/ggi/internal/ggilibinit.h
 include/ggi/internal/internal.h
-include/ggi/internal/misc_int.h
 include/ggi/internal/plat.h
 include/ggi/internal/structs.h
-include/ggi/misc.h
+include/ggi/ll.h
 include/ggi/types.h
 lib/ggi/default/color.a
 lib/ggi/default/color.la
@@ -66,6 +73,9 @@ lib/ggi/default/linear_32.so
 lib/ggi/default/linear_4.a
 lib/ggi/default/linear_4.la
 lib/ggi/default/linear_4.so
+lib/ggi/default/linear_4_r.a
+lib/ggi/default/linear_4_r.la
+lib/ggi/default/linear_4_r.so
 lib/ggi/default/linear_8.a
 lib/ggi/default/linear_8.la
 lib/ggi/default/linear_8.so
@@ -81,18 +91,15 @@ lib/ggi/default/text_16.so
 lib/ggi/default/text_32.a
 lib/ggi/default/text_32.la
 lib/ggi/default/text_32.so
-lib/ggi/display/X-misc.a
-lib/ggi/display/X-misc.la
-lib/ggi/display/X-misc.so
 lib/ggi/display/X.a
 lib/ggi/display/X.la
 lib/ggi/display/X.so
-lib/ggi/display/Xlib.a
-lib/ggi/display/Xlib.la
-lib/ggi/display/Xlib.so
 lib/ggi/display/file.a
 lib/ggi/display/file.la
 lib/ggi/display/file.so
+lib/ggi/display/ipc.a
+lib/ggi/display/ipc.la
+lib/ggi/display/ipc.so
 lib/ggi/display/mansync.a
 lib/ggi/display/mansync.la
 lib/ggi/display/mansync.so
@@ -123,19 +130,26 @@ lib/ggi/display/tile.so
 lib/ggi/display/trueemu.a
 lib/ggi/display/trueemu.la
 lib/ggi/display/trueemu.so
-lib/ggi/display/xf86dga.a
-lib/ggi/display/xf86dga.la
-lib/ggi/display/xf86dga.so
+lib/ggi/helper/helper_x_dbe.a
+lib/ggi/helper/helper_x_dbe.la
+lib/ggi/helper/helper_x_dbe.so
+lib/ggi/helper/helper_x_evi.a
+lib/ggi/helper/helper_x_evi.la
+lib/ggi/helper/helper_x_evi.so
+lib/ggi/helper/helper_x_shm.a
+lib/ggi/helper/helper_x_shm.la
+lib/ggi/helper/helper_x_shm.so
+lib/ggi/helper/helper_x_vidmode.a
+lib/ggi/helper/helper_x_vidmode.la
 lib/libggi.a
 lib/libggi.la
 lib/libggi.so
 lib/libggi.so.2
-lib/libggi.so.2.0
-lib/libggimisc.a
-lib/libggimisc.la
-lib/libggimisc.so
-lib/libggimisc.so.2
-lib/libggimisc.so.2.0
+lib/libggi.so.2.3
+man/man1/cube3d.1
+man/man1/ggiteleserver.1
+man/man1/monitest.1
+man/man3/ggiAddEventMask.3
 man/man3/ggiAddFlags.3
 man/man3/ggiCheckGraphMode.3
 man/man3/ggiCheckMode.3
@@ -146,18 +160,27 @@ man/man3/ggiCopyBox.3
 man/man3/ggiCrossBlit.3
 man/man3/ggiDBGetBuffer.3
 man/man3/ggiDBGetNumBuffers.3
+man/man3/ggiDetachInput.3
 man/man3/ggiDrawBox.3
 man/man3/ggiDrawHLine.3
 man/man3/ggiDrawLine.3
 man/man3/ggiDrawPixel.3
 man/man3/ggiDrawVLine.3
+man/man3/ggiEventPoll.3
+man/man3/ggiEventRead.3
+man/man3/ggiEventSelect.3
+man/man3/ggiEventSend.3
+man/man3/ggiEventsQueued.3
 man/man3/ggiExit.3
 man/man3/ggiFPrintMode.3
 man/man3/ggiFillscreen.3
 man/man3/ggiFlush.3
 man/man3/ggiFlushRegion.3
+man/man3/ggiGammaMax.3
 man/man3/ggiGetBox.3
+man/man3/ggiGetCharSize.3
 man/man3/ggiGetDisplayFrame.3
+man/man3/ggiGetEventMask.3
 man/man3/ggiGetFlags.3
 man/man3/ggiGetGCBackground.3
 man/man3/ggiGetGCClipping.3
@@ -165,6 +188,7 @@ man/man3/ggiGetGCForeground.3
 man/man3/ggiGetGamma.3
 man/man3/ggiGetGammaMap.3
 man/man3/ggiGetHLine.3
+man/man3/ggiGetInput.3
 man/man3/ggiGetMode.3
 man/man3/ggiGetOrigin.3
 man/man3/ggiGetPalette.3
@@ -173,7 +197,10 @@ man/man3/ggiGetPixelFormat.3
 man/man3/ggiGetReadFrame.3
 man/man3/ggiGetVLine.3
 man/man3/ggiGetWriteFrame.3
+man/man3/ggiGetc.3
 man/man3/ggiInit.3
+man/man3/ggiJoinInputs.3
+man/man3/ggiKbhit.3
 man/man3/ggiMapColor.3
 man/man3/ggiOpen.3
 man/man3/ggiPackColors.3
@@ -186,6 +213,7 @@ man/man3/ggiPutPixel.3
 man/man3/ggiPutVLine.3
 man/man3/ggiPutc.3
 man/man3/ggiPuts.3
+man/man3/ggiRemoveEventMask.3
 man/man3/ggiRemoveFlags.3
 man/man3/ggiResourceAcquire.3
 man/man3/ggiResourceMustAcquire.3
@@ -193,6 +221,7 @@ man/man3/ggiResourceRelease.3
 man/man3/ggiSPrintMode.3
 man/man3/ggiSetColorfulPalette.3
 man/man3/ggiSetDisplayFrame.3
+man/man3/ggiSetEventMask.3
 man/man3/ggiSetFlags.3
 man/man3/ggiSetGCBackground.3
 man/man3/ggiSetGCClipping.3
@@ -209,11 +238,40 @@ man/man3/ggiSetTextMode.3
 man/man3/ggiSetWriteFrame.3
 man/man3/ggiUnmapPixel.3
 man/man3/ggiUnpackPixels.3
-man/man6/cube3d.6
+man/man3/ggi_color.3
+man/man3/ggi_coord.3
+man/man3/ggi_directbuffer.3
+man/man3/ggi_graphtype.3
+man/man3/ggi_mode.3
+man/man3/ggi_pixel.3
+man/man3/ggi_pixelformat.3
+man/man3/ggi_pixellinearbuffer.3
+man/man3/ggi_pixelplanarbuffer.3
+man/man3/ggi_samplelinearbuffer.3
+man/man3/ggi_sampleplanarbuffer.3
+man/man7/display-aa.7
+man/man7/display-dga.7
+man/man7/display-directx.7
+man/man7/display-directxnt.7
+man/man7/display-fbdev.7
+man/man7/display-file.7
+man/man7/display-glide.7
+man/man7/display-memory.7
+man/man7/display-monotext.7
+man/man7/display-multi.7
+man/man7/display-palemu.7
+man/man7/display-sub.7
+man/man7/display-svgalib.7
+man/man7/display-tele.7
+man/man7/display-tile.7
+man/man7/display-trueemu.7
+man/man7/display-vcsa.7
+man/man7/display-vgl.7
+man/man7/display-x.7
 man/man7/libggi.7
 share/examples/ggi/libggi.conf
-share/examples/ggi/libggimisc.conf
 @comment in libgii: @dirrm share/examples/ggi
+@dirrm lib/ggi/helper
 @dirrm lib/ggi/display
 @dirrm lib/ggi/default
 @comment in libgii: @dirrm lib/ggi
diff --git a/graphics/libggi/PLIST.dga b/graphics/libggi/PLIST.dga
new file mode 100644
index 00000000000..ee4ceb71706
--- /dev/null
+++ b/graphics/libggi/PLIST.dga
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.dga,v 1.1 2003/04/02 12:05:25 wiz Exp $
+lib/ggi/display/xf86dga.a
+lib/ggi/display/xf86dga.la
+lib/ggi/helper/helper_x_dga.a
+lib/ggi/helper/helper_x_dga.la
diff --git a/graphics/libggi/buildlink2.mk b/graphics/libggi/buildlink2.mk
index a7e70e0efd7..f5df50ad80b 100644
--- a/graphics/libggi/buildlink2.mk
+++ b/graphics/libggi/buildlink2.mk
@@ -1,35 +1,15 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/11/25 20:50:26 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/04/02 12:05:26 wiz Exp $
 
 .if !defined(LIBGGI_BUILDLINK2_MK)
 LIBGGI_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libggi
-BUILDLINK_DEPENDS.libggi?=	libggi>=2.0b2.1
+BUILDLINK_DEPENDS.libggi?=	libggi>=2.0.3
 BUILDLINK_PKGSRCDIR.libggi?=	../../graphics/libggi
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libggi=libggi
 BUILDLINK_PREFIX.libggi_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.libggi+=	include/ggi/display/aa.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/fbdev.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/file.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/glide.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/linvtsw.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/mansync.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/memory.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/modelist.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/monotext.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/multi.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/palemu.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/sub.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/svgalib.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/tele.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/tile.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/trueemu.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/vcsa.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/x.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/xcommon.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/xf86dga.h
-BUILDLINK_FILES.libggi+=	include/ggi/display/xlib.h
+BUILDLINK_FILES.libggi+=	include/ggi/display/*
 BUILDLINK_FILES.libggi+=	include/ggi/ggi-unix.h
 BUILDLINK_FILES.libggi+=	include/ggi/ggi.h
 BUILDLINK_FILES.libggi+=	include/ggi/ggi_ext.h
@@ -39,13 +19,11 @@ BUILDLINK_FILES.libggi+=	include/ggi/internal/ggi-dl.h
 BUILDLINK_FILES.libggi+=	include/ggi/internal/ggidlinit.h
 BUILDLINK_FILES.libggi+=	include/ggi/internal/ggilibinit.h
 BUILDLINK_FILES.libggi+=	include/ggi/internal/internal.h
-BUILDLINK_FILES.libggi+=	include/ggi/internal/misc_int.h
 BUILDLINK_FILES.libggi+=	include/ggi/internal/plat.h
 BUILDLINK_FILES.libggi+=	include/ggi/internal/structs.h
-BUILDLINK_FILES.libggi+=	include/ggi/misc.h
+BUILDLINK_FILES.libggi+=	include/ggi/ll.h
 BUILDLINK_FILES.libggi+=	include/ggi/types.h
 BUILDLINK_FILES.libggi+=	lib/libggi.*
-BUILDLINK_FILES.libggi+=	lib/libggimisc.*
 
 USE_X11=		# defined
 
diff --git a/graphics/libggi/distinfo b/graphics/libggi/distinfo
index 4ba112cf5d6..da85439a00f 100644
--- a/graphics/libggi/distinfo
+++ b/graphics/libggi/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.5 2003/01/02 23:54:56 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2003/04/02 12:05:26 wiz Exp $
 
-SHA1 (libggi-2.0b2.1.tar.gz) = 698de63108a58fa1fc08942266118dc2fccf482c
-Size (libggi-2.0b2.1.tar.gz) = 658294 bytes
-SHA1 (patch-aa) = a911683d105418a8825e1ed8e3405a1069ca8ff2
-SHA1 (patch-ab) = 01b34bfced54470e53259fdb36f1e7def711d7d3
-SHA1 (patch-ac) = 144fe4919dbc1d6434cf764db52a5752be06974b
-SHA1 (patch-ad) = e89cc8c86efabee6495c66d031004c6bf36b152b
-SHA1 (patch-ae) = 62dcb369166ebe88d73bbccedcad0b9b9b1dde4a
+SHA1 (libggi-2.0.3.src.tar.bz2) = 9ce2e713f628fae3b6d169f14739f00a980404bf
+Size (libggi-2.0.3.src.tar.bz2) = 739525 bytes
+SHA1 (patch-aa) = ee9a07dcd8231e9744638b92f1f2de3cb7299ea5
+SHA1 (patch-ab) = 609563e974d17de0ecbd7d102012cea8935e6b54
diff --git a/graphics/libggi/patches/patch-aa b/graphics/libggi/patches/patch-aa
index 897f99dfff8..41dcb661b26 100644
--- a/graphics/libggi/patches/patch-aa
+++ b/graphics/libggi/patches/patch-aa
@@ -1,13 +1,24 @@
-$NetBSD: patch-aa,v 1.3 2003/01/02 23:54:56 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2003/04/02 12:05:26 wiz Exp $
 
---- configure.orig	Sun May 16 19:57:10 1999
+--- configure.orig	Wed Mar 19 22:33:59 2003
 +++ configure
-@@ -5613,7 +5613,7 @@ test "x$exec_prefix" = xNONE && exec_pre
+@@ -11602,8 +11602,8 @@ fi
  
- eval foo="$libdir"
- eval ggi_libdir="$foo"
--eval ggi_confdir="$sysconfdir/ggi"
-+eval ggi_confdir="$sysconfdir"
+     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
+-#define GGICONFDIR "$PATHTAG$static_sysconfdir/$ggi_subdir"
++#define GGICONFDIR "$PATHTAG$static_sysconfdir"
+ EOF
  
+ if test "x$use_threads" = "xpthread"; then
diff --git a/graphics/libggi/patches/patch-ab b/graphics/libggi/patches/patch-ab
index a3d0304983f..d570d6b0894 100644
--- a/graphics/libggi/patches/patch-ab
+++ b/graphics/libggi/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2003/01/02 23:54:57 jmmv Exp $
+$NetBSD: patch-ab,v 1.5 2003/04/02 12:05:27 wiz Exp $
 
---- Makefile.in.orig	Sun May 16 22:49:35 1999
+--- Makefile.in.orig	Wed Apr  2 11:09:09 2003
 +++ Makefile.in
-@@ -93,7 +93,7 @@ AUTOMAKE_OPTIONS = foreign
+@@ -117,7 +117,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
  
- SUBDIRS = include ggi display default extensions programs doc
+ SUBDIRS = include ggi display default extensions programs doc m4 dist
  
--ggiconfdatadir = @ggi_confdir@
-+ggiconfdatadir = @datadir@/examples/ggi
+-ggiconfdatadir = $(sysconfdir)/$(ggi_subdir)
++ggiconfdatadir = $(datadir)/examples/ggi
  ggiconfdata_DATA = libggi.conf
  
  noinst_PROGRAMS = patchlib
diff --git a/graphics/libggi/patches/patch-ac b/graphics/libggi/patches/patch-ac
deleted file mode 100644
index ea8dd94497c..00000000000
--- a/graphics/libggi/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/10/01 14:03:27 rh Exp $
-
---- display/xf86dga/XF86DGA.c.orig	Tue Apr 13 00:57:20 1999
-+++ display/xf86dga/XF86DGA.c
-@@ -6,6 +6,8 @@
- 
- */
- 
-+#include <unistd.h>
-+
- /* THIS IS NOT AN X CONSORTIUM STANDARD */
- 
- /* Defines */
-@@ -283,7 +285,6 @@
- #include <X11/Xmd.h>
- #include <stdlib.h>
- #include <stdio.h>
--#include <unistd.h>
- #include <fcntl.h>
- #if defined(ISC) 
- # define HAS_SVR3_MMAP
diff --git a/graphics/libggi/patches/patch-ad b/graphics/libggi/patches/patch-ad
deleted file mode 100644
index 0f8440cad1f..00000000000
--- a/graphics/libggi/patches/patch-ad
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/11/25 20:48:43 jlam Exp $
-
---- doc/man/Makefile.in.orig	Mon Nov 25 12:45:23 2002
-+++ doc/man/Makefile.in
-@@ -130,7 +130,7 @@ install-man3:
- 	for i in $$list; do \
- 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- 	  else file=$$i; fi; \
--	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  ext=`echo $$i | sed -e 's/^.*\\.//;s/ggi$$//'`; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
- 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
-@@ -145,7 +145,7 @@ uninstall-man3:
- 	  esac; \
- 	done; \
- 	for i in $$list; do \
--	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  ext=`echo $$i | sed -e 's/^.*\\.//;s/ggi$$//'`; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
- 	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
-@@ -163,7 +163,7 @@ install-man7:
- 	for i in $$list; do \
- 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- 	  else file=$$i; fi; \
--	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  ext=`echo $$i | sed -e 's/^.*\\.//;s/ggi$$//'`; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
- 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man7dir)/$$inst"; \
-@@ -178,7 +178,7 @@ uninstall-man7:
- 	  esac; \
- 	done; \
- 	for i in $$list; do \
--	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  ext=`echo $$i | sed -e 's/^.*\\.//;s/ggi$$//'`; \
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
- 	  echo " rm -f $(DESTDIR)$(man7dir)/$$inst"; \
diff --git a/graphics/libggi/patches/patch-ae b/graphics/libggi/patches/patch-ae
deleted file mode 100644
index 79518a29391..00000000000
--- a/graphics/libggi/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/01/02 23:54:58 jmmv Exp $
-
---- extensions/misc/Makefile.in.orig	Fri Jan  3 00:45:40 2003
-+++ extensions/misc/Makefile.in
-@@ -92,7 +92,7 @@ xf86dga_libs = @xf86dga_libs@
- 
- SUBDIRS = ggimisc display demos
- 
--ggiconfdatadir = @ggi_confdir@
-+ggiconfdatadir = @datadir@/examples/ggi
- ggiconfdata_DATA = libggimisc.conf
- 
- DISTCLEANFILES = libggimisc.conf