UPDATE devel/git-cola

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE devel/git-cola

Björn Ketelaars
git-cola received an update, which fixes some bugs and adds some
features. Changelog can be found at
https://github.com/git-cola/git-cola/blob/master/share/doc/git-cola/relnotes.rst

Lightly tested on my laptop.

OK?


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git-cola/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 28 May 2017 08:27:35 -0000 1.20
+++ Makefile 13 Feb 2018 18:27:34 -0000
@@ -2,7 +2,7 @@
 
 COMMENT = python powered git gui
 
-MODPY_EGG_VERSION= 2.11
+MODPY_EGG_VERSION= 3.0
 DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
 
 GH_ACCOUNT = git-cola
@@ -11,7 +11,7 @@ GH_TAGNAME = v${MODPY_EGG_VERSION}
 
 CATEGORIES = devel x11
 
-HOMEPAGE = http://cola.tuxfamily.org/
+HOMEPAGE = https://git-cola.github.io/
 
 # GPLv2 only
 PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/git-cola/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 28 May 2017 08:27:35 -0000 1.7
+++ distinfo 13 Feb 2018 18:27:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (git-cola-2.11.tar.gz) = vEAH4NnIB2PvWNYwsDO/29hAavd7vSkqbGR+08plW1s=
-SIZE (git-cola-2.11.tar.gz) = 1179769
+SHA256 (git-cola-3.0.tar.gz) = YZWPmY1GGOCc4N1HNBGSGBjRPfg48yEC713tmEoNGlA=
+SIZE (git-cola-3.0.tar.gz) = 1218820
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/git-cola/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 8 Nov 2015 19:33:06 -0000 1.2
+++ patches/patch-Makefile 13 Feb 2018 18:27:34 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-Makefile,v 1.2 2015/11/0
 
 Avoid dep on gnu make
 
---- Makefile.orig Mon Oct 12 21:03:45 2015
-+++ Makefile Sun Nov  8 20:17:51 2015
-@@ -44,11 +44,7 @@ setup_args += --force
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -59,11 +59,7 @@ setup_args += --force
  setup_args += --install-scripts=$(bindir)
  setup_args += --record=build/MANIFEST
  setup_args += --install-lib=$(coladir)
@@ -15,5 +16,5 @@ Avoid dep on gnu make
 -export prefix
 +setup_args += --root=$(DESTDIR)
 
- PYTHON_DIRS = test
- PYTHON_DIRS += cola
+ # If NO_VENDOR_LIBS is specified on the command line then pass it to setup.py
+ ifdef NO_VENDOR_LIBS
Index: patches/patch-cola_app_py
===================================================================
RCS file: /cvs/ports/devel/git-cola/patches/patch-cola_app_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-cola_app_py
--- patches/patch-cola_app_py 8 Nov 2015 19:33:06 -0000 1.2
+++ patches/patch-cola_app_py 13 Feb 2018 18:27:34 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-cola_app_py,v 1.2 2015/1
 
 Use ssh-askpass implementation from xenocara.
 
---- cola/app.py.orig Mon Oct 12 21:03:45 2015
-+++ cola/app.py Sun Nov  8 20:17:51 2015
-@@ -118,7 +118,7 @@ def setup_environment():
+Index: cola/app.py
+--- cola/app.py.orig
++++ cola/app.py
+@@ -81,7 +81,7 @@ def setup_environment():
      elif sys.platform == 'darwin':
          askpass = resources.share('bin', 'ssh-askpass-darwin')
      else:
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/git-cola/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 28 May 2017 08:27:35 -0000 1.9
+++ pkg/PLIST 13 Feb 2018 18:27:34 -0000
@@ -206,11 +206,15 @@ share/git-cola/lib/cola/widgets/startup.
 share/git-cola/lib/cola/widgets/stash.py
 share/git-cola/lib/cola/widgets/status.py
 share/git-cola/lib/cola/widgets/text.py
+share/git-cola/lib/cola/widgets/toolbar.py
+share/git-cola/lib/cola/widgets/toolbarcmds.py
 share/git-cola/lib/qtpy/
 share/git-cola/lib/qtpy/QtCore.py
 share/git-cola/lib/qtpy/QtDesigner.py
 share/git-cola/lib/qtpy/QtGui.py
+share/git-cola/lib/qtpy/QtMultimedia.py
 share/git-cola/lib/qtpy/QtNetwork.py
+share/git-cola/lib/qtpy/QtOpenGL.py
 share/git-cola/lib/qtpy/QtPrintSupport.py
 share/git-cola/lib/qtpy/QtSvg.py
 share/git-cola/lib/qtpy/QtTest.py
@@ -220,10 +224,12 @@ share/git-cola/lib/qtpy/__init__.py
 share/git-cola/lib/qtpy/_patch/
 share/git-cola/lib/qtpy/_patch/__init__.py
 share/git-cola/lib/qtpy/_patch/qcombobox.py
+share/git-cola/lib/qtpy/_patch/qheaderview.py
 share/git-cola/lib/qtpy/_version.py
 share/git-cola/lib/qtpy/compat.py
 share/git-cola/lib/qtpy/py3compat.py
 share/git-cola/lib/qtpy/uic.py
+share/locale/cs/LC_MESSAGES/git-cola.mo
 share/locale/de/LC_MESSAGES/git-cola.mo
 share/locale/es/LC_MESSAGES/git-cola.mo
 share/locale/fr/LC_MESSAGES/git-cola.mo

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE devel/git-cola

Rafael Sadowski
On Tue Feb 13, 2018 at 07:28:54PM +0100, Björn Ketelaars wrote:
> git-cola received an update, which fixes some bugs and adds some
> features. Changelog can be found at
> https://github.com/git-cola/git-cola/blob/master/share/doc/git-cola/relnotes.rst
>
> Lightly tested on my laptop.
>
> OK?

Looks good but test section needs love or NO_TEST=Yes

- I read "needs an X server" in pre-test, if that is ture please set
  TEST_IS_INTERACTIVE=X11.
- I think test needs USE_GMAKE=Yes
- make regesss:

===>  Regression tests for git-cola-3.0
ln -sf /usr/local/bin/python2.7 /usr/ports/pobj/git-cola-3.0/bin/python
# needs an X server
# python setup.py build
# running build
# running build_mo
# running build_scripts
# creating build
# creating build/scripts-2.7
# copying and adjusting bin/git-cola -> build/scripts-2.7
# copying and adjusting bin/git-dag -> build/scripts-2.7
# changing mode of build/scripts-2.7/git-cola from 644 to 755
# changing mode of build/scripts-2.7/git-dag from 644 to 755
# nosetests --with-doctest --with-id --exclude=sphinxtogithub --exclude=extras  cola test
# gmake: nosetests: Command not found
# gmake: *** [Makefile:162: test] Error 127
#

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE devel/git-cola

Björn Ketelaars
On Thu 15/02/2018 12:43, Rafael Sadowski wrote:

> On Tue Feb 13, 2018 at 07:28:54PM +0100, Björn Ketelaars wrote:
> > git-cola received an update, which fixes some bugs and adds some
> > features. Changelog can be found at
> > https://github.com/git-cola/git-cola/blob/master/share/doc/git-cola/relnotes.rst
> >
> > Lightly tested on my laptop.
> >
> > OK?
>
> Looks good but test section needs love or NO_TEST=Yes

Yes...test section needed some love. Output 'make test':

Ran 137 tests in 12.860s

OK?


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git-cola/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 28 May 2017 08:27:35 -0000 1.20
+++ Makefile 16 Feb 2018 12:17:13 -0000
@@ -2,7 +2,7 @@
 
 COMMENT = python powered git gui
 
-MODPY_EGG_VERSION= 2.11
+MODPY_EGG_VERSION= 3.0
 DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
 
 GH_ACCOUNT = git-cola
@@ -11,7 +11,7 @@ GH_TAGNAME = v${MODPY_EGG_VERSION}
 
 CATEGORIES = devel x11
 
-HOMEPAGE = http://cola.tuxfamily.org/
+HOMEPAGE = https://git-cola.github.io/
 
 # GPLv2 only
 PERMIT_PACKAGE_CDROM= Yes
@@ -28,14 +28,16 @@ RUN_DEPENDS = devel/desktop-file-utils \
  textproc/xxdiff \
  x11/py-qt4
 
+TEST_DEPENDS = devel/py-mock \
+ devel/py-nose
+
 MODPY_ADJ_FILES= share/git-cola/bin/git-xbase
 
 pre-configure:
  ${SUBST_CMD} ${WRKSRC}/cola/app.py
 
-pre-test:
- ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
- # needs an X server
- rm -f ${WRKSRC}/test/qtutils_test.py
+do-test:
+ ${SUBST_CMD} ${WRKSRC}/test/git_test.py
+ cd ${WRKSRC} && nosetests --exclude=sphinxtogithub --verbose
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/git-cola/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 28 May 2017 08:27:35 -0000 1.7
+++ distinfo 16 Feb 2018 12:17:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (git-cola-2.11.tar.gz) = vEAH4NnIB2PvWNYwsDO/29hAavd7vSkqbGR+08plW1s=
-SIZE (git-cola-2.11.tar.gz) = 1179769
+SHA256 (git-cola-3.0.tar.gz) = YZWPmY1GGOCc4N1HNBGSGBjRPfg48yEC713tmEoNGlA=
+SIZE (git-cola-3.0.tar.gz) = 1218820
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/git-cola/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 8 Nov 2015 19:33:06 -0000 1.2
+++ patches/patch-Makefile 16 Feb 2018 12:17:13 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-Makefile,v 1.2 2015/11/0
 
 Avoid dep on gnu make
 
---- Makefile.orig Mon Oct 12 21:03:45 2015
-+++ Makefile Sun Nov  8 20:17:51 2015
-@@ -44,11 +44,7 @@ setup_args += --force
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -59,11 +59,7 @@ setup_args += --force
  setup_args += --install-scripts=$(bindir)
  setup_args += --record=build/MANIFEST
  setup_args += --install-lib=$(coladir)
@@ -15,5 +16,5 @@ Avoid dep on gnu make
 -export prefix
 +setup_args += --root=$(DESTDIR)
 
- PYTHON_DIRS = test
- PYTHON_DIRS += cola
+ # If NO_VENDOR_LIBS is specified on the command line then pass it to setup.py
+ ifdef NO_VENDOR_LIBS
Index: patches/patch-cola_app_py
===================================================================
RCS file: /cvs/ports/devel/git-cola/patches/patch-cola_app_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-cola_app_py
--- patches/patch-cola_app_py 8 Nov 2015 19:33:06 -0000 1.2
+++ patches/patch-cola_app_py 16 Feb 2018 12:17:13 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-cola_app_py,v 1.2 2015/1
 
 Use ssh-askpass implementation from xenocara.
 
---- cola/app.py.orig Mon Oct 12 21:03:45 2015
-+++ cola/app.py Sun Nov  8 20:17:51 2015
-@@ -118,7 +118,7 @@ def setup_environment():
+Index: cola/app.py
+--- cola/app.py.orig
++++ cola/app.py
+@@ -81,7 +81,7 @@ def setup_environment():
      elif sys.platform == 'darwin':
          askpass = resources.share('bin', 'ssh-askpass-darwin')
      else:
Index: patches/patch-test_git_test_py
===================================================================
RCS file: patches/patch-test_git_test_py
diff -N patches/patch-test_git_test_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-test_git_test_py 16 Feb 2018 12:17:13 -0000
@@ -0,0 +1,63 @@
+$OpenBSD$
+
+test_tag and test_show assume that source has been fetched using git, and that
+full history is availabe. These tests fail as we are using a release tarball.
+
+Index: test/git_test.py
+--- test/git_test.py.orig
++++ test/git_test.py
+@@ -219,26 +219,13 @@ class GitCommandTest(unittest.TestCase):
+         version = self.git.version()[STDOUT]
+         self.failUnless(version.startswith('git version'))
+
+-    def test_tag(self):
+-        """Test running 'git tag'"""
+-        tags = self.git.tag()[STDOUT].splitlines()
+-        if os.getenv('GIT_COLA_NO_HISTORY', False):
+-            return
+-        self.failUnless('v1.0.0' in tags)
+-
+-    def test_show(self):
+-        """Test running 'git show'"""
+-        oid = 'HEAD'
+-        content = self.git.show(oid)[STDOUT]
+-        self.failUnless(content.startswith('commit '))
+-
+     def test_stdout(self):
+         """Test overflowing the stdout buffer"""
+         # Write to stdout only
+         code = ('import sys;'
+                 's = "\\0" * (1024 * 16 + 1);'
+                 'sys.stdout.write(s);')
+-        status, out, err = git.Git.execute(['python', '-c', code], _raw=True)
++        status, out, err = git.Git.execute(['${MODPY_BIN}', '-c', code], _raw=True)
+         self.assertEqual(status, 0)
+         self.assertEqual(len(out), 1024 * 16 + 1)
+         self.assertEqual(len(err), 0)
+@@ -249,7 +236,7 @@ class GitCommandTest(unittest.TestCase):
+         code = ('import sys;'
+                 's = "\\0" * (1024 * 16 + 1);'
+                 'sys.stderr.write(s);')
+-        status, out, err = git.Git.execute(['python', '-c', code], _raw=True)
++        status, out, err = git.Git.execute(['${MODPY_BIN}', '-c', code], _raw=True)
+         self.assertEqual(status, 0)
+         self.assertEqual(len(out), 0)
+         self.assertEqual(len(err), 1024 * 16 + 1)
+@@ -261,7 +248,7 @@ class GitCommandTest(unittest.TestCase):
+                 's = "\\0" * (1024 * 16 + 1);'
+                 'sys.stdout.write(s);'
+                 'sys.stderr.write(s);')
+-        status, out, err = git.Git.execute(['python', '-c', code], _raw=True)
++        status, out, err = git.Git.execute(['${MODPY_BIN}', '-c', code], _raw=True)
+         self.assertEqual(status, 0)
+         self.assertEqual(len(out), 1024 * 16 + 1)
+         self.assertEqual(len(err), 1024 * 16 + 1)
+@@ -273,7 +260,7 @@ class GitCommandTest(unittest.TestCase):
+                 's = "\\0" * (1024 * 16 + 1);'
+                 'sys.stderr.write(s);'
+                 'sys.stdout.write(s);')
+-        status, out, err = git.Git.execute(['python', '-c', code], _raw=True)
++        status, out, err = git.Git.execute(['${MODPY_BIN}', '-c', code], _raw=True)
+         self.assertEqual(status, 0)
+         self.assertEqual(out, '\0' * (1024 * 16 + 1))
+         self.assertEqual(err, '\0' * (1024 * 16 + 1))
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/git-cola/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 28 May 2017 08:27:35 -0000 1.9
+++ pkg/PLIST 16 Feb 2018 12:17:13 -0000
@@ -206,11 +206,15 @@ share/git-cola/lib/cola/widgets/startup.
 share/git-cola/lib/cola/widgets/stash.py
 share/git-cola/lib/cola/widgets/status.py
 share/git-cola/lib/cola/widgets/text.py
+share/git-cola/lib/cola/widgets/toolbar.py
+share/git-cola/lib/cola/widgets/toolbarcmds.py
 share/git-cola/lib/qtpy/
 share/git-cola/lib/qtpy/QtCore.py
 share/git-cola/lib/qtpy/QtDesigner.py
 share/git-cola/lib/qtpy/QtGui.py
+share/git-cola/lib/qtpy/QtMultimedia.py
 share/git-cola/lib/qtpy/QtNetwork.py
+share/git-cola/lib/qtpy/QtOpenGL.py
 share/git-cola/lib/qtpy/QtPrintSupport.py
 share/git-cola/lib/qtpy/QtSvg.py
 share/git-cola/lib/qtpy/QtTest.py
@@ -220,10 +224,12 @@ share/git-cola/lib/qtpy/__init__.py
 share/git-cola/lib/qtpy/_patch/
 share/git-cola/lib/qtpy/_patch/__init__.py
 share/git-cola/lib/qtpy/_patch/qcombobox.py
+share/git-cola/lib/qtpy/_patch/qheaderview.py
 share/git-cola/lib/qtpy/_version.py
 share/git-cola/lib/qtpy/compat.py
 share/git-cola/lib/qtpy/py3compat.py
 share/git-cola/lib/qtpy/uic.py
+share/locale/cs/LC_MESSAGES/git-cola.mo
 share/locale/de/LC_MESSAGES/git-cola.mo
 share/locale/es/LC_MESSAGES/git-cola.mo
 share/locale/fr/LC_MESSAGES/git-cola.mo

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE devel/git-cola

Björn Ketelaars
On Fri 16/02/2018 13:21, Björn Ketelaars wrote:

> On Thu 15/02/2018 12:43, Rafael Sadowski wrote:
> > On Tue Feb 13, 2018 at 07:28:54PM +0100, Björn Ketelaars wrote:
> > > git-cola received an update, which fixes some bugs and adds some
> > > features. Changelog can be found at
> > > https://github.com/git-cola/git-cola/blob/master/share/doc/git-cola/relnotes.rst
> > >
> > > Lightly tested on my laptop.
> > >
> > > OK?
> >
> > Looks good but test section needs love or NO_TEST=Yes
>
Addressed comments from sthen@, one of which being to run compileall.py
on ${PREFIX}/share/git-cola/lib.

make test ran 137 tests without any failures.

OK?


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git-cola/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 28 May 2017 08:27:35 -0000 1.20
+++ Makefile 17 Feb 2018 14:42:31 -0000
@@ -2,7 +2,7 @@
 
 COMMENT = python powered git gui
 
-MODPY_EGG_VERSION= 2.11
+MODPY_EGG_VERSION= 3.0
 DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
 
 GH_ACCOUNT = git-cola
@@ -11,7 +11,7 @@ GH_TAGNAME = v${MODPY_EGG_VERSION}
 
 CATEGORIES = devel x11
 
-HOMEPAGE = http://cola.tuxfamily.org/
+HOMEPAGE = https://git-cola.github.io/
 
 # GPLv2 only
 PERMIT_PACKAGE_CDROM= Yes
@@ -28,14 +28,18 @@ RUN_DEPENDS = devel/desktop-file-utils \
  textproc/xxdiff \
  x11/py-qt4
 
+TEST_DEPENDS = devel/py-mock \
+ devel/py-nose
+
 MODPY_ADJ_FILES= share/git-cola/bin/git-xbase
 
 pre-configure:
  ${SUBST_CMD} ${WRKSRC}/cola/app.py
 
+post-install:
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}/share/git-cola/lib
+
 pre-test:
  ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
- # needs an X server
- rm -f ${WRKSRC}/test/qtutils_test.py
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/git-cola/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 28 May 2017 08:27:35 -0000 1.7
+++ distinfo 17 Feb 2018 14:42:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (git-cola-2.11.tar.gz) = vEAH4NnIB2PvWNYwsDO/29hAavd7vSkqbGR+08plW1s=
-SIZE (git-cola-2.11.tar.gz) = 1179769
+SHA256 (git-cola-3.0.tar.gz) = YZWPmY1GGOCc4N1HNBGSGBjRPfg48yEC713tmEoNGlA=
+SIZE (git-cola-3.0.tar.gz) = 1218820
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/git-cola/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 8 Nov 2015 19:33:06 -0000 1.2
+++ patches/patch-Makefile 17 Feb 2018 14:42:31 -0000
@@ -2,9 +2,33 @@ $OpenBSD: patch-Makefile,v 1.2 2015/11/0
 
 Avoid dep on gnu make
 
---- Makefile.orig Mon Oct 12 21:03:45 2015
-+++ Makefile Sun Nov  8 20:17:51 2015
-@@ -44,11 +44,7 @@ setup_args += --force
+Avoid use of nosetest --with-doctest as this causes a regression test to fail
+with "ImportError (Could not load inotify functions from libc)". Failure is
+caused by the doctest module testing a piece of code that is linux-only. This
+code is not used when running git-cola on OpenBSD.
+
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -26,9 +26,6 @@ TAR = tar
+ # Flags
+ FLAKE8_FLAGS = --max-line-length=80 --statistics --doctests --format=pylint
+ PYLINT_FLAGS = --rcfile=.pylintrc
+-ifdef color
+-    PYLINT_FLAGS += --output-format=colorized
+-endif
+
+ # These values can be overridden on the command-line or via config.mak
+ prefix = $(HOME)
+@@ -44,7 +41,6 @@ cola_app = $(CURDIR)/$(cola_app_base)
+ cola_version = $(shell $(PYTHON) bin/git-cola version --brief)
+ cola_dist := $(cola_base)-$(cola_version)
+
+-NOSE_FLAGS = --with-doctest
+ NOSE_FLAGS += --with-id
+ NOSE_FLAGS += --exclude=sphinxtogithub
+ NOSE_FLAGS += --exclude=extras
+@@ -59,16 +55,7 @@ setup_args += --force
  setup_args += --install-scripts=$(bindir)
  setup_args += --record=build/MANIFEST
  setup_args += --install-lib=$(coladir)
@@ -13,7 +37,12 @@ Avoid dep on gnu make
 -    export DESTDIR
 -endif
 -export prefix
+-
+-# If NO_VENDOR_LIBS is specified on the command line then pass it to setup.py
+-ifdef NO_VENDOR_LIBS
+-    setup_args += --no-vendor-libs
+-endif
 +setup_args += --root=$(DESTDIR)
 
- PYTHON_DIRS = test
- PYTHON_DIRS += cola
+ PYTHON_DIRS = cola
+ PYTHON_DIRS += test
Index: patches/patch-cola_app_py
===================================================================
RCS file: /cvs/ports/devel/git-cola/patches/patch-cola_app_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-cola_app_py
--- patches/patch-cola_app_py 8 Nov 2015 19:33:06 -0000 1.2
+++ patches/patch-cola_app_py 17 Feb 2018 14:42:31 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-cola_app_py,v 1.2 2015/1
 
 Use ssh-askpass implementation from xenocara.
 
---- cola/app.py.orig Mon Oct 12 21:03:45 2015
-+++ cola/app.py Sun Nov  8 20:17:51 2015
-@@ -118,7 +118,7 @@ def setup_environment():
+Index: cola/app.py
+--- cola/app.py.orig
++++ cola/app.py
+@@ -81,7 +81,7 @@ def setup_environment():
      elif sys.platform == 'darwin':
          askpass = resources.share('bin', 'ssh-askpass-darwin')
      else:
Index: patches/patch-test_git_test_py
===================================================================
RCS file: patches/patch-test_git_test_py
diff -N patches/patch-test_git_test_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-test_git_test_py 17 Feb 2018 14:42:31 -0000
@@ -0,0 +1,31 @@
+$OpenBSD$
+
+test_tag and test_show assume that source has been fetched using git, and that
+full history is availabe. These tests fail as we are using a release tarball.
+
+Adapted from
+https://github.com/git-cola/git-cola/commit/4c9d36ae021262a6559a1ae240c31e768bca0b37
+
+Index: test/git_test.py
+--- test/git_test.py.orig
++++ test/git_test.py
+@@ -219,19 +219,6 @@ class GitCommandTest(unittest.TestCase):
+         version = self.git.version()[STDOUT]
+         self.failUnless(version.startswith('git version'))
+
+-    def test_tag(self):
+-        """Test running 'git tag'"""
+-        tags = self.git.tag()[STDOUT].splitlines()
+-        if os.getenv('GIT_COLA_NO_HISTORY', False):
+-            return
+-        self.failUnless('v1.0.0' in tags)
+-
+-    def test_show(self):
+-        """Test running 'git show'"""
+-        oid = 'HEAD'
+-        content = self.git.show(oid)[STDOUT]
+-        self.failUnless(content.startswith('commit '))
+-
+     def test_stdout(self):
+         """Test overflowing the stdout buffer"""
+         # Write to stdout only
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/git-cola/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 28 May 2017 08:27:35 -0000 1.9
+++ pkg/PLIST 17 Feb 2018 14:42:31 -0000
@@ -128,102 +128,206 @@ share/git-cola/icons/zoom-out.svg
 share/git-cola/lib/
 share/git-cola/lib/cola/
 share/git-cola/lib/cola/__init__.py
+share/git-cola/lib/cola/__init__.pyc
 share/git-cola/lib/cola/_version.py
+share/git-cola/lib/cola/_version.pyc
 share/git-cola/lib/cola/actions.py
+share/git-cola/lib/cola/actions.pyc
 share/git-cola/lib/cola/app.py
+share/git-cola/lib/cola/app.pyc
 share/git-cola/lib/cola/cmds.py
+share/git-cola/lib/cola/cmds.pyc
 share/git-cola/lib/cola/compat.py
+share/git-cola/lib/cola/compat.pyc
 share/git-cola/lib/cola/core.py
+share/git-cola/lib/cola/core.pyc
 share/git-cola/lib/cola/decorators.py
+share/git-cola/lib/cola/decorators.pyc
 share/git-cola/lib/cola/diffparse.py
+share/git-cola/lib/cola/diffparse.pyc
 share/git-cola/lib/cola/difftool.py
+share/git-cola/lib/cola/difftool.pyc
 share/git-cola/lib/cola/fsmonitor.py
+share/git-cola/lib/cola/fsmonitor.pyc
 share/git-cola/lib/cola/git.py
+share/git-cola/lib/cola/git.pyc
 share/git-cola/lib/cola/gitcfg.py
+share/git-cola/lib/cola/gitcfg.pyc
 share/git-cola/lib/cola/gitcmds.py
+share/git-cola/lib/cola/gitcmds.pyc
 share/git-cola/lib/cola/gravatar.py
+share/git-cola/lib/cola/gravatar.pyc
 share/git-cola/lib/cola/guicmds.py
+share/git-cola/lib/cola/guicmds.pyc
 share/git-cola/lib/cola/hotkeys.py
+share/git-cola/lib/cola/hotkeys.pyc
 share/git-cola/lib/cola/i18n.py
+share/git-cola/lib/cola/i18n.pyc
 share/git-cola/lib/cola/icons.py
+share/git-cola/lib/cola/icons.pyc
 share/git-cola/lib/cola/inotify.py
+share/git-cola/lib/cola/inotify.pyc
 share/git-cola/lib/cola/interaction.py
+share/git-cola/lib/cola/interaction.pyc
 share/git-cola/lib/cola/main.py
+share/git-cola/lib/cola/main.pyc
 share/git-cola/lib/cola/models/
 share/git-cola/lib/cola/models/__init__.py
+share/git-cola/lib/cola/models/__init__.pyc
 share/git-cola/lib/cola/models/browse.py
+share/git-cola/lib/cola/models/browse.pyc
 share/git-cola/lib/cola/models/dag.py
+share/git-cola/lib/cola/models/dag.pyc
 share/git-cola/lib/cola/models/main.py
+share/git-cola/lib/cola/models/main.pyc
 share/git-cola/lib/cola/models/prefs.py
+share/git-cola/lib/cola/models/prefs.pyc
 share/git-cola/lib/cola/models/selection.py
+share/git-cola/lib/cola/models/selection.pyc
 share/git-cola/lib/cola/models/stash.py
+share/git-cola/lib/cola/models/stash.pyc
 share/git-cola/lib/cola/observable.py
+share/git-cola/lib/cola/observable.pyc
 share/git-cola/lib/cola/ordered_dict.py
+share/git-cola/lib/cola/ordered_dict.pyc
 share/git-cola/lib/cola/qtcompat.py
+share/git-cola/lib/cola/qtcompat.pyc
 share/git-cola/lib/cola/qtutils.py
+share/git-cola/lib/cola/qtutils.pyc
 share/git-cola/lib/cola/resources.py
+share/git-cola/lib/cola/resources.pyc
 share/git-cola/lib/cola/settings.py
+share/git-cola/lib/cola/settings.pyc
 share/git-cola/lib/cola/textwrap.py
+share/git-cola/lib/cola/textwrap.pyc
 share/git-cola/lib/cola/utils.py
+share/git-cola/lib/cola/utils.pyc
 share/git-cola/lib/cola/version.py
+share/git-cola/lib/cola/version.pyc
 share/git-cola/lib/cola/widgets/
 share/git-cola/lib/cola/widgets/__init__.py
+share/git-cola/lib/cola/widgets/__init__.pyc
 share/git-cola/lib/cola/widgets/about.py
+share/git-cola/lib/cola/widgets/about.pyc
 share/git-cola/lib/cola/widgets/action.py
+share/git-cola/lib/cola/widgets/action.pyc
 share/git-cola/lib/cola/widgets/archive.py
+share/git-cola/lib/cola/widgets/archive.pyc
 share/git-cola/lib/cola/widgets/bookmarks.py
+share/git-cola/lib/cola/widgets/bookmarks.pyc
 share/git-cola/lib/cola/widgets/branch.py
+share/git-cola/lib/cola/widgets/branch.pyc
 share/git-cola/lib/cola/widgets/browse.py
+share/git-cola/lib/cola/widgets/browse.pyc
 share/git-cola/lib/cola/widgets/cfgactions.py
+share/git-cola/lib/cola/widgets/cfgactions.pyc
 share/git-cola/lib/cola/widgets/commitmsg.py
+share/git-cola/lib/cola/widgets/commitmsg.pyc
 share/git-cola/lib/cola/widgets/common.py
+share/git-cola/lib/cola/widgets/common.pyc
 share/git-cola/lib/cola/widgets/compare.py
+share/git-cola/lib/cola/widgets/compare.pyc
 share/git-cola/lib/cola/widgets/completion.py
+share/git-cola/lib/cola/widgets/completion.pyc
 share/git-cola/lib/cola/widgets/createbranch.py
+share/git-cola/lib/cola/widgets/createbranch.pyc
 share/git-cola/lib/cola/widgets/createtag.py
+share/git-cola/lib/cola/widgets/createtag.pyc
 share/git-cola/lib/cola/widgets/dag.py
+share/git-cola/lib/cola/widgets/dag.pyc
 share/git-cola/lib/cola/widgets/defs.py
+share/git-cola/lib/cola/widgets/defs.pyc
 share/git-cola/lib/cola/widgets/diff.py
+share/git-cola/lib/cola/widgets/diff.pyc
 share/git-cola/lib/cola/widgets/editremotes.py
+share/git-cola/lib/cola/widgets/editremotes.pyc
 share/git-cola/lib/cola/widgets/filelist.py
+share/git-cola/lib/cola/widgets/filelist.pyc
 share/git-cola/lib/cola/widgets/filetree.py
+share/git-cola/lib/cola/widgets/filetree.pyc
 share/git-cola/lib/cola/widgets/finder.py
+share/git-cola/lib/cola/widgets/finder.pyc
 share/git-cola/lib/cola/widgets/gitignore.py
+share/git-cola/lib/cola/widgets/gitignore.pyc
 share/git-cola/lib/cola/widgets/grep.py
+share/git-cola/lib/cola/widgets/grep.pyc
 share/git-cola/lib/cola/widgets/highlighter.py
+share/git-cola/lib/cola/widgets/highlighter.pyc
 share/git-cola/lib/cola/widgets/log.py
+share/git-cola/lib/cola/widgets/log.pyc
 share/git-cola/lib/cola/widgets/main.py
+share/git-cola/lib/cola/widgets/main.pyc
 share/git-cola/lib/cola/widgets/merge.py
+share/git-cola/lib/cola/widgets/merge.pyc
 share/git-cola/lib/cola/widgets/patch.py
+share/git-cola/lib/cola/widgets/patch.pyc
 share/git-cola/lib/cola/widgets/prefs.py
+share/git-cola/lib/cola/widgets/prefs.pyc
 share/git-cola/lib/cola/widgets/recent.py
+share/git-cola/lib/cola/widgets/recent.pyc
 share/git-cola/lib/cola/widgets/remote.py
+share/git-cola/lib/cola/widgets/remote.pyc
 share/git-cola/lib/cola/widgets/search.py
+share/git-cola/lib/cola/widgets/search.pyc
 share/git-cola/lib/cola/widgets/selectcommits.py
+share/git-cola/lib/cola/widgets/selectcommits.pyc
 share/git-cola/lib/cola/widgets/spellcheck.py
+share/git-cola/lib/cola/widgets/spellcheck.pyc
 share/git-cola/lib/cola/widgets/standard.py
+share/git-cola/lib/cola/widgets/standard.pyc
 share/git-cola/lib/cola/widgets/startup.py
+share/git-cola/lib/cola/widgets/startup.pyc
 share/git-cola/lib/cola/widgets/stash.py
+share/git-cola/lib/cola/widgets/stash.pyc
 share/git-cola/lib/cola/widgets/status.py
+share/git-cola/lib/cola/widgets/status.pyc
 share/git-cola/lib/cola/widgets/text.py
+share/git-cola/lib/cola/widgets/text.pyc
+share/git-cola/lib/cola/widgets/toolbar.py
+share/git-cola/lib/cola/widgets/toolbar.pyc
+share/git-cola/lib/cola/widgets/toolbarcmds.py
+share/git-cola/lib/cola/widgets/toolbarcmds.pyc
 share/git-cola/lib/qtpy/
 share/git-cola/lib/qtpy/QtCore.py
+share/git-cola/lib/qtpy/QtCore.pyc
 share/git-cola/lib/qtpy/QtDesigner.py
+share/git-cola/lib/qtpy/QtDesigner.pyc
 share/git-cola/lib/qtpy/QtGui.py
+share/git-cola/lib/qtpy/QtGui.pyc
+share/git-cola/lib/qtpy/QtMultimedia.py
+share/git-cola/lib/qtpy/QtMultimedia.pyc
 share/git-cola/lib/qtpy/QtNetwork.py
+share/git-cola/lib/qtpy/QtNetwork.pyc
+share/git-cola/lib/qtpy/QtOpenGL.py
+share/git-cola/lib/qtpy/QtOpenGL.pyc
 share/git-cola/lib/qtpy/QtPrintSupport.py
+share/git-cola/lib/qtpy/QtPrintSupport.pyc
 share/git-cola/lib/qtpy/QtSvg.py
+share/git-cola/lib/qtpy/QtSvg.pyc
 share/git-cola/lib/qtpy/QtTest.py
+share/git-cola/lib/qtpy/QtTest.pyc
 share/git-cola/lib/qtpy/QtWebEngineWidgets.py
+share/git-cola/lib/qtpy/QtWebEngineWidgets.pyc
 share/git-cola/lib/qtpy/QtWidgets.py
+share/git-cola/lib/qtpy/QtWidgets.pyc
 share/git-cola/lib/qtpy/__init__.py
+share/git-cola/lib/qtpy/__init__.pyc
 share/git-cola/lib/qtpy/_patch/
 share/git-cola/lib/qtpy/_patch/__init__.py
+share/git-cola/lib/qtpy/_patch/__init__.pyc
 share/git-cola/lib/qtpy/_patch/qcombobox.py
+share/git-cola/lib/qtpy/_patch/qcombobox.pyc
+share/git-cola/lib/qtpy/_patch/qheaderview.py
+share/git-cola/lib/qtpy/_patch/qheaderview.pyc
 share/git-cola/lib/qtpy/_version.py
+share/git-cola/lib/qtpy/_version.pyc
 share/git-cola/lib/qtpy/compat.py
+share/git-cola/lib/qtpy/compat.pyc
 share/git-cola/lib/qtpy/py3compat.py
+share/git-cola/lib/qtpy/py3compat.pyc
 share/git-cola/lib/qtpy/uic.py
+share/git-cola/lib/qtpy/uic.pyc
+share/locale/cs/LC_MESSAGES/git-cola.mo
 share/locale/de/LC_MESSAGES/git-cola.mo
 share/locale/es/LC_MESSAGES/git-cola.mo
 share/locale/fr/LC_MESSAGES/git-cola.mo