3 files changed, 44 insertions, 14 deletions

diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 6892e1d6749a..771fdcb0e485 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libggi
-PORTVERSION=	2.1.2
+PORTVERSION=	2.2.0
 PORTEPOCH=	1
 CATEGORIES=	graphics devel
-MASTER_SITES=	http://www.ggi-project.org/ftp/ggi/v2.1/ \
+MASTER_SITES=	http://www.ggi-project.org/ftp/ggi/v2.2/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ggi
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -17,7 +17,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 MAINTAINER=	antoine.brodin@laposte.net
 COMMENT=	A flexible drawing library
 
-LIB_DEPENDS=	gii.0:${PORTSDIR}/devel/libgii
+LIB_DEPENDS=	gii.1:${PORTSDIR}/devel/libgii
 
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
@@ -41,15 +41,23 @@ MAN3=		ggiCheckMode.3 ggiCopyBox.3 ggiCrossBlit.3 \
 		ggiSetGCForeground.3 ggiSetMode.3 ggiSetOrigin.3 \
 		ggiSetPalette.3 ggiSetTextMode.3 \
 		ggi_color.3 ggi_colormap.3 \
-		ggi_directbuffer.3 ggi_mode.3 ggi_pixelformat.3
+		ggi_directbuffer.3 ggi_mode.3 ggi_pixelformat.3 \
+		ggidev-add_3.3 \
+		ggidev-assign_3.3 \
+		ggidev-eq_3.3 \
+		ggidev-inc_3.3 \
+		ggidev-invert_3.3 \
+		ggidev-sign_3.3
 MAN7=		libggi.7 display-aa.7 display-auto.7 \
-		display-dga.7 display-directx.7 \
+		display-directx.7 \
 		display-fbdev.7 display-file.7 display-glide.7 \
 		display-mansync.7 display-memory.7 display-monotext.7 \
-		display-multi.7 display-palemu.7 display-sub.7 \
+		display-multi.7 display-palemu.7 \
+		display-quartz.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
+		display-vcsa.7 display-vgl.7 display-x.7 \
+		ggidev-triple-int.7
 MLINKS=		ggi-demo.1 demo.1 \
 		display-directx.7 display-directxnt.7 \
 		ggiCheckMode.3 ggiCheckGraphMode.3 - ggiCheckSimpleMode.3 \
@@ -92,7 +100,24 @@ MLINKS=		ggi-demo.1 demo.1 \
 		ggi_directbuffer.3 ggi_pixellinearbuffer.3 \
 		- ggi_pixelplanarbuffer.3 - ggi_samplelinearbuffer.3 \
 		- ggi_sampleplanarbuffer.3 \
-		ggi_mode.3 ggi_coord.3 - ggi_graphtype.3
+		ggi_mode.3 ggi_coord.3 - ggi_graphtype.3 \
+		ggidev-add_3.3 ggidev-divmod_3.3 \
+		- ggidev-mul_3.3 \
+		- ggidev-sub_3.3 \
+		ggidev-assign_3.3 ggidev-assign_int_3.3 \
+		- ggidev-assign_unsigned_3.3 \
+		ggidev-eq_3.3 ggidev-ge_3.3 \
+		ggidev-inc_3.3 ggidev-abs_3.3 \
+		- ggidev-dec_3.3 \
+		- ggidev-negate_3.3 \
+		ggidev-invert_3.3 ggidev-lshift_3.3 \
+		- ggidev-rshift_3.3 \
+		ggidev-sign_3.3 ggidev-bits_3.3 \
+		- ggidev-eq0_3.3 \
+		- ggidev-ge0_3.3 \
+		- ggidev-gt0_3.3 \
+		- ggidev-le0_3.3 \
+		- ggidev-lt0_3.3
 
 .if exists(/usr/include/dev/kgi/kgi.h)
 CONFIGURE_ARGS+=	--enable-kgi --with-extra-includes=/usr/include/dev
@@ -130,6 +155,8 @@ PLIST_SUB+=	WITH_SVGALIB="@comment "
 .endif
 
 post-install:
-	@${CP} ${WRKSRC}/libggi.conf ${PREFIX}/etc/ggi/libggi.conf.dist
+	${TOUCH} ${PREFIX}/lib/ggi/default/fbdev/.keep
+	${TOUCH} ${PREFIX}/lib/ggi/default/kgi/.keep
+	${INSTALL_DATA} ${WRKSRC}/libggi.conf ${PREFIX}/etc/ggi/libggi.conf.dist
 
 .include <bsd.port.post.mk>
diff --git a/graphics/libggi/distinfo b/graphics/libggi/distinfo
index 3e6c7b5211d5..58fcee2102ec 100644
--- a/graphics/libggi/distinfo
+++ b/graphics/libggi/distinfo
@@ -1,3 +1,3 @@
-MD5 (libggi-2.1.2.src.tar.bz2) = f29e844011425ab14706e31a4cdee181
-SHA256 (libggi-2.1.2.src.tar.bz2) = 8e28a68e7f83a88d7ffec0aa8cb3115322ab0d9eb347b6cba34b040b734b767e
-SIZE (libggi-2.1.2.src.tar.bz2) = 927254
+MD5 (libggi-2.2.0.src.tar.bz2) = 2ae12d9b24857ab16a1295c7759a066a
+SHA256 (libggi-2.2.0.src.tar.bz2) = b90b82a3663e686cbf4a18d6de7ec54ba17ca52c9c66705cf5538a3938184bc1
+SIZE (libggi-2.2.0.src.tar.bz2) = 1068406
diff --git a/graphics/libggi/pkg-plist b/graphics/libggi/pkg-plist
index e01886aeae17..e0155a9f3998 100644
--- a/graphics/libggi/pkg-plist
+++ b/graphics/libggi/pkg-plist
@@ -21,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
@@ -37,7 +38,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
@@ -66,6 +66,8 @@ lib/ggi/default/pseudo_stubs.so
 lib/ggi/default/stubs.so
 lib/ggi/default/text_16.so
 lib/ggi/default/text_32.so
+lib/ggi/default/fbdev/.keep
+lib/ggi/default/kgi/.keep
 %%WITH_X%%lib/ggi/display/X.so
 %%WITH_AALIB%%lib/ggi/display/aa.so
 lib/ggi/display/auto.so
@@ -84,7 +86,6 @@ lib/ggi/display/tile.so
 lib/ggi/display/trueemu.so
 %%WITH_SVGALIB%%lib/ggi/display/vgagl.so
 %%WITH_VGL%%lib/ggi/display/vgl.so
-%%WITH_X%%lib/ggi/display/xf86dga.so
 %%WITH_X%%lib/ggi/helper/helper_x_dbe.so
 %%WITH_X%%lib/ggi/helper/helper_x_dga.so
 %%WITH_X%%lib/ggi/helper/helper_x_evi.so
@@ -94,6 +95,8 @@ lib/libggi.a
 lib/libggi.so
 lib/libggi.so.2
 @dirrm include/ggi/display
+@dirrm lib/ggi/default/fbdev
+@dirrm lib/ggi/default/kgi
 @dirrm lib/ggi/default
 @dirrm lib/ggi/display
 %%WITH_X%%@dirrm lib/ggi/helper