diff -Naur /usr/ports/devel/bzr/Makefile bzr/Makefile
--- /usr/ports/devel/bzr/Makefile	2018-07-23 11:07:49.000000000 +0200
+++ bzr/Makefile	2019-08-15 08:09:06.335991000 +0200
@@ -3,9 +3,11 @@
 
 PORTNAME=	bzr
 PORTVERSION=	2.7.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	http://archive.ubuntu.com/ubuntu/pool/universe/b/bzr/
+DISTFILES=	${PORTNAME}_${PORTVERSION}+bzr${UBUNTU_REV}.orig.tar.gz \
+		${PORTNAME}_${PORTVERSION}+bzr${UBUNTU_REV}-${UBUNTU_VER}.debian.tar.xz
 
 MAINTAINER=	fullermd@over-yonder.net
 COMMENT=	Distributed version control system by Canonical
@@ -14,20 +16,23 @@
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}testtools>=0:devel/py-testtools@${PY_FLAVOR}
-
-OPTIONS_DEFINE=	SFTP CA_BUNDLE
-SFTP_DESC=	Paramiko for SFTP support
-CA_BUNDLE_DESC=	Include CA bundle for SSL cert validation
-OPTIONS_DEFAULT=	SFTP CA_BUNDLE
-
 SFTP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko@${PY_FLAVOR}
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USES=		gettext python:2.7 shebangfix
-SHEBANG_FILES=	bzr
-USE_PYTHON=	distutils cython
-PYDISTUTILS_PKGNAME=	bzr
+USE_PYTHON=	distutils cython noegginfo
+
 MAKE_ENV=	BZR_LOG=/dev/null
+PYDISTUTILS_PKGNAME=	bzr
+SHEBANG_FILES=	bzr
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}+bzr${UBUNTU_REV}
+UBUNTU_REV=	6622
+UBUNTU_VER=	15
+
+OPTIONS_DEFINE=	SFTP CA_BUNDLE
+SFTP_DESC=	Paramiko for SFTP support
+CA_BUNDLE_DESC=	Include CA bundle for SSL cert validation
+OPTIONS_DEFAULT=	SFTP CA_BUNDLE
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/bzr.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
@@ -36,4 +41,9 @@
 do-test:
 	cd ${WRKSRC} && ./bzr selftest
 
+do-patch:
+	for p in `cat ${WRKDIR}/debian/patches/series` ; do \
+	   (cd ${WRKSRC} && ${PATCH} -p1 -s < ${WRKDIR}/debian/patches/$$p ) ; \
+	done
+
 .include <bsd.port.mk>
diff -Naur /usr/ports/devel/bzr/distinfo bzr/distinfo
--- /usr/ports/devel/bzr/distinfo	2016-02-11 05:34:15.000000000 +0100
+++ bzr/distinfo	2019-08-14 22:14:39.477817000 +0200
@@ -1,2 +1,5 @@
-SHA256 (bzr-2.7.0.tar.gz) = c9f6bbe0a50201dadc5fddadd94ba50174193c6cf6e39e16f6dd0ad98a1df338
-SIZE (bzr-2.7.0.tar.gz) = 11526191
+TIMESTAMP = 1565813679
+SHA256 (bzr_2.7.0+bzr6622.orig.tar.gz) = 08bba3e76cba9beb6b686e71253045beeab9db94753ddbcafa0f8ed1cba377ff
+SIZE (bzr_2.7.0+bzr6622.orig.tar.gz) = 10948360
+SHA256 (bzr_2.7.0+bzr6622-15.debian.tar.xz) = d2198b93059cc9d37c551f7bfda19a199c18f4c9c6104a8c40ccd6d0c65e6fd3
+SIZE (bzr_2.7.0+bzr6622-15.debian.tar.xz) = 92936