cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to catfish 1.4.2.

Browse Source 
* move to python3
* use MODPY_EGG_VERSION
* avoid building/installing twice
* update dependencies
This commit is contained in:
landry 2016-04-26 15:31:31 +00:00
parent 18d542972b
commit 15890bf92a
7 changed files with 73 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
textproc/catfish/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.21 2015/04/08 06:43:57 kili Exp $
# $OpenBSD: Makefile,v 1.22 2016/04/26 15:31:31 landry Exp $
COMMENT = versatile file searching tool
DISTNAME = catfish-1.2.2
MODPY_EGG_VERSION = 1.4.2
DISTNAME = catfish-${MODPY_EGG_VERSION}
CATEGORIES = textproc
EXTRACT_SUFX = .tar.bz2
@ -13,18 +14,17 @@ HOMEPAGE = http://smdavis.us/projects/catfish/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES = https://launchpad.net/catfish-search/1.2/1.2.2/+download/
MASTER_SITES = https://launchpad.net/catfish-search/${MODPY_EGG_VERSION:C/..$//}/${MODPY_EGG_VERSION}/+download/
MODULES= lang/python
CONFIGURE_STYLE=simple
CONFIGURE_ARGS=--python=${MODPY_BIN}
USE_GMAKE= Yes
MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
MODPY_ADJ_FILES=bin/catfish
NO_BUILD= Yes
RUN_DEPENDS = devel/py-gobject3 \
x11/dbus-python \
RUN_DEPENDS = devel/py-gobject3${MODPY_FLAVOR} \
devel/desktop-file-utils \
devel/py-xdg \
devel/py-pexpect \
devel/xdg-utils \
devel/py-pexpect${MODPY_FLAVOR} \
x11/gtk+3,-guic
BUILD_DEPENDS = textproc/intltool

4
textproc/catfish/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (catfish-1.2.2.tar.bz2) = DpKETnYSB7PTCGxFsm/M+D8OvO10HhrzPYWQd58l7t8=
SIZE (catfish-1.2.2.tar.bz2) = 98956
SHA256 (catfish-1.4.2.tar.bz2) = o/4IfNx7Ki8raInVeJPRt7Z4qs694aKH+kkS7Xzya0g=
SIZE (catfish-1.4.2.tar.bz2) = 124276

12
textproc/catfish/patches/patch-Makefile_in_in
View File

@ -1,12 +0,0 @@
$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

9
textproc/catfish/patches/patch-bin_catfish_in_in
View File

@ -1,9 +0,0 @@
$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 "$@"

8
textproc/catfish/patches/patch-catfish_CatfishSearchEngine_py
View File

@ -1,7 +1,7 @@
:OpenBSD$
--- catfish/CatfishSearchEngine.py.orig Sun Sep 21 23:34:50 2014
+++ catfish/CatfishSearchEngine.py Sat Apr 4 18:02:48 2015
@@ -69,7 +69,7 @@ class CatfishSearchEngine:
--- catfish/CatfishSearchEngine.py.orig Fri Apr 1 05:28:07 2016
+++ catfish/CatfishSearchEngine.py Tue Apr 26 16:31:32 2016
@@ -81,7 +81,7 @@ class CatfishSearchEngine:
"""CatfishSearchEngine is the collection of search backends that are used
to perform a query. Each backend is a CatfishSearchMethod"""
@ -10,7 +10,7 @@
"""Initialize the CatfishSearchEngine. Provide a list of methods to
be included in the search backends. Available backends include:
@@ -463,9 +463,8 @@ class CatfishSearchMethod_Locate(CatfishSearchMethodEx
@@ -503,9 +503,8 @@ class CatfishSearchMethod_Locate(CatfishSearchMethodEx
def __init__(self):
"""Initialize the Locate SearchMethod."""
CatfishSearchMethodExternal.__init__(self, "locate")

12
textproc/catfish/patches/patch-setup_py Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-setup_py,v 1.1 2016/04/26 15:31:31 landry Exp $
--- setup.py.orig Tue Apr 26 16:41:29 2016
+++ setup.py Tue Apr 26 16:41:41 2016
@@ -216,7 +216,7 @@ DistUtilsExtra.auto.setup(
'needs by using several command line options.',
url='https://launchpad.net/catfish-search',
data_files=[
- ('share/man/man1', ['catfish.1']),
+ ('man/man1', ['catfish.1']),
('share/appdata/', ['data/appdata/catfish.appdata.xml'])
],
cmdclass={'install': InstallAndUpdateDataDirectory}

74
textproc/catfish/pkg/PLIST
View File

@ -1,40 +1,50 @@
@comment $OpenBSD: PLIST,v 1.6 2015/04/04 16:01:22 landry Exp $
@comment $OpenBSD: PLIST,v 1.7 2016/04/26 15:31:31 landry Exp $
bin/catfish
lib/python${MODPY_VERSION}/site-packages/catfish/
lib/python${MODPY_VERSION}/site-packages/catfish-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/catfish/AboutCatfishDialog.py
lib/python${MODPY_VERSION}/site-packages/catfish/CatfishSearchEngine.py
lib/python${MODPY_VERSION}/site-packages/catfish/CatfishWindow.py
lib/python${MODPY_VERSION}/site-packages/catfish/__init__.py
lib/python${MODPY_VERSION}/site-packages/catfish/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/catfish/${MODPY_PYCACHE}AboutCatfishDialog.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/catfish/${MODPY_PYCACHE}CatfishSearchEngine.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/catfish/${MODPY_PYCACHE}CatfishWindow.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/catfish/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/catfish_lib/
lib/python${MODPY_VERSION}/site-packages/catfish_lib/AboutDialog.py
lib/python${MODPY_VERSION}/site-packages/catfish_lib/Builder.py
lib/python${MODPY_VERSION}/site-packages/catfish_lib/CatfishSettings.py
lib/python${MODPY_VERSION}/site-packages/catfish_lib/SudoDialog.py
lib/python${MODPY_VERSION}/site-packages/catfish_lib/Window.py
lib/python${MODPY_VERSION}/site-packages/catfish_lib/__init__.py
lib/python${MODPY_VERSION}/site-packages/catfish_lib/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/catfish_lib/${MODPY_PYCACHE}AboutDialog.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/catfish_lib/${MODPY_PYCACHE}Builder.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/catfish_lib/${MODPY_PYCACHE}CatfishSettings.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/catfish_lib/${MODPY_PYCACHE}SudoDialog.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/catfish_lib/${MODPY_PYCACHE}Window.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/catfish_lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/catfish_lib/${MODPY_PYCACHE}catfishconfig.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/catfish_lib/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/catfish_lib/catfishconfig.py
lib/python${MODPY_VERSION}/site-packages/catfish_lib/helpers.py
@man man/man1/catfish.1
share/appdata/
share/appdata/catfish.appdata.xml
share/applications/catfish.desktop
share/catfish/
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/catfish/appdata/
share/catfish/appdata/catfish.appdata.xml.in
share/catfish/ui/
share/catfish/ui/AboutCatfishDialog.ui
share/catfish/ui/CatfishWindow.ui
share/catfish/ui/about_catfish_dialog.xml
share/catfish/ui/catfish_window.xml
share/doc/catfish/
share/doc/catfish/AUTHORS
share/doc/catfish/COPYING
share/doc/catfish/ChangeLog
share/doc/catfish/INSTALL
share/doc/catfish/README
share/icons/hicolor/scalable/apps/catfish.svg
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
@ -44,15 +54,19 @@ 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/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/hr/LC_MESSAGES/catfish.mo
share/locale/hu/LC_MESSAGES/catfish.mo
share/locale/id/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/lt/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
@ -63,8 +77,10 @@ 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/sv/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
@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