Update to 2.91.5.

OptionNG.
Depend on gnome-dictionary since gnome-utils3 is dead


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

3 files changed, 63 insertions, 55 deletions

diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 433089fcb..271105688 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gtranslator/Makefile,v 1.19 2011/10/13 08:00:44 kwm Exp $
+#   $MCom: ports/devel/gtranslator/Makefile,v 1.20 2011/10/19 21:42:29 kwm Exp $
 #
 
 PORTNAME=	gtranslator
-PORTVERSION=	2.90.7
+PORTVERSION=	2.91.5
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 
@@ -19,15 +19,15 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	peas-1.0.0:${PORTSDIR}/devel/libpeas \
-		gdl-3.1:${PORTSDIR}/x11-toolkits/gdl3 \
-		json-glib-1.0.0:${PORTSDIR}/devel/json-glib
+LIB_DEPENDS=	peas-1.0:${PORTSDIR}/devel/libpeas \
+		gdl-3:${PORTSDIR}/x11-toolkits/gdl3 \
+		json-glib-1.0:${PORTSDIR}/devel/json-glib
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 
 USE_XZ=		yes
 USE_GNOME=	gnomehack intlhack gnomeprefix gtk30 libgda4 \
-		gtksourceview3 libxml2 gnomedocutils
+		gtksourceview3 libxml2
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_PYTHON=	yes
@@ -35,23 +35,27 @@ INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-debug \
+		--with-gda=4.0 \
 		--enable-compile-warnings=no
 GLIB_SCHEMAS=	org.gnome.gtranslator.gschema.xml \
 		org.gnome.gtranslator.plugins.codeview.gschema.xml \
-		org.gnome.gtranslator.plugins.open-tran.gschema.xml
+		org.gnome.gtranslator.plugins.open-tran.gschema.xml \
+		org.gnome.gtranslator.plugins.translation-memory.gschema.xml
 MAN1=		gtranslator.1
 MANCOMPRESSED=	yes
 
-OPTIONS=	DICT	"Build dictionary plugin" on
+OPTIONS_DEFINE=	DICT
+OPTIONS_DEFAULT=DICT
+DICT_DESC=	Build dictionary plugin
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_DICT)
-BUILD_DEPENDS+=	gnome-utils>=3.0.0:${PORTSDIR}/deskutils/gnome-utils3
-LIB_DEPENDS+=	gdict-1.0.6:${PORTSDIR}/deskutils/gnome-utils3
+.if ${PORT_OPTIONS:MDICT}
+BUILD_DEPENDS+=	gnome-dictionary>=3.4.0:${PORTSDIR}/deskutils/gnome-dictionary
+LIB_DEPENDS+=	gdict-1.0:${PORTSDIR}/deskutils/gnome-dictionary
 GLIB_SCHEMAS+=	org.gnome.gtranslator.plugins.dictionary.gschema.xml
 CONFIGURE_ARGS+=--with-dictionary
 PLIST_SUB+=	DICT=""
diff --git a/devel/gtranslator/distinfo b/devel/gtranslator/distinfo
index 09078ae9f..31a63231a 100644
--- a/devel/gtranslator/distinfo
+++ b/devel/gtranslator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtranslator-2.90.7.tar.xz) = cdf86aaab2f902a579ac1301bff5d31d7c6cf065dc666250a9749e7df096853a
-SIZE (gtranslator-2.90.7.tar.xz) = 4538548
+SHA256 (gtranslator-2.91.5.tar.xz) = 7dcdabd5c2156bef98f35d2ec31798287d1721e400ea738fb3ccc2ff2ef186e6
+SIZE (gtranslator-2.91.5.tar.xz) = 4559540
diff --git a/devel/gtranslator/pkg-plist b/devel/gtranslator/pkg-plist
index 68f988db1..a9cfe62ef 100644
--- a/devel/gtranslator/pkg-plist
+++ b/devel/gtranslator/pkg-plist
@@ -3,20 +3,22 @@ include/gtranslator-3.0/gtranslator/gtr-application.h
 include/gtranslator-3.0/gtranslator/gtr-context.h
 include/gtranslator-3.0/gtranslator/gtr-debug.h
 include/gtranslator-3.0/gtranslator/gtr-header.h
+include/gtranslator-3.0/gtranslator/gtr-message-container.h
 include/gtranslator-3.0/gtranslator/gtr-message-table.h
 include/gtranslator-3.0/gtranslator/gtr-msg.h
 include/gtranslator-3.0/gtranslator/gtr-notebook.h
 include/gtranslator-3.0/gtranslator/gtr-po.h
 include/gtranslator-3.0/gtranslator/gtr-profile.h
 include/gtranslator-3.0/gtranslator/gtr-statusbar.h
-include/gtranslator-3.0/gtranslator/gtr-tab.h
 include/gtranslator-3.0/gtranslator/gtr-tab-activatable.h
-include/gtranslator-3.0/gtranslator/gtr-translation-memory-ui.h
-include/gtranslator-3.0/gtranslator/gtr-translation-memory.h
+include/gtranslator-3.0/gtranslator/gtr-tab.h
 include/gtranslator-3.0/gtranslator/gtr-view.h
 include/gtranslator-3.0/gtranslator/gtr-window-activatable.h
 include/gtranslator-3.0/gtranslator/gtr-window.h
 lib/gtranslator/girepository-1.0/Gtranslator-3.0.typelib
+lib/gtranslator/libgtranslator-private.a
+lib/gtranslator/libgtranslator-private.la
+lib/gtranslator/libgtranslator-private.so
 lib/gtranslator/plugins/charmap/__init__.py
 lib/gtranslator/plugins/charmap/__init__.pyc
 lib/gtranslator/plugins/charmap/__init__.pyo
@@ -30,6 +32,7 @@ lib/gtranslator/plugins/gtr-codeview.plugin
 lib/gtranslator/plugins/gtr-fullscreen.plugin
 lib/gtranslator/plugins/gtr-insert-params.plugin
 lib/gtranslator/plugins/gtr-open-tran.plugin
+lib/gtranslator/plugins/gtr-translation-memory.plugin
 lib/gtranslator/plugins/libalternatelang.a
 lib/gtranslator/plugins/libalternatelang.la
 lib/gtranslator/plugins/libalternatelang.so
@@ -48,10 +51,9 @@ lib/gtranslator/plugins/libopentran.so
 lib/gtranslator/plugins/libsourcecodeview.a
 lib/gtranslator/plugins/libsourcecodeview.la
 lib/gtranslator/plugins/libsourcecodeview.so
-lib/libgtranslator-private.a
-lib/libgtranslator-private.la
-lib/libgtranslator-private.so
-lib/libgtranslator-private.so.0
+lib/gtranslator/plugins/libtranslation-memory.a
+lib/gtranslator/plugins/libtranslation-memory.la
+lib/gtranslator/plugins/libtranslation-memory.so
 libdata/pkgconfig/gtranslator.pc
 share/applications/gtranslator.desktop
 %%DOCSDIR%%/ExtendedClassDiagram.png
@@ -70,8 +72,6 @@ share/applications/gtranslator.desktop
 %%DOCSDIR%%/gtranslator-GtrProfile.html
 %%DOCSDIR%%/gtranslator-GtrStatusbar.html
 %%DOCSDIR%%/gtranslator-GtrTab.html
-%%DOCSDIR%%/gtranslator-GtrTranslationMemory.html
-%%DOCSDIR%%/gtranslator-GtrTranslationMemoryUi.html
 %%DOCSDIR%%/gtranslator-GtrView.html
 %%DOCSDIR%%/gtranslator-GtrWindow.html
 %%DOCSDIR%%/gtranslator-gtr-debug.html
@@ -141,17 +141,17 @@ share/gnome/help/gtranslator/es/figures/profiles.png
 share/gnome/help/gtranslator/es/figures/tm.png
 share/gnome/help/gtranslator/es/figures/toolbar.png
 share/gnome/help/gtranslator/es/gtranslator.xml
-share/gnome/help/gtranslator/eu/gtranslator.xml
-share/gnome/help/gtranslator/eu/figures/mainwindow.png
-share/gnome/help/gtranslator/eu/figures/toolbar.png
 share/gnome/help/gtranslator/eu/figures/closedialog.png
-share/gnome/help/gtranslator/eu/figures/profiles.png
-share/gnome/help/gtranslator/eu/figures/tm.png
-share/gnome/help/gtranslator/eu/figures/prefs.png
+share/gnome/help/gtranslator/eu/figures/mainwindow.png
 share/gnome/help/gtranslator/eu/figures/prefs-editor.png
-share/gnome/help/gtranslator/eu/figures/profiles-dialog.png
 share/gnome/help/gtranslator/eu/figures/prefs-interface.png
 share/gnome/help/gtranslator/eu/figures/prefs-tm.png
+share/gnome/help/gtranslator/eu/figures/prefs.png
+share/gnome/help/gtranslator/eu/figures/profiles-dialog.png
+share/gnome/help/gtranslator/eu/figures/profiles.png
+share/gnome/help/gtranslator/eu/figures/tm.png
+share/gnome/help/gtranslator/eu/figures/toolbar.png
+share/gnome/help/gtranslator/eu/gtranslator.xml
 share/gnome/help/gtranslator/fr/figures/closedialog.png
 share/gnome/help/gtranslator/fr/figures/mainwindow.png
 share/gnome/help/gtranslator/fr/figures/prefs-editor.png
@@ -185,6 +185,17 @@ share/gnome/help/gtranslator/ja/figures/profiles.png
 share/gnome/help/gtranslator/ja/figures/tm.png
 share/gnome/help/gtranslator/ja/figures/toolbar.png
 share/gnome/help/gtranslator/ja/gtranslator.xml
+share/gnome/help/gtranslator/ru/figures/closedialog.png
+share/gnome/help/gtranslator/ru/figures/mainwindow.png
+share/gnome/help/gtranslator/ru/figures/prefs-editor.png
+share/gnome/help/gtranslator/ru/figures/prefs-interface.png
+share/gnome/help/gtranslator/ru/figures/prefs-tm.png
+share/gnome/help/gtranslator/ru/figures/prefs.png
+share/gnome/help/gtranslator/ru/figures/profiles-dialog.png
+share/gnome/help/gtranslator/ru/figures/profiles.png
+share/gnome/help/gtranslator/ru/figures/tm.png
+share/gnome/help/gtranslator/ru/figures/toolbar.png
+share/gnome/help/gtranslator/ru/gtranslator.xml
 share/gnome/help/gtranslator/sl/figures/closedialog.png
 share/gnome/help/gtranslator/sl/figures/mainwindow.png
 share/gnome/help/gtranslator/sl/figures/prefs-editor.png
@@ -231,6 +242,10 @@ share/gnome/help/gtranslator/zh_CN/figures/toolbar.png
 share/gnome/help/gtranslator/zh_CN/gtranslator.xml
 %%DATADIR%%/dtd/umtf.dtd
 %%DATADIR%%/gir-1.0/Gtranslator-3.0.gir
+%%DATADIR%%/pixmaps/debian.png
+%%DATADIR%%/pixmaps/fedora.png
+%%DATADIR%%/pixmaps/gnome-dictionary.png
+%%DATADIR%%/pixmaps/gnome.png
 %%DATADIR%%/pixmaps/gtranslator-fuzzy-next.png
 %%DATADIR%%/pixmaps/gtranslator-fuzzy-prev.png
 %%DATADIR%%/pixmaps/gtranslator-fuzzy-untranslated-next.png
@@ -239,18 +254,16 @@ share/gnome/help/gtranslator/zh_CN/gtranslator.xml
 %%DATADIR%%/pixmaps/gtranslator-plugin.png
 %%DATADIR%%/pixmaps/gtranslator-untranslated-next.png
 %%DATADIR%%/pixmaps/gtranslator-untranslated-prev.png
-%%DATADIR%%/ui/gtr-codeview-dialog.ui
-%%DATADIR%%/ui/gtr-header-dialog.ui
-%%DATADIR%%/ui/gtr-jump-dialog.ui
-%%DATADIR%%/ui/gtr-languages-fetcher.ui
-%%DATADIR%%/ui/gtr-open-tran-dialog.ui
+%%DATADIR%%/pixmaps/inkscape.png
+%%DATADIR%%/pixmaps/kde.ico
+%%DATADIR%%/pixmaps/mandriva.png
+%%DATADIR%%/pixmaps/mozilla.png
+%%DATADIR%%/pixmaps/oo-logo.png
+%%DATADIR%%/pixmaps/open-tran.png
+%%DATADIR%%/pixmaps/suse.png
+%%DATADIR%%/pixmaps/xfce.png
 %%DATADIR%%/ui/gtr-plural-forms.ini
-%%DATADIR%%/ui/gtr-preferences-dialog.ui
-%%DATADIR%%/ui/gtr-profile-dialog.ui
-%%DATADIR%%/ui/gtr-search-dialog.ui
 %%DATADIR%%/ui/gtr-toolbar.xml
-%%DATADIR%%/ui/gtr-viewer.ui
-%%DATADIR%%/ui/gtranslator-ui.xml
 %%DATADIR%%/ui/layout.xml
 %%DATADIR%%/ui/po.lang
 share/icons/hicolor/16x16/apps/gtranslator.png
@@ -294,6 +307,7 @@ share/locale/ko/LC_MESSAGES/gtranslator.mo
 share/locale/ku/LC_MESSAGES/gtranslator.mo
 share/locale/lt/LC_MESSAGES/gtranslator.mo
 share/locale/lv/LC_MESSAGES/gtranslator.mo
+share/locale/mk/LC_MESSAGES/gtranslator.mo
 share/locale/nb/LC_MESSAGES/gtranslator.mo
 share/locale/nds/LC_MESSAGES/gtranslator.mo
 share/locale/nl/LC_MESSAGES/gtranslator.mo
@@ -312,6 +326,7 @@ share/locale/sr/LC_MESSAGES/gtranslator.mo
 share/locale/sr@latin/LC_MESSAGES/gtranslator.mo
 share/locale/sv/LC_MESSAGES/gtranslator.mo
 share/locale/ta/LC_MESSAGES/gtranslator.mo
+share/locale/te/LC_MESSAGES/gtranslator.mo
 share/locale/th/LC_MESSAGES/gtranslator.mo
 share/locale/tk/LC_MESSAGES/gtranslator.mo
 share/locale/tr/LC_MESSAGES/gtranslator.mo
@@ -330,23 +345,11 @@ share/omf/gtranslator/gtranslator-eu.omf
 share/omf/gtranslator/gtranslator-fr.omf
 share/omf/gtranslator/gtranslator-gl.omf
 share/omf/gtranslator/gtranslator-ja.omf
+share/omf/gtranslator/gtranslator-ru.omf
 share/omf/gtranslator/gtranslator-sl.omf
 share/omf/gtranslator/gtranslator-th.omf
 share/omf/gtranslator/gtranslator-uk.omf
 share/omf/gtranslator/gtranslator-zh_CN.omf
-share/pixmaps/gtranslator/debian.png
-share/pixmaps/gtranslator/fedora.png
-%%DICT%%share/pixmaps/gtranslator/gnome-dictionary.png
-share/pixmaps/gtranslator/gnome.png
-share/pixmaps/gtranslator/inkscape.png
-share/pixmaps/gtranslator/kde.ico
-share/pixmaps/gtranslator/mandriva.png
-share/pixmaps/gtranslator/mozilla.png
-share/pixmaps/gtranslator/oo-logo.png
-share/pixmaps/gtranslator/open-tran.png
-share/pixmaps/gtranslator/suse.png
-share/pixmaps/gtranslator/xfce.png
-@dirrm share/pixmaps/gtranslator
 @dirrm share/omf/gtranslator
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/pixmaps
@@ -361,6 +364,8 @@ share/pixmaps/gtranslator/xfce.png
 @dirrm share/gnome/help/gtranslator/th
 @dirrm share/gnome/help/gtranslator/sl/figures
 @dirrm share/gnome/help/gtranslator/sl
+@dirrm share/gnome/help/gtranslator/ru/figures
+@dirrm share/gnome/help/gtranslator/ru
 @dirrm share/gnome/help/gtranslator/ja/figures
 @dirrm share/gnome/help/gtranslator/ja
 @dirrm share/gnome/help/gtranslator/gl/figures
@@ -388,4 +393,3 @@ share/pixmaps/gtranslator/xfce.png
 @dirrm lib/gtranslator
 @dirrm include/gtranslator-3.0/gtranslator
 @dirrm include/gtranslator-3.0
-@comment locales .. fooooo