- Update catfish to 1.4.13

- Migrate to python3
- Avoid errors due to testing usupported locate command line options

4 files changed, 73 insertions, 33 deletions

diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile
index fb76e28d41a2..d0082b0221f1 100644
--- a/sysutils/catfish/Makefile
+++ b/sysutils/catfish/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	catfish
-PORTVERSION=	1.4.12
+PORTVERSION=	1.4.13
 CATEGORIES=	sysutils
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
@@ -14,10 +14,13 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	\
 	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${PY_FLAVOR} \
+	${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
+	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
+BUILD_DEPENDS=	\
+	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}
-BUILD_DEPENDS=	${RUN_DEPENDS}
 
-USES=		desktop-file-utils gettext-tools gnome python:2.7 tar:bz2
+USES=		desktop-file-utils gettext-tools gnome python:3.4+ tar:bz2
 USE_PYTHON=	distutils
 USE_GNOME=	gtk30 intltool pygobject3
 
diff --git a/sysutils/catfish/distinfo b/sysutils/catfish/distinfo
index 87578726d5c3..70b33fa90d17 100644
--- a/sysutils/catfish/distinfo
+++ b/sysutils/catfish/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577906751
-SHA256 (xfce4/catfish-1.4.12.tar.bz2) = c3fb30e02b217752aa493b49769be1a5fc2adde70b22aef381e6c67d5227134a
-SIZE (xfce4/catfish-1.4.12.tar.bz2) = 221813
+TIMESTAMP = 1579077633
+SHA256 (xfce4/catfish-1.4.13.tar.bz2) = 58c0ea06e5f286019295545fbfd1dbca23aea74c625762bbb4c89a6f484ae839
+SIZE (xfce4/catfish-1.4.13.tar.bz2) = 221999
diff --git a/sysutils/catfish/files/patch-catfish_CatfishSearchEngine.py b/sysutils/catfish/files/patch-catfish_CatfishSearchEngine.py
new file mode 100644
index 000000000000..cfd4562a1ca8
--- /dev/null
+++ b/sysutils/catfish/files/patch-catfish_CatfishSearchEngine.py
@@ -0,0 +1,37 @@
+--- catfish/CatfishSearchEngine.py.orig	2020-01-15 01:49:54 UTC
++++ catfish/CatfishSearchEngine.py
+@@ -24,6 +24,7 @@ import logging
+ 
+ import io
+ import os
++import platform
+ import re
+ import signal
+ import subprocess
+@@ -649,16 +650,17 @@ class CatfishSearchMethod_Locate(CatfishSearchMethodEx
+             "existing": False,
+             "regex": False
+         }
+-        try:
+-            details = subprocess.check_output(["locate", "--help"])
+-            details = details.decode("utf-8")
+-            if "--existing" in details:
+-                caps["existing"] = True
+-            if "--regex" in details or "--regexp" in details:
+-                caps["regex"] = True
++        if platform.system() != 'FreeBSD':
++            try:
++                details = subprocess.check_output(["locate", "--help"])
++                details = details.decode("utf-8")
++                if "--existing" in details:
++                    caps["existing"] = True
++                if "--regex" in details or "--regexp" in details:
++                    caps["regex"] = True
+ 
+-        except subprocess.CalledProcessError:
+-            pass
++            except subprocess.CalledProcessError:
++                pass
+         return caps
+ 
+     def assemble_query(self, keywords, path):
diff --git a/sysutils/catfish/pkg-plist b/sysutils/catfish/pkg-plist
index 8ed62369e32f..d62f637e665f 100644
--- a/sysutils/catfish/pkg-plist
+++ b/sysutils/catfish/pkg-plist
@@ -1,44 +1,44 @@
 bin/catfish
 man/man1/catfish.1.gz
 %%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.py
-%%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.pyc
-%%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.pyo
 %%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.py
-%%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.pyc
-%%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.pyo
 %%PYTHON_SITELIBDIR%%/catfish/CatfishWindow.py
-%%PYTHON_SITELIBDIR%%/catfish/CatfishWindow.pyc
-%%PYTHON_SITELIBDIR%%/catfish/CatfishWindow.pyo
 %%PYTHON_SITELIBDIR%%/catfish/__init__.py
-%%PYTHON_SITELIBDIR%%/catfish/__init__.pyc
-%%PYTHON_SITELIBDIR%%/catfish/__init__.pyo
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishPrefsDialog.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishPrefsDialog.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishSearchEngine.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishSearchEngine.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishWindow.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishWindow.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/__init__.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/__init__.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__init__.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/Builder.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/Builder.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/Builder.pyo
 %%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.pyo
 %%PYTHON_SITELIBDIR%%/catfish_lib/PrefsDialog.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/PrefsDialog.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/PrefsDialog.pyo
 %%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.pyo
 %%PYTHON_SITELIBDIR%%/catfish_lib/Thumbnailer.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/Thumbnailer.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/Thumbnailer.pyo
 %%PYTHON_SITELIBDIR%%/catfish_lib/Window.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/Window.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/Window.pyo
-%%PYTHON_SITELIBDIR%%/catfish_lib/__init__.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Builder.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Builder.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/CatfishSettings.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/CatfishSettings.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/PrefsDialog.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/PrefsDialog.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/SudoDialog.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/SudoDialog.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Thumbnailer.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Thumbnailer.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Window.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Window.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/__init__.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/__init__.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/catfishconfig.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/catfishconfig.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/helpers.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/helpers.cpython-37.pyc
 %%PYTHON_SITELIBDIR%%/catfish_lib/catfishconfig.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/catfishconfig.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/catfishconfig.pyo
 %%PYTHON_SITELIBDIR%%/catfish_lib/helpers.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/helpers.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/helpers.pyo
 share/applications/org.xfce.Catfish.desktop
 %%DATADIR%%/ui/CatfishPreferences.ui
 %%DATADIR%%/ui/CatfishWindow.ui