Index: head/textproc/xml2rfc/Makefile
===================================================================
--- head/textproc/xml2rfc/Makefile	(revision 499280)
+++ head/textproc/xml2rfc/Makefile	(revision 499281)
@@ -1,22 +1,27 @@
 # Created by: jabley@automagic.org
 # $FreeBSD$
 
 PORTNAME=	xml2rfc
-PORTVERSION=	2.8.4
-PORTREVISION=	1
+PORTVERSION=	2.22.3
 CATEGORIES=	textproc
 MASTER_SITES=	http://tools.ietf.org/tools/xml2rfc2/cli/
 
 MAINTAINER=	marcus@FreeBSD.org
-COMMENT=	Tool to create RFCs and related documents from XML, as per RFC2629
+COMMENT=	Tool to create RFCs and related documents from XML
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.2.8:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}country>=1.8:devel/py-country@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyflakes>=0.8.1:devel/py-pyflakes@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}intervaltree>=3.0.1:devel/py-intervaltree@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}google-i18n-address>=2.3.2:devel/py-google-i18n-address@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}html5lib>=1.0.1:www/py-html5lib@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist concurrent optsuffix
 
 .include <bsd.port.mk>
Index: head/textproc/xml2rfc/distinfo
===================================================================
--- head/textproc/xml2rfc/distinfo	(revision 499280)
+++ head/textproc/xml2rfc/distinfo	(revision 499281)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516054593
-SHA256 (xml2rfc-2.8.4.tar.gz) = e2fe8e73c5b3233f0418d6a7beb61b789195abbb58b35e16aa7c528ef46b19cc
-SIZE (xml2rfc-2.8.4.tar.gz) = 1728115
+TIMESTAMP = 1555593477
+SHA256 (xml2rfc-2.22.3.tar.gz) = 943bdb59c532be2ae4981d1cdaa56191e4d2fa0a79cf13125a8ac1a06b391e4e
+SIZE (xml2rfc-2.22.3.tar.gz) = 3914910
Index: head/textproc/xml2rfc/files/patch-requirements.txt
===================================================================
--- head/textproc/xml2rfc/files/patch-requirements.txt	(nonexistent)
+++ head/textproc/xml2rfc/files/patch-requirements.txt	(revision 499281)
@@ -0,0 +1,11 @@
+--- requirements.txt.orig	2019-02-14 14:17:04 UTC
++++ requirements.txt
+@@ -1,7 +1,7 @@
+ google-i18n-address>=2.3.2
+ html5lib>=1.0.1
+ intervaltree>=2.1.0,!=3.0.0
+-lxml>=2.2.8,!=4.3.1 
++lxml>=2.2.8
+ pycountry>=1.8
+ pyflakes>=0.8.1
+ requests>=2.5.0

Property changes on: head/textproc/xml2rfc/files/patch-requirements.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/textproc/xml2rfc/files/patch-xml2rfc.egg-info_requires.txt
===================================================================
--- head/textproc/xml2rfc/files/patch-xml2rfc.egg-info_requires.txt	(nonexistent)
+++ head/textproc/xml2rfc/files/patch-xml2rfc.egg-info_requires.txt	(revision 499281)
@@ -0,0 +1,11 @@
+--- xml2rfc.egg-info/requires.txt.orig	2019-04-08 11:17:38 UTC
++++ xml2rfc.egg-info/requires.txt
+@@ -1,7 +1,7 @@
+ google-i18n-address>=2.3.2
+ html5lib>=1.0.1
+ intervaltree!=3.0.0,>=2.1.0
+-lxml!=4.3.1,>=2.2.8
++lxml>=2.2.8
+ pycountry>=1.8
+ pyflakes>=0.8.1
+ requests>=2.5.0

Property changes on: head/textproc/xml2rfc/files/patch-xml2rfc.egg-info_requires.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/textproc/xml2rfc/pkg-descr
===================================================================
--- head/textproc/xml2rfc/pkg-descr	(revision 499280)
+++ head/textproc/xml2rfc/pkg-descr	(revision 499281)
@@ -1,5 +1,5 @@
 This is a port of xml2rfc, a tool for producing documents formatted
 according to the requirements of the RFC editor from XML, as described
-in RFC 2629.
+in RFCs 7749 and 7991.
 
-WWW: http://xml.resource.org/
+WWW: https://xml2rfc.tools.ietf.org/