- Update to version 0.14.1

- Regenerate patches
- Update WWW
- Update license info: now dual licensed Apache v2 and GPLv2+
  (it's unclear why it was previously labeled as GPLv3)

PR:		212713
Submitted by:	matthew@reztek.cz
Approved by:	maintainer timeout

6 files changed, 24 insertions, 14 deletions

diff --git a/devel/dulwich/Makefile b/devel/dulwich/Makefile
index d127d18195f7..8c37c2d3947b 100644
--- a/devel/dulwich/Makefile
+++ b/devel/dulwich/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dulwich
-PORTVERSION=	0.10.1a
+PORTVERSION=	0.14.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,12 +10,13 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	marco.broeder@posteo.eu
 COMMENT=	Python implementation of the Git file formats and protocols
 
-LICENSE=	GPLv2 GPLv3
+LICENSE=	APACHE20 GPLv2+
 LICENSE_COMB=	dual
+LICENSE_FILE=	COPYING relicensing-apachev2.txt
 
-PORTDOCS=	AUTHORS HACKING NEWS README.md file-format.txt \
-		introduction.txt object-store.txt protocol.txt remote.txt \
-		repo.txt tag.txt
+PORTDOCS=	AUTHORS CONTRIBUTING NEWS README.md TODO conclusion.txt \
+		file-format.txt index.txt introduction.txt object-store.txt \
+		performance.txt porcelain.txt protocol.txt remote.txt repo.txt tag.txt
 PORTEXAMPLES=	clone.py config.py diff.py latest_change.py
 
 USES=		cpe python:2
diff --git a/devel/dulwich/distinfo b/devel/dulwich/distinfo
index a01bc8106131..ce8f7c0f8c4d 100644
--- a/devel/dulwich/distinfo
+++ b/devel/dulwich/distinfo
@@ -1,2 +1,3 @@
-SHA256 (dulwich-0.10.1a.tar.gz) = 666600ab5eb0b6d531879ee0f65dfefd71bce2e21ab3910c28f7789e15b6330b
-SIZE (dulwich-0.10.1a.tar.gz) = 272688
+TIMESTAMP = 1473979673
+SHA256 (dulwich-0.14.1.tar.gz) = 7c1f49e6e72fa8635328d32bfeb7103e86e175d87fa80a9cefdd63a360f7ba93
+SIZE (dulwich-0.14.1.tar.gz) = 292827
diff --git a/devel/dulwich/files/patch-MANIFEST.in b/devel/dulwich/files/patch-MANIFEST.in
index 4af2850b15c4..0d9c4dc66745 100644
--- a/devel/dulwich/files/patch-MANIFEST.in
+++ b/devel/dulwich/files/patch-MANIFEST.in
@@ -1,7 +1,10 @@
---- MANIFEST.in.orig	2015-03-25 01:53:21 UTC
+--- MANIFEST.in.orig	2016-07-03 19:17:14 UTC
 +++ MANIFEST.in
-@@ -8,4 +8,3 @@ include setup.cfg
+@@ -11,7 +11,6 @@ include setup.cfg
  include dulwich/stdint.h
  recursive-include docs conf.py *.txt Makefile make.bat
  recursive-include examples *.py
 -graft dulwich/tests/data
+ include tox.ini
+ include dulwich.cfg
+ include appveyor.yml
diff --git a/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt b/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt
index c1a35e62c6d5..9e3e7970daed 100644
--- a/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt
+++ b/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt
@@ -1,10 +1,11 @@
---- dulwich.egg-info/SOURCES.txt.orig	2015-03-25 01:54:03 UTC
+--- dulwich.egg-info/SOURCES.txt.orig	2016-07-05 22:58:54 UTC
 +++ dulwich.egg-info/SOURCES.txt
-@@ -61,118 +61,6 @@ dulwich/contrib/__init__.py
+@@ -73,123 +73,6 @@ dulwich/contrib/paramiko_vendor.py
  dulwich/contrib/swift.py
  dulwich/contrib/test_swift.py
  dulwich/contrib/test_swift_smoke.py
 -dulwich/tests/__init__.py
+-dulwich/tests/test_archive.py
 -dulwich/tests/test_blackbox.py
 -dulwich/tests/test_client.py
 -dulwich/tests/test_config.py
@@ -24,6 +25,7 @@
 -dulwich/tests/test_patch.py
 -dulwich/tests/test_porcelain.py
 -dulwich/tests/test_protocol.py
+-dulwich/tests/test_reflog.py
 -dulwich/tests/test_refs.py
 -dulwich/tests/test_repository.py
 -dulwich/tests/test_server.py
@@ -51,6 +53,9 @@
 -dulwich/tests/data/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.idx
 -dulwich/tests/data/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.pack
 -dulwich/tests/data/repos/.gitattributes
+-dulwich/tests/data/repos/issue88_expect_ack_nak_client.export
+-dulwich/tests/data/repos/issue88_expect_ack_nak_other.export
+-dulwich/tests/data/repos/issue88_expect_ack_nak_server.export
 -dulwich/tests/data/repos/server_new.export
 -dulwich/tests/data/repos/server_old.export
 -dulwich/tests/data/repos/a.git/HEAD
diff --git a/devel/dulwich/files/patch-setup.py b/devel/dulwich/files/patch-setup.py
index 8b7619757d97..77cdbb22c6ae 100644
--- a/devel/dulwich/files/patch-setup.py
+++ b/devel/dulwich/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2015-03-25 01:54:01 UTC
+--- setup.py.orig	2016-07-05 22:58:08 UTC
 +++ setup.py
-@@ -75,7 +75,7 @@ setup(name='dulwich',
+@@ -83,7 +83,7 @@ setup(name='dulwich',
        The project is named after the part of London that Mr. and Mrs. Git live in
        in the particular Monty Python sketch.
        """,
diff --git a/devel/dulwich/pkg-descr b/devel/dulwich/pkg-descr
index 2bb215c7a924..fa9e64f29fb7 100644
--- a/devel/dulwich/pkg-descr
+++ b/devel/dulwich/pkg-descr
@@ -6,4 +6,4 @@ does not call out to Git directly but instead uses pure Python. All
 functionality is available in pure Python. Optional C extensions can be
 built for improved performance.
 
-WWW: https://www.samba.org/~jelmer/dulwich/
+WWW: https://www.dulwich.io/