3 files changed, 148 insertions, 51 deletions

diff --git a/devel/libgii/Makefile b/devel/libgii/Makefile
index 75514e7fef48..848fec929234 100644
--- a/devel/libgii/Makefile
+++ b/devel/libgii/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	libgii
-PORTVERSION=	0.9.2
+PORTVERSION=	1.0.0
 CATEGORIES=	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
@@ -20,13 +20,22 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_REINPLACE=	yes
 
-MAN1=		mhub.1
-MAN3=		ggAddTask.3 ggCurTime.3 \
-		ggGetSwarType.3 ggGetUserDir.3 ggInit.3 ggLoadModule.3 \
-		ggLockCreate.3 ggRegisterCleanup.3 ggstrlcpy.3 \
-		gg-error.3 gg-types.3 giiEventPoll.3 \
+MAN1=		mhub.1 \
+		xsendbut.1
+MAN3=		gg-error.3 \
+		gg-queue.3 \
+		gg-tree.3 \
+		gg-types.3 \
+		ggAddObserver.3 \
+		ggAddTask.3 ggCurTime.3 \
+		ggGetScope.3 \
+		ggGetSwarType.3 ggGetUserDir.3 ggInit.3 \
+		ggLoadConfig.3 \
+		ggLockCreate.3 \
+		ggParseOptions.3 \
+		ggRegisterCleanup.3 ggstrlcpy.3 \
+		giiEventPoll.3 \
 		giiEventSend.3 giiInit.3 giiMTInit.3 \
 		giiOpen.3 giiPanic.3 giiQueryDeviceInfo.3 \
 		giiQueryValInfo.3 giiSetEventMask.3 gii_cmd_event.3 \
@@ -34,21 +43,133 @@ MAN3=		ggAddTask.3 ggCurTime.3 \
 		gii_event.3 gii_expose_event.3 \
 		gii_key_event.3 gii_pbutton_event.3 gii_pmove_event.3 \
 		gii_val_event.3
+MAN5=		libgii.conf.5
 MAN7=		filter-key.7 filter-mouse.7 filter-save.7 filter-tcp.7 \
 		input-directx.7 input-file.7 input-linux-evdev.7 \
 		input-linux-kbd.7 input-linux-mouse.7 input-lk201.7 \
-		input-mouse.7 input-tcp.7 input-x.7 input-xwin.7 \
+		input-mouse.7 \
+		input-quartz.7 \
+		input-tcp.7 input-x.7 \
 		libgg.7 libgii.7
-MLINKS=		ggAddTask.3 ggDelTask.3 - ggTimeBase.3 \
+MLINKS=		gg-error.3 ggi-error.3 - gii-error.3 \
+		gg-queue.3 GG_CIRCLEQ_EMPTY.3 \
+		- GG_CIRCLEQ_ENTRY.3 \
+		- GG_CIRCLEQ_FIRST.3 \
+		- GG_CIRCLEQ_FOREACH.3 \
+		- GG_CIRCLEQ_FOREACH_REVERSE.3 \
+		- GG_CIRCLEQ_HEAD.3 \
+		- GG_CIRCLEQ_HEAD_INITIALIZER.3 \
+		- GG_CIRCLEQ_INIT.3 \
+		- GG_CIRCLEQ_INSERT_AFTER.3 \
+		- GG_CIRCLEQ_INSERT_BEFORE.3 \
+		- GG_CIRCLEQ_INSERT_HEAD.3 \
+		- GG_CIRCLEQ_INSERT_TAIL.3 \
+		- GG_CIRCLEQ_LAST.3 \
+		- GG_CIRCLEQ_NEXT.3 \
+		- GG_CIRCLEQ_PREV.3 \
+		- GG_CIRCLEQ_REMOVE.3 \
+		- GG_LIST_EMPTY.3 \
+		- GG_LIST_ENTRY.3 \
+		- GG_LIST_FIRST.3 \
+		- GG_LIST_FOREACH.3 \
+		- GG_LIST_HEAD.3 \
+		- GG_LIST_HEAD_INITIALIZER.3 \
+		- GG_LIST_INIT.3 \
+		- GG_LIST_INSERT_AFTER.3 \
+		- GG_LIST_INSERT_BEFORE.3 \
+		- GG_LIST_INSERT_HEAD.3 \
+		- GG_LIST_NEXT.3 \
+		- GG_LIST_REMOVE.3 \
+		- GG_SIMPLEQ_EMPTY.3 \
+		- GG_SIMPLEQ_ENTRY.3 \
+		- GG_SIMPLEQ_FIRST.3 \
+		- GG_SIMPLEQ_FOREACH.3 \
+		- GG_SIMPLEQ_HEAD.3 \
+		- GG_SIMPLEQ_HEAD_INITIALIZER.3 \
+		- GG_SIMPLEQ_INIT.3 \
+		- GG_SIMPLEQ_INSERT_AFTER.3 \
+		- GG_SIMPLEQ_INSERT_HEAD.3 \
+		- GG_SIMPLEQ_INSERT_TAIL.3 \
+		- GG_SIMPLEQ_NEXT.3 \
+		- GG_SIMPLEQ_REMOVE.3 \
+		- GG_SIMPLEQ_REMOVE_HEAD.3 \
+		- GG_SLIST_EMPTY.3 \
+		- GG_SLIST_ENTRY.3 \
+		- GG_SLIST_FIRST.3 \
+		- GG_SLIST_FOREACH.3 \
+		- GG_SLIST_HEAD.3 \
+		- GG_SLIST_HEAD_INITIALIZER.3 \
+		- GG_SLIST_INIT2.3 \
+		- GG_SLIST_INSERT_AFTER.3 \
+		- GG_SLIST_INSERT_HEAD.3 \
+		- GG_SLIST_NEXT.3 \
+		- GG_SLIST_REMOVE.3 \
+		- GG_SLIST_REMOVE_HEAD.3 \
+		- GG_TAILQ_EMPTY.3 \
+		- GG_TAILQ_ENTRY.3 \
+		- GG_TAILQ_FIRST.3 \
+		- GG_TAILQ_FOREACH.3 \
+		- GG_TAILQ_FOREACH_REVERSE.3 \
+		- GG_TAILQ_HEAD.3 \
+		- GG_TAILQ_HEAD_INITIALIZER.3 \
+		- GG_TAILQ_INIT.3 \
+		- GG_TAILQ_INSERT_AFTER.3 \
+		- GG_TAILQ_INSERT_BEFORE.3 \
+		- GG_TAILQ_INSERT_HEAD.3 \
+		- GG_TAILQ_INSERT_TAIL.3 \
+		- GG_TAILQ_LAST.3 \
+		- GG_TAILQ_NEXT.3 \
+		- GG_TAILQ_PREV.3 \
+		- GG_TAILQ_REMOVE.3 \
+		gg-tree.3 GG_RB_EMPTY.3 \
+		- GG_RB_ENTRY.3 \
+		- GG_RB_FIND.3 \
+		- GG_RB_FOREACH.3 \
+		- GG_RB_GENERATE.3 \
+		- GG_RB_HEAD.3 \
+		- GG_RB_INIT.3 \
+		- GG_RB_INITIALIZER.3 \
+		- GG_RB_INSERT.3 \
+		- GG_RB_LEFT.3 \
+		- GG_RB_MAX.3 \
+		- GG_RB_MIN.3 \
+		- GG_RB_NEXT.3 \
+		- GG_RB_PARENT.3 \
+		- GG_RB_PROTOTYPE.3 \
+		- GG_RB_REMOVE.3 \
+		- GG_RB_RIGHT.3 \
+		- GG_RB_ROOT.3 \
+		- GG_SPLAY_EMPTY.3 \
+		- GG_SPLAY_ENTRY.3 \
+		- GG_SPLAY_FIND.3 \
+		- GG_SPLAY_FOREACH.3 \
+		- GG_SPLAY_GENERATE.3 \
+		- GG_SPLAY_HEAD.3 \
+		- GG_SPLAY_INIT.3 \
+		- GG_SPLAY_INITIALIZER.3 \
+		- GG_SPLAY_INSERT.3 \
+		- GG_SPLAY_LEFT.3 \
+		- GG_SPLAY_MAX.3 \
+		- GG_SPLAY_MIN.3 \
+		- GG_SPLAY_NEXT.3 \
+		- GG_SPLAY_PROTOTYPE.3 \
+		- GG_SPLAY_REMOVE.3 \
+		- GG_SPLAY_RIGHT.3 \
+		- GG_SPLAY_ROOT.3 \
+		ggAddObserver.3 ggClearPublisher.3 \
+		- ggDelObserver.3 - ggNotifyObservers.3 \
+		ggAddTask.3 ggDelTask.3 - ggTimeBase.3 \
 		- GG_SCHED_TICKS2USECS.3 - GG_SCHED_USECS2TICKS.3 \
 		ggRegisterCleanup.3 ggCleanupForceExit.3 \
 		- ggUnregisterCleanup.3 \
 		ggCurTime.3 ggUSleep.3 - ggUSlumber.3 \
+		ggGetScope.3 ggDelScope.3 - ggFromScope.3 \
+		- ggNewScope.3 \
 		ggInit.3 ggExit.3 \
-		ggLoadModule.3 ggFreeModule.3 - ggGetSymbolAddress.3 \
+		ggLoadConfig.3 ggConfigIterLocation.3 - ggConfigIterTarget.3 \
+		- ggFreeConfig.3 \
 		ggLockCreate.3 ggLock.3 - ggLockDestroy.3 \
 		- ggTryLock.3 - ggUnlock.3 \
-		gg-error.3 ggi-error.3 - gii-error.3 \
 		ggstrlcpy.3 ggstrlcat.3 \
 		giiSetEventMask.3 giiAddEventMask.3 - giiGetEventMask.3 \
 		giiOpen.3 giiClose.3 - giiJoinInputs.3 - giiSplitInputs.3 \
@@ -61,9 +182,6 @@ MLINKS=		ggAddTask.3 ggDelTask.3 - ggTimeBase.3 \
 		- gii_event_type.3 \
 		gii_cmddata_getvalinfo.3 gii_phystype.3 - gii_valrange.3 \
 		filter-key.7 filter-keytrans.7
-DOCS=		ChangeLog NEWS README
-EXAMPLES=	demos/demo.c demos/filter.c \
-		demos/mhub.c demos/xsendbut.c
 
 .if exists(/usr/include/dev/kii/kii.h)
 CONFIGURE_ARGS+=	--enable-kii --with-extra-includes=/usr/include/dev
@@ -75,9 +193,8 @@ PLIST_SUB+=	KII="@comment "
 .if !defined(WITHOUT_X11)
 USE_XLIB=	yes
 PLIST_SUB+=	WITH_X=""
-MAN1+=		xsendbut.1
 .else
-CONFIGURE_ARGS+=	--disable-x --disable-xwin --without-x
+CONFIGURE_ARGS+=	--disable-x --without-x
 PLIST_SUB+=	WITH_X="@comment "
 .endif
 
@@ -90,25 +207,9 @@ PLIST_SUB+=	VGL="@comment "
 PLIST_SUB+=	VGL=""
 .endif
 
-.if defined(WITHOUT_X11)
-post-patch:
-	@${REINPLACE_CMD} -e 's|\(mhub\.1\).*|\1|; s|xsendbut\.1||' \
-		${WRKSRC}/doc/man/Makefile.in
-.endif
-
 post-install:
-	@${CP} ${WRKSRC}/libgii.conf ${PREFIX}/etc/ggi/libgii.conf.dist
-	@${CP} ${WRKSRC}/filter/mouse/mouse ${PREFIX}/etc/ggi/filter/mouse.dist
-	@${CP} ${WRKSRC}/filter/keytrans/keytrans ${PREFIX}/etc/ggi/filter/keytrans.dist
-	@${MKDIR} ${EXAMPLESDIR}
-.for f in ${EXAMPLES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}
-.endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for f in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
+	${INSTALL_DATA} ${WRKSRC}/libgii.conf ${PREFIX}/etc/ggi/libgii.conf.dist
+	${INSTALL_DATA} ${WRKSRC}/filter/mouse/mouse ${PREFIX}/etc/ggi/filter/mouse.dist
+	${INSTALL_DATA} ${WRKSRC}/filter/keytrans/keytrans ${PREFIX}/etc/ggi/filter/keytrans.dist
 
 .include <bsd.port.post.mk>
diff --git a/devel/libgii/distinfo b/devel/libgii/distinfo
index 1f53be7bf6f5..63f97c82d013 100644
--- a/devel/libgii/distinfo
+++ b/devel/libgii/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgii-0.9.2.src.tar.bz2) = cf85e55eb420ecbbbf901dde98b5877a
-SHA256 (libgii-0.9.2.src.tar.bz2) = f2fd01fd84faf3c8e706f647bce7422b9a01973faacd1e19d20a95a9221ec466
-SIZE (libgii-0.9.2.src.tar.bz2) = 507151
+MD5 (libgii-1.0.0.src.tar.bz2) = d8c05278407d6bb0ff0d974d29c4d860
+SHA256 (libgii-1.0.0.src.tar.bz2) = 36ff45b6931ea169ed55b7de799a50e9dedaf0fcaf84ed7f97e5464ae28b8075
+SIZE (libgii-1.0.0.src.tar.bz2) = 696644
diff --git a/devel/libgii/pkg-plist b/devel/libgii/pkg-plist
index 904856390127..e318668cb2a6 100644
--- a/devel/libgii/pkg-plist
+++ b/devel/libgii/pkg-plist
@@ -12,6 +12,8 @@ etc/ggi/libgii.conf.dist
 include/ggi/errors.h
 include/ggi/events.h
 include/ggi/gg-defs.h
+include/ggi/gg-queue.h
+include/ggi/gg-tree.h
 include/ggi/gg.h
 include/ggi/gii-defs.h
 include/ggi/gii-unix.h
@@ -20,7 +22,10 @@ include/ggi/input/cocoa.h
 include/ggi/input/directx.h
 include/ggi/input/kii.h
 include/ggi/input/lin_kbd.h
+include/ggi/input/quartz.h
+include/ggi/input/xf86dga.h
 include/ggi/input/xwin.h
+include/ggi/internal/gg_replace.h
 include/ggi/internal/gii-dl.h
 include/ggi/internal/gii.h
 include/ggi/keyboard.h
@@ -32,6 +37,7 @@ lib/ggi/filter/tcp.so
 lib/ggi/input/file.so
 %%KII%%lib/ggi/input/kii.so
 lib/ggi/input/linux_mouse.so
+lib/ggi/input/lk201.so
 lib/ggi/input/mouse.so
 lib/ggi/input/null.so
 lib/ggi/input/spaceorb.so
@@ -39,22 +45,12 @@ lib/ggi/input/stdin.so
 lib/ggi/input/tcp.so
 %%VGL%%lib/ggi/input/vgl.so
 %%WITH_X%%lib/ggi/input/x.so
-%%WITH_X%%lib/ggi/input/xwin.so
 lib/libgg.a
 lib/libgg.so
-lib/libgg.so.0
+lib/libgg.so.1
 lib/libgii.a
 lib/libgii.so
-lib/libgii.so.0
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/demo.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/filter.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/mhub.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/xsendbut.c
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+lib/libgii.so.1
 @dirrm lib/ggi/input
 @dirrm lib/ggi/filter
 @dirrm lib/ggi