From 53449784c4904456b04ffad3715885b72c64d944 Mon Sep 17 00:00:00 2001 From: tnn Date: Sat, 30 Jan 2010 14:54:48 +0000 Subject: Update to libgii-1.0.2. Needed for libggi update. No NEWS entry. --- graphics/libgii/Makefile | 7 +- graphics/libgii/PLIST | 134 +++++++++++++++++++++++++++++++++++++-- graphics/libgii/buildlink3.mk | 5 +- graphics/libgii/distinfo | 16 ++--- graphics/libgii/patches/patch-aa | 12 ++-- graphics/libgii/patches/patch-ae | 15 +---- graphics/libgii/patches/patch-af | 16 ++--- graphics/libgii/patches/patch-ag | 16 ++--- 8 files changed, 166 insertions(+), 55 deletions(-) (limited to 'graphics/libgii') diff --git a/graphics/libgii/Makefile b/graphics/libgii/Makefile index 55029c701b2..3955316de4b 100644 --- a/graphics/libgii/Makefile +++ b/graphics/libgii/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.30 2008/07/14 12:56:05 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2010/01/30 14:54:48 tnn Exp $ -DISTNAME= libgii-0.9.1.src +DISTNAME= libgii-1.0.2.src PKGNAME= ${DISTNAME:S/.src//} -PKGREVISION= 3 CATEGORIES= graphics -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:=ggi/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/libgii/PLIST b/graphics/libgii/PLIST index 914d281c195..987f96edf69 100644 --- a/graphics/libgii/PLIST +++ b/graphics/libgii/PLIST @@ -1,10 +1,12 @@ -@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:59:21 joerg Exp $ +@comment $NetBSD: PLIST,v 1.12 2010/01/30 14:54:48 tnn Exp $ ${PLIST.ggtick}bin/ggtick bin/mhub bin/xsendbut 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 @@ -13,7 +15,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 @@ -24,35 +29,151 @@ lib/ggi/filter/save.la lib/ggi/filter/tcp.la lib/ggi/input/file.la lib/ggi/input/linux_mouse.la +lib/ggi/input/lk201.la lib/ggi/input/mouse.la lib/ggi/input/null.la lib/ggi/input/spaceorb.la lib/ggi/input/stdin.la lib/ggi/input/tcp.la lib/ggi/input/x.la -lib/ggi/input/xwin.la lib/libgg.la lib/libgii.la man/man1/mhub.1 man/man1/xsendbut.1 +man/man3/GG_CIRCLEQ_EMPTY.3 +man/man3/GG_CIRCLEQ_ENTRY.3 +man/man3/GG_CIRCLEQ_FIRST.3 +man/man3/GG_CIRCLEQ_FOREACH.3 +man/man3/GG_CIRCLEQ_FOREACH_REVERSE.3 +man/man3/GG_CIRCLEQ_HEAD.3 +man/man3/GG_CIRCLEQ_HEAD_INITIALIZER.3 +man/man3/GG_CIRCLEQ_INIT.3 +man/man3/GG_CIRCLEQ_INSERT_AFTER.3 +man/man3/GG_CIRCLEQ_INSERT_BEFORE.3 +man/man3/GG_CIRCLEQ_INSERT_HEAD.3 +man/man3/GG_CIRCLEQ_INSERT_TAIL.3 +man/man3/GG_CIRCLEQ_LAST.3 +man/man3/GG_CIRCLEQ_NEXT.3 +man/man3/GG_CIRCLEQ_PREV.3 +man/man3/GG_CIRCLEQ_REMOVE.3 +man/man3/GG_LIST_EMPTY.3 +man/man3/GG_LIST_ENTRY.3 +man/man3/GG_LIST_FIRST.3 +man/man3/GG_LIST_FOREACH.3 +man/man3/GG_LIST_HEAD.3 +man/man3/GG_LIST_HEAD_INITIALIZER.3 +man/man3/GG_LIST_INIT.3 +man/man3/GG_LIST_INSERT_AFTER.3 +man/man3/GG_LIST_INSERT_BEFORE.3 +man/man3/GG_LIST_INSERT_HEAD.3 +man/man3/GG_LIST_NEXT.3 +man/man3/GG_LIST_REMOVE.3 +man/man3/GG_RB_EMPTY.3 +man/man3/GG_RB_ENTRY.3 +man/man3/GG_RB_FIND.3 +man/man3/GG_RB_FOREACH.3 +man/man3/GG_RB_GENERATE.3 +man/man3/GG_RB_HEAD.3 +man/man3/GG_RB_INIT.3 +man/man3/GG_RB_INITIALIZER.3 +man/man3/GG_RB_INSERT.3 +man/man3/GG_RB_LEFT.3 +man/man3/GG_RB_MAX.3 +man/man3/GG_RB_MIN.3 +man/man3/GG_RB_NEXT.3 +man/man3/GG_RB_PARENT.3 +man/man3/GG_RB_PROTOTYPE.3 +man/man3/GG_RB_REMOVE.3 +man/man3/GG_RB_RIGHT.3 +man/man3/GG_RB_ROOT.3 man/man3/GG_SCHED_TICKS2USECS.3 man/man3/GG_SCHED_USECS2TICKS.3 +man/man3/GG_SIMPLEQ_EMPTY.3 +man/man3/GG_SIMPLEQ_ENTRY.3 +man/man3/GG_SIMPLEQ_FIRST.3 +man/man3/GG_SIMPLEQ_FOREACH.3 +man/man3/GG_SIMPLEQ_HEAD.3 +man/man3/GG_SIMPLEQ_HEAD_INITIALIZER.3 +man/man3/GG_SIMPLEQ_INIT.3 +man/man3/GG_SIMPLEQ_INSERT_AFTER.3 +man/man3/GG_SIMPLEQ_INSERT_HEAD.3 +man/man3/GG_SIMPLEQ_INSERT_TAIL.3 +man/man3/GG_SIMPLEQ_NEXT.3 +man/man3/GG_SIMPLEQ_REMOVE.3 +man/man3/GG_SIMPLEQ_REMOVE_HEAD.3 +man/man3/GG_SLIST_EMPTY.3 +man/man3/GG_SLIST_ENTRY.3 +man/man3/GG_SLIST_FIRST.3 +man/man3/GG_SLIST_FOREACH.3 +man/man3/GG_SLIST_HEAD.3 +man/man3/GG_SLIST_HEAD_INITIALIZER.3 +man/man3/GG_SLIST_INIT2.3 +man/man3/GG_SLIST_INSERT_AFTER.3 +man/man3/GG_SLIST_INSERT_HEAD.3 +man/man3/GG_SLIST_NEXT.3 +man/man3/GG_SLIST_REMOVE.3 +man/man3/GG_SLIST_REMOVE_HEAD.3 +man/man3/GG_SPLAY_EMPTY.3 +man/man3/GG_SPLAY_ENTRY.3 +man/man3/GG_SPLAY_FIND.3 +man/man3/GG_SPLAY_FOREACH.3 +man/man3/GG_SPLAY_GENERATE.3 +man/man3/GG_SPLAY_HEAD.3 +man/man3/GG_SPLAY_INIT.3 +man/man3/GG_SPLAY_INITIALIZER.3 +man/man3/GG_SPLAY_INSERT.3 +man/man3/GG_SPLAY_LEFT.3 +man/man3/GG_SPLAY_MAX.3 +man/man3/GG_SPLAY_MIN.3 +man/man3/GG_SPLAY_NEXT.3 +man/man3/GG_SPLAY_PROTOTYPE.3 +man/man3/GG_SPLAY_REMOVE.3 +man/man3/GG_SPLAY_RIGHT.3 +man/man3/GG_SPLAY_ROOT.3 +man/man3/GG_TAILQ_EMPTY.3 +man/man3/GG_TAILQ_ENTRY.3 +man/man3/GG_TAILQ_FIRST.3 +man/man3/GG_TAILQ_FOREACH.3 +man/man3/GG_TAILQ_FOREACH_REVERSE.3 +man/man3/GG_TAILQ_HEAD.3 +man/man3/GG_TAILQ_HEAD_INITIALIZER.3 +man/man3/GG_TAILQ_INIT.3 +man/man3/GG_TAILQ_INSERT_AFTER.3 +man/man3/GG_TAILQ_INSERT_BEFORE.3 +man/man3/GG_TAILQ_INSERT_HEAD.3 +man/man3/GG_TAILQ_INSERT_TAIL.3 +man/man3/GG_TAILQ_LAST.3 +man/man3/GG_TAILQ_NEXT.3 +man/man3/GG_TAILQ_PREV.3 +man/man3/GG_TAILQ_REMOVE.3 man/man3/gg-error.3 +man/man3/gg-queue.3 +man/man3/gg-tree.3 man/man3/gg-types.3 +man/man3/ggAddObserver.3 man/man3/ggAddTask.3 man/man3/ggCleanupForceExit.3 +man/man3/ggClearPublisher.3 +man/man3/ggConfigIterLocation.3 +man/man3/ggConfigIterTarget.3 man/man3/ggCurTime.3 +man/man3/ggDelObserver.3 +man/man3/ggDelScope.3 man/man3/ggDelTask.3 man/man3/ggExit.3 -man/man3/ggFreeModule.3 +man/man3/ggFreeConfig.3 +man/man3/ggFromScope.3 +man/man3/ggGetScope.3 man/man3/ggGetSwarType.3 -man/man3/ggGetSymbolAddress.3 man/man3/ggGetUserDir.3 man/man3/ggInit.3 -man/man3/ggLoadModule.3 +man/man3/ggLoadConfig.3 man/man3/ggLock.3 man/man3/ggLockCreate.3 man/man3/ggLockDestroy.3 +man/man3/ggNewScope.3 +man/man3/ggNotifyObservers.3 +man/man3/ggParseOptions.3 man/man3/ggRegisterCleanup.3 man/man3/ggTimeBase.3 man/man3/ggTryLock.3 @@ -99,6 +220,7 @@ man/man3/gii_phystype.3 man/man3/gii_pmove_event.3 man/man3/gii_val_event.3 man/man3/gii_valrange.3 +man/man5/libgii.conf.5 man/man7/filter-key.7 man/man7/filter-keytrans.7 man/man7/filter-mouse.7 @@ -111,9 +233,9 @@ man/man7/input-linux-kbd.7 man/man7/input-linux-mouse.7 man/man7/input-lk201.7 man/man7/input-mouse.7 +man/man7/input-quartz.7 man/man7/input-tcp.7 man/man7/input-x.7 -man/man7/input-xwin.7 man/man7/libgg.7 man/man7/libgii.7 share/examples/ggi/filter/keytrans diff --git a/graphics/libgii/buildlink3.mk b/graphics/libgii/buildlink3.mk index efcb9205294..9d07cd76061 100644 --- a/graphics/libgii/buildlink3.mk +++ b/graphics/libgii/buildlink3.mk @@ -1,12 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:42 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2010/01/30 14:54:48 tnn Exp $ BUILDLINK_TREE+= libgii .if !defined(LIBGII_BUILDLINK3_MK) LIBGII_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libgii+= libgii>=0.9.0 -BUILDLINK_ABI_DEPENDS.libgii?= libgii>=0.9.1nb1 +BUILDLINK_API_DEPENDS.libgii+= libgii>=1.0.2 BUILDLINK_PKGSRCDIR.libgii?= ../../graphics/libgii .include "../../x11/libX11/buildlink3.mk" diff --git a/graphics/libgii/distinfo b/graphics/libgii/distinfo index e3c5c9020be..3cdc400235f 100644 --- a/graphics/libgii/distinfo +++ b/graphics/libgii/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.13 2005/10/10 16:53:57 joerg Exp $ +$NetBSD: distinfo,v 1.14 2010/01/30 14:54:48 tnn Exp $ -SHA1 (libgii-0.9.1.src.tar.bz2) = 5317a3a4024a6a3c50dc3a854f0cf0ef64dcfd54 -RMD160 (libgii-0.9.1.src.tar.bz2) = 4a82881bff5e77d9d7ee53296a69a74386bf2f91 -Size (libgii-0.9.1.src.tar.bz2) = 506921 bytes -SHA1 (patch-aa) = 3dd014586dc16b95125336539d74b6040bd9eb0a -SHA1 (patch-ae) = d7007d2df8de9b29372882d5f8fb782bade44157 -SHA1 (patch-af) = 44c23eb8fd16ccde9a942643e30625fc96ca2169 -SHA1 (patch-ag) = a223af4dd1aec691406d7bc295b3d002185de747 +SHA1 (libgii-1.0.2.src.tar.bz2) = 5ee0cd4a5652df85d68303ace41b88df825a6ea0 +RMD160 (libgii-1.0.2.src.tar.bz2) = 8109f5e9bdd061c3d90120b439c471f5c4369971 +Size (libgii-1.0.2.src.tar.bz2) = 701099 bytes +SHA1 (patch-aa) = 70b3b52d5ea80482ad51941b3053ff7373eada51 +SHA1 (patch-ae) = 050126baf0e2c0abaf96ed7e2ab498beaf8034b9 +SHA1 (patch-af) = 69f3177c6e850581f015f2bfdc4b7df1cb68e91b +SHA1 (patch-ag) = 94d04178e1e1720e2aeaadbea0da4d0c3cd0bc28 diff --git a/graphics/libgii/patches/patch-aa b/graphics/libgii/patches/patch-aa index 0743aed3694..e931a5ac8ba 100644 --- a/graphics/libgii/patches/patch-aa +++ b/graphics/libgii/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.5 2005/03/25 02:46:49 wiz Exp $ +$NetBSD: patch-aa,v 1.6 2010/01/30 14:54:48 tnn Exp $ ---- Makefile.in.orig 2004-11-30 21:56:24.000000000 +0100 +--- Makefile.in.orig 2007-01-26 20:08:28.000000000 +0000 +++ Makefile.in -@@ -255,7 +255,7 @@ target_alias = @target_alias@ +@@ -338,7 +338,7 @@ target_alias = @target_alias@ # multiple AUTOMAKE_OPTIONS lines only confuses automake 1.6 AUTOMAKE_OPTIONS = 1.4 foreign - SUBDIRS = include gg gii input filter regress demos doc m4 dist + SUBDIRS = include gg input filter gii input-shared filter-shared regress demos doc m4 dist -giiconfdatadir = ${sysconfdir}/${ggi_subdir} +giiconfdatadir = ${prefix}/share/examples/ggi giiconfdata_DATA = libgii.conf - DISTCLEANFILES = libgii.conf - EXTRA_DIST = ChangeLog.1999 ChangeLog FAQ INSTALL.autoconf \ + DISTCLEANFILES = libgii.conf config.lt + MAINTAINERCLEANFILES = configure aclocal.m4 acinclude.m4 autom4te.cache \ diff --git a/graphics/libgii/patches/patch-ae b/graphics/libgii/patches/patch-ae index 0cae790a6d8..5794febcb22 100644 --- a/graphics/libgii/patches/patch-ae +++ b/graphics/libgii/patches/patch-ae @@ -1,17 +1,8 @@ -$NetBSD: patch-ae,v 1.6 2005/10/10 16:53:57 joerg Exp $ +$NetBSD: patch-ae,v 1.7 2010/01/30 14:54:48 tnn Exp $ ---- configure.orig 2004-11-30 21:56:28.000000000 +0100 +--- configure.orig 2010-01-30 14:35:05.000000000 +0000 +++ configure -@@ -17879,7 +17879,7 @@ if test "$ac_cv_header_pthread_h" = "yes - TMP_SAVE_CC=$CC - CC="$SHELL ./libtool $CC" - -- for pthreadlib in -lpthread -lc_r -pthread; do -+ for pthreadlib in -lpthread -pthread -lc_r; do - echo "$as_me:$LINENO: checking for pthread_mutex_init with $pthreadlib" >&5 - echo $ECHO_N "checking for pthread_mutex_init with $pthreadlib... $ECHO_C" >&6 - LIBS="$TMP_SAVE_LIBS $pthreadlib" -@@ -20041,7 +20041,7 @@ _ACEOF +@@ -25260,7 +25260,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF diff --git a/graphics/libgii/patches/patch-af b/graphics/libgii/patches/patch-af index 459959d450b..5dc6346c039 100644 --- a/graphics/libgii/patches/patch-af +++ b/graphics/libgii/patches/patch-af @@ -1,13 +1,13 @@ -$NetBSD: patch-af,v 1.3 2005/03/25 02:46:49 wiz Exp $ +$NetBSD: patch-af,v 1.4 2010/01/30 14:54:48 tnn Exp $ ---- filter/mouse/Makefile.in.orig 2004-11-30 21:56:00.000000000 +0100 +--- filter/mouse/Makefile.in.orig 2007-01-26 20:07:59.000000000 +0000 +++ filter/mouse/Makefile.in -@@ -256,7 +256,7 @@ mouse_la_SOURCES = filter.c - mouse_la_LDFLAGS = ${extra_libraries} -module -no-undefined -avoid-version \ - -export-symbols ${srcdir}/EXPSYMS - +@@ -331,7 +331,7 @@ AM_CPPFLAGS = -DDEBUG_NAMESPACE='"libgii + INCLUDES = -I${top_srcdir}/include -I${top_builddir}/include ${extra_includes} + noinst_LTLIBRARIES = libfiltermouse.la + libfiltermouse_la_SOURCES = filter.c -giiconfdatadir = ${sysconfdir}/${ggi_subdir}/filter +giiconfdatadir = $(datadir)/examples/ggi/filter giiconfdata_DATA = mouse - filterlibdir = ${libdir}/${ggi_subdir}/filter - EXTRA_DIST = EXPSYMS mouse + EXTRA_DIST = EXPSYMS man.txt mouse + MAINTAINERCLEANFILES = Makefile.in diff --git a/graphics/libgii/patches/patch-ag b/graphics/libgii/patches/patch-ag index 723894fdd0a..13c34b29631 100644 --- a/graphics/libgii/patches/patch-ag +++ b/graphics/libgii/patches/patch-ag @@ -1,13 +1,13 @@ -$NetBSD: patch-ag,v 1.3 2005/03/25 02:46:49 wiz Exp $ +$NetBSD: patch-ag,v 1.4 2010/01/30 14:54:48 tnn Exp $ ---- filter/keytrans/Makefile.in.orig 2004-11-30 21:55:59.000000000 +0100 +--- filter/keytrans/Makefile.in.orig 2007-01-26 20:07:59.000000000 +0000 +++ filter/keytrans/Makefile.in -@@ -256,7 +256,7 @@ keytrans_la_SOURCES = filter.c - keytrans_la_LDFLAGS = ${extra_libraries} -module -no-undefined -avoid-version \ - -export-symbols ${srcdir}/EXPSYMS - +@@ -331,7 +331,7 @@ AM_CPPFLAGS = -DDEBUG_NAMESPACE='"libgii + INCLUDES = -I${top_srcdir}/include -I${top_builddir}/include ${extra_includes} + noinst_LTLIBRARIES = libkeytrans.la + libkeytrans_la_SOURCES = filter.c -giiconfdatadir = ${sysconfdir}/${ggi_subdir}/filter +giiconfdatadir = $(datadir)/examples/ggi/filter giiconfdata_DATA = keytrans - filterlibdir = ${libdir}/${ggi_subdir}/filter - EXTRA_DIST = EXPSYMS keytrans + EXTRA_DIST = EXPSYMS keytrans man.txt + MAINTAINERCLEANFILES = Makefile.in -- cgit v1.2.3