sysutils/catfish: Update to 1.4.6

- Also update WWW now that catfish is part of the Xfce project
- Set maintainer to xfce@ now that catfish is part of the Xfce project

Changes this release:
  https://mail.xfce.org/pipermail/xfce-announce/2018-July/000626.html

PR:		229850
Approved by:	jpaetzel (maintainer)

4 files changed, 38 insertions, 21 deletions

diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile
index 1615b77674bb..63da9c907917 100644
--- a/sysutils/catfish/Makefile
+++ b/sysutils/catfish/Makefile
@@ -2,11 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	catfish
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.6
 CATEGORIES=	sysutils
-MASTER_SITES=	http://launchpad.net/catfish-search/1.4/1.4.1/+download/
+MASTER_SITES=	XFCE/src/apps/${PORTNAME:tl}/${PORTVERSION:R}
+DIST_SUBDIR=	xfce4
 
-MAINTAINER=	jpaetzel@FreeBSD.org
+MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	GTK search utility
 
 LICENSE=	GPLv3
@@ -17,10 +18,16 @@ RUN_DEPENDS=	\
 	gksu:sysutils/gksu
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
-USES=		python:2.7
+USES=		desktop-file-utils python:2.7 tar:bz2
 USE_PYTHON=	distutils
 USE_GNOME=	gtk30 intltool pygobject3
 
+OPTIONS_DEFINE=	ZEITGEIST
+OPTIONS_DEFAULT=ZEITGEIST
+
+ZEITGEIST_DESC=	Provide recent search suggestions
+ZEITGEIST_LIB_DEPENDS=	libzeitgeist-2.0.so:sysutils/zeitgeist
+
 .include <bsd.port.pre.mk>
 
 PYDISTUTILS_INSTALLARGS=	-c -O1 --prefix=${PREFIX} --root=${STAGEDIR}
diff --git a/sysutils/catfish/distinfo b/sysutils/catfish/distinfo
index 606c71d32fe4..9d11a34d246c 100644
--- a/sysutils/catfish/distinfo
+++ b/sysutils/catfish/distinfo
@@ -1,2 +1,3 @@
-SHA256 (catfish-1.4.1.tar.gz) = f804a1f499a9bc108cf8b2e7a39e3684dbe54711c2bdb7b4702cc957ce059896
-SIZE (catfish-1.4.1.tar.gz) = 135767
+TIMESTAMP = 1531868955
+SHA256 (xfce4/catfish-1.4.6.tar.bz2) = e1caee14c5268ac781434701c0eb26eddfced2c0f1ae066549583ed05f99adbf
+SIZE (xfce4/catfish-1.4.6.tar.bz2) = 150331
diff --git a/sysutils/catfish/pkg-descr b/sysutils/catfish/pkg-descr
index 9affa2a2bfa7..5a18201b07c2 100644
--- a/sysutils/catfish/pkg-descr
+++ b/sysutils/catfish/pkg-descr
@@ -1,3 +1,3 @@
 Catfish is a GTK based search utility.
 
-WWW: http://www.twotoasts.de/index.php/catfish/
+WWW: https://docs.xfce.org/apps/catfish/start
diff --git a/sysutils/catfish/pkg-plist b/sysutils/catfish/pkg-plist
index 5d5e74c3d2de..6298df5c181f 100644
--- a/sysutils/catfish/pkg-plist
+++ b/sysutils/catfish/pkg-plist
@@ -1,54 +1,57 @@
 bin/catfish
 %%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.py
 %%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.pyc
-%%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.pyo
+%%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.py
 %%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.pyc
-%%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.pyo
+%%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/catfish/CatfishWindow.py
 %%PYTHON_SITELIBDIR%%/catfish/CatfishWindow.pyc
-%%PYTHON_SITELIBDIR%%/catfish/CatfishWindow.pyo
+%%PYTHON_SITELIBDIR%%/catfish/CatfishWindow.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/catfish/__init__.py
 %%PYTHON_SITELIBDIR%%/catfish/__init__.pyc
-%%PYTHON_SITELIBDIR%%/catfish/__init__.pyo
+%%PYTHON_SITELIBDIR%%/catfish/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/catfish_lib/AboutDialog.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/AboutDialog.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/AboutDialog.pyo
+%%PYTHON_SITELIBDIR%%/catfish_lib/AboutDialog.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/catfish_lib/Builder.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/Builder.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/Builder.pyo
+%%PYTHON_SITELIBDIR%%/catfish_lib/Builder.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.pyo
+%%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.pyo
+%%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/catfish_lib/Thumbnailer.py
+%%PYTHON_SITELIBDIR%%/catfish_lib/Thumbnailer.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/Thumbnailer.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/catfish_lib/Window.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/Window.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/Window.pyo
+%%PYTHON_SITELIBDIR%%/catfish_lib/Window.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/catfish_lib/__init__.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/catfish_lib/__init__.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/catfish_lib/catfishconfig.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/catfishconfig.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/catfishconfig.pyo
+%%PYTHON_SITELIBDIR%%/catfish_lib/catfishconfig.%%PYTHON_PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/catfish_lib/helpers.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/helpers.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/helpers.pyo
-share/appdata/catfish.appdata.xml
+%%PYTHON_SITELIBDIR%%/catfish_lib/helpers.%%PYTHON_PYOEXTENSION%%
 share/applications/catfish.desktop
-%%DATADIR%%/appdata/catfish.appdata.xml.in
 %%DATADIR%%/ui/AboutCatfishDialog.ui
 %%DATADIR%%/ui/CatfishWindow.ui
 %%DATADIR%%/ui/about_catfish_dialog.xml
 %%DATADIR%%/ui/catfish_window.xml
 %%PORTDOCS%%%%DOCSDIR%%/README
 share/icons/hicolor/scalable/apps/catfish.svg
+share/locale/af/LC_MESSAGES/catfish.mo
 share/locale/ar/LC_MESSAGES/catfish.mo
 share/locale/be/LC_MESSAGES/catfish.mo
 share/locale/bg/LC_MESSAGES/catfish.mo
 share/locale/ca/LC_MESSAGES/catfish.mo
 share/locale/cs/LC_MESSAGES/catfish.mo
+share/locale/da/LC_MESSAGES/catfish.mo
 share/locale/de/LC_MESSAGES/catfish.mo
 share/locale/el/LC_MESSAGES/catfish.mo
 share/locale/en_AU/LC_MESSAGES/catfish.mo
@@ -57,6 +60,8 @@ share/locale/es/LC_MESSAGES/catfish.mo
 share/locale/eu/LC_MESSAGES/catfish.mo
 share/locale/fi/LC_MESSAGES/catfish.mo
 share/locale/fr/LC_MESSAGES/catfish.mo
+share/locale/gl/LC_MESSAGES/catfish.mo
+share/locale/he/LC_MESSAGES/catfish.mo
 share/locale/hr/LC_MESSAGES/catfish.mo
 share/locale/hu/LC_MESSAGES/catfish.mo
 share/locale/id/LC_MESSAGES/catfish.mo
@@ -64,9 +69,11 @@ share/locale/is/LC_MESSAGES/catfish.mo
 share/locale/it/LC_MESSAGES/catfish.mo
 share/locale/ja/LC_MESSAGES/catfish.mo
 share/locale/ko/LC_MESSAGES/catfish.mo
+share/locale/ku/LC_MESSAGES/catfish.mo
 share/locale/lt/LC_MESSAGES/catfish.mo
 share/locale/lv/LC_MESSAGES/catfish.mo
 share/locale/ml/LC_MESSAGES/catfish.mo
+share/locale/nb/LC_MESSAGES/catfish.mo
 share/locale/nl/LC_MESSAGES/catfish.mo
 share/locale/pl/LC_MESSAGES/catfish.mo
 share/locale/pt/LC_MESSAGES/catfish.mo
@@ -74,6 +81,7 @@ share/locale/pt_BR/LC_MESSAGES/catfish.mo
 share/locale/ru/LC_MESSAGES/catfish.mo
 share/locale/si/LC_MESSAGES/catfish.mo
 share/locale/sk/LC_MESSAGES/catfish.mo
+share/locale/sq/LC_MESSAGES/catfish.mo
 share/locale/sr/LC_MESSAGES/catfish.mo
 share/locale/sv/LC_MESSAGES/catfish.mo
 share/locale/tr/LC_MESSAGES/catfish.mo
@@ -81,3 +89,4 @@ share/locale/uk/LC_MESSAGES/catfish.mo
 share/locale/zh_CN/LC_MESSAGES/catfish.mo
 share/locale/zh_TW/LC_MESSAGES/catfish.mo
 share/man/man1/catfish.1
+share/metainfo/catfish.appdata.xml