Index: head/sysutils/catfish/Makefile =================================================================== --- head/sysutils/catfish/Makefile (revision 511976) +++ head/sysutils/catfish/Makefile (revision 511977) @@ -1,36 +1,50 @@ # Created by: jpaetzel@FreeBSD.org # $FreeBSD$ PORTNAME= catfish -PORTVERSION= 1.4.8 +PORTVERSION= 1.4.10 CATEGORIES= sysutils MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= GTK search utility 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} \ - gksu:sysutils/gksu + ${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 -NO_ARCH= yes USE_PYTHON= distutils USE_GNOME= gtk30 intltool pygobject3 +NO_ARCH= yes +INSTALLS_ICONS= yes + OPTIONS_DEFINE= DOCS ZEITGEIST -OPTIONS_DEFAULT=ZEITGEIST +OPTIONS_DEFAULT=ZEITGEIST POLKIT +OPTIONS_MULTI= PRIVILEGES +OPTIONS_MULTI_PRIVILEGES= POLKIT SUDO +POLKIT_DESC= Provide Polkit (pkexec) support +POLKIT_RUN_DEPENDS= pkexec:sysutils/polkit + +SUDO_DESC= Provide sudo support +SUDO_RUN_DEPENDS= sudo:security/sudo + ZEITGEIST_DESC= Provide recent search suggestions ZEITGEIST_LIB_DEPENDS= libzeitgeist-2.0.so:sysutils/zeitgeist + +post-install: + ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/catfish.1 ${STAGEDIR}${PREFIX}/man/man1/catfish.1 + (cd ${STAGEDIR}${PREFIX}/share && ${RMDIR} -p man/man1) + ${GZIP} ${STAGEDIR}${PREFIX}/man/man1/catfish.1 .include PYDISTUTILS_INSTALLARGS= -c -O1 --prefix=${PREFIX} --root=${STAGEDIR} .include Index: head/sysutils/catfish/distinfo =================================================================== --- head/sysutils/catfish/distinfo (revision 511976) +++ head/sysutils/catfish/distinfo (revision 511977) @@ -1,3 +1,3 @@ -TIMESTAMP = 1564305030 -SHA256 (xfce4/catfish-1.4.8.tar.bz2) = f3babed77a1059f1894c0ca1792887a6c9c77e76808923c1c6727d5ea59fd84c -SIZE (xfce4/catfish-1.4.8.tar.bz2) = 181027 +TIMESTAMP = 1568376958 +SHA256 (xfce4/catfish-1.4.10.tar.bz2) = 2573a004105031f871c92fed22a0c4b15bb96f2dff6e36c4f2959f56b62e343d +SIZE (xfce4/catfish-1.4.10.tar.bz2) = 213951 Index: head/sysutils/catfish/files/patch-catfish_CatfishWindow.py =================================================================== --- head/sysutils/catfish/files/patch-catfish_CatfishWindow.py (nonexistent) +++ head/sysutils/catfish/files/patch-catfish_CatfishWindow.py (revision 511977) @@ -0,0 +1,28 @@ +--- catfish/CatfishWindow.py.orig 2019-07-27 11:21:22 UTC ++++ catfish/CatfishWindow.py +@@ -22,6 +22,7 @@ import logging + import mimetypes + import os + import subprocess ++import sys + import time + from locale import gettext as _ + from shutil import copy2, rmtree +@@ -738,9 +739,15 @@ class CatfishWindow(Window): + self.update_index_unlock.set_sensitive(False) + + if SudoDialog.prefer_pkexec(): +- self.updatedb_process = SudoDialog.env_spawn('pkexec updatedb', 1) ++ if sys.platform.startswith('linux'): ++ self.updatedb_process = SudoDialog.env_spawn('pkexec updatedb', 1) ++ elif 'bsd' in sys.platform or sys.platform.startswith('dragonfly'): ++ self.updatedb_process = SudoDialog.env_spawn('pkexec /usr/libexec/locate.updatedb', 1) + else: +- self.updatedb_process = SudoDialog.env_spawn('sudo updatedb', 1) ++ if sys.platform.startswith('linux'): ++ self.updatedb_process = SudoDialog.env_spawn('sudo updatedb', 1) ++ elif 'bsd' in sys.platform or sys.platform.startswith('dragonfly'): ++ self.updatedb_process = SudoDialog.env_spawn('sudo /usr/libexec/locate.updatedb', 1) + try: + # Check for password prompt or program exit. + self.updatedb_process.expect(".*ssword.*") Property changes on: head/sysutils/catfish/files/patch-catfish_CatfishWindow.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py =================================================================== --- head/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py (nonexistent) +++ head/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py (revision 511977) @@ -0,0 +1,23 @@ +--- catfish_lib/SudoDialog.py.orig 2019-07-27 11:21:22 UTC ++++ catfish_lib/SudoDialog.py +@@ -18,6 +18,7 @@ + + from gi.repository import Gtk, GdkPixbuf + import os ++import sys + + from locale import gettext as _ + +@@ -316,7 +317,11 @@ class SudoDialog(Gtk.Dialog): + Return True if successful. + ''' + # Set the pexpect variables and spawn the process. +- child = env_spawn('sudo /bin/true', 1) ++ if sys.platform.startswith('linux'): ++ child = env_spawn('sudo /bin/true', 1) ++ elif 'bsd' in sys.platform or sys.platform.startswith('dragonfly'): ++ child = env_spawn('sudo /usr/bin/true', 1) ++ + try: + # Check for password prompt or program exit. + child.expect([".*ssword.*", pexpect.EOF]) Property changes on: head/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py =================================================================== --- head/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py (nonexistent) +++ head/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py (revision 511977) @@ -0,0 +1,22 @@ +--- catfish_lib/catfishconfig.py.orig 2019-08-11 17:51:09 UTC ++++ catfish_lib/catfishconfig.py +@@ -17,6 +17,7 @@ + # with this program. If not, see . + + import os ++import sys + + __all__ = [ + 'project_path_not_found', +@@ -29,7 +30,10 @@ __all__ = [ + # files). By default, this is ../data, relative your trunk layout + __catfish_data_directory__ = '../data/' + # Location of locate.db file +-__locate_db_path__ = '/var/lib/mlocate/mlocate.db' ++if sys.platform.startswith('linux'): ++ __locate_db_path__ = '/var/lib/mlocate/mlocate.db' ++elif 'bsd' in sys.platform or sys.platform.startswith('dragonfly'): ++ __locate_db_path__ = '/var/db/locate.database' + __license__ = 'GPL-3+' + __version__ = '1.4.9' + Property changes on: head/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/catfish/pkg-plist =================================================================== --- head/sysutils/catfish/pkg-plist (revision 511976) +++ head/sysutils/catfish/pkg-plist (revision 511977) @@ -1,97 +1,107 @@ bin/catfish +man/man1/catfish.1.gz %%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.py %%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.pyc %%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.pyo +%%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_lib/AboutDialog.py %%PYTHON_SITELIBDIR%%/catfish_lib/AboutDialog.pyc %%PYTHON_SITELIBDIR%%/catfish_lib/AboutDialog.pyo %%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/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/AboutCatfishDialog.ui +%%DATADIR%%/ui/CatfishPreferences.ui %%DATADIR%%/ui/CatfishWindow.ui %%DATADIR%%/ui/about_catfish_dialog.xml +%%DATADIR%%/ui/catfish-wl-headerbar.png +%%DATADIR%%/ui/catfish-wl-titlebar.png +%%DATADIR%%/ui/catfish_preferences.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 share/locale/eo/LC_MESSAGES/catfish.mo 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/hy_AM/LC_MESSAGES/catfish.mo share/locale/id/LC_MESSAGES/catfish.mo share/locale/ie/LC_MESSAGES/catfish.mo 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/ms/LC_MESSAGES/catfish.mo share/locale/nb/LC_MESSAGES/catfish.mo share/locale/nl/LC_MESSAGES/catfish.mo share/locale/nn/LC_MESSAGES/catfish.mo share/locale/pl/LC_MESSAGES/catfish.mo share/locale/pt/LC_MESSAGES/catfish.mo 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/th/LC_MESSAGES/catfish.mo share/locale/tr/LC_MESSAGES/catfish.mo 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