Update to 3.6.0.

Submitted by:	Gustau Perez


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

3 files changed, 90 insertions, 110 deletions

diff --git a/deskutils/gnome-search-tool/Makefile b/deskutils/gnome-search-tool/Makefile
index e0353be62..e5030bce8 100644
--- a/deskutils/gnome-search-tool/Makefile
+++ b/deskutils/gnome-search-tool/Makefile
@@ -1,9 +1,9 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/deskutils/gnome-search-tool/Makefile 17268 2013-04-01 05:13:11Z marcus $
+#   $MCom$
 
 PORTNAME=	gnome-search-tool
-PORTVERSION=	3.4.0
+PORTVERSION=	3.6.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -11,20 +11,21 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 file search utilities
 
+BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+
 CONFLICTS=	gnome-utils-2.[0-9]*
 
 USE_XZ=		yes
 USES=		gettext pathfix pkgconfig
-INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomedocutils
+USE_GNOME=	gnomeprefix gtk30 intlhack
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gnome-search-tool.1
-GCONF_SCHEMAS=	gnome-search-tool.schemas
+GLIB_SCHEMAS=	org.gnome.gnome-search-tool.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-search-tool/distinfo b/deskutils/gnome-search-tool/distinfo
index f65697ad2..48a05eeb4 100644
--- a/deskutils/gnome-search-tool/distinfo
+++ b/deskutils/gnome-search-tool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-search-tool-3.4.0.tar.xz) = 6c4ed39ab1196d118e5e0d2a7faa07fbbb257831454ee92ff0c6f28c0942e69c
-SIZE (gnome3/gnome-search-tool-3.4.0.tar.xz) = 902664
+SHA256 (gnome3/gnome-search-tool-3.6.0.tar.xz) = a33000cd7d033be4ea50422f0f2cca611da5b79bd0f0875017f105a1bc177f42
+SIZE (gnome3/gnome-search-tool-3.6.0.tar.xz) = 685172
diff --git a/deskutils/gnome-search-tool/pkg-plist b/deskutils/gnome-search-tool/pkg-plist
index 617b39110..78ca5b515 100644
--- a/deskutils/gnome-search-tool/pkg-plist
+++ b/deskutils/gnome-search-tool/pkg-plist
@@ -1,46 +1,46 @@
 bin/gnome-search-tool
+share/GConf/gsettings/gnome-search-tool.convert
 share/applications/gnome-search-tool.desktop
-share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/C/legal.xml
-share/gnome/help/gnome-search-tool/ca/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/ca/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/cs/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/cs/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/de/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/de/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/el/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/el/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/en_GB/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/en_GB/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/eu/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/eu/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/fi/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/fi/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/fr/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/fr/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/it/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/it/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/ja/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/ja/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/ko/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/ko/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/oc/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/oc/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/ru/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/ru/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/sl/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/sl/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/sv/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/sv/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/te/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/te/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/uk/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/uk/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/zh_CN/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/zh_CN/gnome-search-tool.xml
+share/help/C/gnome-search-tool/index.docbook
+share/help/C/gnome-search-tool/legal.xml
+share/help/ca/gnome-search-tool/index.docbook
+share/help/ca/gnome-search-tool/legal.xml
+share/help/cs/gnome-search-tool/index.docbook
+share/help/cs/gnome-search-tool/legal.xml
+share/help/de/gnome-search-tool/index.docbook
+share/help/de/gnome-search-tool/legal.xml
+share/help/el/gnome-search-tool/index.docbook
+share/help/el/gnome-search-tool/legal.xml
+share/help/en_GB/gnome-search-tool/index.docbook
+share/help/en_GB/gnome-search-tool/legal.xml
+share/help/es/gnome-search-tool/index.docbook
+share/help/es/gnome-search-tool/legal.xml
+share/help/eu/gnome-search-tool/index.docbook
+share/help/eu/gnome-search-tool/legal.xml
+share/help/fi/gnome-search-tool/index.docbook
+share/help/fi/gnome-search-tool/legal.xml
+share/help/fr/gnome-search-tool/index.docbook
+share/help/fr/gnome-search-tool/legal.xml
+share/help/it/gnome-search-tool/index.docbook
+share/help/it/gnome-search-tool/legal.xml
+share/help/ja/gnome-search-tool/index.docbook
+share/help/ja/gnome-search-tool/legal.xml
+share/help/ko/gnome-search-tool/index.docbook
+share/help/ko/gnome-search-tool/legal.xml
+share/help/oc/gnome-search-tool/index.docbook
+share/help/oc/gnome-search-tool/legal.xml
+share/help/ru/gnome-search-tool/index.docbook
+share/help/ru/gnome-search-tool/legal.xml
+share/help/sl/gnome-search-tool/index.docbook
+share/help/sl/gnome-search-tool/legal.xml
+share/help/sv/gnome-search-tool/index.docbook
+share/help/sv/gnome-search-tool/legal.xml
+share/help/te/gnome-search-tool/index.docbook
+share/help/te/gnome-search-tool/legal.xml
+share/help/uk/gnome-search-tool/index.docbook
+share/help/uk/gnome-search-tool/legal.xml
+share/help/zh_CN/gnome-search-tool/index.docbook
+share/help/zh_CN/gnome-search-tool/legal.xml
 share/locale/af/LC_MESSAGES/gnome-search-tool.mo
 share/locale/am/LC_MESSAGES/gnome-search-tool.mo
 share/locale/ar/LC_MESSAGES/gnome-search-tool.mo
@@ -130,29 +130,8 @@ share/locale/xh/LC_MESSAGES/gnome-search-tool.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-search-tool.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-search-tool.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-search-tool.mo
-share/omf/gnome-search-tool/gnome-search-tool-C.omf
-share/omf/gnome-search-tool/gnome-search-tool-ca.omf
-share/omf/gnome-search-tool/gnome-search-tool-cs.omf
-share/omf/gnome-search-tool/gnome-search-tool-de.omf
-share/omf/gnome-search-tool/gnome-search-tool-el.omf
-share/omf/gnome-search-tool/gnome-search-tool-en_GB.omf
-share/omf/gnome-search-tool/gnome-search-tool-es.omf
-share/omf/gnome-search-tool/gnome-search-tool-eu.omf
-share/omf/gnome-search-tool/gnome-search-tool-fi.omf
-share/omf/gnome-search-tool/gnome-search-tool-fr.omf
-share/omf/gnome-search-tool/gnome-search-tool-it.omf
-share/omf/gnome-search-tool/gnome-search-tool-ja.omf
-share/omf/gnome-search-tool/gnome-search-tool-ko.omf
-share/omf/gnome-search-tool/gnome-search-tool-oc.omf
-share/omf/gnome-search-tool/gnome-search-tool-ru.omf
-share/omf/gnome-search-tool/gnome-search-tool-sl.omf
-share/omf/gnome-search-tool/gnome-search-tool-sv.omf
-share/omf/gnome-search-tool/gnome-search-tool-te.omf
-share/omf/gnome-search-tool/gnome-search-tool-uk.omf
-share/omf/gnome-search-tool/gnome-search-tool-zh_CN.omf
 share/pixmaps/gsearchtool/thumbnail_frame.png
 @dirrm share/pixmaps/gsearchtool
-@dirrm share/omf/gnome-search-tool
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -195,45 +174,45 @@ share/pixmaps/gsearchtool/thumbnail_frame.png
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrm share/gnome/help/gnome-search-tool/zh_CN/figures
-@dirrm share/gnome/help/gnome-search-tool/zh_CN
-@dirrm share/gnome/help/gnome-search-tool/uk/figures
-@dirrm share/gnome/help/gnome-search-tool/uk
-@dirrm share/gnome/help/gnome-search-tool/te/figures
-@dirrm share/gnome/help/gnome-search-tool/te
-@dirrm share/gnome/help/gnome-search-tool/sv/figures
-@dirrm share/gnome/help/gnome-search-tool/sv
-@dirrm share/gnome/help/gnome-search-tool/sl/figures
-@dirrm share/gnome/help/gnome-search-tool/sl
-@dirrm share/gnome/help/gnome-search-tool/ru/figures
-@dirrm share/gnome/help/gnome-search-tool/ru
-@dirrm share/gnome/help/gnome-search-tool/oc/figures
-@dirrm share/gnome/help/gnome-search-tool/oc
-@dirrm share/gnome/help/gnome-search-tool/ko/figures
-@dirrm share/gnome/help/gnome-search-tool/ko
-@dirrm share/gnome/help/gnome-search-tool/ja/figures
-@dirrm share/gnome/help/gnome-search-tool/ja
-@dirrm share/gnome/help/gnome-search-tool/it/figures
-@dirrm share/gnome/help/gnome-search-tool/it
-@dirrm share/gnome/help/gnome-search-tool/fr/figures
-@dirrm share/gnome/help/gnome-search-tool/fr
-@dirrm share/gnome/help/gnome-search-tool/fi/figures
-@dirrm share/gnome/help/gnome-search-tool/fi
-@dirrm share/gnome/help/gnome-search-tool/eu/figures
-@dirrm share/gnome/help/gnome-search-tool/eu
-@dirrm share/gnome/help/gnome-search-tool/es/figures
-@dirrm share/gnome/help/gnome-search-tool/es
-@dirrm share/gnome/help/gnome-search-tool/en_GB/figures
-@dirrm share/gnome/help/gnome-search-tool/en_GB
-@dirrm share/gnome/help/gnome-search-tool/el/figures
-@dirrm share/gnome/help/gnome-search-tool/el
-@dirrm share/gnome/help/gnome-search-tool/de/figures
-@dirrm share/gnome/help/gnome-search-tool/de
-@dirrm share/gnome/help/gnome-search-tool/cs/figures
-@dirrm share/gnome/help/gnome-search-tool/cs
-@dirrm share/gnome/help/gnome-search-tool/ca/figures
-@dirrm share/gnome/help/gnome-search-tool/ca
-@dirrm share/gnome/help/gnome-search-tool/C/figures
-@dirrm share/gnome/help/gnome-search-tool/C
-@dirrm share/gnome/help/gnome-search-tool
+@dirrm share/help/zh_CN/gnome-search-tool
+@dirrmtry share/help/zh_CN
+@dirrm share/help/uk/gnome-search-tool
+@dirrmtry share/help/uk
+@dirrm share/help/te/gnome-search-tool
+@dirrmtry share/help/te
+@dirrm share/help/sv/gnome-search-tool
+@dirrmtry share/help/sv
+@dirrm share/help/sl/gnome-search-tool
+@dirrmtry share/help/sl
+@dirrm share/help/ru/gnome-search-tool
+@dirrmtry share/help/ru
+@dirrm share/help/oc/gnome-search-tool
+@dirrmtry share/help/oc
+@dirrm share/help/ko/gnome-search-tool
+@dirrmtry share/help/ko
+@dirrm share/help/ja/gnome-search-tool
+@dirrmtry share/help/ja
+@dirrm share/help/it/gnome-search-tool
+@dirrmtry share/help/it
+@dirrm share/help/fr/gnome-search-tool
+@dirrmtry share/help/fr
+@dirrm share/help/fi/gnome-search-tool
+@dirrmtry share/help/fi
+@dirrm share/help/eu/gnome-search-tool
+@dirrmtry share/help/eu
+@dirrm share/help/es/gnome-search-tool
+@dirrmtry share/help/es
+@dirrm share/help/en_GB/gnome-search-tool
+@dirrmtry share/help/en_GB
+@dirrm share/help/el/gnome-search-tool
+@dirrmtry share/help/el
+@dirrm share/help/de/gnome-search-tool
+@dirrmtry share/help/de
+@dirrm share/help/cs/gnome-search-tool
+@dirrmtry share/help/cs
+@dirrm share/help/ca/gnome-search-tool
+@dirrmtry share/help/ca
+@dirrm share/help/C/gnome-search-tool
+@dirrmtry share/help/C
+@dirrmtry share/help
 @dirrmtry share/applications