4 files changed, 25 insertions, 36 deletions
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 5c6ea5b35887..6dcc2281d53d 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libggi
-PORTVERSION=	2.0.5
+PORTVERSION=	2.1.0
 PORTEPOCH=	1
 CATEGORIES=	graphics devel
-MASTER_SITES=	ftp://ftp.ggi-project.org/pub/packages/ggi/ggi/v2.0/ \
+MASTER_SITES=	http://www.ggi-project.org/ftp/ggi/v2.1/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ggi
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -27,16 +27,13 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-.ifdef USE_THREADS
 CFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ARGS+=	--enable-threads
-.endif
 
 .if exists(/usr/include/dev/kgi/kgi.h)
 CONFIGURE_ARGS+=	--enable-kgi --with-extra-includes=/usr/include/dev
 .endif
 
-MAN1=		cube3d.1 ggiteleserver.1 monitest.1
+MAN1=		cube3d.1 ggi-demo.1 ggiteleserver.1 monitest.1
 MAN3=		ggiCheckMode.3 ggiCopyBox.3 ggiCrossBlit.3 \
 		ggiDBGetNumBuffers.3 ggiDrawBox.3 ggiDrawHLine.3 \
 		ggiDrawLine.3 ggiDrawPixel.3 ggiDrawVLine.3 \
@@ -48,15 +45,18 @@ MAN3=		ggiCheckMode.3 ggiCopyBox.3 ggiCrossBlit.3 \
 		ggiPutc.3 ggiResourceAcquire.3 ggiSetColorfulPalette.3 \
 		ggiSetDisplayFrame.3 ggiSetFlags.3 ggiSetGCClipping.3 \
 		ggiSetGCForeground.3 ggiSetMode.3 ggiSetOrigin.3 \
-		ggiSetPalette.3 ggi_color.3 ggi_directbuffer.3 \
-		ggi_mode.3 ggi_pixelformat.3
-MAN7=		libggi.7 display-aa.7 display-dga.7 display-directx.7 \
+		ggiSetPalette.3 ggi_color.3 ggi_colormap.3 \
+		ggi_directbuffer.3 ggi_mode.3 ggi_pixelformat.3
+MAN7=		libggi.7 display-aa.7 display-auto.7 \
+		display-dga.7 display-directx.7 \
 		display-fbdev.7 display-file.7 display-glide.7 \
-		display-memory.7 display-monotext.7 display-multi.7 \
-		display-palemu.7 display-sub.7 display-svgalib.7 \
-		display-tele.7 display-tile.7 display-trueemu.7 \
+		display-mansync.7 display-memory.7 display-monotext.7 \
+		display-multi.7 display-palemu.7 display-sub.7 \
+		display-svgalib.7 display-tele.7 display-terminfo.7 \
+		display-tile.7 display-trueemu.7 \
 		display-vcsa.7 display-vgl.7 display-x.7
-MLINKS=		display-directx.7 display-directxnt.7 \
+MLINKS=		ggi-demo.1 demo.1 \
+		display-directx.7 display-directxnt.7 \
 		ggiCheckMode.3 ggiCheckGraphMode.3 - ggiCheckSimpleMode.3 \
 		- ggiCheckTextMode.3 ggiDBGetNumBuffers.3 ggiDBGetBuffer.3 \
 		ggiDrawBox.3 ggiGetBox.3 - ggiPutBox.3 \
@@ -93,6 +93,7 @@ MLINKS=		display-directx.7 display-directxnt.7 \
 		ggiSetOrigin.3 ggiGetOrigin.3 \
 		ggiSetPalette.3 ggiGetPalette.3 \
 		ggi_color.3 ggi_pixel.3 \
+		ggi_colormap.3 ggi_colormap_region.3 \
 		ggi_directbuffer.3 ggi_pixellinearbuffer.3 \
 		- ggi_pixelplanarbuffer.3 - ggi_samplelinearbuffer.3 \
 		- ggi_sampleplanarbuffer.3 \
diff --git a/graphics/libggi/distinfo b/graphics/libggi/distinfo
index d02064af2dfb..ea610ee1c49c 100644
--- a/graphics/libggi/distinfo
+++ b/graphics/libggi/distinfo
@@ -1,2 +1,2 @@
-MD5 (libggi-2.0.5.src.tar.bz2) = 1d58f28a7718bf2840fac39cd3a0d6db
-SIZE (libggi-2.0.5.src.tar.bz2) = 826857
+MD5 (libggi-2.1.0.src.tar.bz2) = 08321e01148f7a3f96865e9939733d47
+SIZE (libggi-2.1.0.src.tar.bz2) = 878959
diff --git a/graphics/libggi/files/patch-m4-gii_paths b/graphics/libggi/files/patch-m4-gii_paths
deleted file mode 100644
index c8855afe522e..000000000000
--- a/graphics/libggi/files/patch-m4-gii_paths
+++ /dev/null
@@ -1,21 +0,0 @@
---- m4/gii_paths.m4.orig	Wed Nov 27 10:02:19 2002
-+++ m4/gii_paths.m4	Sat Jun  5 22:00:41 2004
-@@ -31,13 +31,13 @@
-    fi
-    if test -d "$gii_top_builddir" -a -d "$gii_top_srcdir" ; then
-      if test "$gii_top_builddir" = "$gii_top_srcdir" ; then
--       CFLAGS="$CFLAGS -I$gii_top_builddir/include"
--       CPPFLAGS="$CPPFLAGS -I$gii_top_builddir/include"
-+       CFLAGS="-I$gii_top_builddir/include $CFLAGS"
-+       CPPFLAGS="-I$gii_top_builddir/include $CPPFLAGS"
-      else
--       CFLAGS="$CFLAGS -I$gii_top_srcdir/include -I$gii_top_builddir/include"
--       CPPFLAGS="$CPPFLAGS -I$gii_top_srcdir/include -I$gii_top_builddir/include"
-+       CFLAGS="-I$gii_top_srcdir/include -I$gii_top_builddir/include $CFLAGS"
-+       CPPFLAGS="-I$gii_top_srcdir/include -I$gii_top_builddir/include $CPPFLAGS"
-      fi
--     LDFLAGS="$LDFLAGS -L$gii_top_builddir/gg -L$gii_top_builddir/gii"
-+     LDFLAGS="-L$gii_top_builddir/gg -L$gii_top_builddir/gii $LDFLAGS"
-    fi
- ]])
- 
diff --git a/graphics/libggi/pkg-plist b/graphics/libggi/pkg-plist
index 4ca9b44a2abc..f0e82f00b774 100644
--- a/graphics/libggi/pkg-plist
+++ b/graphics/libggi/pkg-plist
@@ -5,6 +5,7 @@ bin/monitest
 etc/ggi/libggi.conf.dist
 @exec [ -f %B/libggi.conf ] || cp %B/%f %B/libggi.conf
 include/ggi/display/aa.h
+include/ggi/display/auto.h
 include/ggi/display/directx.h
 include/ggi/display/fbdev.h
 include/ggi/display/file.h
@@ -20,6 +21,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
@@ -32,6 +34,7 @@ include/ggi/display/xcommon.h
 include/ggi/display/xevi.h
 include/ggi/display/xf86dga.h
 include/ggi/display/xlib.h
+include/ggi/ggi-defs.h
 include/ggi/ggi-unix.h
 include/ggi/ggi.h
 include/ggi/ggi_ext.h
@@ -43,6 +46,8 @@ include/ggi/internal/ggilibinit.h
 include/ggi/internal/internal.h
 include/ggi/internal/plat.h
 include/ggi/internal/structs.h
+include/ggi/internal/triple-int.h
+include/ggi/internal/unit.h
 include/ggi/ll.h
 include/ggi/types.h
 lib/ggi/default/color.la
@@ -71,6 +76,8 @@ 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/pseudo_stubs.la
+lib/ggi/default/pseudo_stubs.so
 lib/ggi/default/stubs.la
 lib/ggi/default/stubs.so
 lib/ggi/default/text_16.la
@@ -81,6 +88,8 @@ 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/auto.la
+lib/ggi/display/auto.so
 lib/ggi/display/file.la
 lib/ggi/display/file.so
 lib/ggi/display/ipc.la