Index: head/devel/dulwich/Makefile
===================================================================
--- head/devel/dulwich/Makefile	(revision 467161)
+++ head/devel/dulwich/Makefile	(revision 467162)
@@ -1,44 +1,44 @@
 # Created by: Marco Broeder <marco.broeder@posteo.eu>
 # $FreeBSD$
 
 PORTNAME=	dulwich
-PORTVERSION=	0.15.0
+PORTVERSION=	0.18.6
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	marco.broeder@posteo.eu
 COMMENT=	Python implementation of the Git file formats and protocols
 
 LICENSE=	APACHE20 GPLv2+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-PORTDOCS=	AUTHORS CONTRIBUTING NEWS README.md TODO conclusion.txt \
+PORTDOCS=	AUTHORS 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
 CPE_VENDOR=	dulwich_project
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	${REINPLACE_CMD} -e 's|PYTHON = python|PYTHON = ${PYTHON_CMD}|g' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \
 		${WRKSRC}/setup.py ${WRKSRC}/examples/*.py
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}/${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/*.so
 	${CP} ${WRKSRC}/docs/*.txt ${WRKSRC}/docs/tutorial/*.txt ${WRKSRC}/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/)
 	${CP} ${WRKSRC}/examples/*.py ${WRKSRC}/
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTEXAMPLES} \
 		${STAGEDIR}${EXAMPLESDIR}/)
 
 .include <bsd.port.mk>
Index: head/devel/dulwich/distinfo
===================================================================
--- head/devel/dulwich/distinfo	(revision 467161)
+++ head/devel/dulwich/distinfo	(revision 467162)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481271050
-SHA256 (dulwich-0.15.0.tar.gz) = 6f0a09d93f01caf1ba054b3f751d5cc1f0e6afc5c97fd23d67d7acf92f0d0b16
-SIZE (dulwich-0.15.0.tar.gz) = 297106
+TIMESTAMP = 1516829918
+SHA256 (dulwich-0.18.6.tar.gz) = 38a04406bc68315794c3bab37c7d4ed137fb8a839482d8894e72b0d9b3eb41a9
+SIZE (dulwich-0.18.6.tar.gz) = 331325
Index: head/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt
===================================================================
--- head/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt	(revision 467161)
+++ head/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt	(revision 467162)
@@ -1,126 +1,130 @@
---- dulwich.egg-info/SOURCES.txt.orig	2016-07-05 22:58:54 UTC
+--- dulwich.egg-info/SOURCES.txt.orig	2018-01-24 22:39:28 UTC
 +++ dulwich.egg-info/SOURCES.txt
-@@ -73,123 +73,6 @@ dulwich/contrib/paramiko_vendor.py
- dulwich/contrib/swift.py
+@@ -76,125 +76,7 @@ dulwich/contrib/swift.py
+ dulwich/contrib/test_release_robot.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
 -dulwich/tests/test_diff_tree.py
 -dulwich/tests/test_fastexport.py
 -dulwich/tests/test_file.py
 -dulwich/tests/test_grafts.py
 -dulwich/tests/test_greenthreads.py
 -dulwich/tests/test_hooks.py
+-dulwich/tests/test_ignore.py
 -dulwich/tests/test_index.py
 -dulwich/tests/test_lru_cache.py
 -dulwich/tests/test_missing_obj_finder.py
 -dulwich/tests/test_object_store.py
 -dulwich/tests/test_objects.py
 -dulwich/tests/test_objectspec.py
 -dulwich/tests/test_pack.py
 -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
 -dulwich/tests/test_utils.py
 -dulwich/tests/test_walk.py
 -dulwich/tests/test_web.py
 -dulwich/tests/utils.py
 -dulwich/tests/compat/__init__.py
 -dulwich/tests/compat/server_utils.py
 -dulwich/tests/compat/test_client.py
 -dulwich/tests/compat/test_pack.py
 -dulwich/tests/compat/test_repository.py
 -dulwich/tests/compat/test_server.py
 -dulwich/tests/compat/test_utils.py
 -dulwich/tests/compat/test_web.py
 -dulwich/tests/compat/utils.py
 -dulwich/tests/data/blobs/11/11111111111111111111111111111111111111
 -dulwich/tests/data/blobs/6f/670c0fb53f9463760b7295fbb814e965fb20c8
 -dulwich/tests/data/blobs/95/4a536f7819d40e6f637f849ee187dd10066349
 -dulwich/tests/data/blobs/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
 -dulwich/tests/data/commits/0d/89f20333fbb1d2f3a94da77f4981373d8f4310
 -dulwich/tests/data/commits/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc
 -dulwich/tests/data/commits/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e
 -dulwich/tests/data/indexes/index
 -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
 -dulwich/tests/data/repos/a.git/packed-refs
 -dulwich/tests/data/repos/a.git/objects/28/237f4dc30d0d462658d6b937b08a0f0b6ef55a
 -dulwich/tests/data/repos/a.git/objects/2a/72d929692c41d8554c07f6301757ba18a65d91
 -dulwich/tests/data/repos/a.git/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec
 -dulwich/tests/data/repos/a.git/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9
 -dulwich/tests/data/repos/a.git/objects/7d/9a07d797595ef11344549b8d08198e48c15364
 -dulwich/tests/data/repos/a.git/objects/a2/96d0bb611188cabb256919f36bc30117cca005
 -dulwich/tests/data/repos/a.git/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097
 -dulwich/tests/data/repos/a.git/objects/b0/931cadc54336e78a1d980420e3268903b57a50
 -dulwich/tests/data/repos/a.git/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f
 -dulwich/tests/data/repos/a.git/refs/heads/master
 -dulwich/tests/data/repos/a.git/refs/tags/mytag
 -dulwich/tests/data/repos/empty.git/HEAD
 -dulwich/tests/data/repos/empty.git/config
 -dulwich/tests/data/repos/empty.git/objects/info/.gitignore
 -dulwich/tests/data/repos/empty.git/objects/pack/.gitignore
 -dulwich/tests/data/repos/empty.git/refs/heads/.gitignore
 -dulwich/tests/data/repos/empty.git/refs/tags/.gitignore
 -dulwich/tests/data/repos/ooo_merge.git/HEAD
 -dulwich/tests/data/repos/ooo_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b
 -dulwich/tests/data/repos/ooo_merge.git/objects/38/74e9c60a6d149c44c928140f250d81e6381520
 -dulwich/tests/data/repos/ooo_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8
 -dulwich/tests/data/repos/ooo_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6
 -dulwich/tests/data/repos/ooo_merge.git/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1
 -dulwich/tests/data/repos/ooo_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870
 -dulwich/tests/data/repos/ooo_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349
 -dulwich/tests/data/repos/ooo_merge.git/objects/b2/a2766a2879c209ab1176e7e778b81ae422eeaa
 -dulwich/tests/data/repos/ooo_merge.git/objects/f5/07291b64138b875c28e03469025b1ea20bc614
 -dulwich/tests/data/repos/ooo_merge.git/objects/f9/e39b120c68182a4ba35349f832d0e4e61f485c
 -dulwich/tests/data/repos/ooo_merge.git/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5
 -dulwich/tests/data/repos/ooo_merge.git/refs/heads/master
 -dulwich/tests/data/repos/refs.git/HEAD
 -dulwich/tests/data/repos/refs.git/packed-refs
 -dulwich/tests/data/repos/refs.git/objects/3b/9e5457140e738c2dcd39bf6d7acf88379b90d1
 -dulwich/tests/data/repos/refs.git/objects/3e/c9c43c84ff242e3ef4a9fc5bc111fd780a76a8
 -dulwich/tests/data/repos/refs.git/objects/42/d06bd4b77fed026b154d16493e5deab78f02ec
 -dulwich/tests/data/repos/refs.git/objects/a1/8114c31713746a33a2e70d9914d1ef3e781425
 -dulwich/tests/data/repos/refs.git/objects/cd/a609072918d7b70057b6bef9f4c2537843fcfe
 -dulwich/tests/data/repos/refs.git/objects/df/6800012397fb85c56e7418dd4eb9405dee075c
 -dulwich/tests/data/repos/refs.git/refs/heads/40-char-ref-aaaaaaaaaaaaaaaaaa
 -dulwich/tests/data/repos/refs.git/refs/heads/loop
 -dulwich/tests/data/repos/refs.git/refs/heads/master
 -dulwich/tests/data/repos/refs.git/refs/tags/refs-0.2
 -dulwich/tests/data/repos/simple_merge.git/HEAD
 -dulwich/tests/data/repos/simple_merge.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310
 -dulwich/tests/data/repos/simple_merge.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853
 -dulwich/tests/data/repos/simple_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b
 -dulwich/tests/data/repos/simple_merge.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6
 -dulwich/tests/data/repos/simple_merge.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc
 -dulwich/tests/data/repos/simple_merge.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e
 -dulwich/tests/data/repos/simple_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8
 -dulwich/tests/data/repos/simple_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6
 -dulwich/tests/data/repos/simple_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870
 -dulwich/tests/data/repos/simple_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349
 -dulwich/tests/data/repos/simple_merge.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd
 -dulwich/tests/data/repos/simple_merge.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7
 -dulwich/tests/data/repos/simple_merge.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86
 -dulwich/tests/data/repos/simple_merge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
 -dulwich/tests/data/repos/simple_merge.git/refs/heads/master
 -dulwich/tests/data/repos/submodule/dotgit
 -dulwich/tests/data/tags/71/033db03a03c6a36721efcf1968dd8f8e0cf023
 -dulwich/tests/data/trees/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6
  examples/clone.py
  examples/config.py
  examples/diff.py
+-examples/latest_change.py
+\ No newline at end of file
++examples/latest_change.py
Index: head/devel/dulwich/files/patch-setup.py
===================================================================
--- head/devel/dulwich/files/patch-setup.py	(revision 467161)
+++ head/devel/dulwich/files/patch-setup.py	(revision 467162)
@@ -1,11 +1,12 @@
---- setup.py.orig	2016-07-05 22:58:08 UTC
-+++ setup.py
-@@ -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.
+--- setup.py.orig	2018-01-24 16:10:15.448366000 -0600
++++ setup.py	2018-01-24 16:10:49.157689000 -0600
+@@ -91,8 +91,7 @@
+       The project is named after the part of London that Mr. and Mrs. Git live
+       in in the particular Monty Python sketch.
        """,
--      packages=['dulwich', 'dulwich.tests', 'dulwich.tests.compat', 'dulwich.contrib'],
+-      packages=['dulwich', 'dulwich.tests', 'dulwich.tests.compat',
+-                'dulwich.contrib'],
 +      packages=['dulwich', 'dulwich.contrib'],
        package_data={'': ['../docs/tutorial/*.txt']},
        scripts=['bin/dulwich', 'bin/dul-receive-pack', 'bin/dul-upload-pack'],
        classifiers=[