ports/80024: Update devel/libgii to 0.9.1
Antoine Brodin
antoine.brodin at laposte.net
Sun Apr 17 12:20:03 UTC 2005
>Number: 80024
>Category: ports
>Synopsis: Update devel/libgii to 0.9.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 17 12:20:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Antoine Brodin
>Release: FreeBSD 6.0-CURRENT i386
>Organization:
none
>Environment:
System: FreeBSD barton.dreadbsd.org 6.0-CURRENT FreeBSD 6.0-CURRENT #21: Fri Apr 15 12:55:09 CEST 2005 antoine at barton.dreadbsd.org:/usr/obj/usr/src/sys/BARTON i386
>Description:
Changes from 0.9.0 to 0.9.1:
----------------------------
- input-linux_kbd: Fix tons of warnings about type re-defintions. Patch from
Tobias Hunger.
- fix compiler error with gcc 3.4 in the pthread based scheduler. Patch from
Tobias Hunger.
- #define GIIK_Enter and GIIK_Delete properly in <ggi/keyboard.h>
- pthread locking: fix crash on GNU Hurd
- typo fix: configure --disable-stdin now actually disables input-stdin
- input-xwin: locking is conditional, so do with unlocking. Patch from SF
#1164406
- input-x: enable keyboard focus by default as originally intended
- build system: fix case bug in long long test
- build system: make configure fail when passing an unsupported mutex type
to --enable-mutexes
- documentation: added manpages for input-x and input-xwin
Changes in the port:
--------------------
- take maintainership
- respect WITHOUT_X11
- use USE_LIBTOOL_VER=15
- silence forced deinstall when other ggi related ports are installed
>How-To-Repeat:
>Fix:
--- libgii.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libgii/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile 6 Dec 2004 21:34:48 -0000 1.19
+++ Makefile 17 Apr 2005 11:34:02 -0000
@@ -6,28 +6,20 @@
#
PORTNAME= libgii
-PORTVERSION= 0.9.0
+PORTVERSION= 0.9.1
CATEGORIES= devel
MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.1/ \
${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ggi
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= antoine.brodin at laposte.net
COMMENT= GGI API for input sources
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
-USE_XLIB= yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
-
-.if exists(/usr/include/dev/kii/kii.h)
-CONFIGURE_ARGS+= --enable-kii --with-extra-includes=/usr/include/dev
-PLIST_SUB+= KII=""
-.else
-PLIST_SUB+= KII="@comment "
-.endif
+USE_LIBTOOL_VER= 15
MAN1= mhub.1 xsendbut.1
MAN3= ggAddTask.3 ggCurTime.3 \
@@ -44,7 +36,8 @@
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
+ input-mouse.7 input-tcp.7 input-x.7 input-xwin.7 \
+ libgg.7 libgii.7
MLINKS= ggAddTask.3 ggDelTask.3 - ggTimeBase.3 \
- GG_SCHED_TICKS2USECS.3 - GG_SCHED_USECS2TICKS.3 \
ggRegisterCleanup.3 ggCleanupForceExit.3 \
@@ -73,6 +66,21 @@
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
+PLIST_SUB+= KII=""
+.else
+PLIST_SUB+= KII="@comment "
+.endif
+
+.if !defined(WITHOUT_X11)
+USE_XLIB= yes
+PLIST_SUB+= WITH_X=""
+.else
+CONFIGURE_ARGS+= --disable-x --disable-xwin
+PLIST_SUB+= WITH_X="@comment "
+.endif
+
.include <bsd.port.pre.mk>
.if !exists(/usr/include/vgl.h) || ${ARCH} != "i386"
@@ -83,6 +91,9 @@
.endif
post-install:
+.if exists(${PREFIX}/bin/xsendbut) && defined(WITHOUT_X11)
+ @${RM} ${PREFIX}/bin/xsendbut
+.endif
@${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
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/libgii/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 6 Dec 2004 21:34:48 -0000 1.7
+++ distinfo 17 Apr 2005 11:11:43 -0000
@@ -1,2 +1,2 @@
-MD5 (libgii-0.9.0.src.tar.bz2) = 3c7a16c9cfe6400d9f40f918abc9670f
-SIZE (libgii-0.9.0.src.tar.bz2) = 505030
+MD5 (libgii-0.9.1.src.tar.bz2) = 27d5f187b1b5fe435454b27fcf3af3e6
+SIZE (libgii-0.9.1.src.tar.bz2) = 506921
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/libgii/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- pkg-plist 6 Dec 2004 21:34:48 -0000 1.8
+++ pkg-plist 17 Apr 2005 11:27:55 -0000
@@ -1,5 +1,5 @@
bin/mhub
-bin/xsendbut
+%%WITH_X%%bin/xsendbut
@unexec if cmp -s %D/etc/ggi/filter/keytrans %D/etc/ggi/filter/keytrans.dist; then rm -f %D/etc/ggi/filter/keytrans; fi
etc/ggi/filter/keytrans.dist
@exec [ -f %B/keytrans ] || cp %B/%f %B/keytrans
@@ -25,40 +25,23 @@
include/ggi/internal/gii.h
include/ggi/keyboard.h
include/ggi/system.h
-lib/ggi/filter/keytrans.la
lib/ggi/filter/keytrans.so
-lib/ggi/filter/mouse.la
lib/ggi/filter/mouse.so
-lib/ggi/filter/save.la
lib/ggi/filter/save.so
-lib/ggi/filter/tcp.la
lib/ggi/filter/tcp.so
-lib/ggi/input/file.la
lib/ggi/input/file.so
-%%KII%%lib/ggi/input/kii.la
%%KII%%lib/ggi/input/kii.so
-lib/ggi/input/linux_mouse.la
lib/ggi/input/linux_mouse.so
-lib/ggi/input/mouse.la
lib/ggi/input/mouse.so
-lib/ggi/input/null.la
lib/ggi/input/null.so
-lib/ggi/input/spaceorb.la
lib/ggi/input/spaceorb.so
-lib/ggi/input/stdin.la
lib/ggi/input/stdin.so
-lib/ggi/input/tcp.la
lib/ggi/input/tcp.so
-%%VGL%%lib/ggi/input/vgl.la
%%VGL%%lib/ggi/input/vgl.so
-lib/ggi/input/x.la
-lib/ggi/input/x.so
-lib/ggi/input/xwin.la
-lib/ggi/input/xwin.so
-lib/libgg.la
+%%WITH_X%%lib/ggi/input/x.so
+%%WITH_X%%lib/ggi/input/xwin.so
lib/libgg.so
lib/libgg.so.0
-lib/libgii.la
lib/libgii.so
lib/libgii.so.0
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -72,9 +55,9 @@
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/ggi/input
@dirrm lib/ggi/filter
- at dirrm lib/ggi
- at dirrm include/ggi/internal
+ at unexec rmdir %D/lib/ggi 2>/dev/null || true
+ at unexec rmdir %D/include/ggi/internal 2>/dev/null || true
@dirrm include/ggi/input
- at dirrm include/ggi
+ at unexec rmdir %D/include/ggi 2>/dev/null || true
@unexec rmdir %D/etc/ggi/filter 2>/dev/null || true
@unexec rmdir %D/etc/ggi 2>/dev/null || true
--- libgii.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list