Re: [maintainer update] devel/git-crypt 0.6.0 --> 0.7.0
Ping. On Fri, 22 Apr 2022, Paco Esteban wrote: > Hi ports@, > > This is a simple update for devel/git-crypt to its latest version 0.7.0 > Changelog reads: > > * Avoid "argument list too long" errors on macOS. > * Fix handling of "-" arguments. > * Minor documentation improvements. > > Works fine for me on amd64. > > Ok to commit ? diff 9151fe3cdd89feb34573bf1117f0648961810822 /usr/ports blob - 63f9765eb3f093e9b3eed1aed45a978ed897db07 file + devel/git-crypt/Makefile --- devel/git-crypt/Makefile +++ devel/git-crypt/Makefile @@ -1,8 +1,7 @@ COMMENT = transparent file encryption in Git -DISTNAME = git-crypt-0.6.0 +DISTNAME = git-crypt-0.7.0 CATEGORIES = devel -REVISION = 0 HOMEPAGE = https://www.agwa.name/projects/git-crypt/ MAINTAINER = Paco Esteban blob - b3a005dbf046e542b4884715fd485018d37d44da file + devel/git-crypt/distinfo --- devel/git-crypt/distinfo +++ devel/git-crypt/distinfo @@ -1,2 +1,2 @@ -SHA256 (git-crypt-0.6.0.tar.gz) = bTD82ZRC1Q9LPI1VQGf/HZgM358xIO53QTEXLbqY/W8= -SIZE (git-crypt-0.6.0.tar.gz) = 57275 +SHA256 (git-crypt-0.7.0.tar.gz) = UPEAgWpjamgkBHA7bCOkWeTTAkiyiGpc9XGw1SUnx9g= +SIZE (git-crypt-0.7.0.tar.gz) = 57621 -- Paco Esteban. 0x5818130B8A6DBC03
[maintainer update] devel/git-crypt 0.6.0 --> 0.7.0
Hi ports@, This is a simple update for devel/git-crypt to its latest version 0.7.0 Changelog reads: * Avoid "argument list too long" errors on macOS. * Fix handling of "-" arguments. * Minor documentation improvements. Works fine for me on amd64. Ok to commit ? diff 9151fe3cdd89feb34573bf1117f0648961810822 /usr/ports blob - 63f9765eb3f093e9b3eed1aed45a978ed897db07 file + devel/git-crypt/Makefile --- devel/git-crypt/Makefile +++ devel/git-crypt/Makefile @@ -1,8 +1,7 @@ COMMENT = transparent file encryption in Git -DISTNAME = git-crypt-0.6.0 +DISTNAME = git-crypt-0.7.0 CATEGORIES = devel -REVISION = 0 HOMEPAGE = https://www.agwa.name/projects/git-crypt/ MAINTAINER = Paco Esteban blob - b3a005dbf046e542b4884715fd485018d37d44da file + devel/git-crypt/distinfo --- devel/git-crypt/distinfo +++ devel/git-crypt/distinfo @@ -1,2 +1,2 @@ -SHA256 (git-crypt-0.6.0.tar.gz) = bTD82ZRC1Q9LPI1VQGf/HZgM358xIO53QTEXLbqY/W8= -SIZE (git-crypt-0.6.0.tar.gz) = 57275 +SHA256 (git-crypt-0.7.0.tar.gz) = UPEAgWpjamgkBHA7bCOkWeTTAkiyiGpc9XGw1SUnx9g= +SIZE (git-crypt-0.7.0.tar.gz) = 57621 -- Paco Esteban. 0x5818130B8A6DBC03
UPDATE: devel/git-lfs to 2.13.1
Hi, The attached diff updates Git LFS to 2.13.1. I have tested it on amd64. It works. Please update. Thanks, Asher Index: Makefile === RCS file: /cvs/ports/devel/git-lfs/Makefile,v retrieving revision 1.17 diff -u -p -u -p -r1.17 Makefile --- Makefile 5 Nov 2020 15:56:39 - 1.17 +++ Makefile 2 Jan 2021 20:55:42 - @@ -4,7 +4,7 @@ COMMENT = Git extension for versioning GH_PROJECT = git-lfs GH_ACCOUNT = git-lfs -GH_TAGNAME = v2.12.1 +GH_TAGNAME = v2.13.1 CATEGORIES = devel Index: distinfo === RCS file: /cvs/ports/devel/git-lfs/distinfo,v retrieving revision 1.15 diff -u -p -u -p -r1.15 distinfo --- distinfo 5 Nov 2020 15:56:39 - 1.15 +++ distinfo 2 Jan 2021 20:55:42 - @@ -1,2 +1,2 @@ -SHA256 (git-lfs-2.12.1.tar.gz) = Ky5w8SM/fv6aAQdxUQORoHUn7HwK9yHs+O2rrF1g9is= -SIZE (git-lfs-2.12.1.tar.gz) = 2848245 +SHA256 (git-lfs-2.13.1.tar.gz) = W6fZRdlq1JSS4p7b/RzOUosqA0/d2/blQk51SkoBICk= +SIZE (git-lfs-2.13.1.tar.gz) = 2526962
UPDATE: devel/git-lfs to 2.12.0
Hi, The attached diff updates Git LFS to 2.12.0. I have tested it on amd64. It works. Please update. Thanks, Asher Index: Makefile === RCS file: /cvs/ports/devel/git-lfs/Makefile,v retrieving revision 1.15 diff -u -p -u -p -r1.15 Makefile --- Makefile 6 Mar 2020 08:59:09 - 1.15 +++ Makefile 2 Sep 2020 16:03:42 - @@ -4,7 +4,7 @@ COMMENT = Git extension for versioning GH_PROJECT = git-lfs GH_ACCOUNT = git-lfs -GH_TAGNAME = v2.10.0 +GH_TAGNAME = v2.12.0 CATEGORIES = devel Index: distinfo === RCS file: /cvs/ports/devel/git-lfs/distinfo,v retrieving revision 1.13 diff -u -p -u -p -r1.13 distinfo --- distinfo 6 Mar 2020 08:59:09 - 1.13 +++ distinfo 2 Sep 2020 16:03:42 - @@ -1,2 +1,2 @@ -SHA256 (git-lfs-2.10.0.tar.gz) = B/1cV6EDnVcX3Bkq/74yaOwv0DrM3KRiy1BMC0GUzSM= -SIZE (git-lfs-2.10.0.tar.gz) = 2771571 +SHA256 (git-lfs-2.12.0.tar.gz) = mXHZHNKw3TTM2kGj25dQS/20+8I8wu5Lbjua/qVkOUE= +SIZE (git-lfs-2.12.0.tar.gz) = 2847273 Index: pkg/PLIST === RCS file: /cvs/ports/devel/git-lfs/pkg/PLIST,v retrieving revision 1.5 diff -u -p -u -p -r1.5 PLIST --- pkg/PLIST 6 Mar 2020 08:59:09 - 1.5 +++ pkg/PLIST 2 Sep 2020 16:03:42 - @@ -17,6 +17,7 @@ @man man/man1/git-lfs-migrate.1 @man man/man1/git-lfs-pointer.1 @man man/man1/git-lfs-post-checkout.1 +@man man/man1/git-lfs-post-commit.1 @man man/man1/git-lfs-post-merge.1 @man man/man1/git-lfs-pre-push.1 @man man/man1/git-lfs-prune.1
UPDATE: devel/git-lfs to 2.11.0
Hi, The attached diff updates Git LFS to 2.11.0. I have tested it on amd64. It works. Please update. Thanks, Asher Index: Makefile === RCS file: /cvs/ports/devel/git-lfs/Makefile,v retrieving revision 1.15 diff -u -p -u -p -r1.15 Makefile --- Makefile 6 Mar 2020 08:59:09 - 1.15 +++ Makefile 24 May 2020 15:12:42 - @@ -4,7 +4,7 @@ COMMENT = Git extension for versioning GH_PROJECT = git-lfs GH_ACCOUNT = git-lfs -GH_TAGNAME = v2.10.0 +GH_TAGNAME = v2.11.0 CATEGORIES = devel Index: distinfo === RCS file: /cvs/ports/devel/git-lfs/distinfo,v retrieving revision 1.13 diff -u -p -u -p -r1.13 distinfo --- distinfo 6 Mar 2020 08:59:09 - 1.13 +++ distinfo 24 May 2020 15:12:42 - @@ -1,2 +1,2 @@ -SHA256 (git-lfs-2.10.0.tar.gz) = B/1cV6EDnVcX3Bkq/74yaOwv0DrM3KRiy1BMC0GUzSM= -SIZE (git-lfs-2.10.0.tar.gz) = 2771571 +SHA256 (git-lfs-2.11.0.tar.gz) = gYPEy++M+cLoawwKmCJFHi3ycvic6zV8SYv98P8bNsc= +SIZE (git-lfs-2.11.0.tar.gz) = 2839623 Index: pkg/PLIST === RCS file: /cvs/ports/devel/git-lfs/pkg/PLIST,v retrieving revision 1.5 diff -u -p -u -p -r1.5 PLIST --- pkg/PLIST 6 Mar 2020 08:59:09 - 1.5 +++ pkg/PLIST 24 May 2020 15:12:42 - @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2020/03/06 08:59:09 jca Exp $ +@comment $OpenBSD: PLIST,v$ @bin bin/git-lfs @man man/man1/git-lfs-checkout.1 @man man/man1/git-lfs-clean.1 @@ -17,6 +17,7 @@ @man man/man1/git-lfs-migrate.1 @man man/man1/git-lfs-pointer.1 @man man/man1/git-lfs-post-checkout.1 +@man man/man1/git-lfs-post-commit.1 @man man/man1/git-lfs-post-merge.1 @man man/man1/git-lfs-pre-push.1 @man man/man1/git-lfs-prune.1
UPDATE devel/git-cola-3.7
Enclosed a simple diff for updating git-cola to 3.7. Changes: https://github.com/git-cola/git-cola/blob/v3.7/CHANGES.rst 'make test' runs successfully. Run tested on amd64. Comments/OK? diff --git devel/git-cola/Makefile devel/git-cola/Makefile index 85b533ee192..4d1d9d12d01 100644 --- devel/git-cola/Makefile +++ devel/git-cola/Makefile @@ -2,8 +2,7 @@ COMMENT = python powered git gui -MODPY_EGG_VERSION= 3.6 -REVISION = 0 +MODPY_EGG_VERSION= 3.7 GH_ACCOUNT = git-cola GH_PROJECT = git-cola diff --git devel/git-cola/distinfo devel/git-cola/distinfo index 14b6faa2dff..0843017c618 100644 --- devel/git-cola/distinfo +++ devel/git-cola/distinfo @@ -1,2 +1,2 @@ -SHA256 (git-cola-3.6.tar.gz) = YzafUZ+BmIwtFnuixZrVNkTT+sK3vh4S0/Hfm4/ZGDk= -SIZE (git-cola-3.6.tar.gz) = 967745 +SHA256 (git-cola-3.7.tar.gz) = mhQnsFwQfsgzeIHtaLtFCsBAoIiA+R3LdwWI91XW/Rs= +SIZE (git-cola-3.7.tar.gz) = 968501 diff --git devel/git-cola/patches/patch-Makefile devel/git-cola/patches/patch-Makefile index 79ca0e1a2c6..5931022acf6 100644 --- devel/git-cola/patches/patch-Makefile +++ devel/git-cola/patches/patch-Makefile @@ -8,8 +8,8 @@ code is not used when running git-cola on OpenBSD. Index: Makefile --- Makefile.orig +++ Makefile -@@ -72,7 +72,7 @@ FLAKE8_FLAGS += --format=pylint - FLAKE8_FLAGS += --doctests +@@ -71,7 +71,7 @@ endif + FLAKE8_FLAGS = $(VERBOSE) PYTEST_FLAGS = $(QUIET) $(TEST_VERBOSE) -PYTEST_FLAGS += --doctest-modules diff --git devel/git-cola/patches/patch-cola_app_py devel/git-cola/patches/patch-cola_app_py index 5d63bd8e245..1e0da62b596 100644 --- devel/git-cola/patches/patch-cola_app_py +++ devel/git-cola/patches/patch-cola_app_py @@ -5,7 +5,7 @@ Use ssh-askpass implementation from xenocara. Index: cola/app.py --- cola/app.py.orig +++ cola/app.py -@@ -98,7 +98,7 @@ def setup_environment(): +@@ -101,7 +101,7 @@ def setup_environment(): elif sys.platform == 'darwin': askpass = resources.share('bin', 'ssh-askpass-darwin') else:
Re: UPDATE: devel/git-lfs to 2.10.0
On Thu, Mar 05 2020, Asher Pasha wrote: > Hi, > The attached diff updates Git Large File System to 2.10.0. I have > tested it on amd64. It works. Please update. Committed, thanks. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
UPDATE: devel/git-lfs to 2.10.0
Hi, The attached diff updates Git Large File System to 2.10.0. I have tested it on amd64. It works. Please update. Thanks, Asher Index: Makefile === RCS file: /cvs/ports/devel/git-lfs/Makefile,v retrieving revision 1.14 diff -u -p -u -p -r1.14 Makefile --- Makefile 12 Jul 2019 20:44:09 - 1.14 +++ Makefile 5 Mar 2020 16:49:05 - @@ -4,7 +4,7 @@ COMMENT = Git extension for versioning GH_PROJECT = git-lfs GH_ACCOUNT = git-lfs -GH_TAGNAME = v2.5.2 +GH_TAGNAME = v2.10.0 CATEGORIES = devel Index: distinfo === RCS file: /cvs/ports/devel/git-lfs/distinfo,v retrieving revision 1.12 diff -u -p -u -p -r1.12 distinfo --- distinfo 2 Oct 2018 15:13:48 - 1.12 +++ distinfo 5 Mar 2020 16:49:05 - @@ -1,2 +1,2 @@ -SHA256 (git-lfs-2.5.2.tar.gz) = CrIfD5tsQKzZdIoWafECPvOPkT2L6Du/e3x9mDvTxNE= -SIZE (git-lfs-2.5.2.tar.gz) = 947150 +SHA256 (git-lfs-2.10.0.tar.gz) = B/1cV6EDnVcX3Bkq/74yaOwv0DrM3KRiy1BMC0GUzSM= +SIZE (git-lfs-2.10.0.tar.gz) = 2771571 Index: pkg/PLIST === RCS file: /cvs/ports/devel/git-lfs/pkg/PLIST,v retrieving revision 1.4 diff -u -p -u -p -r1.4 PLIST --- pkg/PLIST 26 Jul 2017 19:23:26 - 1.4 +++ pkg/PLIST 5 Mar 2020 16:49:05 - @@ -3,6 +3,7 @@ @man man/man1/git-lfs-checkout.1 @man man/man1/git-lfs-clean.1 @man man/man1/git-lfs-clone.1 +@man man/man1/git-lfs-dedup.1 @man man/man1/git-lfs-env.1 @man man/man1/git-lfs-ext.1 @man man/man1/git-lfs-fetch.1 @@ -22,6 +23,7 @@ @man man/man1/git-lfs-pull.1 @man man/man1/git-lfs-push.1 @man man/man1/git-lfs-smudge.1 +@man man/man1/git-lfs-standalone-file.1 @man man/man1/git-lfs-status.1 @man man/man1/git-lfs-track.1 @man man/man1/git-lfs-uninstall.1
Re: UPDATE devel/git-cola 3.5
On Tue 24/09/2019 16:49, Björn Ketelaars wrote: > Enclosed diff brings git-cola to 3.5, which is a bugfix release. Release > notes can be found at > https://github.com/git-cola/git-cola/blob/v3.5/share/doc/git-cola/relnotes.rst > > 'make test' fails one test (IconTestCase.test_from_filename_unicode). > I'm not sure, but it look to me that the test itself is at fault. I have > opened an issue upstream. > Run tested OK on amd64. Upstream fixed the failing unit test. With this fix 'make test' runs successfully. New diff enclosed. OK? Index: Makefile === RCS file: /cvs/ports/devel/git-cola/Makefile,v retrieving revision 1.30 diff -u -p -r1.30 Makefile --- Makefile12 Jul 2019 20:44:09 - 1.30 +++ Makefile25 Sep 2019 11:06:04 - @@ -2,7 +2,7 @@ COMMENT = python powered git gui -MODPY_EGG_VERSION= 3.4 +MODPY_EGG_VERSION= 3.5 DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION} GH_ACCOUNT = git-cola Index: distinfo === RCS file: /cvs/ports/devel/git-cola/distinfo,v retrieving revision 1.12 diff -u -p -r1.12 distinfo --- distinfo18 Jun 2019 04:13:54 - 1.12 +++ distinfo25 Sep 2019 11:06:04 - @@ -1,2 +1,2 @@ -SHA256 (git-cola-3.4.tar.gz) = dj44LYsyQnU5WF0X7G/pICbAc/bTGoZKWBbr4izyRbw= -SIZE (git-cola-3.4.tar.gz) = 963393 +SHA256 (git-cola-3.5.tar.gz) = f9z8QyazXjhLl71LshibTLXPJYlINSdZwwLmMrQbsuI= +SIZE (git-cola-3.5.tar.gz) = 970155 Index: patches/patch-test_icons_test_py === RCS file: patches/patch-test_icons_test_py diff -N patches/patch-test_icons_test_py --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-test_icons_test_py25 Sep 2019 11:06:04 - @@ -0,0 +1,16 @@ +$OpenBSD$ + +Fix unit test. Taken from https://github.com/git-cola/git-cola/pull/993. + +Index: test/icons_test.py +--- test/icons_test.py.orig test/icons_test.py +@@ -11,7 +11,7 @@ from cola import icons + class IconTestCase(unittest.TestCase): + + def test_from_filename_unicode(self): +-filename = compat.uchr(0x400) + '.odt' ++filename = compat.uchr(0x400) + '.py' + expect = 'file-code.svg' + actual = icons.basename_from_filename(filename) + self.assertEqual(expect, actual)
UPDATE devel/git-cola 3.5
Enclosed diff brings git-cola to 3.5, which is a bugfix release. Release notes can be found at https://github.com/git-cola/git-cola/blob/v3.5/share/doc/git-cola/relnotes.rst 'make test' fails one test (IconTestCase.test_from_filename_unicode). I'm not sure, but it look to me that the test itself is at fault. I have opened an issue upstream. Run tested OK on amd64. Comments/OK? Index: Makefile === RCS file: /cvs/ports/devel/git-cola/Makefile,v retrieving revision 1.30 diff -u -p -r1.30 Makefile --- Makefile12 Jul 2019 20:44:09 - 1.30 +++ Makefile24 Sep 2019 14:37:04 - @@ -2,7 +2,7 @@ COMMENT = python powered git gui -MODPY_EGG_VERSION= 3.4 +MODPY_EGG_VERSION= 3.5 DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION} GH_ACCOUNT = git-cola Index: distinfo === RCS file: /cvs/ports/devel/git-cola/distinfo,v retrieving revision 1.12 diff -u -p -r1.12 distinfo --- distinfo18 Jun 2019 04:13:54 - 1.12 +++ distinfo24 Sep 2019 14:37:04 - @@ -1,2 +1,2 @@ -SHA256 (git-cola-3.4.tar.gz) = dj44LYsyQnU5WF0X7G/pICbAc/bTGoZKWBbr4izyRbw= -SIZE (git-cola-3.4.tar.gz) = 963393 +SHA256 (git-cola-3.5.tar.gz) = f9z8QyazXjhLl71LshibTLXPJYlINSdZwwLmMrQbsuI= +SIZE (git-cola-3.5.tar.gz) = 970155
Re: UPDATE devel/git-cola
OK mariani@ On Mon, Mar 4, 2019 at 4:17 AM Björn Ketelaars wrote: > > On Mon 11/02/2019 10:16, Björn Ketelaars wrote: > > On Mon 04/02/2019 20:35, Björn Ketelaars wrote: > > > > > > Enclosed diff updates git-cola to 3.3, which fixes some minor issues. > > > Changelog can be found at > > > https://github.com/git-cola/git-cola/blob/master/share/doc/git-cola/relnotes.rst > > > > > > Comments/OK? > > > > Ping... > > Ping >
Re: UPDATE devel/git-cola
On Mon 11/02/2019 10:16, Björn Ketelaars wrote: > On Mon 04/02/2019 20:35, Björn Ketelaars wrote: > > > > Enclosed diff updates git-cola to 3.3, which fixes some minor issues. > > Changelog can be found at > > https://github.com/git-cola/git-cola/blob/master/share/doc/git-cola/relnotes.rst > > > > Comments/OK? > > Ping... Ping
Re: UPDATE devel/git-cola
On Mon 04/02/2019 20:35, Björn Ketelaars wrote: > > Enclosed diff updates git-cola to 3.3, which fixes some minor issues. > Changelog can be found at > https://github.com/git-cola/git-cola/blob/master/share/doc/git-cola/relnotes.rst > > Comments/OK? Ping...
UPDATE devel/git-cola
Enclosed diff updates git-cola to 3.3, which fixes some minor issues. Changelog can be found at https://github.com/git-cola/git-cola/blob/master/share/doc/git-cola/relnotes.rst Comments/OK? Index: Makefile === RCS file: /cvs/ports/devel/git-cola/Makefile,v retrieving revision 1.26 diff -u -p -r1.26 Makefile --- Makefile16 Sep 2018 09:10:44 - 1.26 +++ Makefile4 Feb 2019 19:31:35 - @@ -2,9 +2,8 @@ COMMENT = python powered git gui -MODPY_EGG_VERSION= 3.2 +MODPY_EGG_VERSION= 3.3 DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION} -REVISION = 0 GH_ACCOUNT = git-cola GH_PROJECT = git-cola Index: distinfo === RCS file: /cvs/ports/devel/git-cola/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo8 Sep 2018 03:55:10 - 1.10 +++ distinfo4 Feb 2019 19:31:35 - @@ -1,2 +1,2 @@ -SHA256 (git-cola-3.2.tar.gz) = QAXnFNt4sHPB74veVUhUUtx6MeO4zAtNYNYRL/teoig= -SIZE (git-cola-3.2.tar.gz) = 1208723 +SHA256 (git-cola-3.3.tar.gz) = s/oNM5UJVkFk2Ks8jNDAdq0/3VAK886lWn+koInNPAE= +SIZE (git-cola-3.3.tar.gz) = 953269 Index: pkg/PLIST === RCS file: /cvs/ports/devel/git-cola/pkg/PLIST,v retrieving revision 1.14 diff -u -p -r1.14 PLIST --- pkg/PLIST 16 Sep 2018 04:55:44 - 1.14 +++ pkg/PLIST 4 Feb 2019 19:31:35 - @@ -33,6 +33,7 @@ share/git-cola/icons/dark/circle-slash-r share/git-cola/icons/dark/circle-slash.svg share/git-cola/icons/dark/desktop-download.svg share/git-cola/icons/dark/diff.svg +share/git-cola/icons/dark/document-save-symbolic.svg share/git-cola/icons/dark/edit-copy.svg share/git-cola/icons/dark/edit-select-all.svg share/git-cola/icons/dark/edit-undo.svg @@ -81,6 +82,7 @@ share/git-cola/icons/dark/zoom-in.svg share/git-cola/icons/dark/zoom-out.svg share/git-cola/icons/desktop-download.svg share/git-cola/icons/diff.svg +share/git-cola/icons/document-save-symbolic.svg share/git-cola/icons/edit-copy.svg share/git-cola/icons/edit-select-all.svg share/git-cola/icons/edit-undo.svg @@ -137,6 +139,8 @@ 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/cmd.py +share/git-cola/lib/cola/cmd.pyc share/git-cola/lib/cola/cmds.py share/git-cola/lib/cola/cmds.pyc share/git-cola/lib/cola/compat.py @@ -291,6 +295,8 @@ 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/submodules.py +share/git-cola/lib/cola/widgets/submodules.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
Re: [update]: devel/git
On 2018/11/18 18:02, Klemens Nanni wrote: > CC'ing the maintainer. > > On Sun, Nov 18, 2018 at 05:57:29PM +0100, Paco Esteban wrote: > > I was trying to send a patch using 'git send-email'. Right after I > > supply password for my email account I get this: > > > > Need MIME::Base64 and Authen::SASL todo auth at > > /usr/local/libexec/git/git-send-email line 1520. > I'm surprised this hasn't come up earlier. > > > MIME::Base64 is part of the Perl core modules, but Authen::SASL is not. > > So maybe this (silly) diff could be useful ... don't know. > Thanks for your report and diff. > > OK with me after bumping REVISION. If noone objects or commits it, I'll > do so next week. > Really this is an (optional) dependency of Net::SMTP, which is in base ... 163 sub auth { 164 my ($self, $username, $password) = @_; 165 166 eval { 167 require MIME::Base64; 168 require Authen::SASL; 169 } or $self->set_status(500, ["Need MIME::Base64 and Authen::SASL todo auth"]), return 0;
Re: [update]: devel/git
CC'ing the maintainer. On Sun, Nov 18, 2018 at 05:57:29PM +0100, Paco Esteban wrote: > I was trying to send a patch using 'git send-email'. Right after I > supply password for my email account I get this: > > Need MIME::Base64 and Authen::SASL todo auth at > /usr/local/libexec/git/git-send-email line 1520. I'm surprised this hasn't come up earlier. > MIME::Base64 is part of the Perl core modules, but Authen::SASL is not. > So maybe this (silly) diff could be useful ... don't know. Thanks for your report and diff. OK with me after bumping REVISION. If noone objects or commits it, I'll do so next week.
[update]: devel/git
Hi, I was trying to send a patch using 'git send-email'. Right after I supply password for my email account I get this: Need MIME::Base64 and Authen::SASL todo auth at /usr/local/libexec/git/git-send-email line 1520. MIME::Base64 is part of the Perl core modules, but Authen::SASL is not. So maybe this (silly) diff could be useful ... don't know. Cheers, -- Paco Esteban https://onna.be/gpgkey.asc Index: Makefile === RCS file: /cvs/ports/devel/git/Makefile,v retrieving revision 1.194 diff -u -p -r1.194 Makefile --- Makefile5 Oct 2018 21:54:41 - 1.194 +++ Makefile18 Nov 2018 16:49:23 - @@ -43,7 +43,8 @@ WANTLIB-main =c crypto curl expat icon RUN_DEPENDS-main = net/rsync \ devel/p5-Error \ - devel/cvsps + devel/cvsps \ + security/p5-Authen-SASL LIB_DEPENDS-main = devel/gettext \ net/curl
Re: UPDATE devel/git-lfs
OK kn
Re: UPDATE devel/git-lfs
On Wed 19/09/2018 18:45, Björn Ketelaars wrote: > Enclosed diff brings git-lfs to 2.5.2, which is a maintenance release. > Changelog can be found at > https://github.com/git-lfs/git-lfs/releases/tag/v2.5.2 > > Tested ok on amd64. > > Comments/OKs? OK?
UPDATE devel/git-lfs
Enclosed diff brings git-lfs to 2.5.2, which is a maintenance release. Changelog can be found at https://github.com/git-lfs/git-lfs/releases/tag/v2.5.2 Tested ok on amd64. Comments/OKs? Index: Makefile === RCS file: /cvs/ports/devel/git-lfs/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile5 Aug 2018 20:51:25 - 1.12 +++ Makefile19 Sep 2018 16:36:42 - @@ -4,7 +4,7 @@ COMMENT = Git extension for versioning GH_PROJECT = git-lfs GH_ACCOUNT = git-lfs -GH_TAGNAME = v2.5.1 +GH_TAGNAME = v2.5.2 CATEGORIES = devel Index: distinfo === RCS file: /cvs/ports/devel/git-lfs/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo5 Aug 2018 20:51:25 - 1.11 +++ distinfo19 Sep 2018 16:36:42 - @@ -1,2 +1,2 @@ -SHA256 (git-lfs-2.5.1.tar.gz) = hcMUjHy9khbjVrkxe8cm/42YKzdlTsGybFNyOLqb/Y4= -SIZE (git-lfs-2.5.1.tar.gz) = 946596 +SHA256 (git-lfs-2.5.2.tar.gz) = CrIfD5tsQKzZdIoWafECPvOPkT2L6Du/e3x9mDvTxNE= +SIZE (git-lfs-2.5.2.tar.gz) = 947150
Re: UPDATE devel/git-cola
On Sat, Sep 15, 2018 at 10:12:39PM +0200, Björn Ketelaars wrote: > Discussed with kn@ off list: > > New diff adding ${MODPY_FLAVOR} to deps having py flavors. OK kn
Re: UPDATE devel/git-cola
On Sat 15/09/2018 18:28, Klemens Nanni wrote: > On Sat, Sep 15, 2018 at 05:15:45PM +0200, Björn Ketelaars wrote: > > Instead of using the bundled qtpy use the version in ports. No issues > > found on amd64. > Sounds good. What about this from upstream README: > > Set QT_API=pyqt4 in your environment if you have both versions > of PyQt installed and want to ensure that PyQt4 is used. > > Dependencies are lacking ${MODPY_FLAVOR}. > > git-cola runs fine with your diff but I still see this: > > /usr/local/lib/python2.7/site-packages/qtpy/__init__.py:211: > RuntimeWarning: Selected binding "pyqt5" could not be found, using "pyqt" > 'using "{}"'.format(initial_api, API), RuntimeWarning) > > > As a side note, git-cola does not seem to work with Python 3 on our site: > > $ git-cola > Traceback (most recent call last): > File "/usr/local/lib/python3.6/site-packages/qtpy/__init__.py", line > 199, in > from PySide import __version__ as PYSIDE_VERSION # analysis:ignore > ModuleNotFoundError: No module named 'PySide' > > During handling of the above exception, another exception occurred: > > Traceback (most recent call last): > File "/usr/local/bin/git-cola", line 53, in > from cola.main import main > File "/usr/local/share/git-cola/lib/cola/main.py", line 6, in > from . import app > File "/usr/local/share/git-cola/lib/cola/app.py", line 15, in > from qtpy import QtCore > File "/usr/local/lib/python3.6/site-packages/qtpy/__init__.py", line > 205, in > raise PythonQtError('No Qt bindings could be found') > qtpy.PythonQtError: No Qt bindings could be found Discussed with kn@ off list: New diff adding ${MODPY_FLAVOR} to deps having py flavors. Tested a build with both py-qt4 and py-qt5 installed: - Starting git-cola results in py-qt5 being used - removing py-qt5, and starting git-cola again results in py-qt4 being used Above is expected behaviour. Please note that one can force use of py-qt4 by setting QT_API=pyqt4 in the environment. OK? Index: Makefile === RCS file: /cvs/ports/devel/git-cola/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile8 Sep 2018 03:55:10 - 1.24 +++ Makefile15 Sep 2018 20:01:13 - @@ -4,6 +4,7 @@ COMMENT = python powered git gui MODPY_EGG_VERSION= 3.2 DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION} +REVISION = 0 GH_ACCOUNT = git-cola GH_PROJECT = git-cola @@ -13,6 +14,8 @@ CATEGORIES = devel x11 HOMEPAGE = https://git-cola.github.io/ +MAINTAINER = Bjorn Ketelaars + # GPLv2 only PERMIT_PACKAGE_CDROM= Yes @@ -21,17 +24,21 @@ MODULES = lang/python BUILD_DEPENDS =devel/gettext-tools \ devel/git \ textproc/xxdiff \ - x11/py-qt4 + x11/py-qt4 \ + x11/py-qtpy${MODPY_FLAVOR} RUN_DEPENDS = devel/desktop-file-utils \ devel/git \ textproc/xxdiff \ - x11/py-qt4 + x11/py-qt4 \ + x11/py-qtpy${MODPY_FLAVOR} -TEST_DEPENDS = devel/py-mock \ - devel/py-test +TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR} \ + devel/py-test${MODPY_FLAVOR} USE_GMAKE =Yes + +MAKE_ENV = GIT_COLA_NO_VENDOR_LIBS=1 MODPY_ADJ_FILES= share/git-cola/bin/git-xbase Index: pkg/PLIST === RCS file: /cvs/ports/devel/git-cola/pkg/PLIST,v retrieving revision 1.13 diff -u -p -r1.13 PLIST --- pkg/PLIST 8 Sep 2018 03:55:10 - 1.13 +++ pkg/PLIST 15 Sep 2018 20:01:13 - @@ -297,50 +297,6 @@ share/git-cola/lib/cola/widgets/toolbar. 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/QtHelp.py -share/git-cola/lib/qtpy/QtHelp.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/QtSql.py -share/git-cola/lib/qtpy/QtSql.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/l
Re: UPDATE devel/git-cola
On 2018/09/15 18:28, Klemens Nanni wrote: > On Sat, Sep 15, 2018 at 05:15:45PM +0200, Björn Ketelaars wrote: > > Instead of using the bundled qtpy use the version in ports. No issues > > found on amd64. > Sounds good. What about this from upstream README: > > Set QT_API=pyqt4 in your environment if you have both versions > of PyQt installed and want to ensure that PyQt4 is used. > > Dependencies are lacking ${MODPY_FLAVOR}. > > git-cola runs fine with your diff but I still see this: > > /usr/local/lib/python2.7/site-packages/qtpy/__init__.py:211: > RuntimeWarning: Selected binding "pyqt5" could not be found, using "pyqt" > 'using "{}"'.format(initial_api, API), RuntimeWarning) > > > As a side note, git-cola does not seem to work with Python 3 on our site: > > $ git-cola > Traceback (most recent call last): > File "/usr/local/lib/python3.6/site-packages/qtpy/__init__.py", line > 199, in > from PySide import __version__ as PYSIDE_VERSION # analysis:ignore > ModuleNotFoundError: No module named 'PySide' That's because you don't have any supported qt backend installed - IIRC if you install py3-qt5 it works. git-cola uses the first one it finds out of py-qt5, py-qt4, pyside - if none of them are found it shows the "module not found" error for the last one it tried. (pyside isn't in ports, py-qt4 doesn't have a py3 flavour, py-qt5 does). > > During handling of the above exception, another exception occurred: > > Traceback (most recent call last): > File "/usr/local/bin/git-cola", line 53, in > from cola.main import main > File "/usr/local/share/git-cola/lib/cola/main.py", line 6, in > from . import app > File "/usr/local/share/git-cola/lib/cola/app.py", line 15, in > from qtpy import QtCore > File "/usr/local/lib/python3.6/site-packages/qtpy/__init__.py", line > 205, in > raise PythonQtError('No Qt bindings could be found') > qtpy.PythonQtError: No Qt bindings could be found >
Re: UPDATE devel/git-cola
On Sat, Sep 15, 2018 at 05:15:45PM +0200, Björn Ketelaars wrote: > Instead of using the bundled qtpy use the version in ports. No issues > found on amd64. Sounds good. What about this from upstream README: Set QT_API=pyqt4 in your environment if you have both versions of PyQt installed and want to ensure that PyQt4 is used. Dependencies are lacking ${MODPY_FLAVOR}. git-cola runs fine with your diff but I still see this: /usr/local/lib/python2.7/site-packages/qtpy/__init__.py:211: RuntimeWarning: Selected binding "pyqt5" could not be found, using "pyqt" 'using "{}"'.format(initial_api, API), RuntimeWarning) As a side note, git-cola does not seem to work with Python 3 on our site: $ git-cola Traceback (most recent call last): File "/usr/local/lib/python3.6/site-packages/qtpy/__init__.py", line 199, in from PySide import __version__ as PYSIDE_VERSION # analysis:ignore ModuleNotFoundError: No module named 'PySide' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/usr/local/bin/git-cola", line 53, in from cola.main import main File "/usr/local/share/git-cola/lib/cola/main.py", line 6, in from . import app File "/usr/local/share/git-cola/lib/cola/app.py", line 15, in from qtpy import QtCore File "/usr/local/lib/python3.6/site-packages/qtpy/__init__.py", line 205, in raise PythonQtError('No Qt bindings could be found') qtpy.PythonQtError: No Qt bindings could be found
UPDATE devel/git-cola
Instead of using the bundled qtpy use the version in ports. No issues found on amd64. While here take MAINTAINER. ok? Index: Makefile === RCS file: /cvs/ports/devel/git-cola/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile8 Sep 2018 03:55:10 - 1.24 +++ Makefile15 Sep 2018 15:13:46 - @@ -4,6 +4,7 @@ COMMENT = python powered git gui MODPY_EGG_VERSION= 3.2 DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION} +REVISION = 0 GH_ACCOUNT = git-cola GH_PROJECT = git-cola @@ -13,6 +14,8 @@ CATEGORIES = devel x11 HOMEPAGE = https://git-cola.github.io/ +MAINTAINER = Bjorn Ketelaars + # GPLv2 only PERMIT_PACKAGE_CDROM= Yes @@ -21,17 +24,21 @@ MODULES = lang/python BUILD_DEPENDS =devel/gettext-tools \ devel/git \ textproc/xxdiff \ - x11/py-qt4 + x11/py-qt4 \ + x11/py-qtpy RUN_DEPENDS = devel/desktop-file-utils \ devel/git \ textproc/xxdiff \ - x11/py-qt4 + x11/py-qt4 \ + x11/py-qtpy TEST_DEPENDS = devel/py-mock \ devel/py-test USE_GMAKE =Yes + +MAKE_ENV = GIT_COLA_NO_VENDOR_LIBS=1 MODPY_ADJ_FILES= share/git-cola/bin/git-xbase Index: pkg/PLIST === RCS file: /cvs/ports/devel/git-cola/pkg/PLIST,v retrieving revision 1.13 diff -u -p -r1.13 PLIST --- pkg/PLIST 8 Sep 2018 03:55:10 - 1.13 +++ pkg/PLIST 15 Sep 2018 15:13:46 - @@ -297,50 +297,6 @@ share/git-cola/lib/cola/widgets/toolbar. 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/QtHelp.py -share/git-cola/lib/qtpy/QtHelp.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/QtSql.py -share/git-cola/lib/qtpy/QtSql.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
Re: UPDATE devel/git-cola
On 2018/09/07 19:13, Björn Ketelaars wrote: > On Fri 07/09/2018 14:40, Stuart Henderson wrote: > > On 2018/09/05 14:51, Björn Ketelaars wrote: > > > A new version of git-cola is available fixing several usability issues, > > > and adding some new features. Changelog can be found at > > > https://github.com/git-cola/git-cola/blob/64f94b51573653a2f31db24fdf2239387bce2b2a/share/doc/git-cola/relnotes.rst > > > > > > 'make test' runs successfully, and I've been running this version for > > > the last couple of days on amd64 without encountering a regression. > > > > > > Before committing the diff below: any users who like to do some > > > additional testing? > > > > OK, though in the interest of reproducibility (git-cola uses py-qt5 if > > present, then py-qt4, then pyside, in that order) I wonder if it's maybe > > worth switching the dep to py-qt5? Or making it an "either/or"? > > > > git-cola has xxdiff as RDEP, which in turn depends on QT4. Changing > git-cola to py-qt5 increases the number of dependencies significantly, > which imho does not make sense as it does not solve a problem, or add > a nice to have feature. > I prefer not switching to py-qt5. > > OK? Fair enough, my OK still stands.
Re: UPDATE devel/git-cola
On Fri 07/09/2018 14:40, Stuart Henderson wrote: > On 2018/09/05 14:51, Björn Ketelaars wrote: > > A new version of git-cola is available fixing several usability issues, > > and adding some new features. Changelog can be found at > > https://github.com/git-cola/git-cola/blob/64f94b51573653a2f31db24fdf2239387bce2b2a/share/doc/git-cola/relnotes.rst > > > > 'make test' runs successfully, and I've been running this version for > > the last couple of days on amd64 without encountering a regression. > > > > Before committing the diff below: any users who like to do some > > additional testing? > > OK, though in the interest of reproducibility (git-cola uses py-qt5 if > present, then py-qt4, then pyside, in that order) I wonder if it's maybe > worth switching the dep to py-qt5? Or making it an "either/or"? > git-cola has xxdiff as RDEP, which in turn depends on QT4. Changing git-cola to py-qt5 increases the number of dependencies significantly, which imho does not make sense as it does not solve a problem, or add a nice to have feature. I prefer not switching to py-qt5. OK?
Re: UPDATE devel/git-cola
On 2018/09/05 14:51, Björn Ketelaars wrote: > A new version of git-cola is available fixing several usability issues, > and adding some new features. Changelog can be found at > https://github.com/git-cola/git-cola/blob/64f94b51573653a2f31db24fdf2239387bce2b2a/share/doc/git-cola/relnotes.rst > > 'make test' runs successfully, and I've been running this version for > the last couple of days on amd64 without encountering a regression. > > Before committing the diff below: any users who like to do some > additional testing? OK, though in the interest of reproducibility (git-cola uses py-qt5 if present, then py-qt4, then pyside, in that order) I wonder if it's maybe worth switching the dep to py-qt5? Or making it an "either/or"?
UPDATE devel/git-cola
A new version of git-cola is available fixing several usability issues, and adding some new features. Changelog can be found at https://github.com/git-cola/git-cola/blob/64f94b51573653a2f31db24fdf2239387bce2b2a/share/doc/git-cola/relnotes.rst 'make test' runs successfully, and I've been running this version for the last couple of days on amd64 without encountering a regression. Before committing the diff below: any users who like to do some additional testing? Index: Makefile === RCS file: /cvs/ports/devel/git-cola/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- Makefile27 Jun 2018 21:03:39 - 1.23 +++ Makefile5 Sep 2018 12:49:10 - @@ -2,9 +2,8 @@ COMMENT = python powered git gui -MODPY_EGG_VERSION= 3.1 +MODPY_EGG_VERSION= 3.2 DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION} -REVISION = 0 GH_ACCOUNT = git-cola GH_PROJECT = git-cola Index: distinfo === RCS file: /cvs/ports/devel/git-cola/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo9 May 2018 04:24:30 - 1.9 +++ distinfo5 Sep 2018 12:49:10 - @@ -1,2 +1,2 @@ -SHA256 (git-cola-3.1.tar.gz) = p6CD+EaXpW7nyRDM/GgNNsXER8a1o1IuAb/53pFHT1c= -SIZE (git-cola-3.1.tar.gz) = 1179782 +SHA256 (git-cola-3.2.tar.gz) = QAXnFNt4sHPB74veVUhUUtx6MeO4zAtNYNYRL/teoig= +SIZE (git-cola-3.2.tar.gz) = 1208723 Index: patches/patch-Makefile === RCS file: /cvs/ports/devel/git-cola/patches/patch-Makefile,v retrieving revision 1.4 diff -u -p -r1.4 patch-Makefile --- patches/patch-Makefile 9 May 2018 04:24:30 - 1.4 +++ patches/patch-Makefile 5 Sep 2018 12:49:10 - @@ -8,12 +8,12 @@ code is not used when running git-cola o Index: Makefile --- Makefile.orig +++ Makefile -@@ -53,7 +53,7 @@ ifdef V - else - QUIET = --quiet - endif --PYTEST_FLAGS = $(QUIET) $(TEST_VERBOSE) --doctest-modules -+PYTEST_FLAGS = $(QUIET) $(TEST_VERBOSE) - FLAKE8_FLAGS = --max-line-length=80 --statistics --doctests --format=pylint - PYLINT_FLAGS = --rcfile=.pylintrc - ifdef color +@@ -72,7 +72,7 @@ FLAKE8_FLAGS += --format=pylint + FLAKE8_FLAGS += --doctests + + PYTEST_FLAGS = $(QUIET) $(TEST_VERBOSE) +-PYTEST_FLAGS += --doctest-modules ++#PYTEST_FLAGS += --doctest-modules + + TOX_FLAGS = $(VERBOSE_SHORT) --develop --skip-missing-interpreters + Index: patches/patch-cola_app_py === RCS file: /cvs/ports/devel/git-cola/patches/patch-cola_app_py,v retrieving revision 1.4 diff -u -p -r1.4 patch-cola_app_py --- patches/patch-cola_app_py 9 May 2018 04:24:30 - 1.4 +++ patches/patch-cola_app_py 5 Sep 2018 12:49:10 - @@ -5,7 +5,7 @@ Use ssh-askpass implementation from xeno Index: cola/app.py --- cola/app.py.orig +++ cola/app.py -@@ -86,7 +86,7 @@ def setup_environment(): +@@ -90,7 +90,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.12 diff -u -p -r1.12 PLIST --- pkg/PLIST 27 Jun 2018 21:03:40 - 1.12 +++ pkg/PLIST 5 Sep 2018 12:49:10 - @@ -202,6 +202,8 @@ 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/spellcheck.py +share/git-cola/lib/cola/spellcheck.pyc share/git-cola/lib/cola/textwrap.py share/git-cola/lib/cola/textwrap.pyc share/git-cola/lib/cola/utils.py @@ -302,6 +304,8 @@ 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/QtHelp.py +share/git-cola/lib/qtpy/QtHelp.pyc share/git-cola/lib/qtpy/QtMultimedia.py share/git-cola/lib/qtpy/QtMultimedia.pyc share/git-cola/lib/qtpy/QtNetwork.py @@ -310,6 +314,8 @@ 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/QtSql.py +share/git-cola/lib/qtpy/QtSql.pyc share/git-cola/lib/qtpy/QtSvg.py share/git-cola/lib/qtpy/QtSvg.pyc share/git-cola/lib/qtpy/QtTest.py
UPDATE devel/git-lfs
git-lfs 2.5.1 is available, which fixes some bugs and adds some features. Builds and works as advertised on amd64. OK? Index: Makefile === RCS file: /cvs/ports/devel/git-lfs/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile13 Jun 2018 09:49:26 - 1.11 +++ Makefile5 Aug 2018 19:41:42 - @@ -4,7 +4,7 @@ COMMENT = Git extension for versioning GH_PROJECT = git-lfs GH_ACCOUNT = git-lfs -GH_TAGNAME = v2.4.2 +GH_TAGNAME = v2.5.1 CATEGORIES = devel Index: distinfo === RCS file: /cvs/ports/devel/git-lfs/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo13 Jun 2018 09:49:26 - 1.10 +++ distinfo5 Aug 2018 19:41:42 - @@ -1,2 +1,2 @@ -SHA256 (git-lfs-2.4.2.tar.gz) = EwpVKifI8ySsBUi6+dsFGcSulsJqhfkmwH6+DxWmn8I= -SIZE (git-lfs-2.4.2.tar.gz) = 791443 +SHA256 (git-lfs-2.5.1.tar.gz) = hcMUjHy9khbjVrkxe8cm/42YKzdlTsGybFNyOLqb/Y4= +SIZE (git-lfs-2.5.1.tar.gz) = 946596
Re: UPDATE devel/git-lfs
On Wed 06/06/2018 20:18, Björn Ketelaars wrote: > Enclosed a diff for bringing git-lfs to 2.4.2, which fixes some bugs. > Changelog can be found at > https://github.com/git-lfs/git-lfs/blob/release-2.4/CHANGELOG.md > > Build, and tested OK on amd64. > > OK? Ping!
update devel/git to 2.17.1
Routine update that also cleans up some unneeded patches and uses Python 3. While here, I took the liberty to do some `cd && make' -> `make -C'. patch-Makefile can be dropped if we just change into the t/ subdirectory directly which is all the port's main Makefile does anyawy. Upstream's perl/Makefile.PL is no more. t/t-basic.sh succeeds so stop expectin failure. t/t9200-git-cvsexportcommit.sh runs fine as is, too. Upstream has "70ec6bd63 Stop using sum(1)" from 14.08.2017 making our patch obsolete. Tested successfully on amd64 in daily use during the last two weeks. Feedback? OK? Index: Makefile === RCS file: /cvs/ports/devel/git/Makefile,v retrieving revision 1.189 diff -u -p -r1.189 Makefile --- Makefile4 Jun 2018 10:47:29 - 1.189 +++ Makefile11 Jun 2018 21:25:28 - @@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag COMMENT-svn = GIT - subversion interoperability tools COMMENT-x11 = GIT - graphical tools -V =2.16.4 +V =2.17.1 DISTNAME = git-${V} PKGNAME-main = ${DISTNAME} PKGNAME-svn = git-svn-${V} @@ -16,7 +16,7 @@ HOMEPAGE =https://git-scm.com/ MAINTAINER = Benoit Lecocq # GPLv2 only -PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_CDROM = Yes DOC_DISTFILE = git-manpages-${V}${EXTRACT_SUFX} DISTFILES =${DISTNAME}${EXTRACT_SUFX} ${DOC_DISTFILE} @@ -24,8 +24,10 @@ EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUF MASTER_SITES = https://www.kernel.org/pub/software/scm/git/ -MODULES = x11/tk lang/python +MODULES = lang/python \ + x11/tk +MODPY_VERSION =${MODPY_DEFAULT_VERSION_3} MODPY_BUILDDEP = No MODPY_RUNDEP = No MODPY_ADJ_FILES = contrib/hooks/multimail/git_multimail.py \ @@ -88,7 +90,7 @@ TEST_DEPENDS =archivers/gtar \ post-extract: @mkdir -p ${WRKSRC}/doc - @cd ${WRKSRC}/doc && ${TAR} -xzf ${FULLDISTDIR}/${DOC_DISTFILE} + ${TAR} -C ${WRKSRC}/doc -xzf ${FULLDISTDIR}/${DOC_DISTFILE} @cd ${WRKSRC} && perl -pi -e "s|/usr/share/git|${TRUEPREFIX}/share/git|g" \ doc/man1/git-clone.1 doc/man1/git-init.1 doc/man1/gitweb.1 @@ -109,13 +111,13 @@ post-install: ${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/setgitperms.perl \ ${PREFIX}/share/git-core/templates/hooks/setgitperms.perl chown -R ${BINOWN}:${BINGRP} ${PREFIX}/libexec/git - cd ${WRKBUILD}/gitweb && \ - ${MAKE_ENV} ${MAKE_PROGRAM} gitwebdir=${TRUEPREFIX}/share/gitweb install + ${MAKE_ENV} ${MAKE_PROGRAM} -C ${WRKBUILD}/gitweb \ + gitwebdir=${TRUEPREFIX}/share/gitweb install perl -pi -e "s|${WRKINST}||g" ${PREFIX}/share/gitweb/gitweb.cgi ${INSTALL_DATA} ${WRKBUILD}/gitweb/README ${PREFIX}/share/gitweb do-test: - cd ${WRKSRC} && ${MAKE_ENV} GIT_TEST_OPTS="--immediate" ${MAKE_PROGRAM} \ + ${MAKE_ENV} GIT_TEST_OPTS="--immediate" ${MAKE_PROGRAM} -C ${WRKSRC}/t \ HOME=${WRKDIST}/t test .include Index: distinfo === RCS file: /cvs/ports/devel/git/distinfo,v retrieving revision 1.143 diff -u -p -r1.143 distinfo --- distinfo4 Jun 2018 10:47:29 - 1.143 +++ distinfo10 Jun 2018 12:14:30 - @@ -1,4 +1,4 @@ -SHA256 (git-2.16.4.tar.gz) = 6HCevNo9eTzZM8pVAEgUlZu45vpRi1s39gLZiB5InS4= -SHA256 (git-manpages-2.16.4.tar.gz) = bO4IVtt53t2uRTHG3ibJwJD7PT0OMS/WlX4eH4PJxmI= -SIZE (git-2.16.4.tar.gz) = 7290813 -SIZE (git-manpages-2.16.4.tar.gz) = 678200 +SHA256 (git-2.17.1.tar.gz) = 7GRS8MjVwfO8zqvXBwuKil7qEdTioElVwTm1Bl/X0Jo= +SHA256 (git-manpages-2.17.1.tar.gz) = lzIFPBphjSV2wXUdAknkNwL2MqVx+EURMxiCvrNgZ30= +SIZE (git-2.17.1.tar.gz) = 7366760 +SIZE (git-manpages-2.17.1.tar.gz) = 682441 Index: patches/patch-Makefile === RCS file: patches/patch-Makefile diff -N patches/patch-Makefile --- patches/patch-Makefile 4 Jun 2018 10:47:29 - 1.77 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,13 +0,0 @@ -$OpenBSD: patch-Makefile,v 1.77 2018/06/04 10:47:29 sthen Exp $ -Index: Makefile Makefile.orig -+++ Makefile -@@ -2463,7 +2463,7 @@ export TEST_NO_MALLOC_CHECK - - ### Testing rules - --test: all -+test: - $(MAKE) -C t/ all - - perf: all Index: patches/patch-gitweb_gitweb_perl === RCS file: /cvs/ports/devel/git/patches/patch-gitweb_gitweb_perl,v retrieving revision 1.31 diff -u -p -r1.31 patch-gitweb_gitweb_perl --- patches/patch-gitweb_gitweb_perl20 Jan 2018 09:24:57 - 1.31 +++ patches/patch-gitweb_gitweb_perl30 May 2018 12:51:06 - @@ -5,7 +5,7 @@ This prevents the following error: '-T a Index: gitweb/gitweb.perl --- gitweb/gitweb.perl.orig +++ gitweb/gitweb.perl -@@ -
UPDATE devel/git-lfs
Enclosed a diff for bringing git-lfs to 2.4.2, which fixes some bugs. Changelog can be found at https://github.com/git-lfs/git-lfs/blob/release-2.4/CHANGELOG.md Build, and tested OK on amd64. OK? Index: Makefile === RCS file: /cvs/ports/devel/git-lfs/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile29 May 2018 19:22:01 - 1.10 +++ Makefile6 Jun 2018 18:12:00 - @@ -4,7 +4,7 @@ COMMENT = Git extension for versioning GH_PROJECT = git-lfs GH_ACCOUNT = git-lfs -GH_TAGNAME = v2.4.1 +GH_TAGNAME = v2.4.2 CATEGORIES = devel Index: distinfo === RCS file: /cvs/ports/devel/git-lfs/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo29 May 2018 19:22:01 - 1.9 +++ distinfo6 Jun 2018 18:12:00 - @@ -1,2 +1,2 @@ -SHA256 (git-lfs-2.4.1.tar.gz) = P1eqe8grIfWsnI3zP+2FO7j7784KXuz/gKUE5WQmpI4= -SIZE (git-lfs-2.4.1.tar.gz) = 790742 +SHA256 (git-lfs-2.4.2.tar.gz) = EwpVKifI8ySsBUi6+dsFGcSulsJqhfkmwH6+DxWmn8I= +SIZE (git-lfs-2.4.2.tar.gz) = 791443
Re: UPDATE devel/git-lfs
On Thu, May 24, 2018 at 06:58:02AM +0200, Björn Ketelaars wrote: > Diff below brings git-lfs to 2.4.1, which is a bugfix release. Overview > on changes can be found at https://github.com/git-lfs/git-lfs/releases > > Build phase complained about not finding groff, which is used for > creating manpages. As such, add textproc/groff as BDEP. > > Tested lightly on amd64. > > OK? OK abieber@ > > > Index: Makefile > === > RCS file: /cvs/ports/devel/git-lfs/Makefile,v > retrieving revision 1.9 > diff -u -p -r1.9 Makefile > --- Makefile 14 Apr 2018 22:53:54 - 1.9 > +++ Makefile 24 May 2018 04:52:44 - > @@ -4,8 +4,7 @@ COMMENT = Git extension for versioning > > GH_PROJECT = git-lfs > GH_ACCOUNT = git-lfs > -GH_TAGNAME = v2.4.0 > -REVISION = 0 > +GH_TAGNAME = v2.4.1 > > CATEGORIES = devel > > @@ -21,7 +20,8 @@ MODULES = lang/go \ > MODRUBY_BUILDDEP = No > MODRUBY_RUNDEP = No > > -BUILD_DEPENDS = textproc/ruby-ronn > +BUILD_DEPENDS = textproc/groff \ > + textproc/ruby-ronn > RUN_DEPENDS =devel/git > > # Convert the manpages with ronn instead of mangen.go > Index: distinfo > === > RCS file: /cvs/ports/devel/git-lfs/distinfo,v > retrieving revision 1.8 > diff -u -p -r1.8 distinfo > --- distinfo 2 Apr 2018 08:44:14 - 1.8 > +++ distinfo 24 May 2018 04:52:44 - > @@ -1,2 +1,2 @@ > -SHA256 (git-lfs-2.4.0.tar.gz) = PybNAgqWX2HI6PEkoCeU2G9G8vxGJyiK/nDtQ/OYsSE= > -SIZE (git-lfs-2.4.0.tar.gz) = 787610 > +SHA256 (git-lfs-2.4.1.tar.gz) = P1eqe8grIfWsnI3zP+2FO7j7784KXuz/gKUE5WQmpI4= > +SIZE (git-lfs-2.4.1.tar.gz) = 790742 > -- PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
UPDATE devel/git-lfs
Diff below brings git-lfs to 2.4.1, which is a bugfix release. Overview on changes can be found at https://github.com/git-lfs/git-lfs/releases Build phase complained about not finding groff, which is used for creating manpages. As such, add textproc/groff as BDEP. Tested lightly on amd64. OK? Index: Makefile === RCS file: /cvs/ports/devel/git-lfs/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile14 Apr 2018 22:53:54 - 1.9 +++ Makefile24 May 2018 04:52:44 - @@ -4,8 +4,7 @@ COMMENT = Git extension for versioning GH_PROJECT = git-lfs GH_ACCOUNT = git-lfs -GH_TAGNAME = v2.4.0 -REVISION = 0 +GH_TAGNAME = v2.4.1 CATEGORIES = devel @@ -21,7 +20,8 @@ MODULES = lang/go \ MODRUBY_BUILDDEP = No MODRUBY_RUNDEP = No -BUILD_DEPENDS =textproc/ruby-ronn +BUILD_DEPENDS =textproc/groff \ + textproc/ruby-ronn RUN_DEPENDS = devel/git # Convert the manpages with ronn instead of mangen.go Index: distinfo === RCS file: /cvs/ports/devel/git-lfs/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo2 Apr 2018 08:44:14 - 1.8 +++ distinfo24 May 2018 04:52:44 - @@ -1,2 +1,2 @@ -SHA256 (git-lfs-2.4.0.tar.gz) = PybNAgqWX2HI6PEkoCeU2G9G8vxGJyiK/nDtQ/OYsSE= -SIZE (git-lfs-2.4.0.tar.gz) = 787610 +SHA256 (git-lfs-2.4.1.tar.gz) = P1eqe8grIfWsnI3zP+2FO7j7784KXuz/gKUE5WQmpI4= +SIZE (git-lfs-2.4.1.tar.gz) = 790742
Re: UPDATE devel/git-cola
On Mon, Apr 30 2018, Björn Ketelaars wrote: > Diff below brings git-cola to the latest version (3.1). Overview on > fixes and additions can be found at > https://github.com/git-cola/git-cola/blob/master/share/doc/git-cola/relnotes.rst > > - upstream switched to py.test to execute the test suite instead of > nosetests > - instead of patching Makefile to make it compatible with OpenBSD's > make just switch to gnake. The patch is too big, and too hard to > maintain > - drop patch which has been committed upstream > > make test runs successfully, and (lightly) tested on amd64. > > Comments/OKs? Looks good ports-wise, ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE devel/git-cola
On Mon 30/04/2018 20:44, Björn Ketelaars wrote: > Diff below brings git-cola to the latest version (3.1). Overview on > fixes and additions can be found at > https://github.com/git-cola/git-cola/blob/master/share/doc/git-cola/relnotes.rst > > - upstream switched to py.test to execute the test suite instead of > nosetests > - instead of patching Makefile to make it compatible with OpenBSD's > make just switch to gnake. The patch is too big, and too hard to > maintain > - drop patch which has been committed upstream > > make test runs successfully, and (lightly) tested on amd64. > > Comments/OKs? Ping
UPDATE devel/git-cola
Diff below brings git-cola to the latest version (3.1). Overview on fixes and additions can be found at https://github.com/git-cola/git-cola/blob/master/share/doc/git-cola/relnotes.rst - upstream switched to py.test to execute the test suite instead of nosetests - instead of patching Makefile to make it compatible with OpenBSD's make just switch to gnake. The patch is too big, and too hard to maintain - drop patch which has been committed upstream make test runs successfully, and (lightly) tested on amd64. Comments/OKs? Index: Makefile === RCS file: /cvs/ports/devel/git-cola/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- Makefile18 Feb 2018 11:35:48 - 1.21 +++ Makefile30 Apr 2018 18:27:59 - @@ -2,7 +2,7 @@ COMMENT = python powered git gui -MODPY_EGG_VERSION= 3.0 +MODPY_EGG_VERSION= 3.1 DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION} GH_ACCOUNT = git-cola @@ -29,7 +29,9 @@ RUN_DEPENDS = devel/desktop-file-utils \ x11/py-qt4 TEST_DEPENDS = devel/py-mock \ - devel/py-nose + devel/py-test + +USE_GMAKE =Yes MODPY_ADJ_FILES= share/git-cola/bin/git-xbase Index: distinfo === RCS file: /cvs/ports/devel/git-cola/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo18 Feb 2018 11:35:48 - 1.8 +++ distinfo30 Apr 2018 18:27:59 - @@ -1,2 +1,2 @@ -SHA256 (git-cola-3.0.tar.gz) = YZWPmY1GGOCc4N1HNBGSGBjRPfg48yEC713tmEoNGlA= -SIZE (git-cola-3.0.tar.gz) = 1218820 +SHA256 (git-cola-3.1.tar.gz) = p6CD+EaXpW7nyRDM/GgNNsXER8a1o1IuAb/53pFHT1c= +SIZE (git-cola-3.1.tar.gz) = 1179782 Index: patches/patch-Makefile === RCS file: /cvs/ports/devel/git-cola/patches/patch-Makefile,v retrieving revision 1.3 diff -u -p -r1.3 patch-Makefile --- patches/patch-Makefile 18 Feb 2018 11:35:48 - 1.3 +++ patches/patch-Makefile 30 Apr 2018 18:27:59 - @@ -1,8 +1,6 @@ $OpenBSD: patch-Makefile,v 1.3 2018/02/18 11:35:48 bket Exp $ -Avoid dep on gnu make - -Avoid use of nosetest --with-doctest as this causes a regression test to fail +Avoid use of pytest --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. @@ -10,39 +8,12 @@ code is not used when running git-cola o Index: Makefile --- Makefile.orig +++ Makefile -@@ -26,9 +26,6 @@ TAR = tar - # Flags +@@ -53,7 +53,7 @@ ifdef V + else + QUIET = --quiet + endif +-PYTEST_FLAGS = $(QUIET) $(TEST_VERBOSE) --doctest-modules ++PYTEST_FLAGS = $(QUIET) $(TEST_VERBOSE) 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) --ifdef DESTDIR --setup_args += --root=$(DESTDIR) --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 = cola - PYTHON_DIRS += test + ifdef color Index: patches/patch-cola_app_py === RCS file: /cvs/ports/devel/git-cola/patches/patch-cola_app_py,v retrieving revision 1.3 diff -u -p -r1.3 patch-cola_app_py --- patches/patch-cola_app_py 18 Feb 2018 11:35:48 - 1.3 +++ patches/patch-cola_app_py 30 Apr 2018 18:27:59 - @@ -5,7 +5,7 @@ Use ssh-askpass implementation from xeno Index: cola/app.py --- cola/app.py.orig +++ cola/app.py -@@ -81,7 +81,7 @@ def setup_environment(): +@@ -86,7 +86,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 --- patches/patch-test_git_test_py 18 Feb 2018 11:35:48 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,31 +0,0 @@ -$OpenBSD
Re: UPDATE devel/git-lfs
On Fri, Mar 30, 2018 at 06:17:57AM +0200, Björn Ketelaars wrote: > Enclosed a diff for bringing git-lfs to the latest version, which fixes > some bugs and adds new features. Changelog can be found at > https://github.com/git-lfs/git-lfs/blob/master/CHANGELOG.md > > OK? OK kn
UPDATE devel/git-lfs
Enclosed a diff for bringing git-lfs to the latest version, which fixes some bugs and adds new features. Changelog can be found at https://github.com/git-lfs/git-lfs/blob/master/CHANGELOG.md OK? Index: Makefile === RCS file: /cvs/ports/devel/git-lfs/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile4 Nov 2017 21:58:31 - 1.7 +++ Makefile30 Mar 2018 04:13:27 - @@ -4,7 +4,7 @@ COMMENT = Git extension for versioning GH_PROJECT = git-lfs GH_ACCOUNT = git-lfs -GH_TAGNAME = v2.3.4 +GH_TAGNAME = v2.4.0 CATEGORIES = devel Index: distinfo === RCS file: /cvs/ports/devel/git-lfs/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo4 Nov 2017 21:58:31 - 1.7 +++ distinfo30 Mar 2018 04:13:27 - @@ -1,2 +1,2 @@ -SHA256 (git-lfs-2.3.4.tar.gz) = JZT+e9jMKdce/9CHYjt4ytqwSnTlBs7rSXGk7Zp/u5Q= -SIZE (git-lfs-2.3.4.tar.gz) = 747313 +SHA256 (git-lfs-2.4.0.tar.gz) = PybNAgqWX2HI6PEkoCeU2G9G8vxGJyiK/nDtQ/OYsSE= +SIZE (git-lfs-2.4.0.tar.gz) = 787610
Re: UPDATE devel/git-cola
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 --- Makefile28 May 2017 08:27:35 - 1.20 +++ Makefile17 Feb 2018 14:42:31 - @@ -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 Index: distinfo === RCS file: /cvs/ports/devel/git-cola/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo28 May 2017 08:27:35 - 1.7 +++ distinfo17 Feb 2018 14:42:31 - @@ -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 - 1.2 +++ patches/patch-Makefile 17 Feb 2018 14:42:31 - @@ -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 - 1.2 +++ patches/patch-cola_app_py 17 Feb 2018 14:42:31 - @@ -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.pySun Nov 8 20:17:
Re: UPDATE devel/git-cola
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 --- Makefile28 May 2017 08:27:35 - 1.20 +++ Makefile16 Feb 2018 12:17:13 - @@ -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 Index: distinfo === RCS file: /cvs/ports/devel/git-cola/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo28 May 2017 08:27:35 - 1.7 +++ distinfo16 Feb 2018 12:17:13 - @@ -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 - 1.2 +++ patches/patch-Makefile 16 Feb 2018 12:17:13 - @@ -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 - 1.2 +++ patches/patch-cola_app_py 16 Feb 2018 12:17:13 - @@ -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.pySun 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 - +++ patches/patch-test_git_test_py 16 Feb 2018 12:17:13 - @@ -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 o
Re: UPDATE devel/git-cola
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 #
UPDATE devel/git-cola
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 --- Makefile28 May 2017 08:27:35 - 1.20 +++ Makefile13 Feb 2018 18:27:34 - @@ -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 --- distinfo28 May 2017 08:27:35 - 1.7 +++ distinfo13 Feb 2018 18:27:34 - @@ -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 - 1.2 +++ patches/patch-Makefile 13 Feb 2018 18:27:34 - @@ -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 - 1.2 +++ patches/patch-cola_app_py 13 Feb 2018 18:27:34 - @@ -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.pySun 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 - 1.9 +++ pkg/PLIST 13 Feb 2018 18:27:34 - @@ -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
Re: [UPDATE] devel/git 2.5.0 -> 2.5.1
On 12/02/17 14:59, Klemens Nanni wrote: Simple update including various fixes, changelog since 2.5.0: https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.15.1.txt While here, switch HOMEPAGE to HTTPS. Tests pass on amd64: fixed 2 success 16486 failed 0 broken 223 total 17013 Feedback? Any takers? Committed, thanks ! diff --git a/devel/git/Makefile b/devel/git/Makefile index bd314fb5595..0c074effda6 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storage Tool COMMENT-svn = GIT - subversion interoperability tools COMMENT-x11 = GIT - graphical tools -V = 2.15.0 +V =2.15.1 REVISION-main = 0 DISTNAME =git-${V} PKGNAME-main =${DISTNAME} @@ -12,7 +12,7 @@ PKGNAME-svn = git-svn-${V} PKGNAME-x11 = git-x11-${V} CATEGORIES = devel -HOMEPAGE = http://git-scm.com/ +HOMEPAGE = https://git-scm.com/ MAINTAINER = Benoit Lecocq diff --git a/devel/git/distinfo b/devel/git/distinfo index ee700f50c28..e9a3ef36b52 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,4 +1,4 @@ -SHA256 (git-2.15.0.tar.gz) = JXYsxQEDpqBmXEbqM86wV47uAcGbagj9OT6GCMy9s9o= -SHA256 (git-manpages-2.15.0.tar.gz) = OxuevwLUqm50G+zR7ZMZWXSIdD+Tn9qzuJTsUtJUCO8= -SIZE (git-2.15.0.tar.gz) = 7188145 -SIZE (git-manpages-2.15.0.tar.gz) = 671471 +SHA256 (git-2.15.1.tar.gz) = hfyoeBqDyWum2zhMwapqXuHjRHRrr6wcvh8P5tEQnIQ= +SHA256 (git-manpages-2.15.1.tar.gz) = RyRUxJTJp/UK04Bgw+7DcvYX3mVLIPPrO+WfwXpoP6E= +SIZE (git-2.15.1.tar.gz) = 7190225 +SIZE (git-manpages-2.15.1.tar.gz) = 671818 diff --git a/devel/git/patches/patch-Makefile b/devel/git/patches/patch-Makefile index 7dbd1ec970c..910b275ceef 100644 --- a/devel/git/patches/patch-Makefile +++ b/devel/git/patches/patch-Makefile @@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile,v 1.74 2017/11/08 09:17:14 benoit Exp $ Index: Makefile --- Makefile.orig +++ Makefile -@@ -2435,7 +2435,7 @@ export TEST_NO_MALLOC_CHECK +@@ -2436,7 +2436,7 @@ export TEST_NO_MALLOC_CHECK ### Testing rules diff --git a/devel/git/patches/patch-config_mak_uname b/devel/git/patches/patch-config_mak_uname index c65904e25d0..503962e99bb 100644 --- a/devel/git/patches/patch-config_mak_uname +++ b/devel/git/patches/patch-config_mak_uname @@ -5,7 +5,7 @@ OpenBSD wants DIR_HAS_BSD_GROUP_SEMANTICS, just like FreeBSD Index: config.mak.uname --- config.mak.uname.orig +++ config.mak.uname -@@ -211,6 +211,7 @@ endif +@@ -212,6 +212,7 @@ endif ifeq ($(uname_S),OpenBSD) NO_STRCASESTR = YesPlease NO_MEMMEM = YesPlease diff --git a/devel/git/patches/patch-t_test-lib_sh b/devel/git/patches/patch-t_test-lib_sh index 7605404a9d4..b03ff9daf04 100644 --- a/devel/git/patches/patch-t_test-lib_sh +++ b/devel/git/patches/patch-t_test-lib_sh @@ -20,7 +20,7 @@ Index: t/test-lib.sh # if --tee was passed, write the output not only to the terminal, but # additionally to the file test-results/$BASENAME.out, too. case "$GIT_TEST_TEE_STARTED, $* " in -@@ -1014,6 +1019,15 @@ case $uname_s in +@@ -1015,6 +1020,15 @@ case $uname_s in test_set_prereq CYGWIN test_set_prereq SED_STRIPS_CR test_set_prereq GREP_STRIPS_CR
[UPDATE] devel/git 2.5.0 -> 2.5.1
Simple update including various fixes, changelog since 2.5.0: https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.15.1.txt While here, switch HOMEPAGE to HTTPS. Tests pass on amd64: fixed 2 success 16486 failed 0 broken 223 total 17013 Feedback? Any takers? diff --git a/devel/git/Makefile b/devel/git/Makefile index bd314fb5595..0c074effda6 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storage Tool COMMENT-svn = GIT - subversion interoperability tools COMMENT-x11 = GIT - graphical tools -V =2.15.0 +V =2.15.1 REVISION-main =0 DISTNAME = git-${V} PKGNAME-main = ${DISTNAME} @@ -12,7 +12,7 @@ PKGNAME-svn = git-svn-${V} PKGNAME-x11 = git-x11-${V} CATEGORIES = devel -HOMEPAGE = http://git-scm.com/ +HOMEPAGE = https://git-scm.com/ MAINTAINER = Benoit Lecocq diff --git a/devel/git/distinfo b/devel/git/distinfo index ee700f50c28..e9a3ef36b52 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,4 +1,4 @@ -SHA256 (git-2.15.0.tar.gz) = JXYsxQEDpqBmXEbqM86wV47uAcGbagj9OT6GCMy9s9o= -SHA256 (git-manpages-2.15.0.tar.gz) = OxuevwLUqm50G+zR7ZMZWXSIdD+Tn9qzuJTsUtJUCO8= -SIZE (git-2.15.0.tar.gz) = 7188145 -SIZE (git-manpages-2.15.0.tar.gz) = 671471 +SHA256 (git-2.15.1.tar.gz) = hfyoeBqDyWum2zhMwapqXuHjRHRrr6wcvh8P5tEQnIQ= +SHA256 (git-manpages-2.15.1.tar.gz) = RyRUxJTJp/UK04Bgw+7DcvYX3mVLIPPrO+WfwXpoP6E= +SIZE (git-2.15.1.tar.gz) = 7190225 +SIZE (git-manpages-2.15.1.tar.gz) = 671818 diff --git a/devel/git/patches/patch-Makefile b/devel/git/patches/patch-Makefile index 7dbd1ec970c..910b275ceef 100644 --- a/devel/git/patches/patch-Makefile +++ b/devel/git/patches/patch-Makefile @@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile,v 1.74 2017/11/08 09:17:14 benoit Exp $ Index: Makefile --- Makefile.orig +++ Makefile -@@ -2435,7 +2435,7 @@ export TEST_NO_MALLOC_CHECK +@@ -2436,7 +2436,7 @@ export TEST_NO_MALLOC_CHECK ### Testing rules diff --git a/devel/git/patches/patch-config_mak_uname b/devel/git/patches/patch-config_mak_uname index c65904e25d0..503962e99bb 100644 --- a/devel/git/patches/patch-config_mak_uname +++ b/devel/git/patches/patch-config_mak_uname @@ -5,7 +5,7 @@ OpenBSD wants DIR_HAS_BSD_GROUP_SEMANTICS, just like FreeBSD Index: config.mak.uname --- config.mak.uname.orig +++ config.mak.uname -@@ -211,6 +211,7 @@ endif +@@ -212,6 +212,7 @@ endif ifeq ($(uname_S),OpenBSD) NO_STRCASESTR = YesPlease NO_MEMMEM = YesPlease diff --git a/devel/git/patches/patch-t_test-lib_sh b/devel/git/patches/patch-t_test-lib_sh index 7605404a9d4..b03ff9daf04 100644 --- a/devel/git/patches/patch-t_test-lib_sh +++ b/devel/git/patches/patch-t_test-lib_sh @@ -20,7 +20,7 @@ Index: t/test-lib.sh # if --tee was passed, write the output not only to the terminal, but # additionally to the file test-results/$BASENAME.out, too. case "$GIT_TEST_TEE_STARTED, $* " in -@@ -1014,6 +1019,15 @@ case $uname_s in +@@ -1015,6 +1020,15 @@ case $uname_s in test_set_prereq CYGWIN test_set_prereq SED_STRIPS_CR test_set_prereq GREP_STRIPS_CR
Re: update devel/git to 2.0.0
On 08/11/14 18:24, Pascal Stumpf wrote: > On Wed, 09 Jul 2014 09:57:12 +0200, Pascal Stumpf wrote: >> On Tue, 8 Jul 2014 14:38:59 +1000 (EST), Damien Miller wrote: > On >> Thu, 29 May 2014, Pascal Stumpf wrote: > > > Here's an update to the >> freshly released git 2.0.0. Regresses fine on > > amd64. > > Could I >> make a request: could you please package the "multimail" package > in >> contrib/hooks/multimail? Preferably as a subpackage, but just > under >> share/git would be better than nothing. > > -d > > >> >> Sure. Regarding the failing regress tests that were reported: I've run >> it a few times now on powerpc and amd64 and never saw any failures. >> > > Update to 2.0.4. Still ok? ok ! > > Index: Makefile > === > RCS file: /cvs/ports/devel/git/Makefile,v > retrieving revision 1.113 > diff -u -p -r1.113 Makefile > --- Makefile 21 May 2014 08:39:57 - 1.113 > +++ Makefile 11 Aug 2014 16:23:54 - > @@ -4,7 +4,7 @@ COMMENT-main =GIT - Tree History Storag > COMMENT-svn =GIT - subversion interoperability tools > COMMENT-x11 =GIT - graphical tools > > -V = 1.9.3 > +V = 2.0.4 > DISTNAME = git-${V} > PKGNAME-main = ${DISTNAME} > PKGNAME-svn =git-svn-${V} > @@ -24,7 +24,13 @@ EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUF > > MASTER_SITES = https://www.kernel.org/pub/software/scm/git/ > > -MODULES =devel/gettext x11/tk > +MODULES =devel/gettext x11/tk lang/python > + > +MODPY_BUILDDEP = No > +MODPY_RUNDEP = No > +MODPY_ADJ_FILES =contrib/hooks/multimail/git_multimail.py \ > + contrib/hooks/multimail/migrate-mailhook-config \ > + contrib/hooks/multimail/post-receive > > BUILD_DEPENDS = devel/p5-Error > > @@ -102,6 +108,11 @@ post-install: > pax -rw . ${PREFIX}/man > ${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/post-receive-email \ > > ${PREFIX}/share/git-core/templates/hooks/post-receive-email.sample > + ${INSTALL_DATA_DIR} ${PREFIX}/share/git-core/templates/hooks/multimail > +.for f in git_multimail.py migrate-mailhook-config post-receive > + ${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/multimail/$f \ > + ${PREFIX}/share/git-core/templates/hooks/multimail > +.endfor > chown -R ${BINOWN}:${BINGRP} ${PREFIX}/libexec/git > cd ${WRKBUILD}/gitweb && \ > ${MAKE_ENV} ${MAKE_PROGRAM} > gitwebdir=${TRUEPREFIX}/share/gitweb install > Index: distinfo > === > RCS file: /cvs/ports/devel/git/distinfo,v > retrieving revision 1.83 > diff -u -p -r1.83 distinfo > --- distinfo 21 May 2014 08:39:57 - 1.83 > +++ distinfo 11 Aug 2014 16:23:54 - > @@ -1,4 +1,4 @@ > -SHA256 (git-1.9.3.tar.gz) = cbymd++juHoGDLod6eNRLnqw8JGX75XWSOUoDZptE1c= > -SHA256 (git-manpages-1.9.3.tar.gz) = > Q7+wnAcsz+DtSwrTDQTI80tq9NL1LNjf20h4fMnIUJ0= > -SIZE (git-1.9.3.tar.gz) = 4846233 > -SIZE (git-manpages-1.9.3.tar.gz) = 571550 > +SHA256 (git-2.0.4.tar.gz) = 3Z3wK33Mdfl3fE+ALGuFYhgDhd3eTjuEeeB5+ZzR0ck= > +SHA256 (git-manpages-2.0.4.tar.gz) = > pM9SedQbRIkFs6mVjjXolFTXbi8UBN8TWe2XaU+c/f4= > +SIZE (git-2.0.4.tar.gz) = 4905866 > +SIZE (git-manpages-2.0.4.tar.gz) = 575421 > Index: patches/patch-Makefile > === > RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v > retrieving revision 1.46 > diff -u -p -r1.46 patch-Makefile > --- patches/patch-Makefile21 May 2014 08:39:57 - 1.46 > +++ patches/patch-Makefile11 Aug 2014 16:23:54 - > @@ -1,7 +1,7 @@ > -$OpenBSD: patch-Makefile,v 1.46 2014/05/21 08:39:57 dcoppa Exp $ > Makefile.origFri May 9 20:55:10 2014 > -+++ Makefile Wed May 21 09:09:29 2014 > -@@ -2080,13 +2080,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o > http-walk > +$OpenBSD: patch-Makefile,v 1.45 2014/03/10 20:56:53 pascal Exp $ > +--- Makefile.origThu Jul 31 00:10:29 2014 > Makefile Sun Aug 10 18:57:39 2014 > +@@ -2068,13 +2068,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o > http-walk > $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) > > $(LIB_FILE): $(LIB_OBJS) > @@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.46 2014/05/ > > export DEFAULT_EDITOR DEFAULT_PAGER > > -@@ -2264,7 +2264,7 @@ export TEST_NO_MALLOC_CHECK > +@@ -2255,7 +2255,7 @@ export TEST_NO_MALLOC_CHECK > > ### Testing rules > > Index: pkg/PLIST-main > === > RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v > retrieving revision 1.57 > diff -u -p -r1.57 PLIST-main > --- pkg/PLIST-main10 Mar 2014 20:56:53 - 1.57 > +++ pkg/PLIST-main11 Aug 2014 16:23:54 - > @@ -366,6 +366,10 @@ share/git-core/templates/description > share/git-core/templates/
Re: update devel/git to 2.0.0
On Wed, 09 Jul 2014 09:57:12 +0200, Pascal Stumpf wrote: > On Tue, 8 Jul 2014 14:38:59 +1000 (EST), Damien Miller wrote: > On > Thu, 29 May 2014, Pascal Stumpf wrote: > > > Here's an update to the > freshly released git 2.0.0. Regresses fine on > > amd64. > > Could I > make a request: could you please package the "multimail" package > in > contrib/hooks/multimail? Preferably as a subpackage, but just > under > share/git would be better than nothing. > > -d > > > > Sure. Regarding the failing regress tests that were reported: I've run > it a few times now on powerpc and amd64 and never saw any failures. > Update to 2.0.4. Still ok? Index: Makefile === RCS file: /cvs/ports/devel/git/Makefile,v retrieving revision 1.113 diff -u -p -r1.113 Makefile --- Makefile21 May 2014 08:39:57 - 1.113 +++ Makefile11 Aug 2014 16:23:54 - @@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag COMMENT-svn = GIT - subversion interoperability tools COMMENT-x11 = GIT - graphical tools -V =1.9.3 +V =2.0.4 DISTNAME = git-${V} PKGNAME-main = ${DISTNAME} PKGNAME-svn = git-svn-${V} @@ -24,7 +24,13 @@ EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUF MASTER_SITES = https://www.kernel.org/pub/software/scm/git/ -MODULES = devel/gettext x11/tk +MODULES = devel/gettext x11/tk lang/python + +MODPY_BUILDDEP = No +MODPY_RUNDEP = No +MODPY_ADJ_FILES = contrib/hooks/multimail/git_multimail.py \ + contrib/hooks/multimail/migrate-mailhook-config \ + contrib/hooks/multimail/post-receive BUILD_DEPENDS =devel/p5-Error @@ -102,6 +108,11 @@ post-install: pax -rw . ${PREFIX}/man ${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/post-receive-email \ ${PREFIX}/share/git-core/templates/hooks/post-receive-email.sample + ${INSTALL_DATA_DIR} ${PREFIX}/share/git-core/templates/hooks/multimail +.for f in git_multimail.py migrate-mailhook-config post-receive + ${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/multimail/$f \ + ${PREFIX}/share/git-core/templates/hooks/multimail +.endfor chown -R ${BINOWN}:${BINGRP} ${PREFIX}/libexec/git cd ${WRKBUILD}/gitweb && \ ${MAKE_ENV} ${MAKE_PROGRAM} gitwebdir=${TRUEPREFIX}/share/gitweb install Index: distinfo === RCS file: /cvs/ports/devel/git/distinfo,v retrieving revision 1.83 diff -u -p -r1.83 distinfo --- distinfo21 May 2014 08:39:57 - 1.83 +++ distinfo11 Aug 2014 16:23:54 - @@ -1,4 +1,4 @@ -SHA256 (git-1.9.3.tar.gz) = cbymd++juHoGDLod6eNRLnqw8JGX75XWSOUoDZptE1c= -SHA256 (git-manpages-1.9.3.tar.gz) = Q7+wnAcsz+DtSwrTDQTI80tq9NL1LNjf20h4fMnIUJ0= -SIZE (git-1.9.3.tar.gz) = 4846233 -SIZE (git-manpages-1.9.3.tar.gz) = 571550 +SHA256 (git-2.0.4.tar.gz) = 3Z3wK33Mdfl3fE+ALGuFYhgDhd3eTjuEeeB5+ZzR0ck= +SHA256 (git-manpages-2.0.4.tar.gz) = pM9SedQbRIkFs6mVjjXolFTXbi8UBN8TWe2XaU+c/f4= +SIZE (git-2.0.4.tar.gz) = 4905866 +SIZE (git-manpages-2.0.4.tar.gz) = 575421 Index: patches/patch-Makefile === RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v retrieving revision 1.46 diff -u -p -r1.46 patch-Makefile --- patches/patch-Makefile 21 May 2014 08:39:57 - 1.46 +++ patches/patch-Makefile 11 Aug 2014 16:23:54 - @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile,v 1.46 2014/05/21 08:39:57 dcoppa Exp $ Makefile.orig Fri May 9 20:55:10 2014 -+++ Makefile Wed May 21 09:09:29 2014 -@@ -2080,13 +2080,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk +$OpenBSD: patch-Makefile,v 1.45 2014/03/10 20:56:53 pascal Exp $ +--- Makefile.orig Thu Jul 31 00:10:29 2014 Makefile Sun Aug 10 18:57:39 2014 +@@ -2068,13 +2068,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIB_FILE): $(LIB_OBJS) @@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.46 2014/05/ export DEFAULT_EDITOR DEFAULT_PAGER -@@ -2264,7 +2264,7 @@ export TEST_NO_MALLOC_CHECK +@@ -2255,7 +2255,7 @@ export TEST_NO_MALLOC_CHECK ### Testing rules Index: pkg/PLIST-main === RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v retrieving revision 1.57 diff -u -p -r1.57 PLIST-main --- pkg/PLIST-main 10 Mar 2014 20:56:53 - 1.57 +++ pkg/PLIST-main 11 Aug 2014 16:23:54 - @@ -366,6 +366,10 @@ share/git-core/templates/description share/git-core/templates/hooks/ share/git-core/templates/hooks/applypatch-msg.sample share/git-core/templates/hooks/commit-msg.sample +share/git-core/templates/hooks/multimail/ +share/git-core/templates/hooks/multimail/git_multimail.py +share/git-core/templates/hooks/
Re: update devel/git to 2.0.0
On Tue, 8 Jul 2014 14:38:59 +1000 (EST), Damien Miller wrote: > On Thu, 29 May 2014, Pascal Stumpf wrote: > > > Here's an update to the freshly released git 2.0.0. Regresses fine on > > amd64. > > Could I make a request: could you please package the "multimail" package > in contrib/hooks/multimail? Preferably as a subpackage, but just > under share/git would be better than nothing. > > -d > > Sure. Regarding the failing regress tests that were reported: I've run it a few times now on powerpc and amd64 and never saw any failures. Index: Makefile === RCS file: /cvs/ports/devel/git/Makefile,v retrieving revision 1.113 diff -u -p -r1.113 Makefile --- Makefile21 May 2014 08:39:57 - 1.113 +++ Makefile9 Jul 2014 07:55:34 - @@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag COMMENT-svn = GIT - subversion interoperability tools COMMENT-x11 = GIT - graphical tools -V =1.9.3 +V =2.0.0 DISTNAME = git-${V} PKGNAME-main = ${DISTNAME} PKGNAME-svn = git-svn-${V} @@ -24,7 +24,13 @@ EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUF MASTER_SITES = https://www.kernel.org/pub/software/scm/git/ -MODULES = devel/gettext x11/tk +MODULES = devel/gettext x11/tk lang/python + +MODPY_BUILDDEP = No +MODPY_RUNDEP = No +MODPY_ADJ_FILES = contrib/hooks/multimail/git_multimail.py \ + contrib/hooks/multimail/migrate-mailhook-config \ + contrib/hooks/multimail/post-receive BUILD_DEPENDS =devel/p5-Error @@ -102,6 +108,11 @@ post-install: pax -rw . ${PREFIX}/man ${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/post-receive-email \ ${PREFIX}/share/git-core/templates/hooks/post-receive-email.sample + ${INSTALL_DATA_DIR} ${PREFIX}/share/git-core/templates/hooks/multimail +.for f in git_multimail.py migrate-mailhook-config post-receive + ${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/multimail/$f \ + ${PREFIX}/share/git-core/templates/hooks/multimail +.endfor chown -R ${BINOWN}:${BINGRP} ${PREFIX}/libexec/git cd ${WRKBUILD}/gitweb && \ ${MAKE_ENV} ${MAKE_PROGRAM} gitwebdir=${TRUEPREFIX}/share/gitweb install Index: distinfo === RCS file: /cvs/ports/devel/git/distinfo,v retrieving revision 1.83 diff -u -p -r1.83 distinfo --- distinfo21 May 2014 08:39:57 - 1.83 +++ distinfo9 Jul 2014 07:55:34 - @@ -1,4 +1,4 @@ -SHA256 (git-1.9.3.tar.gz) = cbymd++juHoGDLod6eNRLnqw8JGX75XWSOUoDZptE1c= -SHA256 (git-manpages-1.9.3.tar.gz) = Q7+wnAcsz+DtSwrTDQTI80tq9NL1LNjf20h4fMnIUJ0= -SIZE (git-1.9.3.tar.gz) = 4846233 -SIZE (git-manpages-1.9.3.tar.gz) = 571550 +SHA256 (git-2.0.0.tar.gz) = xqNw6VMmcBA33+MvjmbznN0oVXyoT/2ygtYELDepi2g= +SHA256 (git-manpages-2.0.0.tar.gz) = ElI/4cjei4iZe1SDMT4UPJbAoRbBmkmN27/lc+2Yve0= +SIZE (git-2.0.0.tar.gz) = 4898319 +SIZE (git-manpages-2.0.0.tar.gz) = 575350 Index: patches/patch-Makefile === RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v retrieving revision 1.46 diff -u -p -r1.46 patch-Makefile --- patches/patch-Makefile 21 May 2014 08:39:57 - 1.46 +++ patches/patch-Makefile 9 Jul 2014 07:55:34 - @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile,v 1.46 2014/05/21 08:39:57 dcoppa Exp $ Makefile.orig Fri May 9 20:55:10 2014 -+++ Makefile Wed May 21 09:09:29 2014 -@@ -2080,13 +2080,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk +$OpenBSD: patch-Makefile,v 1.45 2014/03/10 20:56:53 pascal Exp $ +--- Makefile.orig Wed May 28 21:10:36 2014 Makefile Thu May 29 13:01:29 2014 +@@ -2075,13 +2075,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIB_FILE): $(LIB_OBJS) @@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.46 2014/05/ export DEFAULT_EDITOR DEFAULT_PAGER -@@ -2264,7 +2264,7 @@ export TEST_NO_MALLOC_CHECK +@@ -2262,7 +2262,7 @@ export TEST_NO_MALLOC_CHECK ### Testing rules Index: pkg/PLIST-main === RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v retrieving revision 1.57 diff -u -p -r1.57 PLIST-main --- pkg/PLIST-main 10 Mar 2014 20:56:53 - 1.57 +++ pkg/PLIST-main 9 Jul 2014 07:55:34 - @@ -366,6 +366,10 @@ share/git-core/templates/description share/git-core/templates/hooks/ share/git-core/templates/hooks/applypatch-msg.sample share/git-core/templates/hooks/commit-msg.sample +share/git-core/templates/hooks/multimail/ +share/git-core/templates/hooks/multimail/git_multimail.py +share/git-core/templates/hooks/multimail/migrate-mailhook-config +share/git-core/templates/hooks/multimail/post-receive share/git-cor
Re: update devel/git to 2.0.0
On Thu, 29 May 2014, Pascal Stumpf wrote: > Here's an update to the freshly released git 2.0.0. Regresses fine on > amd64. Could I make a request: could you please package the "multimail" package in contrib/hooks/multimail? Preferably as a subpackage, but just under share/git would be better than nothing. -d
update devel/git to 2.0.0
Here's an update to the freshly released git 2.0.0. Regresses fine on amd64. Index: Makefile === RCS file: /cvs/ports/devel/git/Makefile,v retrieving revision 1.113 diff -u -p -r1.113 Makefile --- Makefile21 May 2014 08:39:57 - 1.113 +++ Makefile29 May 2014 15:29:29 - @@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag COMMENT-svn = GIT - subversion interoperability tools COMMENT-x11 = GIT - graphical tools -V =1.9.3 +V =2.0.0 DISTNAME = git-${V} PKGNAME-main = ${DISTNAME} PKGNAME-svn = git-svn-${V} Index: distinfo === RCS file: /cvs/ports/devel/git/distinfo,v retrieving revision 1.83 diff -u -p -r1.83 distinfo --- distinfo21 May 2014 08:39:57 - 1.83 +++ distinfo29 May 2014 15:29:29 - @@ -1,4 +1,4 @@ -SHA256 (git-1.9.3.tar.gz) = cbymd++juHoGDLod6eNRLnqw8JGX75XWSOUoDZptE1c= -SHA256 (git-manpages-1.9.3.tar.gz) = Q7+wnAcsz+DtSwrTDQTI80tq9NL1LNjf20h4fMnIUJ0= -SIZE (git-1.9.3.tar.gz) = 4846233 -SIZE (git-manpages-1.9.3.tar.gz) = 571550 +SHA256 (git-2.0.0.tar.gz) = xqNw6VMmcBA33+MvjmbznN0oVXyoT/2ygtYELDepi2g= +SHA256 (git-manpages-2.0.0.tar.gz) = ElI/4cjei4iZe1SDMT4UPJbAoRbBmkmN27/lc+2Yve0= +SIZE (git-2.0.0.tar.gz) = 4898319 +SIZE (git-manpages-2.0.0.tar.gz) = 575350 Index: patches/patch-Makefile === RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v retrieving revision 1.46 diff -u -p -r1.46 patch-Makefile --- patches/patch-Makefile 21 May 2014 08:39:57 - 1.46 +++ patches/patch-Makefile 29 May 2014 15:29:29 - @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile,v 1.46 2014/05/21 08:39:57 dcoppa Exp $ Makefile.orig Fri May 9 20:55:10 2014 -+++ Makefile Wed May 21 09:09:29 2014 -@@ -2080,13 +2080,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk +$OpenBSD: patch-Makefile,v 1.45 2014/03/10 20:56:53 pascal Exp $ +--- Makefile.orig Wed May 28 21:10:36 2014 Makefile Thu May 29 13:01:29 2014 +@@ -2075,13 +2075,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIB_FILE): $(LIB_OBJS) @@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.46 2014/05/ export DEFAULT_EDITOR DEFAULT_PAGER -@@ -2264,7 +2264,7 @@ export TEST_NO_MALLOC_CHECK +@@ -2262,7 +2262,7 @@ export TEST_NO_MALLOC_CHECK ### Testing rules
update: devel/git
Update to git 1.9.0. Regress tests fine on amd64. Index: Makefile === RCS file: /cvs/ports/devel/git/Makefile,v retrieving revision 1.109 diff -u -p -r1.109 Makefile --- Makefile15 Jan 2014 19:57:01 - 1.109 +++ Makefile9 Mar 2014 13:05:39 - @@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag COMMENT-svn = GIT - subversion interoperability tools COMMENT-x11 = GIT - graphical tools -V =1.8.5.3 +V =1.9.0 DISTNAME = git-${V} PKGNAME-main = ${DISTNAME} PKGNAME-svn = git-svn-${V} Index: distinfo === RCS file: /cvs/ports/devel/git/distinfo,v retrieving revision 1.79 diff -u -p -r1.79 distinfo --- distinfo15 Jan 2014 19:57:01 - 1.79 +++ distinfo9 Mar 2014 13:05:39 - @@ -1,4 +1,4 @@ -SHA256 (git-1.8.5.3.tar.gz) = MUjuTqtFn+nK8UXBqbiyfGqBxmwYaPeQ9YiWBUzf46c= -SHA256 (git-manpages-1.8.5.3.tar.gz) = jAtJ2uawEIoGndkaL+EU0TZC30UJXYYcIHweP45xU2Y= -SIZE (git-1.8.5.3.tar.gz) = 4757215 -SIZE (git-manpages-1.8.5.3.tar.gz) = 569620 +SHA256 (git-1.9.0.tar.gz) = 3jCX/cNtYk6mz0u4U0Av3ngazbhg8SFSxeuHl3c4mII= +SHA256 (git-manpages-1.9.0.tar.gz) = pR4rZKit3jnndPBShD4PUTtdMxhJK1FedS4zmw06hcc= +SIZE (git-1.9.0.tar.gz) = 4839724 +SIZE (git-manpages-1.9.0.tar.gz) = 571616 Index: patches/patch-Makefile === RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v retrieving revision 1.44 diff -u -p -r1.44 patch-Makefile --- patches/patch-Makefile 13 Jan 2014 09:12:10 - 1.44 +++ patches/patch-Makefile 9 Mar 2014 13:05:39 - @@ -1,7 +1,7 @@ $OpenBSD: patch-Makefile,v 1.44 2014/01/13 09:12:10 dcoppa Exp $ Makefile.orig Wed Dec 18 00:46:08 2013 -+++ Makefile Fri Jan 10 15:55:01 2014 -@@ -2065,13 +2065,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk +--- Makefile.orig Fri Feb 14 22:57:09 2014 Makefile Sun Feb 16 18:13:36 2014 +@@ -2072,13 +2072,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIB_FILE): $(LIB_OBJS) @@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.44 2014/01/ export DEFAULT_EDITOR DEFAULT_PAGER -@@ -2249,7 +2249,7 @@ export TEST_NO_MALLOC_CHECK +@@ -2256,7 +2256,7 @@ export TEST_NO_MALLOC_CHECK ### Testing rules Index: patches/patch-gitweb_gitweb_perl === RCS file: /cvs/ports/devel/git/patches/patch-gitweb_gitweb_perl,v retrieving revision 1.24 diff -u -p -r1.24 patch-gitweb_gitweb_perl --- patches/patch-gitweb_gitweb_perl13 Jan 2014 09:12:10 - 1.24 +++ patches/patch-gitweb_gitweb_perl9 Mar 2014 13:05:39 - @@ -2,9 +2,9 @@ $OpenBSD: patch-gitweb_gitweb_perl,v 1.2 This prevents the following error: '-T and -B not implemented on filehandles' gitweb/gitweb.perl.origWed Dec 18 00:46:08 2013 -+++ gitweb/gitweb.perl Fri Jan 10 15:55:01 2014 -@@ -6908,7 +6908,7 @@ sub git_blob_plain { +--- gitweb/gitweb.perl.origFri Feb 14 22:57:09 2014 gitweb/gitweb.perl Sun Feb 16 18:13:37 2014 +@@ -6981,7 +6981,7 @@ sub git_blob_plain { $expires = "+1d"; } @@ -13,7 +13,7 @@ This prevents the following error: '-T a or die_error(500, "Open git-cat-file blob '$hash' failed"); # content-type (can include charset) -@@ -6970,7 +6970,7 @@ sub git_blob { +@@ -7043,7 +7043,7 @@ sub git_blob { } my $have_blame = gitweb_check_feature('blame'); Index: patches/patch-t_t-basic_sh === RCS file: /cvs/ports/devel/git/patches/patch-t_t-basic_sh,v retrieving revision 1.6 diff -u -p -r1.6 patch-t_t-basic_sh --- patches/patch-t_t-basic_sh 13 Sep 2013 07:10:01 - 1.6 +++ patches/patch-t_t-basic_sh 9 Mar 2014 13:05:39 - @@ -1,7 +1,7 @@ $OpenBSD: patch-t_t-basic_sh,v 1.6 2013/09/13 07:10:01 dcoppa Exp $ t/t-basic.sh.orig Fri Aug 23 21:38:43 2013 -+++ t/t-basic.sh Thu Sep 12 13:47:09 2013 -@@ -631,7 +631,7 @@ test_expect_success 'update-index D/F conflict' ' +--- t/t-basic.sh.orig Fri Feb 14 22:57:09 2014 t/t-basic.sh Sun Feb 16 18:13:37 2014 +@@ -626,7 +626,7 @@ test_expect_success 'update-index D/F conflict' ' test $numpath0 = 1 ' Index: patches/patch-t_t9200-git-cvsexportcommit_sh === RCS file: /cvs/ports/devel/git/patches/patch-t_t9200-git-cvsexportcommit_sh,v retrieving revision 1.4 diff -u -p -r1.4 patch-t_t9200-git-cvsexportcommit_sh --- patches/patch-t_t9200-git-cvsexportcommit_sh25 Jan 2013 08:14:59 - 1.4 +++ patches/patch-t_t9200-git-cvsexportcommit_sh9 Mar 2014 13:05:39 - @@ -1,7 +1,7 @@ $OpenBSD: patch-t
Re: UPDATE: devel/git
On Sat, 25 May 2013, Benoit Lecocq wrote: > Hi, > > This diff updates git to the latest release 1.8.3. > > Comments ? OK ? for f in test-results/t*-*.counts; do \ echo "$f"; \ done | '/bin/sh' ./aggregate-results.sh fixed 1 success 9711 failed 0 broken 74 total 10014 gmake[3]: Leaving directory `/usr/ports/pobj/git-1.8.3/git-1.8.3/t' OK dcoppa@ > Cheers, > benoit Ciao, David
Re: UPDATE: devel/git
On Wed, 30 Jan 2013, Benoit Lecocq wrote: > Hi, > > This diff updates git to the latest release 1.8.1.2. > Tested on amd64, bugfix release. > > Comments ? OK ? for f in test-results/t*-*.counts; do \ echo "$f"; \ done | '/bin/sh' ./aggregate-results.sh fixed 1 success 9711 failed 0 broken 74 total 10014 gmake[3]: Leaving directory `/usr/ports/pobj/git-1.8.3/git-1.8.3/t' OK dcoppa@ Ciao, David
UPDATE: devel/git
Hi, This diff updates git to the latest release 1.8.3. Comments ? OK ? Cheers, benoit Index: Makefile === RCS file: /cvs/ports/devel/git/Makefile,v retrieving revision 1.96 diff -u -p -u -r1.96 Makefile --- Makefile 11 May 2013 14:23:49 - 1.96 +++ Makefile 25 May 2013 12:21:38 - @@ -4,7 +4,7 @@ COMMENT-main = GIT - Tree History Storag COMMENT-svn = GIT - subversion interoperability tools COMMENT-x11 = GIT - graphical tools -V = 1.8.2.3 +V = 1.8.3 DISTNAME = git-${V} PKGNAME-main = ${DISTNAME} PKGNAME-svn = git-svn-${V} Index: distinfo === RCS file: /cvs/ports/devel/git/distinfo,v retrieving revision 1.67 diff -u -p -u -r1.67 distinfo --- distinfo 11 May 2013 14:23:49 - 1.67 +++ distinfo 25 May 2013 12:21:38 - @@ -1,4 +1,4 @@ -SHA256 (git-1.8.2.3.tar.gz) = uo1C1HsJVbF5Ba8BM7AauOPyjw45uZZ+xEZAPAtJmR8= -SHA256 (git-manpages-1.8.2.3.tar.gz) = jpHXpJzaku2ZnrljKuPw8isZEOVN5YyeUxB2h8GPFBQ= -SIZE (git-1.8.2.3.tar.gz) = 4405610 -SIZE (git-manpages-1.8.2.3.tar.gz) = 537688 +SHA256 (git-1.8.3.tar.gz) = 8dPG1oP48VA1qNDz6zDtFg/2YHER38YCbYg2MHrrxTo= +SHA256 (git-manpages-1.8.3.tar.gz) = lzgAqlUIZ50ituI2gG+PSul4W7Kq0wQayKyrOd8eR2s= +SIZE (git-1.8.3.tar.gz) = 4470281 +SIZE (git-manpages-1.8.3.tar.gz) = 542692 Index: patches/patch-Makefile === RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v retrieving revision 1.38 diff -u -p -u -r1.38 patch-Makefile --- patches/patch-Makefile 2 May 2013 10:01:34 - 1.38 +++ patches/patch-Makefile 25 May 2013 12:21:39 - @@ -1,7 +1,7 @@ $OpenBSD: patch-Makefile,v 1.38 2013/05/02 10:01:34 dcoppa Exp $ Makefile.orig Tue Apr 30 12:18:10 2013 -+++ Makefile Tue Apr 30 12:33:22 2013 -@@ -2029,13 +2029,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk +--- Makefile.orig Fri May 24 21:15:35 2013 Makefile Sat May 25 08:42:31 2013 +@@ -2035,13 +2035,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIB_FILE): $(LIB_OBJS) @@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.38 2013/05/ export DEFAULT_EDITOR DEFAULT_PAGER -@@ -2209,7 +2209,7 @@ export TEST_NO_MALLOC_CHECK +@@ -2215,7 +2215,7 @@ export TEST_NO_MALLOC_CHECK ### Testing rules
Re: UPDATE: devel/git
On Fri, May 10, 2013 at 8:24 AM, Benoit Lecocq wrote: > Hi, > > This diff updates git to the latest release 1.8.2.3. > A bugfix release. > > Comments ? OK ? Please, go ahead. Ok with me. > Cheers, > benoit cheers, David
UPDATE: devel/git
Hi, This diff updates git to the latest release 1.8.2.3. A bugfix release. Comments ? OK ? Cheers, benoit Index: Makefile === RCS file: /cvs/ports/devel/git/Makefile,v retrieving revision 1.95 diff -u -r1.95 Makefile --- Makefile 2 May 2013 11:06:06 - 1.95 +++ Makefile 10 May 2013 06:01:44 - @@ -4,7 +4,7 @@ COMMENT-svn = GIT - subversion interoperability tools COMMENT-x11 = GIT - graphical tools -V = 1.8.2.2 +V = 1.8.2.3 DISTNAME = git-${V} PKGNAME-main = ${DISTNAME} PKGNAME-svn = git-svn-${V} Index: distinfo === RCS file: /cvs/ports/devel/git/distinfo,v retrieving revision 1.66 diff -u -r1.66 distinfo --- distinfo 2 May 2013 10:01:34 - 1.66 +++ distinfo 10 May 2013 06:01:44 - @@ -1,4 +1,4 @@ -SHA256 (git-1.8.2.2.tar.gz) = Ag3jjtowK7bhvkYPdJkhGUgZOzBr6rThpSD/xvcpR5Q= -SHA256 (git-manpages-1.8.2.2.tar.gz) = Io3rU4ZUFXKOvXq/GNiMc9PBZg3toNN5cF1G2xBjZus= -SIZE (git-1.8.2.2.tar.gz) = 4404477 -SIZE (git-manpages-1.8.2.2.tar.gz) = 537739 +SHA256 (git-1.8.2.3.tar.gz) = uo1C1HsJVbF5Ba8BM7AauOPyjw45uZZ+xEZAPAtJmR8= +SHA256 (git-manpages-1.8.2.3.tar.gz) = jpHXpJzaku2ZnrljKuPw8isZEOVN5YyeUxB2h8GPFBQ= +SIZE (git-1.8.2.3.tar.gz) = 4405610 +SIZE (git-manpages-1.8.2.3.tar.gz) = 537688
Re: UPDATE: devel/git
On Wed, Mar 13, 2013 at 11:28 AM, Benoit Lecocq wrote: > Hi, > > This diff updates git to the latest release 1.8.1.3. > > Comments ? OK ? > > Cheers, > benoit Works fine for me. ok dcoppa@ ciao, David
UPDATE: devel/git
Hi, This diff updates git to the latest release 1.8.1.3. Comments ? OK ? Cheers, benoit Index: Makefile === RCS file: /cvs/ports/devel/git/Makefile,v retrieving revision 1.92 diff -u -r1.92 Makefile --- Makefile 12 Mar 2013 22:39:30 - 1.92 +++ Makefile 13 Mar 2013 12:30:35 - @@ -4,8 +4,7 @@ COMMENT-svn = GIT - subversion interoperability tools COMMENT-x11 = GIT - graphical tools -V = 1.8.1.2 -REVISION-main = 0 +V = 1.8.1.3 DISTNAME = git-${V} PKGNAME-main = ${DISTNAME} PKGNAME-svn = git-svn-${V} Index: distinfo === RCS file: /cvs/ports/devel/git/distinfo,v retrieving revision 1.64 diff -u -r1.64 distinfo --- distinfo 30 Jan 2013 12:16:13 - 1.64 +++ distinfo 13 Mar 2013 12:30:35 - @@ -1,4 +1,4 @@ -SHA256 (git-1.8.1.2.tar.gz) = B9IQo33uxGW00A5JB8cy3uXF0jx9kMG1guerdUvPJMc= -SHA256 (git-manpages-1.8.1.2.tar.gz) = JhLnm8VDfGvXe5oTFHTYyjXhnXFz8T8wG07gURvz33o= -SIZE (git-1.8.1.2.tar.gz) = 4297221 -SIZE (git-manpages-1.8.1.2.tar.gz) = 528481 +SHA256 (git-1.8.1.3.tar.gz) = N1Mkfb/YAqrxyyyRe46HO27RPACasPpffZCzx1kZX/E= +SHA256 (git-manpages-1.8.1.3.tar.gz) = mPYbps9knzx8tipAGUqYb3Vh9kj4GtPZ4OzaZG2QhTk= +SIZE (git-1.8.1.3.tar.gz) = 4302035 +SIZE (git-manpages-1.8.1.3.tar.gz) = 528587 Index: patches/patch-Makefile === RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v retrieving revision 1.36 diff -u -r1.36 patch-Makefile --- patches/patch-Makefile 12 Mar 2013 22:39:31 - 1.36 +++ patches/patch-Makefile 13 Mar 2013 12:30:35 - @@ -1,6 +1,6 @@ $OpenBSD: patch-Makefile,v 1.36 2013/03/12 22:39:31 sthen Exp $ Makefile.orig Mon Jan 28 20:01:51 2013 -+++ Makefile Sun Feb 17 11:12:26 2013 +--- Makefile.orig Fri Feb 8 01:00:07 2013 Makefile Wed Mar 13 10:35:45 2013 @@ -1123,13 +1123,13 @@ ifeq ($(uname_S),FreeBSD) HAVE_PATHS_H = YesPlease endif @@ -18,7 +18,7 @@ endif ifeq ($(uname_S),NetBSD) ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2) -@@ -1600,7 +1600,7 @@ endif +@@ -1601,7 +1601,7 @@ endif EXTLIBS += -lz ifndef NO_OPENSSL @@ -27,7 +27,7 @@ ifdef OPENSSLDIR BASIC_CFLAGS += -I$(OPENSSLDIR)/include OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib) -@@ -2486,13 +2486,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk +@@ -2487,13 +2487,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIB_FILE): $(LIB_OBJS) @@ -44,7 +44,7 @@ export DEFAULT_EDITOR DEFAULT_PAGER -@@ -2678,7 +2678,7 @@ export TEST_NO_MALLOC_CHECK +@@ -2679,7 +2679,7 @@ export TEST_NO_MALLOC_CHECK ### Testing rules
UPDATE: devel/git
Hi, This diff updates git to the latest release 1.8.1.2. Tested on amd64, bugfix release. Comments ? OK ? Cheers, benoit Index: Makefile === RCS file: /cvs/ports/devel/git/Makefile,v retrieving revision 1.89 diff -u -r1.89 Makefile --- Makefile 25 Jan 2013 08:14:59 - 1.89 +++ Makefile 30 Jan 2013 11:45:36 - @@ -4,7 +4,7 @@ COMMENT-svn = GIT - subversion interoperability tools COMMENT-x11 = GIT - graphical tools -V = 1.8.1.1 +V = 1.8.1.2 DISTNAME = git-${V} PKGNAME-main = ${DISTNAME} PKGNAME-svn = git-svn-${V} Index: distinfo === RCS file: /cvs/ports/devel/git/distinfo,v retrieving revision 1.63 diff -u -r1.63 distinfo --- distinfo 25 Jan 2013 08:14:59 - 1.63 +++ distinfo 30 Jan 2013 11:45:36 - @@ -1,4 +1,4 @@ -SHA256 (git-1.8.1.1.tar.gz) = i1vQgdw48+FKzIbyNCMamkbR6amQyMcyrtaFbScU3/Y= -SHA256 (git-manpages-1.8.1.1.tar.gz) = bbgB3ZTXjr0+bUazsJ7IxHD3E4OJ5FdYsPxtP/WjJQY= -SIZE (git-1.8.1.1.tar.gz) = 4295398 -SIZE (git-manpages-1.8.1.1.tar.gz) = 528447 +SHA256 (git-1.8.1.2.tar.gz) = B9IQo33uxGW00A5JB8cy3uXF0jx9kMG1guerdUvPJMc= +SHA256 (git-manpages-1.8.1.2.tar.gz) = JhLnm8VDfGvXe5oTFHTYyjXhnXFz8T8wG07gURvz33o= +SIZE (git-1.8.1.2.tar.gz) = 4297221 +SIZE (git-manpages-1.8.1.2.tar.gz) = 528481
Re: update: devel/git
On Mon, 26 Nov 2012 13:36:08 +0100, Pascal Stumpf wrote: > Update to git 1.8.0. > > - Don't install docs other than manpages. They just consume a lot of > build time. > > - re-enable threads now that we have rthreads > > - apparently no need for gtar > > There's one test that fails (last one in t-basic.sh), but other than > that, regress passes. Haven't tested gitweb or svn functionality. Updated diff for 1.8.0.1. Index: Makefile === RCS file: /cvs/ports/devel/git/Makefile,v retrieving revision 1.85 diff -u -p -r1.85 Makefile --- Makefile21 Feb 2012 22:19:31 - 1.85 +++ Makefile28 Nov 2012 10:15:57 - @@ -4,17 +4,13 @@ COMMENT-main =GIT - Tree History Storag COMMENT-svn = GIT - subversion interoperability tools COMMENT-x11 = GIT - graphical tools -V =1.7.6 +V =1.8.0.1 DISTNAME = git-${V} PKGNAME-main = ${DISTNAME} PKGNAME-svn = git-svn-${V} PKGNAME-x11 = git-x11-${V} CATEGORIES = devel -REVISION-main =4 -REVISION-svn = 2 -REVISION-x11 = 2 - HOMEPAGE = http://git-scm.com/ MAINTAINER = Benoit Lecocq @@ -25,34 +21,25 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -DOC_DISTFILES =git-manpages-${V}${EXTRACT_SUFX} \ - git-htmldocs-${V}${EXTRACT_SUFX} -DISTFILES =${DISTNAME}${EXTRACT_SUFX} ${DOC_DISTFILES} +DOC_DISTFILE = git-manpages-${V}${EXTRACT_SUFX} +DISTFILES =${DISTNAME}${EXTRACT_SUFX} ${DOC_DISTFILE} EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX} -MASTER_SITES = http://distfiles.nl/ \ - ftp://ftp.kernel.org/pub/software/scm/git/ \ - ftp://ftp.de.kernel.org/pub/software/scm/git/ \ - ftp://ftp.au.kernel.org/pub/software/scm/git/ - -TAR = ${LOCALBASE}/bin/gtar +MASTER_SITES = http://git-core.googlecode.com/files/ -MODULES = converters/libiconv x11/tk +MODULES = devel/gettext x11/tk -BUILD_DEPENDS =archivers/gtar \ - devel/p5-Error \ - textproc/asciidoc \ - textproc/xmlto +BUILD_DEPENDS =devel/p5-Error MULTI_PACKAGES = -main -svn -x11 -WANTLIB-main = c expat crypto curl ssl z ${MODLIBICONV_WANTLIB} +WANTLIB-main = c expat crypto curl pthread ssl z ${MODGETTEXT_WANTLIB} RUN_DEPENDS-main = net/rsync \ devel/p5-Error \ devel/cvsps \ - ${MODLIBICONV_RUN_DEPENDS} + ${MODGETTEXT_RUN_DEPENDS} LIB_DEPENDS-main = net/curl \ - ${MODLIBICONV_LIB_DEPENDS} + ${MODGETTEXT_LIB_DEPENDS} RUN_DEPENDS-svn = ${BASE_PKGPATH} \ devel/p5-Term-ReadKey \ @@ -91,29 +78,17 @@ SKIP_TESTS =t9502-gitweb-standalone-pa post-extract: @mkdir -p ${WRKSRC}/doc -.for distfile in ${DOC_DISTFILES} - @cd ${WRKSRC}/doc && ${TAR} -xzf ${FULLDISTDIR}/${distfile}${EXTRACT_SUFX} -.endfor - @rm -f ${WRKSRC}/doc/man1/git-p4import.1 + @cd ${WRKSRC}/doc && ${TAR} -xzf ${FULLDISTDIR}/${DOC_DISTFILE} @cd ${WRKSRC} && perl -pi -e "s|/usr/share/git|${TRUEPREFIX}/share/git|g" \ - Documentation/git-clone.txt Documentation/git-init.txt \ - doc/man1/git-clone.1 doc/man1/git-init.1 doc/git-clone.txt \ - doc/git-init.txt doc/git-clone.html doc/git-init.html - -post-build: - @cd ${WRKBUILD}/Documentation && ${MAKE_ENV} ${MAKE_PROGRAM} man + doc/man1/git-clone.1 doc/man1/git-init.1 doc/man1/gitweb.1 post-install: ${INSTALL_DATA} ${WRKBUILD}/libgit.a ${PREFIX}/lib ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKBUILD}/contrib/emacs/*.el \ ${PREFIX}/share/emacs/site-lisp - cd ${WRKBUILD}/Documentation && \ - ${MAKE_ENV} ${MAKE_PROGRAM} mandir=${TRUEPREFIX}/man install-man - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/git cd ${WRKBUILD}/doc && \ - pax -rw *.html howto/*.html *.txt howto/*.txt \ - ${PREFIX}/share/doc/git + pax -rw . ${PREFIX}/man ${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/post-receive-email \ ${PREFIX}/share/git-core/templates/hooks/post-receive-email.sample chown -R ${BINOWN}:${BINGRP} ${PREFIX}/libexec/git @@ -125,6 +100,6 @@ post-install: do-regress: cd ${WRKSRC}/t && rm -f ${SKIP_TESTS} cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} \ - HOME=${WRKDIST}/t/trash TAR=${TAR} test + HOME=${WRKDIST}/t/trash test .include Index: distinfo === RCS file: /cvs/ports/de
Re: update: devel/git
On Mon, 26 Nov 2012 13:49:09 +0100, Jasper Lievisse Adriaanse wrote: > On Mon, Nov 26, 2012 at 01:36:08PM +0100, Pascal Stumpf wrote: > > Update to git 1.8.0. > > > > - Don't install docs other than manpages. They just consume a lot of > > build time. > > > > - re-enable threads now that we have rthreads > > > > - apparently no need for gtar > > > > There's one test that fails (last one in t-basic.sh), but other than > > that, regress passes. Haven't tested gitweb or svn functionality. > Seems you forgot something: > Err, sorry. Correct diff: Index: Makefile === RCS file: /cvs/ports/devel/git/Makefile,v retrieving revision 1.85 diff -u -p -r1.85 Makefile --- Makefile21 Feb 2012 22:19:31 - 1.85 +++ Makefile26 Nov 2012 12:52:47 - @@ -4,17 +4,13 @@ COMMENT-main =GIT - Tree History Storag COMMENT-svn = GIT - subversion interoperability tools COMMENT-x11 = GIT - graphical tools -V =1.7.6 +V =1.8.0 DISTNAME = git-${V} PKGNAME-main = ${DISTNAME} PKGNAME-svn = git-svn-${V} PKGNAME-x11 = git-x11-${V} CATEGORIES = devel -REVISION-main =4 -REVISION-svn = 2 -REVISION-x11 = 2 - HOMEPAGE = http://git-scm.com/ MAINTAINER = Benoit Lecocq @@ -25,34 +21,25 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -DOC_DISTFILES =git-manpages-${V}${EXTRACT_SUFX} \ - git-htmldocs-${V}${EXTRACT_SUFX} -DISTFILES =${DISTNAME}${EXTRACT_SUFX} ${DOC_DISTFILES} +DOC_DISTFILE = git-manpages-${V}${EXTRACT_SUFX} +DISTFILES =${DISTNAME}${EXTRACT_SUFX} ${DOC_DISTFILE} EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX} -MASTER_SITES = http://distfiles.nl/ \ - ftp://ftp.kernel.org/pub/software/scm/git/ \ - ftp://ftp.de.kernel.org/pub/software/scm/git/ \ - ftp://ftp.au.kernel.org/pub/software/scm/git/ - -TAR = ${LOCALBASE}/bin/gtar +MASTER_SITES = http://git-core.googlecode.com/files/ -MODULES = converters/libiconv x11/tk +MODULES = devel/gettext x11/tk -BUILD_DEPENDS =archivers/gtar \ - devel/p5-Error \ - textproc/asciidoc \ - textproc/xmlto +BUILD_DEPENDS =devel/p5-Error MULTI_PACKAGES = -main -svn -x11 -WANTLIB-main = c expat crypto curl ssl z ${MODLIBICONV_WANTLIB} +WANTLIB-main = c expat crypto curl pthread ssl z ${MODGETTEXT_WANTLIB} RUN_DEPENDS-main = net/rsync \ devel/p5-Error \ devel/cvsps \ - ${MODLIBICONV_RUN_DEPENDS} + ${MODGETTEXT_RUN_DEPENDS} LIB_DEPENDS-main = net/curl \ - ${MODLIBICONV_LIB_DEPENDS} + ${MODGETTEXT_LIB_DEPENDS} RUN_DEPENDS-svn = ${BASE_PKGPATH} \ devel/p5-Term-ReadKey \ @@ -91,29 +78,17 @@ SKIP_TESTS =t9502-gitweb-standalone-pa post-extract: @mkdir -p ${WRKSRC}/doc -.for distfile in ${DOC_DISTFILES} - @cd ${WRKSRC}/doc && ${TAR} -xzf ${FULLDISTDIR}/${distfile}${EXTRACT_SUFX} -.endfor - @rm -f ${WRKSRC}/doc/man1/git-p4import.1 + @cd ${WRKSRC}/doc && ${TAR} -xzf ${FULLDISTDIR}/${DOC_DISTFILE} @cd ${WRKSRC} && perl -pi -e "s|/usr/share/git|${TRUEPREFIX}/share/git|g" \ - Documentation/git-clone.txt Documentation/git-init.txt \ - doc/man1/git-clone.1 doc/man1/git-init.1 doc/git-clone.txt \ - doc/git-init.txt doc/git-clone.html doc/git-init.html - -post-build: - @cd ${WRKBUILD}/Documentation && ${MAKE_ENV} ${MAKE_PROGRAM} man + doc/man1/git-clone.1 doc/man1/git-init.1 doc/man1/gitweb.1 post-install: ${INSTALL_DATA} ${WRKBUILD}/libgit.a ${PREFIX}/lib ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKBUILD}/contrib/emacs/*.el \ ${PREFIX}/share/emacs/site-lisp - cd ${WRKBUILD}/Documentation && \ - ${MAKE_ENV} ${MAKE_PROGRAM} mandir=${TRUEPREFIX}/man install-man - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/git cd ${WRKBUILD}/doc && \ - pax -rw *.html howto/*.html *.txt howto/*.txt \ - ${PREFIX}/share/doc/git + pax -rw . ${PREFIX}/man ${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/post-receive-email \ ${PREFIX}/share/git-core/templates/hooks/post-receive-email.sample chown -R ${BINOWN}:${BINGRP} ${PREFIX}/libexec/git @@ -125,6 +100,6 @@ post-install: do-regress: cd ${WRKSRC}/t && rm -f ${SKIP_TESTS} cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} \ - HOME=${WRKDIST}/t/trash TAR=${TAR} test + HOME=${WRKDIST}/t/
update: devel/git
Update to git 1.8.0. - Don't install docs other than manpages. They just consume a lot of build time. - re-enable threads now that we have rthreads - apparently no need for gtar There's one test that fails (last one in t-basic.sh), but other than that, regress passes. Haven't tested gitweb or svn functionality. Index: Makefile === RCS file: /cvs/ports/devel/git/Makefile,v retrieving revision 1.85 diff -u -p -r1.85 Makefile --- Makefile21 Feb 2012 22:19:31 - 1.85 +++ Makefile26 Nov 2012 12:35:22 - @@ -4,17 +4,13 @@ COMMENT-main =GIT - Tree History Storag COMMENT-svn = GIT - subversion interoperability tools COMMENT-x11 = GIT - graphical tools -V =1.7.6 +V =1.8.0 DISTNAME = git-${V} PKGNAME-main = ${DISTNAME} PKGNAME-svn = git-svn-${V} PKGNAME-x11 = git-x11-${V} CATEGORIES = devel -REVISION-main =4 -REVISION-svn = 2 -REVISION-x11 = 2 - HOMEPAGE = http://git-scm.com/ MAINTAINER = Benoit Lecocq @@ -25,34 +21,25 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -DOC_DISTFILES =git-manpages-${V}${EXTRACT_SUFX} \ - git-htmldocs-${V}${EXTRACT_SUFX} +DOC_DISTFILE = git-manpages-${V}${EXTRACT_SUFX} DISTFILES =${DISTNAME}${EXTRACT_SUFX} ${DOC_DISTFILES} EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX} -MASTER_SITES = http://distfiles.nl/ \ - ftp://ftp.kernel.org/pub/software/scm/git/ \ - ftp://ftp.de.kernel.org/pub/software/scm/git/ \ - ftp://ftp.au.kernel.org/pub/software/scm/git/ - -TAR = ${LOCALBASE}/bin/gtar +MASTER_SITES = http://git-core.googlecode.com/files/ -MODULES = converters/libiconv x11/tk +MODULES = devel/gettext x11/tk -BUILD_DEPENDS =archivers/gtar \ - devel/p5-Error \ - textproc/asciidoc \ - textproc/xmlto +BUILD_DEPENDS =devel/p5-Error MULTI_PACKAGES = -main -svn -x11 -WANTLIB-main = c expat crypto curl ssl z ${MODLIBICONV_WANTLIB} +WANTLIB-main = c expat crypto curl pthread ssl z ${MODGETTEXT_WANTLIB} RUN_DEPENDS-main = net/rsync \ devel/p5-Error \ devel/cvsps \ - ${MODLIBICONV_RUN_DEPENDS} + ${MODGETTEXT_RUN_DEPENDS} LIB_DEPENDS-main = net/curl \ - ${MODLIBICONV_LIB_DEPENDS} + ${MODGETTEXT_LIB_DEPENDS} RUN_DEPENDS-svn = ${BASE_PKGPATH} \ devel/p5-Term-ReadKey \ @@ -91,29 +78,17 @@ SKIP_TESTS =t9502-gitweb-standalone-pa post-extract: @mkdir -p ${WRKSRC}/doc -.for distfile in ${DOC_DISTFILES} - @cd ${WRKSRC}/doc && ${TAR} -xzf ${FULLDISTDIR}/${distfile}${EXTRACT_SUFX} -.endfor - @rm -f ${WRKSRC}/doc/man1/git-p4import.1 + @cd ${WRKSRC}/doc && ${TAR} -xzf ${FULLDISTDIR}/${DOC_DISTFILE} @cd ${WRKSRC} && perl -pi -e "s|/usr/share/git|${TRUEPREFIX}/share/git|g" \ - Documentation/git-clone.txt Documentation/git-init.txt \ - doc/man1/git-clone.1 doc/man1/git-init.1 doc/git-clone.txt \ - doc/git-init.txt doc/git-clone.html doc/git-init.html - -post-build: - @cd ${WRKBUILD}/Documentation && ${MAKE_ENV} ${MAKE_PROGRAM} man + doc/man1/git-clone.1 doc/man1/git-init.1 doc/man1/gitweb.1 post-install: ${INSTALL_DATA} ${WRKBUILD}/libgit.a ${PREFIX}/lib ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKBUILD}/contrib/emacs/*.el \ ${PREFIX}/share/emacs/site-lisp - cd ${WRKBUILD}/Documentation && \ - ${MAKE_ENV} ${MAKE_PROGRAM} mandir=${TRUEPREFIX}/man install-man - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/git cd ${WRKBUILD}/doc && \ - pax -rw *.html howto/*.html *.txt howto/*.txt \ - ${PREFIX}/share/doc/git + pax -rw . ${PREFIX}/man ${INSTALL_DATA} ${WRKBUILD}/contrib/hooks/post-receive-email \ ${PREFIX}/share/git-core/templates/hooks/post-receive-email.sample chown -R ${BINOWN}:${BINGRP} ${PREFIX}/libexec/git @@ -125,6 +100,6 @@ post-install: do-regress: cd ${WRKSRC}/t && rm -f ${SKIP_TESTS} cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} \ - HOME=${WRKDIST}/t/trash TAR=${TAR} test + HOME=${WRKDIST}/t/trash test .include Index: distinfo === RCS file: /cvs/ports/devel/git/distinfo,v retrieving revision 1.60 diff -u -p -r1.60 distinfo --- distinfo24 Jul 2011 16:29:28 - 1.60 +++ distinfo26 Nov 2012 12:35:22 - @@ -1,15
Re: update: devel/git
On Mon, Nov 26, 2012 at 01:36:08PM +0100, Pascal Stumpf wrote: > Update to git 1.8.0. > > - Don't install docs other than manpages. They just consume a lot of > build time. > > - re-enable threads now that we have rthreads > > - apparently no need for gtar > > There's one test that fails (last one in t-basic.sh), but other than > that, regress passes. Haven't tested gitweb or svn functionality. Seems you forgot something: ===> Enabling ccache for git-1.8.0 ===> Checking files for git-1.8.0 >> Fetch http://git-core.googlecode.com/files/git-1.8.0.tar.gz git-1.8.0.tar.gz 100% |***| 4126 KB00:05 >> (SHA256) git-1.8.0.tar.gz: OK ===> git-1.8.0 depends on: p5-Error-* -> p5-Error-0.17018 ===> git-1.8.0 depends on: gettext->=0.10.38 -> gettext-0.18.1p5 ===> git-1.8.0 depends on: gmake-* -> gmake-3.82p2 ===> git-1.8.0 depends on: ccache-* -> ccache-3.1.8 ===> git-1.8.0 depends on: groff->=1.21 -> groff-1.21p8 ===> git-1.8.0 depends on: libiconv-* -> libiconv-1.14p0 ===> git-1.8.0 depends on: curl-* -> curl-7.26.0 ===> Verifying specs: intl>=5 iconv>=6 c expat crypto curl pthread ssl z intl>=5 iconv>=6 ===> found intl.6.0 iconv.6.0 c.66.0 expat.10.0 crypto.21.0 curl.23.0 pthread.17.0 ssl.19.0 z.4.1 ===> Extracting for git-1.8.0 tar: Failed open to read on /usr/ports/distfiles/git-manpages-1.8.0.tar.gz: No such file or directory *** Error 1 in . (Makefile:81 'post-extract': @cd /usr/obj/ports/git-1.8.0/git-1.8.0/doc && /bin/tar -xzf /usr/ports/distfiles/git-manpages-...) *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2365 '/usr/obj/ports/git-1.8.0/.extract_done') *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1767 '/usr/ports/packages/amd64/all/git-1.8.0.tgz') *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2303 '_internal-package') *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2283 'package') *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1784 '/var/db/pkg/git-1.8.0/+CONTENTS') *** Error 1 in /usr/ports/devel/git (/usr/ports/infrastructure/mk/bsd.port.mk:2283 'install') gurthang:git {274} > Index: Makefile > === > RCS file: /cvs/ports/devel/git/Makefile,v > retrieving revision 1.85 > diff -u -p -r1.85 Makefile > --- Makefile 21 Feb 2012 22:19:31 - 1.85 > +++ Makefile 26 Nov 2012 12:35:22 - > @@ -4,17 +4,13 @@ COMMENT-main = GIT - Tree History Storag > COMMENT-svn =GIT - subversion interoperability tools > COMMENT-x11 =GIT - graphical tools > > -V = 1.7.6 > +V = 1.8.0 > DISTNAME = git-${V} > PKGNAME-main = ${DISTNAME} > PKGNAME-svn =git-svn-${V} > PKGNAME-x11 =git-x11-${V} > CATEGORIES = devel > > -REVISION-main = 4 > -REVISION-svn = 2 > -REVISION-x11 = 2 > - > HOMEPAGE = http://git-scm.com/ > > MAINTAINER = Benoit Lecocq > @@ -25,34 +21,25 @@ PERMIT_PACKAGE_FTP = Yes > PERMIT_DISTFILES_CDROM = Yes > PERMIT_DISTFILES_FTP = Yes > > -DOC_DISTFILES = git-manpages-${V}${EXTRACT_SUFX} \ > - git-htmldocs-${V}${EXTRACT_SUFX} > +DOC_DISTFILE = git-manpages-${V}${EXTRACT_SUFX} > DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${DOC_DISTFILES} > EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX} > > -MASTER_SITES = http://distfiles.nl/ \ > - ftp://ftp.kernel.org/pub/software/scm/git/ \ > - ftp://ftp.de.kernel.org/pub/software/scm/git/ \ > - ftp://ftp.au.kernel.org/pub/software/scm/git/ > - > -TAR =${LOCALBASE}/bin/gtar > +MASTER_SITES = http://git-core.googlecode.com/files/ > > -MODULES =converters/libiconv x11/tk > +MODULES =devel/gettext x11/tk > > -BUILD_DEPENDS = archivers/gtar \ > - devel/p5-Error \ > - textproc/asciidoc \ > - textproc/xmlto > +BUILD_DEPENDS = devel/p5-Error > > MULTI_PACKAGES = -main -svn -x11 > > -WANTLIB-main = c expat crypto curl ssl z ${MODLIBICONV_WANTLIB} > +WANTLIB-main = c expat crypto curl pthread ssl z > ${MODGETTEXT_WANTLIB} > RUN_DEPENDS-main = net/rsync \ > devel/p5-Error \ > devel/cvsps \ > - ${MODLIBICONV_RUN_DEPENDS} > + ${MODGETTEXT_RUN_DEPENDS} > LIB_DEPENDS-main = net/curl \ > - ${MODLIBICONV_LIB_DEPENDS} > + ${MODGETTEXT_LIB_DEPENDS} > > RUN_DEPENDS-svn =${BASE_PKGPATH} \ > devel/p5-Term-ReadKey \ > @@ -91,29 +78,17 @@ SKIP_TESTS = t9502-gitweb-standalone-pa > > post-extract: > @mkdir -p ${WRKSRC}/doc > -.for distfile in ${DOC_DIS