- Update to 0.9.0

PR:		ports/74745
Submitted by:	Antoine Brodin <antoine.brodin@laposte.net>

5 files changed, 39 insertions, 83 deletions

diff --git a/devel/libgii/Makefile b/devel/libgii/Makefile
index 697010fed107..07a254eb78ec 100644
--- a/devel/libgii/Makefile
+++ b/devel/libgii/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	libgii
-PORTVERSION=	0.8.5
+PORTVERSION=	0.9.0
 CATEGORIES=	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
@@ -19,7 +19,6 @@ COMMENT=	GGI API for input sources
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_BZIP2=	yes
 USE_XLIB=	yes
-USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
@@ -30,9 +29,11 @@ PLIST_SUB+=	KII=""
 PLIST_SUB+=	KII="@comment "
 .endif
 
-MAN1=		mhub.1
-MAN3=		ggGetSwarType.3 ggGetUserDir.3 ggInit.3 \
-		ggLockCreate.3 ggRegisterCleanup.3 giiEventPoll.3 \
+MAN1=		mhub.1 xsendbut.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 \
 		giiEventSend.3 giiInit.3 giiMTInit.3 \
 		giiOpen.3 giiPanic.3 giiQueryDeviceInfo.3 \
 		giiQueryValInfo.3 giiSetEventMask.3 gii_cmd_event.3 \
@@ -44,10 +45,17 @@ 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 libgg.7 libgii.7
-MLINKS=		ggRegisterCleanup.3 ggCleanupForceExit.3 \
-		- ggUnregisterCleanup.3 ggInit.3 ggExit.3 \
+MLINKS=		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 \
+		ggInit.3 ggExit.3 \
+		ggLoadModule.3 ggFreeModule.3 - ggGetSymbolAddress.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 \
 		giiEventPoll.3 giiEventRead.3 - giiEventSelect.3 \
@@ -60,8 +68,7 @@ MLINKS=		ggRegisterCleanup.3 ggCleanupForceExit.3 \
 		gii_cmddata_getvalinfo.3 gii_phystype.3 - gii_valrange.3 \
 		filter-key.7 filter-keytrans.7
 DOCSDIR=	share/doc/libgii
-DOCS=		ChangeLog NEWS README \
-		doc/env.txt doc/inputs.txt
+DOCS=		ChangeLog NEWS README
 EXAMPLESDIR=	share/examples/libgii
 EXAMPLES=	demos/demo.c demos/filter.c \
 		demos/mhub.c demos/xsendbut.c
@@ -75,9 +82,6 @@ PLIST_SUB+=	VGL="@comment "
 PLIST_SUB+=	VGL=""
 .endif
 
-post-configure:
-	@${REINPLACE_CMD} -e 's/\(deplibs\) -lc/\1/;' ${WRKSRC}/libtool
-
 post-install:
 	@${CP} ${WRKSRC}/libgii.conf ${PREFIX}/etc/ggi/libgii.conf.dist
 	@${CP} ${WRKSRC}/filter/mouse/mouse ${PREFIX}/etc/ggi/filter/mouse.dist
diff --git a/devel/libgii/distinfo b/devel/libgii/distinfo
index 447f66ba8b49..805096763c5e 100644
--- a/devel/libgii/distinfo
+++ b/devel/libgii/distinfo
@@ -1,2 +1,2 @@
-MD5 (libgii-0.8.5.src.tar.bz2) = 1584ff2417198d413252a13ce4b6c80f
-SIZE (libgii-0.8.5.src.tar.bz2) = 436619
+MD5 (libgii-0.9.0.src.tar.bz2) = 3c7a16c9cfe6400d9f40f918abc9670f
+SIZE (libgii-0.9.0.src.tar.bz2) = 505030
diff --git a/devel/libgii/files/patch-aa b/devel/libgii/files/patch-aa
deleted file mode 100644
index ae6aa8ac59fc..000000000000
--- a/devel/libgii/files/patch-aa
+++ /dev/null
@@ -1,60 +0,0 @@
-*** input/kii/kii.c.orig	Mon Apr 14 12:34:49 2003
---- input/kii/kii.c	Mon Apr 14 12:40:07 2003
-***************
-*** 33,39 ****
-  		kiic_mapper_identify_request_t	request;
-  		kiic_mapper_identify_result_t	result;
-  	} identify;
-! 
-  	if (NULL == ctx) {
-  
-  		return -KII_ERRNO(LIB, INVAL);
---- 33,42 ----
-  		kiic_mapper_identify_request_t	request;
-  		kiic_mapper_identify_result_t	result;
-  	} identify;
-! 	union {
-! 		kiic_mapper_attach_request_t	request;
-! 		kiic_mapper_attach_result_t	result;
-! 	} attach;
-  	if (NULL == ctx) {
-  
-  		return -KII_ERRNO(LIB, INVAL);
-***************
-*** 52,57 ****
---- 55,72 ----
-  		return -KII_ERRNO(LIB, INVAL);
-  	}
-  
-+ #ifdef __FreeBSD__
-+ 	memset(&attach, 0, sizeof(attach));
-+ 
-+ 	/* Pass an invalid device id to force auto attachement */
-+ 	attach.request.device_id = -1;
-+ 	if (ioctl((*ctx)->mapper.fd, KIIC_MAPPER_ATTACH, &attach)) {
-+ 
-+ 		perror("failed to attach to device");
-+ 		return errno;
-+ 	}
-+ #endif
-+ 
-  	memset(&identify, 0, sizeof(identify));
-  	strncpy(identify.request.client, "libkii",
-  		sizeof(identify.request.client));
-***************
-*** 176,182 ****
-  void kiiPrintEvent(kii_context_t *kii, FILE *f, const kii_event_t *e)
-  {
-  	fprintf(f, "event: size %i, focus %i, device %i, time %i",
-! 		e->any.size, e->any.focus, e->any.device, e->any.time);
-  
-  	switch (e->any.type) {
-  
---- 191,197 ----
-  void kiiPrintEvent(kii_context_t *kii, FILE *f, const kii_event_t *e)
-  {
-  	fprintf(f, "event: size %i, focus %i, device %i, time %i",
-! 		e->any.size, e->any.focus, e->any.device, (int)e->any.time);
-  
-  	switch (e->any.type) {
-  
diff --git a/devel/libgii/pkg-descr b/devel/libgii/pkg-descr
index 2c276f96bd6a..7d9fcde7a3ec 100644
--- a/devel/libgii/pkg-descr
+++ b/devel/libgii/pkg-descr
@@ -1,10 +1,19 @@
-The goal of LibGII is to provide a single easy to use, but yet powerful, API
-for all possible input sources.  However we are not there yet.  The API is far
-from set in stone yet, and is likely to change.
+LibGII (General Input Interface) is intended to be to input what our LibGGI
+(General Graphics Interface) library is to graphics.
 
-The main purpose of this LibGII release is to accompany our LibGGI beta
-release, but you're still very welcome to use LibGII as a standalone library
-for your non-LibGGI applications.
+LibGII is based on the concept of input streams, which virtualize access
+to the underlying input drivers. Events from various input devices are
+abstracted into easy-to-use structures. LibGII also allows the application to
+join streams together, receiving input from an arbitrary combination of
+devices. LibGII is a separate component from LibGGI, although LibGGI
+depends on LibGII for input purposes.
+
+The main purpose of this LibGII release is to accompany our LibGGI
+release, but you're still very welcome to use LibGII as a standalone
+library for your non-LibGGI applications. Also you might be interrested in
+the mhub utility found in the demos directory. mhub is a mouse event repeater
+and converter. See mhub(1) and the libgii(7) and input-<target>(7) manual pages
+for more info.
 
 WWW: http://www.ggi-project.org/
 
diff --git a/devel/libgii/pkg-plist b/devel/libgii/pkg-plist
index 5b0961b29fb2..095d89908ac7 100644
--- a/devel/libgii/pkg-plist
+++ b/devel/libgii/pkg-plist
@@ -11,9 +11,14 @@ etc/ggi/libgii.conf.dist
 @exec [ -f %B/libgii.conf ] || cp %B/%f %B/libgii.conf
 include/ggi/errors.h
 include/ggi/events.h
+include/ggi/gg-defs.h
 include/ggi/gg.h
+include/ggi/gii-defs.h
 include/ggi/gii-unix.h
 include/ggi/gii.h
+include/ggi/input/cocoa.h
+include/ggi/input/directx.h
+include/ggi/input/kii.h
 include/ggi/input/lin_kbd.h
 include/ggi/input/xwin.h
 include/ggi/internal/gii-dl.h
@@ -59,8 +64,6 @@ lib/libgii.so.0
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/env.txt
-%%PORTDOCS%%%%DOCSDIR%%/inputs.txt
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/filter.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/mhub.c