Update to 2.0.4 and fix plist. This encompasses nearly 9 months'

worth of changes, some of which are extensive; see ChangeLog
for details.  Note that the patchfiles are now incorporated into
the upstream version.

PR:		ports/62352
Submitted by:	Andrew Kenneth Milton <akm@theinternet.com.au>

10 files changed, 43 insertions, 645 deletions

diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index d414ad0c988d..e14ed68e2324 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libggi
-PORTVERSION=	2.0.3
+PORTVERSION=	2.0.4
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics devel
@@ -24,7 +24,6 @@ USE_BZIP2=	yes
 USE_XLIB=	yes
 INSTALLS_SHLIB=	yes
 
-USE_AUTOCONF_VER=	253
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-internal-dga	#This is broken for now
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/libggi/distinfo b/graphics/libggi/distinfo
index beaf43a74a45..ab3c0422951c 100644
--- a/graphics/libggi/distinfo
+++ b/graphics/libggi/distinfo
@@ -1,2 +1 @@
-MD5 (libggi-2.0.3.src.tar.bz2) = 89a723c041a123110cad167d37f1a192
-SIZE (libggi-2.0.3.src.tar.bz2) = 739525
+MD5 (libggi-2.0.4.src.tar.bz2) = b1a68aba26e12cd164ea032ad3ad5556
diff --git a/graphics/libggi/files/patch-aa b/graphics/libggi/files/patch-aa
deleted file mode 100644
index 040e1cf6a2af..000000000000
--- a/graphics/libggi/files/patch-aa
+++ /dev/null
@@ -1,109 +0,0 @@
-*** display/kgi/kgi.c.orig	Thu Dec  5 16:59:59 2002
---- display/kgi/kgi.c	Mon Apr 14 17:06:19 2003
-***************
-*** 15,20 ****
---- 15,30 ----
-  		kgic_mapper_identify_request_t	request;
-  		kgic_mapper_identify_result_t	result;
-  	} cb;
-+ #ifdef __FreeBSD__
-+ 	union {
-+ 		kgic_mapper_attach_request_t	request;
-+ 		kgic_mapper_attach_result_t	result;
-+ 	} at;
-+ 	union {
-+ 		kgic_mapper_get_unit_request_t	request;
-+ 		kgic_mapper_get_unit_result_t	result;
-+ 	} get_unit;
-+ #endif
-  
-  	if (NULL == ctx) {
-  
-***************
-*** 35,40 ****
---- 45,81 ----
-  		return -KGI_INVAL;
-  	}
-  
-+ #ifdef __FreeBSD__
-+ 	memset(&get_unit, 0, sizeof(get_unit));
-+ 
-+ 	/* Pass an invalid device id to force auto attachement */
-+ 	get_unit.request.unit = -1;
-+ 	if (ioctl(ctx->mapper.fd, KGIC_MAPPER_GET_UNIT, &get_unit)) {
-+ 		perror("failed to get free unit");
-+ 		return errno;
-+ 	}
-+ 
-+ 	/* Close /dev/graphic then open the true one */
-+ 	close(ctx->mapper.fd);
-+ 
-+ 	sprintf(fname, "/dev/graphic%i", get_unit.result.unit);
-+ 	ctx->mapper.fd = open(fname, O_RDWR | O_NONBLOCK);
-+ 	if (ctx->mapper.fd < 0) {
-+ 		perror("failed to open /dev/graphicX");
-+ 		return errno;
-+ 	}
-+ 
-+ 	memset(&at, 0, sizeof(at));
-+ 
-+ 	/* Pass an invalid device id to force auto attachement */
-+ 	at.request.device_id = -1;
-+ 	if (ioctl(ctx->mapper.fd, KGIC_MAPPER_ATTACH, &at)) {
-+ 
-+ 		perror("failed to attach to device");
-+ 		return errno;
-+ 	}
-+ #endif
-+ 
-  	memset(&cb, 0, sizeof(cb));
-  	strncpy(cb.request.client, client,
-  		sizeof(cb.request.client));
-***************
-*** 245,252 ****
-  	switch (cb.result.type & KGI_RT_MASK) {
-  
-  	case KGI_RT_MMIO:
-! 		printf("MMIO: window %i, size %i, align %.8x, "
-! 			"access %.8x\n",
-  			cb.result.info.mmio.window,
-  			cb.result.info.mmio.size,
-  			cb.result.info.mmio.align,
---- 286,293 ----
-  	switch (cb.result.type & KGI_RT_MASK) {
-  
-  	case KGI_RT_MMIO:
-! 		printf("MMIO: window %li, size %li, align %.8lx, "
-! 			"access %.8lx\n",
-  			cb.result.info.mmio.window,
-  			cb.result.info.mmio.size,
-  			cb.result.info.mmio.align,
-***************
-*** 254,266 ****
-  		break;
-  
-  	case KGI_RT_ACCEL:
-! 		printf("ACCEL: recommended are %i buffers of size %i\n",
-  			cb.result.info.accel.buffers,
-  			cb.result.info.accel.buffer_size);
-  		break;
-  
-  	case KGI_RT_SHMEM:
-! 		printf("SHMEM: (maximum) aperture size %i\n",
-  			cb.result.info.shmem.aperture_size);
-  		break;
-  
---- 295,307 ----
-  		break;
-  
-  	case KGI_RT_ACCEL:
-! 		printf("ACCEL: recommended are %li buffers of size %li\n",
-  			cb.result.info.accel.buffers,
-  			cb.result.info.accel.buffer_size);
-  		break;
-  
-  	case KGI_RT_SHMEM:
-! 		printf("SHMEM: (maximum) aperture size %li\n",
-  			cb.result.info.shmem.aperture_size);
-  		break;
-  
diff --git a/graphics/libggi/files/patch-ab b/graphics/libggi/files/patch-ab
deleted file mode 100644
index 342deb7ad4a3..000000000000
--- a/graphics/libggi/files/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
-*** display/kgi/mode.c.orig	Mon Nov  4 16:32:41 2002
---- display/kgi/mode.c	Mon Apr 14 13:13:40 2003
-***************
-*** 114,119 ****
---- 114,125 ----
-  		int name_size;
-  		char *space;
-  
-+ #ifdef __FreeBSD__
-+ 		/* XXX no accel support in kernel */
-+ 		GGIDPRINT("Warning!! Accel not supported by FreeBSD kernel\n");
-+ 		return -1;
-+ #endif
-+ 
-  		accel = kgiGetResource(&KGI_CTX(vis), 0, KGI_RT_ACCEL);
-  		if (! accel) {
-  		
-***************
-*** 180,186 ****
-  		return -1;
-  	}
-  
-! 	GGIDPRINT("Found fb as resource %d", fb->resource);
-  
-  	kgiSetupMmapFB(&KGI_CTX(vis), fb->resource);
-  
---- 186,192 ----
-  		return -1;
-  	}
-  
-! 	GGIDPRINT("Found fb as resource %d\n", fb->resource);
-  
-  	kgiSetupMmapFB(&KGI_CTX(vis), fb->resource);
-  
diff --git a/graphics/libggi/files/patch-ac b/graphics/libggi/files/patch-ac
deleted file mode 100644
index a5bc69375e61..000000000000
--- a/graphics/libggi/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-*** include/ggi/display/kgi.h.orig	Mon Apr 14 13:24:33 2003
---- include/ggi/display/kgi.h	Mon Apr 14 13:25:00 2003
-***************
-*** 29,37 ****
-  #define _GGI_DISPLAY_KGI_H
-  
-  #include <stdlib.h>
-- #include <kgi/system.h>
-  #include <kgi/kgi.h>
-- #include <kgi/cmd.h>
-  
-  #include <ggi/internal/ggi-dl.h>
-  
---- 29,35 ----
diff --git a/graphics/libggi/files/patch-configure.in b/graphics/libggi/files/patch-configure.in
deleted file mode 100644
index 3576c99046ea..000000000000
--- a/graphics/libggi/files/patch-configure.in
+++ /dev/null
@@ -1,174 +0,0 @@
---- configure.in.orig	Sun Aug 17 17:28:49 2003
-+++ configure.in	Sun Aug 17 17:29:44 2003
-@@ -30,6 +30,11 @@
- dnl Common useable Targets
- build_x_target="auto"
- build_xlib_target="no"
-+build_x_dbe_target="auto"
-+build_x_evi_target="auto"
-+build_x_shm_target="auto"
-+build_x_xf86dga_target="auto"
-+build_x_xf86vmode_target="auto"
- build_file_target="auto"
- build_kgi_target="no"
- build_libkgi_target="no"
-@@ -276,6 +281,25 @@
- linux/kdev_t.h linux/major.h glide.h glide/glide.h kgimon.h sys/un.h \
- sys/socket.h netinet/in.h netdb.h windows.h ddraw.h vgl.h)
- 
-+
-+dnl ========================================================================
-+dnl Check header files dependencies.
-+
-+dnl Disable targets requiring non-existing headers
-+if test "x$ac_cv_header_sys_shm_h" != "xyes"; then
-+	build_x_shm_target="no"
-+	build_ipc_target="no"
-+dnl TODO:
-+dnl Disable programs/demos/wrap.c here
-+fi
-+
-+if test "x$ac_cv_header_sys_ipc_h" != "xyes"; then
-+	build_ipc_target="no"
-+dnl TODO:
-+dnl Disable programs/demos/wrap.c here
-+fi
-+
-+
- dnl ========================================================================
- dnl LibGII must be built
- 
-@@ -349,6 +373,11 @@
- 
- 
- dnl ========================================================================
-+dnl Check function dependencies.
-+
-+dnl TODO: Disable targets requiring non-existing functions.
-+
-+dnl ========================================================================
- dnl Checks whether to compile in various SWARs
- 
- if test "x$do_noswar" = "xyes"; then
-@@ -624,15 +653,18 @@
- 
- 
- dnl This is necessary as there are plattforms, where
--dnl $ac_x_includes does NOT belong to the default search
-+dnl $(ac_)x_includes does NOT belong to the default search
- dnl path. Darwin is such a system, for example.
--dnl $ac_x_includes contains the right path to the X
-+dnl $(ac_)x_includes contains the right path to the X
- dnl includes (/usr/X11R6/include on most systems).
- 
-     cflags_old="$CFLAGS"
-     cppflags_old="$CPPFLAGS"
--    CFLAGS="$CFLAGS -I$ac_x_includes"
--    CPPFLAGS="$CPPFLAGS -I$ac_x_includes"
-+    if test -z "$x_includes" -o "x$x_includes" = "xNONE"; then
-+	x_includes="$ac_x_includes"
-+    fi
-+    CFLAGS="$CFLAGS -I$x_includes"
-+    CPPFLAGS="$CPPFLAGS -I$x_includes"
- 
-     AC_CHECK_HEADERS(X11/extensions/xf86dga.h	\
- 		X11/extensions/Xdbe.h		\
-@@ -642,6 +674,22 @@
-     CFLAGS="$cflags_old"
-     CPPFLAGS="$cppflags_old"
- 
-+    if test "x$ac_cv_header_X11_extensions_Xdbe_h" != "xyes"; then
-+	build_x_dbe_target="no"
-+    fi
-+    if test "x$ac_cv_header_X11_extensions_XEVI_h" != "xyes"; then
-+	build_x_evi_target="no"
-+    fi
-+    if test "x$ac_cv_header_X11_extensions_XShm_h" != "xyes"; then
-+	build_x_shm_target="no"
-+    fi
-+    if test "x$ac_cv_header_X11_extensions_xf86dga_h" != "xyes"; then
-+	build_x_xf86dga_target="no"
-+    fi
-+    if test "x$ac_cv_header_X11_extensions_xf86vmode_h" != "xyes"; then
-+	build_x_xf86vmode_target="no"
-+    fi
-+
-     x_helper_xf86dga_libs=""
-     x_helper_xf86vm_libs=""
- 
-@@ -649,7 +697,7 @@
- 	x_helper_xf86dga_libs="-lXxf86dga_pic",
- 	AC_CHECK_LIB(Xxf86dga, XF86DGAQueryVersion,
- 		x_helper_xf86dga_libs="-lXxf86dga",
--  		ac_cv_header_X11_extensions_xf86dga_h=no,
-+  		build_x_xf86dga_target=no,
- 		[ $X_LIBS -lXext -lX11 $X_EXTRA_LIBS ]),
- 	[ $X_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
- 
-@@ -657,7 +705,7 @@
- 	x_helper_xf86vm_libs="-lXxf86vm_pic",
- 	AC_CHECK_LIB(Xxf86vm, XF86VidModeSwitchToMode,
- 		x_helper_xf86vm_libs="-lXxf86vm",
--		ac_cv_header_X11_extensions_xf86vmode_h=no,
-+		build_x_xf86vmode_target=no,
- 		[ $X_LIBS -lXext -lX11 $X_EXTRA_LIBS ]),
- 	[ $X_LIBS -lXext -lX11 $X_EXTRA_LIBS ])
-   fi
-@@ -699,8 +747,10 @@
- 
- if test "x$build_kgi_target" != "xno"; then
-    AC_TRY_COMPILE([
--#include "kgi/config.h"
--#include <kgi/system.h>
-+#ifndef __FreeBSD__
-+#  include "kgi/config.h"
-+#  include <kgi/system.h>
-+#endif
- #include <kgi/kgi.h>
-    ],[
- kgi_u32_t i;
-@@ -827,7 +877,7 @@
-   AC_MSG_RESULT(yes)
- 
-   AC_MSG_CHECKING(if we should build support for DoubleBuffer extension for x target)
--  if test "x$ac_cv_header_X11_extensions_Xdbe_h" != "xyes"; then
-+  if test "x$build_x_dbe_target" = "xno"; then
- 	AC_MSG_RESULT(no)
-   else
- 	XSUBDIRS="$XSUBDIRS dbe"
-@@ -835,7 +885,7 @@
-   fi
- 
-   AC_MSG_CHECKING(if we should build support for Extended Visual Information extension for x target)
--  if test "x$ac_cv_header_X11_extensions_XEVI_h" != "xyes"; then
-+  if test "x$build_x_evi_target" = "xno"; then
- 	AC_MSG_RESULT(no)
-   else
- 	XSUBDIRS="$XSUBDIRS evi"
-@@ -843,7 +893,7 @@
-   fi
- 
-   AC_MSG_CHECKING(if we should build support for MIT-SHM extension for x target)
--  if test "x$ac_cv_header_X11_extensions_XShm_h" != "xyes"; then
-+  if test "x$build_x_shm_target" = "xno"; then
- 	AC_MSG_RESULT(no)
-   else
- 	XSUBDIRS="$XSUBDIRS shm"
-@@ -851,7 +901,7 @@
-   fi
- 
-   AC_MSG_CHECKING(if we should build support for xf86dga extension for x target)
--  if test "x$ac_cv_header_X11_extensions_xf86dga_h" != "xyes"; then
-+  if test "x$build_x_xf86dga_target" = "xno"; then
- 	AC_MSG_RESULT(no)
-   else
- 	XSUBDIRS="$XSUBDIRS dga"
-@@ -859,7 +909,7 @@
-   fi
- 
-   AC_MSG_CHECKING(if we should build support for XF86 Vidmode extension for x target)
--  if test "x$ac_cv_header_X11_extensions_xf86vmode_h" != "xyes"; then
-+  if test "x$build_x_xf86vmode_target" = "xno"; then
- 	AC_MSG_RESULT(no)
-   else
- 	XSUBDIRS="$XSUBDIRS vidmode"
diff --git a/graphics/libggi/files/patch-default-linear_16-crossblit.c b/graphics/libggi/files/patch-default-linear_16-crossblit.c
deleted file mode 100644
index d6b52f7ed5f8..000000000000
--- a/graphics/libggi/files/patch-default-linear_16-crossblit.c
+++ /dev/null
@@ -1,272 +0,0 @@
---- default/linear_16/crossblit.c.orig	Tue Oct 28 06:21:37 2003
-+++ default/linear_16/crossblit.c	Tue Oct 28 06:23:43 2003
-@@ -1278,67 +1278,67 @@
- 				while (stopcol > dstp + 11) {
- 				  void *dummy;
- 				  __asm__ __volatile__(
--				   "movq  (%1), %%mm0\n\t
--                                    pxor  %%mm5, %%mm5\n\t
--                                    movq  8(%1), %%mm1\n\t
--                                    pxor  %%mm6, %%mm6\n\t
--                                    movq  16(%1), %%mm2\n\t
--                                    pxor  %%mm7, %%mm7\n\t
--                                    add   $24, %1\n\t
--
--                                    .Lleft%=:
--                                    cmp   $0, 8(%2)\n\t
--                                    je    .Lmiddle%=\n\t
--
--                                    movq  %%mm0, %%mm3\n\t
--                                    movq  %%mm1, %%mm4\n\t
--                                    psllw (%2), %%mm3\n\t
--                                    psllw (%2), %%mm4\n\t
--                                    pand  8(%2), %%mm3\n\t
--                                    pand  8(%2), %%mm4\n\t
--                                    por   %%mm3, %%mm5\n\t
--                                    movq  %%mm2, %%mm3\n\t
--                                    por   %%mm4, %%mm6\n\t
--                                    psllw (%2), %%mm3\n\t
--                                    pand  8(%2), %%mm3\n\t
--                                    cmp   $0, (%2)\n\t
--                                    por   %%mm3, %%mm7\n\t
--                                    je    .Lright%=\n\t
--                                    add   $16, %2\n\t
--                                    jmp   .Lleft%=\n\t
--
--                                    .Lmiddle%=:\n\t
--                                    cmp   $0, (%2)\n\t
--                                    je    .Lright%=\n\t
--
--                                    .Ldone%=:\n\t
--                                    movq  %%mm5, (%0)\n\t
--                                    movq  %%mm6, 8(%0)\n\t
--                                    movq  %%mm7, 16(%0)\n\t
--                                    add   $24, %0\n\t
--                                    jmp   .Lout%=\n\t
--
--                                    .Lright%=:\n\t
--                                    add   $16, %2\n\t
--                                    cmp   $0, 8(%2)\n\t
--                                    je    .Ldone%=\n\t
--
--                                    movq  %%mm0, %%mm3\n\t
--                                    movq  %%mm1, %%mm4\n\t
--                                    psrlw (%2), %%mm3\n\t
--                                    psrlw (%2), %%mm4\n\t
--                                    pand  8(%2), %%mm3\n\t
--                                    pand  8(%2), %%mm4\n\t
--                                    por   %%mm3, %%mm5\n\t
--                                    movq  %%mm2, %%mm3\n\t
--                                    por   %%mm4, %%mm6\n\t
--                                    psrlw (%2), %%mm3\n\t
--                                    pand  8(%2), %%mm3\n\t
--                                    por   %%mm3, %%mm7\n\t
--
--                                    jmp   .Lright%=\n\t
--
--                                    .Lout%=:\n\t
-+				   "movq  (%1), %%mm0\n\t\
-+                                    pxor  %%mm5, %%mm5\n\t\
-+                                    movq  8(%1), %%mm1\n\t\
-+                                    pxor  %%mm6, %%mm6\n\t\
-+                                    movq  16(%1), %%mm2\n\t\
-+                                    pxor  %%mm7, %%mm7\n\t\
-+                                    add   $24, %1\n\t\
-+\
-+                                    .Lleft%=:\
-+                                    cmp   $0, 8(%2)\n\t\
-+                                    je    .Lmiddle%=\n\t\
-+\
-+                                    movq  %%mm0, %%mm3\n\t\
-+                                    movq  %%mm1, %%mm4\n\t\
-+                                    psllw (%2), %%mm3\n\t\
-+                                    psllw (%2), %%mm4\n\t\
-+                                    pand  8(%2), %%mm3\n\t\
-+                                    pand  8(%2), %%mm4\n\t\
-+                                    por   %%mm3, %%mm5\n\t\
-+                                    movq  %%mm2, %%mm3\n\t\
-+                                    por   %%mm4, %%mm6\n\t\
-+                                    psllw (%2), %%mm3\n\t\
-+                                    pand  8(%2), %%mm3\n\t\
-+                                    cmp   $0, (%2)\n\t\
-+                                    por   %%mm3, %%mm7\n\t\
-+                                    je    .Lright%=\n\t\
-+                                    add   $16, %2\n\t\
-+                                    jmp   .Lleft%=\n\t\
-+\
-+                                    .Lmiddle%=:\n\t\
-+                                    cmp   $0, (%2)\n\t\
-+                                    je    .Lright%=\n\t\
-+\
-+                                    .Ldone%=:\n\t\
-+                                    movq  %%mm5, (%0)\n\t\
-+                                    movq  %%mm6, 8(%0)\n\t\
-+                                    movq  %%mm7, 16(%0)\n\t\
-+                                    add   $24, %0\n\t\
-+                                    jmp   .Lout%=\n\t\
-+\
-+                                    .Lright%=:\n\t\
-+                                    add   $16, %2\n\t\
-+                                    cmp   $0, 8(%2)\n\t\
-+                                    je    .Ldone%=\n\t\
-+\
-+                                    movq  %%mm0, %%mm3\n\t\
-+                                    movq  %%mm1, %%mm4\n\t\
-+                                    psrlw (%2), %%mm3\n\t\
-+                                    psrlw (%2), %%mm4\n\t\
-+                                    pand  8(%2), %%mm3\n\t\
-+                                    pand  8(%2), %%mm4\n\t\
-+                                    por   %%mm3, %%mm5\n\t\
-+                                    movq  %%mm2, %%mm3\n\t\
-+                                    por   %%mm4, %%mm6\n\t\
-+                                    psrlw (%2), %%mm3\n\t\
-+                                    pand  8(%2), %%mm3\n\t\
-+                                    por   %%mm3, %%mm7\n\t\
-+\
-+                                    jmp   .Lright%=\n\t\
-+\
-+                                    .Lout%=:\n\t\
-                                     emms\n\t"
- 				   : "=qom" (dstp), "=qom" (srcp), "=q" (dummy)
- 				   : "qom" (dstp), "qom" (srcp), "q" (tab)
-@@ -1438,73 +1438,73 @@
- 				  void *dummy;
- 				  __asm__ __volatile__(
- 
--				   "movq  (%1), %%mm0\n\t
--                                    movq  8(%1), %%mm1\n\t
--                                    movq  16(%1), %%mm2\n\t
--                                    movq  24(%1), %%mm3\n\t
--                                    add   $32, %1\n\t
--                                    pxor  %%mm7, %%mm7\n\t
--                                    pxor  %%mm6, %%mm6\n\t
--
--                                    .Lleft%=:
--                                    cmp   $0, 8(%2)\n\t
--                                    je    .Lmiddle%=\n\t
--
--                                    movq  %%mm1, %%mm4\n\t
--                                    movq  %%mm0, %%mm5\n\t
--                                    pslld (%2), %%mm4\n\t
--                                    pslld (%2), %%mm5\n\t
--                                    psrad $16, %%mm4\n\t
--                                    psrad $16, %%mm5\n\t
--                                    packssdw %%mm4, %%mm5\n\t
--                                    movq  %%mm3, %%mm4\n\t
--                                    pand  8(%2), %%mm5\n\t
--                                    por   %%mm5, %%mm6\n\t
--                                    movq  %%mm2, %%mm5\n\t
--                                    pslld (%2), %%mm4\n\t
--                                    pslld (%2), %%mm5\n\t
--                                    psrad $16, %%mm4\n\t
--                                    psrad $16, %%mm5\n\t
--                                    packssdw %%mm4, %%mm5\n\t
--                                    pand  8(%2), %%mm5\n\t
--                                    cmp   $0, (%2)\n\t
--                                    por   %%mm5, %%mm7\n\t
--                                    je    .Lright%=\n\t
--                                    add   $16, %2\n\t
--                                    jmp   .Lleft%=\n\t
--
--                                    .Lmiddle%=:\n\t
--                                    cmp   $0, (%2)\n\t
--                                    je    .Lright%=\n\t
--
--                                    .Ldone%=:\n\t
--                                    movq  %%mm6, (%0)\n\t
--                                    movq  %%mm7, 8(%0)\n\t
--                                    add   $16, %0\n\t
--                                    jmp   .Lout%=\n\t
--
--                                    .Lright%=:\n\t
--                                    add   $16, %2\n\t
--                                    cmp   $0, 8(%2)\n\t
--                                    je    .Ldone%=\n\t
--
--                                    movq  %%mm1, %%mm4\n\t
--                                    movq  %%mm0, %%mm5\n\t
--                                    psrld (%2), %%mm4\n\t
--                                    psrld (%2), %%mm5\n\t
--                                    packssdw %%mm4, %%mm5\n\t
--                                    movq  %%mm3, %%mm4\n\t
--                                    pand  8(%2), %%mm5\n\t
--                                    por   %%mm5, %%mm6\n\t
--                                    movq  %%mm2, %%mm5\n\t
--                                    psrld (%2), %%mm4\n\t
--                                    psrld (%2), %%mm5\n\t
--                                    packssdw %%mm4, %%mm5\n\t
--                                    pand  8(%2), %%mm5\n\t
--                                    por   %%mm5, %%mm7\n\t
--                                    jmp   .Lright%=\n\t
--
--                                    .Lout%=:\n\t
-+				   "movq  (%1), %%mm0\n\t\
-+                                    movq  8(%1), %%mm1\n\t\
-+                                    movq  16(%1), %%mm2\n\t\
-+                                    movq  24(%1), %%mm3\n\t\
-+                                    add   $32, %1\n\t\
-+                                    pxor  %%mm7, %%mm7\n\t\
-+                                    pxor  %%mm6, %%mm6\n\t\
-+\
-+                                    .Lleft%=:\\
-+                                    cmp   $0, 8(%2)\n\t\\
-+                                    je    .Lmiddle%=\n\t\\
-+\
-+                                    movq  %%mm1, %%mm4\n\t\
-+                                    movq  %%mm0, %%mm5\n\t\
-+                                    pslld (%2), %%mm4\n\t\
-+                                    pslld (%2), %%mm5\n\t\
-+                                    psrad $16, %%mm4\n\t\
-+                                    psrad $16, %%mm5\n\t\
-+                                    packssdw %%mm4, %%mm5\n\t\
-+                                    movq  %%mm3, %%mm4\n\t\
-+                                    pand  8(%2), %%mm5\n\t\
-+                                    por   %%mm5, %%mm6\n\t\
-+                                    movq  %%mm2, %%mm5\n\t\
-+                                    pslld (%2), %%mm4\n\t\
-+                                    pslld (%2), %%mm5\n\t\
-+                                    psrad $16, %%mm4\n\t\
-+                                    psrad $16, %%mm5\n\t\
-+                                    packssdw %%mm4, %%mm5\n\t\
-+                                    pand  8(%2), %%mm5\n\t\
-+                                    cmp   $0, (%2)\n\t\
-+                                    por   %%mm5, %%mm7\n\t\
-+                                    je    .Lright%=\n\t\
-+                                    add   $16, %2\n\t\
-+                                    jmp   .Lleft%=\n\t\
-+\
-+                                    .Lmiddle%=:\n\t\
-+                                    cmp   $0, (%2)\n\t\
-+                                    je    .Lright%=\n\t\
-+\
-+                                    .Ldone%=:\n\t\
-+                                    movq  %%mm6, (%0)\n\t\
-+                                    movq  %%mm7, 8(%0)\n\t\
-+                                    add   $16, %0\n\t\
-+                                    jmp   .Lout%=\n\t\
-+\
-+                                    .Lright%=:\n\t\
-+                                    add   $16, %2\n\t\
-+                                    cmp   $0, 8(%2)\n\t\
-+                                    je    .Ldone%=\n\t\
-+\
-+                                    movq  %%mm1, %%mm4\n\t\
-+                                    movq  %%mm0, %%mm5\n\t\
-+                                    psrld (%2), %%mm4\n\t\
-+                                    psrld (%2), %%mm5\n\t\
-+                                    packssdw %%mm4, %%mm5\n\t\
-+                                    movq  %%mm3, %%mm4\n\t\
-+                                    pand  8(%2), %%mm5\n\t\
-+                                    por   %%mm5, %%mm6\n\t\
-+                                    movq  %%mm2, %%mm5\n\t\
-+                                    psrld (%2), %%mm4\n\t\
-+                                    psrld (%2), %%mm5\n\t\
-+                                    packssdw %%mm4, %%mm5\n\t\
-+                                    pand  8(%2), %%mm5\n\t\
-+                                    por   %%mm5, %%mm7\n\t\
-+                                    jmp   .Lright%=\n\t\
-+\
-+                                    .Lout%=:\n\t\
-                                     emms\n\t"
- 				   : "=qom" (dstp), "=qom" (srcp), "=q" (dummy)
- 				   : "qom" (dstp), "qom" (srcp), "q" (tab)
diff --git a/graphics/libggi/files/patch-display-xf86dga-XF86VMode.c b/graphics/libggi/files/patch-display-xf86dga-XF86VMode.c
deleted file mode 100644
index 79a51f583bc1..000000000000
--- a/graphics/libggi/files/patch-display-xf86dga-XF86VMode.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- display/xf86dga/XF86VMode.c.orig	Wed Jan 15 09:29:40 2003
-+++ display/xf86dga/XF86VMode.c	Tue Dec  9 00:20:08 2003
-@@ -36,6 +36,10 @@
- 
- /* THIS IS NOT AN X CONSORTIUM STANDARD */
- 
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#include <unistd.h>
-+
- #define _POSIX_C_SOURCE	199309L
- #if !defined (__OpenBSD__)
- #define _POSIX_SOURCE
diff --git a/graphics/libggi/files/patch-ltmain.sh b/graphics/libggi/files/patch-ltmain.sh
deleted file mode 100644
index 0c9089ac359a..000000000000
--- a/graphics/libggi/files/patch-ltmain.sh
+++ /dev/null
@@ -1,23 +0,0 @@
---- ltmain.sh.orig	Wed Dec 18 06:19:10 2002
-+++ ltmain.sh	Sat Dec 21 02:44:34 2002
-@@ -973,6 +973,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
-@@ -4325,10 +4326,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/libggi/pkg-plist b/graphics/libggi/pkg-plist
index b3f945248d2b..724019622202 100644
--- a/graphics/libggi/pkg-plist
+++ b/graphics/libggi/pkg-plist
@@ -45,48 +45,87 @@ include/ggi/internal/plat.h
 include/ggi/internal/structs.h
 include/ggi/ll.h
 include/ggi/types.h
+lib/ggi/default/color.la
 lib/ggi/default/color.so
+lib/ggi/default/ilbm.la
 lib/ggi/default/ilbm.so
+lib/ggi/default/iplanar_2p.la
 lib/ggi/default/iplanar_2p.so
+lib/ggi/default/linear_1.la
 lib/ggi/default/linear_1.so
+lib/ggi/default/linear_16.la
 lib/ggi/default/linear_16.so
+lib/ggi/default/linear_1_r.la
 lib/ggi/default/linear_1_r.so
+lib/ggi/default/linear_2.la
 lib/ggi/default/linear_2.so
+lib/ggi/default/linear_24.la
 lib/ggi/default/linear_24.so
+lib/ggi/default/linear_32.la
 lib/ggi/default/linear_32.so
+lib/ggi/default/linear_4.la
 lib/ggi/default/linear_4.so
+lib/ggi/default/linear_4_r.la
 lib/ggi/default/linear_4_r.so
+lib/ggi/default/linear_8.la
 lib/ggi/default/linear_8.so
+lib/ggi/default/planar.la
 lib/ggi/default/planar.so
+lib/ggi/default/stubs.la
 lib/ggi/default/stubs.so
+lib/ggi/default/text_16.la
 lib/ggi/default/text_16.so
+lib/ggi/default/text_32.la
 lib/ggi/default/text_32.so
+lib/ggi/display/X.la
 lib/ggi/display/X.so
+%%WITH_AALIB%%lib/ggi/display/aa.la
 %%WITH_AALIB%%lib/ggi/display/aa.so
+lib/ggi/display/file.la
 lib/ggi/display/file.so
+lib/ggi/display/ipc.la
 lib/ggi/display/ipc.so
+lib/ggi/display/mansync.la
 lib/ggi/display/mansync.so
+lib/ggi/display/memory.la
 lib/ggi/display/memory.so
+lib/ggi/display/monotext.la
 lib/ggi/display/monotext.so
+lib/ggi/display/multi.la
 lib/ggi/display/multi.so
+lib/ggi/display/palemu.la
 lib/ggi/display/palemu.so
+lib/ggi/display/sub.la
 lib/ggi/display/sub.so
+%%WITH_SVGALIB%%lib/ggi/display/svgalib.la
 %%WITH_SVGALIB%%lib/ggi/display/svgalib.so
+lib/ggi/display/tele.la
 lib/ggi/display/tele.so
+lib/ggi/display/terminfo.la
 lib/ggi/display/terminfo.so
+lib/ggi/display/tile.la
 lib/ggi/display/tile.so
+lib/ggi/display/trueemu.la
 lib/ggi/display/trueemu.so
+%%WITH_SVGALIB%%lib/ggi/display/vgagl.la
 %%WITH_SVGALIB%%lib/ggi/display/vgagl.so
+lib/ggi/display/vgl.la
 lib/ggi/display/vgl.so
+lib/ggi/display/xf86dga.la
 lib/ggi/display/xf86dga.so
+lib/ggi/helper/helper_x_dbe.la
 lib/ggi/helper/helper_x_dbe.so
+lib/ggi/helper/helper_x_dga.la
 lib/ggi/helper/helper_x_dga.so
+lib/ggi/helper/helper_x_evi.la
 lib/ggi/helper/helper_x_evi.so
+lib/ggi/helper/helper_x_shm.la
 lib/ggi/helper/helper_x_shm.so
+lib/ggi/helper/helper_x_vidmode.la
 lib/ggi/helper/helper_x_vidmode.so
 lib/libggi.so
 lib/libggi.so.2
 @dirrm include/ggi/display
-@dirrm lib/ggi/helper
-@dirrm lib/ggi/display
 @dirrm lib/ggi/default
+@dirrm lib/ggi/display
+@dirrm lib/ggi/helper