git: 1a58d5d40fc0 - main - sysutils/catfish: Fix build

The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1a58d5d40fc0624b46cf311324326f26c6d52c6e

commit 1a58d5d40fc0624b46cf311324326f26c6d52c6e
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2024-12-29 10:24:24 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2024-12-29 10:24:24 +0000

    sysutils/catfish: Fix build
    
    - Correct botched update
    - Add missing dependencies
    - Cleanup Makefile
    
    Reported by:    pkg-fallout
---
 sysutils/catfish/Makefile  | 22 +++++++++++++---------
 sysutils/catfish/pkg-plist | 32 ++++----------------------------
 2 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile
index 178b1ba2a271..e157aac7e252 100644
--- a/sysutils/catfish/Makefile
+++ b/sysutils/catfish/Makefile
@@ -10,23 +10,27 @@ WWW=		https://www.bluesabre.org/projects/catfish/
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
 		pdftotext:graphics/poppler-utils
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}
-
-USES=		cpe desktop-file-utils gettext-tools gnome meson python tar:bz2
-USE_GNOME=	gtk30 pygobject3
 
+USES=		cpe desktop-file-utils gettext-tools gnome meson pkgconfig \
+		python shebangfix tar:bz2 xfce
 CPE_VENDOR=	catfish_project
+USE_GNOME=	gdkpixbuf2 gtk30 pygobject3
+USE_XFCE=	xfconf
+BINARY_ALIAS=	python3=${PYTHON_CMD}
+SHEBANG_FILES=	bin/catfish
 
 NO_ARCH=	yes
 
 PORTSCOUT=	limitw:1,even
 
-OPTIONS_DEFINE=	DOCS ZEITGEIST
-OPTIONS_DEFAULT=POLKIT
-OPTIONS_MULTI=	PRIVILEGES
+OPTIONS_DEFINE=			DOCS ZEITGEIST
+OPTIONS_DEFAULT=		POLKIT
+OPTIONS_MULTI=			PRIVILEGES
 OPTIONS_MULTI_PRIVILEGES=	POLKIT SUDO
 
 POLKIT_DESC=	Provide Polkit (pkexec) support
diff --git a/sysutils/catfish/pkg-plist b/sysutils/catfish/pkg-plist
index 090d85e955bb..39259b5bbb33 100644
--- a/sysutils/catfish/pkg-plist
+++ b/sysutils/catfish/pkg-plist
@@ -4,14 +4,6 @@ share/man/man1/catfish.1.gz
 %%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.py
 %%PYTHON_SITELIBDIR%%/catfish/CatfishWindow.py
 %%PYTHON_SITELIBDIR%%/catfish/__init__.py
-%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishPrefsDialog.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishPrefsDialog.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishSearchEngine.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishSearchEngine.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishWindow.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishWindow.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/catfish/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/catfish/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/catfish_lib/__init__.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/Builder.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.py
@@ -20,27 +12,8 @@ share/man/man1/catfish.1.gz
 %%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/Thumbnailer.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/Window.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Builder.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Builder.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/CatfishSettings.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/CatfishSettings.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/FiletypeLists%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/FiletypeLists%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/PrefsDialog.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/PrefsDialog.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/SudoDialog.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/SudoDialog.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Thumbnailer.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Thumbnailer.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Window.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Window.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/catfishconfig.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/catfishconfig.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/catfish_lib/catfishconfig.py
+%%PYTHON_SITELIBDIR%%/catfish_lib/defs.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/helpers.py
 share/applications/org.xfce.Catfish.desktop
 %%DATADIR%%/ui/CatfishPreferences.ui
@@ -56,6 +29,9 @@ share/icons/hicolor/16x16/apps/org.xfce.catfish.svg
 share/icons/hicolor/48x48/apps/org.xfce.catfish.png
 share/icons/hicolor/48x48/apps/org.xfce.catfish.svg
 share/icons/hicolor/scalable/apps/org.xfce.catfish.svg
+share/locale/ast/LC_MESSAGES/catfish.mo
+share/locale/oc/LC_MESSAGES/catfish.mo
+share/locale/ro/LC_MESSAGES/catfish.mo
 share/locale/af/LC_MESSAGES/catfish.mo
 share/locale/ar/LC_MESSAGES/catfish.mo
 share/locale/be/LC_MESSAGES/catfish.mo