svn commit: r511977 - in head/sysutils/catfish: . files
Guido Falsi
madpilot at FreeBSD.org
Fri Sep 13 15:46:28 UTC 2019
Author: madpilot
Date: Fri Sep 13 15:46:26 2019
New Revision: 511977
URL: https://svnweb.freebsd.org/changeset/ports/511977
Log:
- Update catfish to 1.4.10
- Upstream removed gksu support, escalation now provided by polkit
and/or sudo
- Install man page in correct location and compress it
- Silence some portlint warnings
Extra pathces provided by Olivier Duchateau <duchateau.olivier at gmail.com>
Added:
head/sysutils/catfish/files/
head/sysutils/catfish/files/patch-catfish_CatfishWindow.py (contents, props changed)
head/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py (contents, props changed)
head/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py (contents, props changed)
Modified:
head/sysutils/catfish/Makefile
head/sysutils/catfish/distinfo
head/sysutils/catfish/pkg-plist
Modified: head/sysutils/catfish/Makefile
==============================================================================
--- head/sysutils/catfish/Makefile Fri Sep 13 15:35:29 2019 (r511976)
+++ head/sysutils/catfish/Makefile Fri Sep 13 15:46:26 2019 (r511977)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= catfish
-PORTVERSION= 1.4.8
+PORTVERSION= 1.4.10
CATEGORIES= sysutils
MASTER_SITES= XFCE/apps
DIST_SUBDIR= xfce4
@@ -14,20 +14,34 @@ 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 <bsd.port.pre.mk>
Modified: head/sysutils/catfish/distinfo
==============================================================================
--- head/sysutils/catfish/distinfo Fri Sep 13 15:35:29 2019 (r511976)
+++ head/sysutils/catfish/distinfo Fri Sep 13 15:46:26 2019 (r511977)
@@ -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
Added: head/sysutils/catfish/files/patch-catfish_CatfishWindow.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/catfish/files/patch-catfish_CatfishWindow.py Fri Sep 13 15:46:26 2019 (r511977)
@@ -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.*")
Added: head/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py Fri Sep 13 15:46:26 2019 (r511977)
@@ -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])
Added: head/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py Fri Sep 13 15:46:26 2019 (r511977)
@@ -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 <https://www.gnu.org/licenses/>.
+
+ 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'
+
Modified: head/sysutils/catfish/pkg-plist
==============================================================================
--- head/sysutils/catfish/pkg-plist Fri Sep 13 15:35:29 2019 (r511976)
+++ head/sysutils/catfish/pkg-plist Fri Sep 13 15:46:26 2019 (r511977)
@@ -1,7 +1,11 @@
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
@@ -20,6 +24,9 @@ bin/catfish
%%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
@@ -40,8 +47,12 @@ bin/catfish
%%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
@@ -93,5 +104,4 @@ 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
More information about the svn-ports-all
mailing list