From 117bcb7aa3c48819e0769e32dcbb898172cab03e Mon Sep 17 00:00:00 2001 From: landry Date: Sat, 4 Apr 2015 16:01:22 +0000 Subject: [PATCH] Update to catfish 1.2.2. Note that the locate method leaves zombies processes behind, to be investigated. --- textproc/catfish/Makefile | 20 +++---- textproc/catfish/distinfo | 4 +- textproc/catfish/patches/patch-Makefile_in | 41 --------------- textproc/catfish/patches/patch-Makefile_in_in | 12 +++++ .../catfish/patches/patch-bin_catfish_in_in | 9 ++++ .../patch-catfish_CatfishSearchEngine_py | 15 ++++++ textproc/catfish/patches/patch-catfish_in | 21 -------- textproc/catfish/pkg/PLIST | 52 +++++++++++++++++-- 8 files changed, 95 insertions(+), 79 deletions(-) delete mode 100644 textproc/catfish/patches/patch-Makefile_in create mode 100644 textproc/catfish/patches/patch-Makefile_in_in create mode 100644 textproc/catfish/patches/patch-bin_catfish_in_in create mode 100644 textproc/catfish/patches/patch-catfish_CatfishSearchEngine_py delete mode 100644 textproc/catfish/patches/patch-catfish_in diff --git a/textproc/catfish/Makefile b/textproc/catfish/Makefile index fe35e8197b5..1151412cdac 100644 --- a/textproc/catfish/Makefile +++ b/textproc/catfish/Makefile @@ -1,37 +1,33 @@ -# $OpenBSD: Makefile,v 1.19 2015/04/04 09:21:04 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.20 2015/04/04 16:01:22 landry Exp $ COMMENT = versatile file searching tool -DISTNAME = catfish-search-0.4.0.1 -PKGNAME = ${DISTNAME:S/-search//} +DISTNAME = catfish-1.2.2 CATEGORIES = textproc EXTRACT_SUFX = .tar.bz2 -REVISION = 6 - -HOMEPAGE = http://www.twotoasts.de/index.php?/pages/catfish_summary.html MAINTAINER = Landry Breuil +HOMEPAGE = http://smdavis.us/projects/catfish/ + # GPLv2 PERMIT_PACKAGE_CDROM= Yes -MASTER_SITES = https://launchpad.net/catfish-search/0.4/0.4.0.1/+download/ +MASTER_SITES = https://launchpad.net/catfish-search/1.2/1.2.2/+download/ MODULES= lang/python -CONFIGURE_STYLE=none +CONFIGURE_STYLE=simple +CONFIGURE_ARGS=--python=${MODPY_BIN} USE_GMAKE= Yes RUN_DEPENDS = devel/py-gobject3 \ x11/dbus-python \ devel/desktop-file-utils \ devel/py-xdg \ + devel/py-pexpect \ x11/gtk+3,-guic # pygobject GTK3 introspection (not provided by indirect dependencies) RUN_DEPENDS += x11/gtk+3 -pre-configure: - cd ${WRKSRC} && ${SUBST_CMD} -c Makefile.in Makefile - cd ${WRKSRC} && ${SUBST_CMD} -c catfish.in catfish - .include diff --git a/textproc/catfish/distinfo b/textproc/catfish/distinfo index de9c2a38c22..56a3a52fa40 100644 --- a/textproc/catfish/distinfo +++ b/textproc/catfish/distinfo @@ -1,2 +1,2 @@ -SHA256 (catfish-search-0.4.0.1.tar.bz2) = hsB1thEeCANLLe4fPHf+43Z2z3Z2xIA7JY/4P7M8Cvo= -SIZE (catfish-search-0.4.0.1.tar.bz2) = 41257 +SHA256 (catfish-1.2.2.tar.bz2) = DpKETnYSB7PTCGxFsm/M+D8OvO10HhrzPYWQd58l7t8= +SIZE (catfish-1.2.2.tar.bz2) = 98956 diff --git a/textproc/catfish/patches/patch-Makefile_in b/textproc/catfish/patches/patch-Makefile_in deleted file mode 100644 index 30df2f98b47..00000000000 --- a/textproc/catfish/patches/patch-Makefile_in +++ /dev/null @@ -1,41 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2009/06/04 02:03:39 landry Exp $ ---- Makefile.in.orig Fri Oct 24 23:14:07 2008 -+++ Makefile.in Sun Apr 26 14:56:05 2009 -@@ -1,13 +1,11 @@ - APPNAME=catfish --PREFIX=@prefix@ --PYTHON=`which python` -+PREFIX=${PREFIX} -+PYTHON=${MODPY_BIN} - LANGUAGE_FILES=$(patsubst po/%.po, locale/%/LC_MESSAGES/$(APPNAME).mo, $(wildcard po/*.po)) - DESTDIR= - - all: $(LANGUAGE_FILES) - $(PYTHON) ./build.py build $(APPNAME) -- sed -e s,%prefix%,$(PREFIX), $(APPNAME).in > $(APPNAME) -- chmod +x $(APPNAME) - - locale/%/LC_MESSAGES/$(APPNAME).mo: po/%.po - mkdir -p $(dir $@) -@@ -23,7 +21,7 @@ install: all - - install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps - install $(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps -- ln -sf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps/$(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/$(APPNAME).svg -+ ln -sf $(TRUEPREFIX)/share/icons/hicolor/scalable/apps/$(APPNAME).svg $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/$(APPNAME).svg - - install -d $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME) - install AUTHORS $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME) -@@ -33,10 +31,10 @@ install: all - install README $(DESTDIR)/$(PREFIX)/share/doc/$(APPNAME) - - install -d $(DESTDIR)/$(PREFIX)/share/applications -- install --mode=644 $(APPNAME).desktop $(DESTDIR)/$(PREFIX)/share/applications -+ install -m 644 $(APPNAME).desktop $(DESTDIR)/$(PREFIX)/share/applications - - cp -rf locale $(DESTDIR)/$(PREFIX)/share -- ln -sf $(DESTDIR)/$(PREFIX)/share/locale $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/locale -+ ln -sf $(TRUEPREFIX)/share/locale $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/locale - - uninstall: - rm -f $(DESTDIR)/$(PREFIX)/share/applications/$(APPNAME).desktop diff --git a/textproc/catfish/patches/patch-Makefile_in_in b/textproc/catfish/patches/patch-Makefile_in_in new file mode 100644 index 00000000000..524974e14b5 --- /dev/null +++ b/textproc/catfish/patches/patch-Makefile_in_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-Makefile_in_in,v 1.1 2015/04/04 16:01:22 landry Exp $ +--- Makefile.in.in.orig Sun Mar 1 08:24:27 2015 ++++ Makefile.in.in Sun Mar 1 08:24:34 2015 +@@ -62,7 +62,7 @@ install: all + install data/appdata/catfish.appdata.xml $(DESTDIR)/$(PREFIX)/share/appdata/catfish.appdata.xml + + install -d $(DESTDIR)/$(PREFIX)/share/applications +- install --mode=644 $(APPNAME).desktop $(DESTDIR)/$(PREFIX)/share/applications ++ install -m 644 $(APPNAME).desktop $(DESTDIR)/$(PREFIX)/share/applications + + cp -rf locale $(DESTDIR)/$(PREFIX)/share + ln -sf $(PREFIX)/share/locale $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/locale diff --git a/textproc/catfish/patches/patch-bin_catfish_in_in b/textproc/catfish/patches/patch-bin_catfish_in_in new file mode 100644 index 00000000000..014e34d7f86 --- /dev/null +++ b/textproc/catfish/patches/patch-bin_catfish_in_in @@ -0,0 +1,9 @@ +$OpenBSD: patch-bin_catfish_in_in,v 1.1 2015/04/04 16:01:22 landry Exp $ +--- bin/catfish.in.in.orig Sat Apr 4 16:47:56 2015 ++++ bin/catfish.in.in Sat Apr 4 16:48:02 2015 +@@ -1,2 +1,2 @@ +-#!/usr/bin/env bash +-%python% %prefix%/share/catfish/bin/catfish.py "$@" +\ No newline at end of file ++#!/bin/sh ++%python% %prefix%/share/catfish/bin/catfish.py "$@" diff --git a/textproc/catfish/patches/patch-catfish_CatfishSearchEngine_py b/textproc/catfish/patches/patch-catfish_CatfishSearchEngine_py new file mode 100644 index 00000000000..b32729d28e0 --- /dev/null +++ b/textproc/catfish/patches/patch-catfish_CatfishSearchEngine_py @@ -0,0 +1,15 @@ +:OpenBSD$ +--- catfish/CatfishSearchEngine.py.orig Sun Sep 21 23:34:50 2014 ++++ catfish/CatfishSearchEngine.py Sat Apr 4 17:59:10 2015 +@@ -463,9 +463,8 @@ class CatfishSearchMethod_Locate(CatfishSearchMethodEx + def __init__(self): + """Initialize the Locate SearchMethod.""" + CatfishSearchMethodExternal.__init__(self, "locate") +- self.command = ["locate", "-i", "%path*%keywords*", "--existing"] ++ self.command = ["locate", "-i", "%keywords"] + + def assemble_query(self, keywords, path): + """Assemble the search query.""" +- return ["locate", "--regex", "-i", "{}".format(string_regex(keywords, +- path))] ++ return ["locate", "-i", str(keywords)] diff --git a/textproc/catfish/patches/patch-catfish_in b/textproc/catfish/patches/patch-catfish_in deleted file mode 100644 index a51ae984160..00000000000 --- a/textproc/catfish/patches/patch-catfish_in +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-catfish_in,v 1.1.1.1 2009/06/04 02:03:39 landry Exp $ ---- catfish.in.orig Sun Apr 26 14:35:15 2009 -+++ catfish.in Sun Apr 26 14:37:11 2009 -@@ -1,14 +1,4 @@ --#!/usr/bin/env bash -- -+#!/bin/sh - APPNAME=catfish -- --if [ -e $APPNAME.pyc ] -- then python $APPNAME.pyc "$@" -- else -- if [ -e $APPNAME.py ] -- then python $APPNAME.py "$@" -- else -- cd %prefix%/share/$APPNAME -- python $APPNAME.pyc "$@" -- fi -- fi -+cd ${PREFIX}/share/$APPNAME -+${MODPY_BIN} $APPNAME.pyc "$@" diff --git a/textproc/catfish/pkg/PLIST b/textproc/catfish/pkg/PLIST index 92685486193..3711edc1868 100644 --- a/textproc/catfish/pkg/PLIST +++ b/textproc/catfish/pkg/PLIST @@ -1,10 +1,32 @@ -@comment $OpenBSD: PLIST,v 1.5 2012/09/10 20:54:40 landry Exp $ +@comment $OpenBSD: PLIST,v 1.6 2015/04/04 16:01:22 landry Exp $ bin/catfish +share/appdata/ +share/appdata/catfish.appdata.xml share/applications/catfish.desktop share/catfish/ -share/catfish/catfish.glade -share/catfish/catfish.pyc +share/catfish/bin/ +share/catfish/bin/catfish.py +share/catfish/catfish/ share/catfish/catfish.svg +share/catfish/catfish/AboutCatfishDialog.py +share/catfish/catfish/CatfishSearchEngine.py +share/catfish/catfish/CatfishWindow.py +share/catfish/catfish/__init__.py +share/catfish/catfish_lib/ +share/catfish/catfish_lib/AboutDialog.py +share/catfish/catfish_lib/Builder.py +share/catfish/catfish_lib/CatfishSettings.py +share/catfish/catfish_lib/SudoDialog.py +share/catfish/catfish_lib/Window.py +share/catfish/catfish_lib/__init__.py +share/catfish/catfish_lib/catfishconfig.py +share/catfish/catfish_lib/helpers.py +share/catfish/data/ +share/catfish/data/ui/ +share/catfish/data/ui/AboutCatfishDialog.ui +share/catfish/data/ui/CatfishWindow.ui +share/catfish/data/ui/about_catfish_dialog.xml +share/catfish/data/ui/catfish_window.xml share/catfish/locale share/doc/catfish/ share/doc/catfish/AUTHORS @@ -14,12 +36,36 @@ share/doc/catfish/INSTALL share/doc/catfish/README share/icons/hicolor/scalable/apps/catfish.svg 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/de/LC_MESSAGES/catfish.mo +share/locale/el/LC_MESSAGES/catfish.mo +share/locale/en_AU/ +share/locale/en_AU/LC_MESSAGES/ +share/locale/en_AU/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/hu/LC_MESSAGES/catfish.mo +share/locale/id/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/lv/LC_MESSAGES/catfish.mo +share/locale/ml/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 +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/sr/LC_MESSAGES/catfish.mo +share/locale/tr/LC_MESSAGES/catfish.mo +share/locale/uk/LC_MESSAGES/catfish.mo +share/locale/zh_TW/LC_MESSAGES/catfish.mo @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor @exec %D/bin/update-desktop-database