Update to 0.3.91.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16254 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 90 insertions, 56 deletions

diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile
index 74ffb08ef..503c65b05 100644
--- a/accessibility/caribou/Makefile
+++ b/accessibility/caribou/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/accessibility/caribou/Makefile,v 1.6 2011/04/06 05:49:22 kwm Exp $
+#    $MCom: ports/accessibility/caribou/Makefile,v 1.7 2011/06/11 18:55:55 mezz Exp $
 #
 
 PORTNAME=	caribou
-PORTVERSION=	0.2.00
+PORTVERSION=	0.3.91
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -15,18 +15,31 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome On-Screen keyboard
 
-LIB_DEPENDS=	clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter
-
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
-USE_BZIP2=	yes
+
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS=	clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter \
+		gee.2:${PORTSDIR}/devel/libgee \
+		xklavier.12:${PORTSDIR}/x11/libxklavier
+
+USE_XZ=		yes
 USE_GMAKE=	yes
+MAKE_JOBS_UNSAFE=yes
 USE_GETTEXT=	yes
 USE_PYTHON=	yes
-USE_GNOME=	gnomehack intltool pygobject gtk30 intlhack gnomedocutils
+USE_XORG=	x11 xtst
+USE_GNOME=	gnomehack intltool pygobject3 gtk30 intlhack gnomedocutils \
+		libxml2
 GNU_CONFIGURE=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-GLIB_SCHEMAS=	org.gnome.caribou.gschema.xml
+CONFIGURE_ARGS=	--enable-gtk2-module=no
+GLIB_SCHEMAS=	org.gnome.caribou.gschema.xml \
+		org.gnome.antler.gschema.xml
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \
+		${WRKSRC}/tools/*.py
 
 .include <bsd.port.mk>
diff --git a/accessibility/caribou/distinfo b/accessibility/caribou/distinfo
index 2756de656..88c6d38a9 100644
--- a/accessibility/caribou/distinfo
+++ b/accessibility/caribou/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/caribou-0.2.00.tar.bz2) = a4cabf170ab03a912e09922ba0e966a269c5bdb1b0a6e48f3b7859183a34c0bf
-SIZE (gnome3/caribou-0.2.00.tar.bz2) = 134707
+SHA256 (gnome3/caribou-0.3.91.tar.xz) = 4fe2f493d21fd3fcbdd846f26a5b308f7af62db55f6ac4ae6e91513eb7316bca
+SIZE (gnome3/caribou-0.3.91.tar.xz) = 343732
diff --git a/accessibility/caribou/pkg-plist b/accessibility/caribou/pkg-plist
index 920ec9edf..d9a5772b2 100644
--- a/accessibility/caribou/pkg-plist
+++ b/accessibility/caribou/pkg-plist
@@ -1,53 +1,67 @@
 bin/caribou
+bin/caribou-preferences
 etc/xdg/autostart/caribou-autostart.desktop
+lib/girepository-1.0/Caribou-1.0.typelib
+lib/gtk-3.0/modules/libcaribou-gtk-module.a
+lib/gtk-3.0/modules/libcaribou-gtk-module.la
+lib/gtk-3.0/modules/libcaribou-gtk-module.so
+lib/libcaribou.a
+lib/libcaribou.la
+lib/libcaribou.so
+lib/libcaribou.so.0
 %%PYTHON_SITELIBDIR%%/caribou/__init__.py
 %%PYTHON_SITELIBDIR%%/caribou/__init__.pyc
 %%PYTHON_SITELIBDIR%%/caribou/__init__.pyo
-%%PYTHON_SITELIBDIR%%/caribou/common/__init__.py
-%%PYTHON_SITELIBDIR%%/caribou/common/__init__.pyc
-%%PYTHON_SITELIBDIR%%/caribou/common/__init__.pyo
-%%PYTHON_SITELIBDIR%%/caribou/common/const.py
-%%PYTHON_SITELIBDIR%%/caribou/common/const.pyc
-%%PYTHON_SITELIBDIR%%/caribou/common/const.pyo
-%%PYTHON_SITELIBDIR%%/caribou/common/setting_types.py
-%%PYTHON_SITELIBDIR%%/caribou/common/setting_types.pyc
-%%PYTHON_SITELIBDIR%%/caribou/common/setting_types.pyo
-%%PYTHON_SITELIBDIR%%/caribou/common/settings.py
-%%PYTHON_SITELIBDIR%%/caribou/common/settings.pyc
-%%PYTHON_SITELIBDIR%%/caribou/common/settings.pyo
-%%PYTHON_SITELIBDIR%%/caribou/common/settings_manager.py
-%%PYTHON_SITELIBDIR%%/caribou/common/settings_manager.pyc
-%%PYTHON_SITELIBDIR%%/caribou/common/settings_manager.pyo
-%%PYTHON_SITELIBDIR%%/caribou/ui/__init__.py
-%%PYTHON_SITELIBDIR%%/caribou/ui/__init__.pyc
-%%PYTHON_SITELIBDIR%%/caribou/ui/__init__.pyo
-%%PYTHON_SITELIBDIR%%/caribou/ui/i18n.py
-%%PYTHON_SITELIBDIR%%/caribou/ui/i18n.pyc
-%%PYTHON_SITELIBDIR%%/caribou/ui/i18n.pyo
-%%PYTHON_SITELIBDIR%%/caribou/ui/keyboard.py
-%%PYTHON_SITELIBDIR%%/caribou/ui/keyboard.pyc
-%%PYTHON_SITELIBDIR%%/caribou/ui/keyboard.pyo
-%%PYTHON_SITELIBDIR%%/caribou/ui/main.py
-%%PYTHON_SITELIBDIR%%/caribou/ui/main.pyc
-%%PYTHON_SITELIBDIR%%/caribou/ui/main.pyo
-%%PYTHON_SITELIBDIR%%/caribou/ui/opacity.py
-%%PYTHON_SITELIBDIR%%/caribou/ui/opacity.pyc
-%%PYTHON_SITELIBDIR%%/caribou/ui/opacity.pyo
-%%PYTHON_SITELIBDIR%%/caribou/ui/preferences_window.py
-%%PYTHON_SITELIBDIR%%/caribou/ui/preferences_window.pyc
-%%PYTHON_SITELIBDIR%%/caribou/ui/preferences_window.pyo
-%%PYTHON_SITELIBDIR%%/caribou/ui/scan.py
-%%PYTHON_SITELIBDIR%%/caribou/ui/scan.pyc
-%%PYTHON_SITELIBDIR%%/caribou/ui/scan.pyo
-%%PYTHON_SITELIBDIR%%/caribou/ui/window.py
-%%PYTHON_SITELIBDIR%%/caribou/ui/window.pyc
-%%PYTHON_SITELIBDIR%%/caribou/ui/window.pyo
+%%PYTHON_SITELIBDIR%%/caribou/antler/__init__.py
+%%PYTHON_SITELIBDIR%%/caribou/antler/__init__.pyc
+%%PYTHON_SITELIBDIR%%/caribou/antler/__init__.pyo
+%%PYTHON_SITELIBDIR%%/caribou/antler/antler_settings.py
+%%PYTHON_SITELIBDIR%%/caribou/antler/antler_settings.pyc
+%%PYTHON_SITELIBDIR%%/caribou/antler/antler_settings.pyo
+%%PYTHON_SITELIBDIR%%/caribou/antler/keyboard_view.py
+%%PYTHON_SITELIBDIR%%/caribou/antler/keyboard_view.pyc
+%%PYTHON_SITELIBDIR%%/caribou/antler/keyboard_view.pyo
+%%PYTHON_SITELIBDIR%%/caribou/antler/main.py
+%%PYTHON_SITELIBDIR%%/caribou/antler/main.pyc
+%%PYTHON_SITELIBDIR%%/caribou/antler/main.pyo
+%%PYTHON_SITELIBDIR%%/caribou/antler/window.py
+%%PYTHON_SITELIBDIR%%/caribou/antler/window.pyc
+%%PYTHON_SITELIBDIR%%/caribou/antler/window.pyo
+%%PYTHON_SITELIBDIR%%/caribou/daemon/__init__.py
+%%PYTHON_SITELIBDIR%%/caribou/daemon/__init__.pyc
+%%PYTHON_SITELIBDIR%%/caribou/daemon/__init__.pyo
+%%PYTHON_SITELIBDIR%%/caribou/daemon/main.py
+%%PYTHON_SITELIBDIR%%/caribou/daemon/main.pyc
+%%PYTHON_SITELIBDIR%%/caribou/daemon/main.pyo
+%%PYTHON_SITELIBDIR%%/caribou/i18n.py
+%%PYTHON_SITELIBDIR%%/caribou/i18n.pyc
+%%PYTHON_SITELIBDIR%%/caribou/i18n.pyo
+%%PYTHON_SITELIBDIR%%/caribou/settings/__init__.py
+%%PYTHON_SITELIBDIR%%/caribou/settings/__init__.pyc
+%%PYTHON_SITELIBDIR%%/caribou/settings/__init__.pyo
+%%PYTHON_SITELIBDIR%%/caribou/settings/caribou_settings.py
+%%PYTHON_SITELIBDIR%%/caribou/settings/caribou_settings.pyc
+%%PYTHON_SITELIBDIR%%/caribou/settings/caribou_settings.pyo
+%%PYTHON_SITELIBDIR%%/caribou/settings/preferences_window.py
+%%PYTHON_SITELIBDIR%%/caribou/settings/preferences_window.pyc
+%%PYTHON_SITELIBDIR%%/caribou/settings/preferences_window.pyo
+%%PYTHON_SITELIBDIR%%/caribou/settings/setting_types.py
+%%PYTHON_SITELIBDIR%%/caribou/settings/setting_types.pyc
+%%PYTHON_SITELIBDIR%%/caribou/settings/setting_types.pyo
+%%PYTHON_SITELIBDIR%%/caribou/settings/settings_manager.py
+%%PYTHON_SITELIBDIR%%/caribou/settings/settings_manager.pyc
+%%PYTHON_SITELIBDIR%%/caribou/settings/settings_manager.pyo
+libexec/antler-keyboard
+share/antler/dark-key-border.svg
+share/antler/style.css
 share/applications/caribou.desktop
-share/caribou/keyboards/hebrew.xml
-share/caribou/keyboards/lexic_es.json
-share/caribou/keyboards/qwerty_en.json
-share/caribou/keyboards/qwerty_es.json
-share/caribou/keyboards/qwerty.xml
+share/caribou/layouts/fullscale/us.xml
+share/caribou/layouts/scan/us.xml
+share/caribou/layouts/touch/ara.xml
+share/caribou/layouts/touch/il.xml
+share/caribou/layouts/touch/us.xml
+share/dbus-1/services/org.gnome.Caribou.Antler.service
+share/gir-1.0/Caribou-1.0.gir
 share/locale/ar/LC_MESSAGES/caribou.mo
 share/locale/ast/LC_MESSAGES/caribou.mo
 share/locale/bg/LC_MESSAGES/caribou.mo
@@ -58,7 +72,9 @@ share/locale/da/LC_MESSAGES/caribou.mo
 share/locale/de/LC_MESSAGES/caribou.mo
 share/locale/el/LC_MESSAGES/caribou.mo
 share/locale/en_GB/LC_MESSAGES/caribou.mo
+share/locale/eo/LC_MESSAGES/caribou.mo
 share/locale/es/LC_MESSAGES/caribou.mo
+share/locale/fa/LC_MESSAGES/caribou.mo
 share/locale/fr/LC_MESSAGES/caribou.mo
 share/locale/gl/LC_MESSAGES/caribou.mo
 share/locale/he/LC_MESSAGES/caribou.mo
@@ -82,13 +98,18 @@ share/locale/sr@latin/LC_MESSAGES/caribou.mo
 share/locale/sv/LC_MESSAGES/caribou.mo
 share/locale/ta/LC_MESSAGES/caribou.mo
 share/locale/ug/LC_MESSAGES/caribou.mo
+share/locale/uk/LC_MESSAGES/caribou.mo
 share/locale/zh_CN/LC_MESSAGES/caribou.mo
 share/locale/zh_HK/LC_MESSAGES/caribou.mo
 share/locale/zh_TW/LC_MESSAGES/caribou.mo
-@dirrm share/caribou/keyboards
+@dirrm share/caribou/layouts/touch
+@dirrm share/caribou/layouts/scan
+@dirrm share/caribou/layouts/fullscale
+@dirrm share/caribou/layouts/
 @dirrm share/caribou
-@dirrm %%PYTHON_SITELIBDIR%%/caribou/ui
-@dirrm %%PYTHON_SITELIBDIR%%/caribou/common
+@dirrm %%PYTHON_SITELIBDIR%%/caribou/settings
+@dirrm %%PYTHON_SITELIBDIR%%/caribou/daemon
+@dirrm %%PYTHON_SITELIBDIR%%/caribou/antler
 @dirrm %%PYTHON_SITELIBDIR%%/caribou
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK