Update to 0.4.10.

Use shabangfix.


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

4 files changed, 34 insertions, 47 deletions

diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile
index 13a777fcb..2d2098503 100644
--- a/accessibility/caribou/Makefile
+++ b/accessibility/caribou/Makefile
@@ -3,7 +3,7 @@
 #    $MCom: ports/trunk/accessibility/caribou/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	caribou
-PORTVERSION=	0.4.3
+PORTVERSION=	0.4.10
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,17 +16,18 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	clutter-glx-1.0:${PORTSDIR}/graphics/clutter \
-		gee:${PORTSDIR}/devel/libgee06 \
+		gee-0.8:${PORTSDIR}/devel/libgee \
 		xklavier:${PORTSDIR}/x11/libxklavier
 RUN_DEPENDS=	py*-atspi>=2.1.91:${PORTSDIR}/accessibility/py-atspi
 
 USE_XZ=		yes
 USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=yes
-USES=		gettext pathfix pkgconfig
+USES=		gettext pathfix pkgconfig shebangfix
+SHEBANG_FILES=	tools/fix_gir.py tools/make_schema.py
 USE_PYTHON=	yes
 USE_XORG=	x11 xtst
-USE_GNOME=	intltool pygobject3 gtk30 intlhack gnomedocutils libxml2
+USE_GNOME=	gnomehier intltool pygobject3 gtk30 intlhack libxml2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -34,13 +35,4 @@ 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
-	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' \
-		-e 's|$${BASH_SOURCE\[0\]}|.|g' \
-		${WRKSRC}/bin/antler-keyboard.in \
-		${WRKSRC}/bin/caribou-preferences.in \
-		${WRKSRC}/bin/caribou.in
-
 .include <bsd.port.mk>
diff --git a/accessibility/caribou/distinfo b/accessibility/caribou/distinfo
index 4dca0e0be..0ecccd529 100644
--- a/accessibility/caribou/distinfo
+++ b/accessibility/caribou/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/caribou-0.4.3.tar.xz) = 9aac01b14f5cd6c82642596f211eecc75eaddfbe60f09ddab027b096927b2ec4
-SIZE (gnome3/caribou-0.4.3.tar.xz) = 358244
+SHA256 (gnome3/caribou-0.4.10.tar.xz) = 6480ce3a87cf4f01dd1fb52edbb31a2aa9f5573a0860b67115c86bbcd7b17865
+SIZE (gnome3/caribou-0.4.10.tar.xz) = 395384
diff --git a/accessibility/caribou/files/patch-tools__make_schema.py b/accessibility/caribou/files/patch-tools__make_schema.py
deleted file mode 100644
index 336ff0e00..000000000
--- a/accessibility/caribou/files/patch-tools__make_schema.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/make_schema.py.orig	2012-08-06 18:41:04.000000000 +0200
-+++ tools/make_schema.py	2012-08-06 18:41:15.000000000 +0200
-@@ -58,7 +58,7 @@
-             schemalist.appendChild(key)
-             self._append_children_element_value_pairs(
-                 doc, key, [('default',
--                            getattr(setting.gvariant, "print_")(False)),
-+                            getattr(setting.gvariant, "print")(False)),
-                            ('_summary', setting.short_desc),
-                            ('_description', setting.long_desc)])
- 
diff --git a/accessibility/caribou/pkg-plist b/accessibility/caribou/pkg-plist
index 735093746..2847cace5 100644
--- a/accessibility/caribou/pkg-plist
+++ b/accessibility/caribou/pkg-plist
@@ -29,12 +29,6 @@ lib/libcaribou.so.0
 %%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
@@ -53,10 +47,10 @@ lib/libcaribou.so.0
 %%PYTHON_SITELIBDIR%%/caribou/settings/settings_manager.py
 %%PYTHON_SITELIBDIR%%/caribou/settings/settings_manager.pyc
 %%PYTHON_SITELIBDIR%%/caribou/settings/settings_manager.pyo
+libdata/pkgconfig/caribou-1.0.pc
 libexec/antler-keyboard
 share/antler/dark-key-border.svg
 share/antler/style.css
-share/applications/caribou.desktop
 share/caribou/layouts/fullscale/us.xml
 share/caribou/layouts/scan/us.xml
 share/caribou/layouts/touch/ara.xml
@@ -64,11 +58,13 @@ 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/an/LC_MESSAGES/caribou.mo
 share/locale/ar/LC_MESSAGES/caribou.mo
 share/locale/as/LC_MESSAGES/caribou.mo
 share/locale/ast/LC_MESSAGES/caribou.mo
 share/locale/be/LC_MESSAGES/caribou.mo
 share/locale/bg/LC_MESSAGES/caribou.mo
+share/locale/bn_IN/LC_MESSAGES/caribou.mo
 share/locale/ca/LC_MESSAGES/caribou.mo
 share/locale/ca@valencia/LC_MESSAGES/caribou.mo
 share/locale/cs/LC_MESSAGES/caribou.mo
@@ -83,6 +79,7 @@ share/locale/eu/LC_MESSAGES/caribou.mo
 share/locale/fa/LC_MESSAGES/caribou.mo
 share/locale/fi/LC_MESSAGES/caribou.mo
 share/locale/fr/LC_MESSAGES/caribou.mo
+share/locale/fur/LC_MESSAGES/caribou.mo
 share/locale/gl/LC_MESSAGES/caribou.mo
 share/locale/gu/LC_MESSAGES/caribou.mo
 share/locale/he/LC_MESSAGES/caribou.mo
@@ -98,6 +95,7 @@ share/locale/lt/LC_MESSAGES/caribou.mo
 share/locale/lv/LC_MESSAGES/caribou.mo
 share/locale/mk/LC_MESSAGES/caribou.mo
 share/locale/ml/LC_MESSAGES/caribou.mo
+share/locale/mr/LC_MESSAGES/caribou.mo
 share/locale/ms/LC_MESSAGES/caribou.mo
 share/locale/nb/LC_MESSAGES/caribou.mo
 share/locale/nl/LC_MESSAGES/caribou.mo
@@ -124,20 +122,8 @@ share/locale/vi/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/layouts/touch
-@dirrm share/caribou/layouts/scan
-@dirrm share/caribou/layouts/fullscale
-@dirrm share/caribou/layouts/
-@dirrm share/caribou
-@dirrm share/antler
-@dirrmtry share/applications
-@dirrm %%PYTHON_SITELIBDIR%%/caribou/settings
-@dirrm %%PYTHON_SITELIBDIR%%/caribou/daemon
-@dirrm %%PYTHON_SITELIBDIR%%/caribou/antler
-@dirrm %%PYTHON_SITELIBDIR%%/caribou
-@dirrmtry lib/gnome-settings-daemon-3.0/gtk-modules
-@dirrmtry lib/gnome-settings-daemon-3.0
-@dirrm include/libcaribou
+share/vala/vapi/caribou-1.0.vapi
+share/vala/vapi/caribou-1.0.deps
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/ug/LC_MESSAGES
@@ -148,11 +134,31 @@ share/locale/zh_TW/LC_MESSAGES/caribou.mo
 @dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
 @dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
+@dirrm share/caribou/layouts/touch
+@dirrm share/caribou/layouts/scan
+@dirrm share/caribou/layouts/fullscale
+@dirrm share/caribou/layouts/
+@dirrm share/caribou
+@dirrm share/antler
+@dirrm %%PYTHON_SITELIBDIR%%/caribou/settings
+@dirrm %%PYTHON_SITELIBDIR%%/caribou/antler
+@dirrm %%PYTHON_SITELIBDIR%%/caribou
+@dirrmtry lib/gnome-settings-daemon-3.0/gtk-modules
+@dirrmtry lib/gnome-settings-daemon-3.0
+@dirrm include/libcaribou