ports/51795: update port: devel/libgii from 0.7 to 0.8.3

[Matthew West]

>Number:         51795
>Category:       ports
>Synopsis:       update port: devel/libgii from 0.7 to 0.8.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 05 07:30:15 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Matthew West
>Release:        FreeBSD 5.0-RELEASE-p1 i386
>Organization:
University of Cape Town
>Environment:

>Description:

updates devel/libgii from 0.7 to 0.8.3

files changed: Makefile distinfo pkg-plist
files added: files/patch-aa

relinquishes my maintainer status of this port to Pedro, who has been
doing all the work on it recently

>How-To-Repeat:

>Fix:

diff -ruN libgii.orig/Makefile libgii/Makefile
--- libgii.orig/Makefile	Fri Feb 21 19:23:53 2003
+++ libgii/Makefile	Mon May  5 16:06:55 2003
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	libgii
-PORTVERSION=	0.7
+PORTVERSION=	0.8.3
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.ggi-project.org/pub/ggi/ggi/2_0_beta_3/
+MASTER_SITES=	ftp://ftp.ggi-project.org/pub/ggi/ggi/v2.0/
+DISTNAME=	$(PORTNAME)-$(PORTVERSION).src
 
-MAINTAINER=	mwest at uct.ac.za
+MAINTAINER=	giffunip at yahoo.com
 COMMENT=	API for input sources
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_BZIP2=	yes
 USE_XLIB=	yes
 INSTALLS_SHLIB=	yes
@@ -22,16 +24,28 @@
 CFLAGS+=	${PTHREAD_LIBS}
 
 MAN1=		mhub.1
-MAN3=		giiEventPoll.3gii giiEventSend.3gii giiInit.3gii \
-		giiOpen.3gii giiPanic.3gii giiSetEventMask.3gii
-MAN7=		libgii.7gii
-MLINKS=		giiEventPoll.3gii giiEventRead.3gii \
-		- giiEventSelect.3gii - giiEventsQueued.3gii \
-		giiInit.3gii giiExit.3gii \
-		giiOpen.3gii giiClose.3gii - giiJoinInputs.3gii \
-		giiSetEventMask.3gii giiAddEventMask.3gii \
-		- giiGetEventMask.3gii - giiRemoveEventMask.3gii
-
+MAN3=		giiEventPoll.3 giiEventSend.3 giiInit.3 \
+		giiOpen.3 giiPanic.3 giiSetEventMask.3 \
+		giiMTInit.3 giiQueryDeviceInfo.3 \
+		giiQueryDeviceInfoByNumber.3 giiQueryValInfo.3 \
+		giiSplitInputs.3 gii_any_event.3 gii_cmd_event.3 \
+		gii_cmd_nodata_event.3 gii_cmddata_getdevinfo.3 \
+		gii_cmddata_getvalinfo.3 gii_event.3 gii_event_mask.3 \
+		gii_event_type.3 gii_expose_event.3 gii_key_event.3 \
+		gii_pbutton_event.3 gii_phystype.3 gii_pmove_event.3 \
+		gii_val_event.3 gii_valrange.3
+MAN7=		libgii.7 \
+		filter-key.7 filter-keytrans.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
+MLINKS=		giiEventPoll.3 giiEventRead.3 \
+		- giiEventSelect.3 - giiEventsQueued.3 \
+		giiInit.3 giiExit.3 \
+		giiOpen.3 giiClose.3 - giiJoinInputs.3 \
+		giiSetEventMask.3 giiAddEventMask.3 \
+		- giiGetEventMask.3 - giiRemoveEventMask.3
 DOCSDIR=	share/doc/libgii
 DOCS=		ChangeLog NEWS README \
 		doc/env.txt doc/inputs.txt
diff -ruN libgii.orig/distinfo libgii/distinfo
--- libgii.orig/distinfo	Mon May  7 13:43:24 2001
+++ libgii/distinfo	Mon May  5 16:02:15 2003
@@ -1 +1 @@
-MD5 (libgii-0.7.tar.bz2) = 3b93ad12ad614165501ea4cf3b1d0f4b
+MD5 (libgii-0.8.3.src.tar.bz2) = 3cd0f19384e963e250043095cc74a4c0
diff -ruN libgii.orig/files/patch-aa libgii/files/patch-aa
--- libgii.orig/files/patch-aa	Thu Jan  1 02:00:00 1970
+++ libgii/files/patch-aa	Mon May  5 16:02:15 2003
@@ -0,0 +1,60 @@
+*** 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 -ruN libgii.orig/pkg-plist libgii/pkg-plist
--- libgii.orig/pkg-plist	Sun Jun 17 19:20:43 2001
+++ libgii/pkg-plist	Mon May  5 16:02:15 2003
@@ -18,7 +18,6 @@
 include/ggi/input/xwin.h
 include/ggi/internal/gii-dl.h
 include/ggi/internal/gii.h
-include/ggi/internal/gii_debug.h
 include/ggi/keyboard.h
 include/ggi/system.h
 lib/ggi/filter/keytrans.la
>Release-Note:
>Audit-Trail:
>Unformatted: