Index: head/security/py-certbot/Makefile
===================================================================
--- head/security/py-certbot/Makefile	(revision 441334)
+++ head/security/py-certbot/Makefile	(revision 441335)
@@ -1,47 +1,47 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	certbot
 PORTVERSION=	0.13.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Let's Encrypt client
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}acme==${PKGVERSION}:security/py-acme \
 		${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse \
 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj \
 		${PYTHON_PKGNAMEPREFIX}cryptography>=0.7:security/py-cryptography \
 		${PYTHON_PKGNAMEPREFIX}parsedatetime>=1.3:devel/py-parsedatetime \
 		${PYTHON_PKGNAMEPREFIX}psutil>=2.2.1:sysutils/py-psutil \
 		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
 		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339 \
 		${PYTHON_PKGNAMEPREFIX}python2-pythondialog>=3.2.2r1:devel/py-python2-pythondialog \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
 		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's|/etc/|${LOCALBASE}/etc/|' \
 		-e 's|/var/lib|/var/db|' \
 		${WRKSRC}/${PORTNAME}/constants.py
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
Index: head/security/py-certbot/files/patch-certbot_tests_util__test.py
===================================================================
--- head/security/py-certbot/files/patch-certbot_tests_util__test.py	(nonexistent)
+++ head/security/py-certbot/files/patch-certbot_tests_util__test.py	(revision 441335)
@@ -0,0 +1,40 @@
+From 42d07d756df0cf96c9d20b44e772858391d48384 Mon Sep 17 00:00:00 2001
+From: Ryan Pineo <ry@tsl.io>
+Date: Fri, 12 May 2017 15:45:54 -0400
+Subject: [PATCH] support version 0.12.0 of configargparse
+
+fixes #4648
+
+--- certbot/tests/util_test.py.orig	2017-05-16 07:27:15 UTC
++++ certbot/tests/util_test.py
+@@ -5,6 +5,7 @@ import os
+ import stat
+ import unittest
+ 
++import configargparse
+ import mock
+ import six
+ 
+@@ -333,6 +334,22 @@ class AddDeprecatedArgumentTest(unittest
+                 pass
+         self.assertTrue("--old-option" not in stdout.getvalue())
+ 
++    def test_when_configargparse(self):
++        '''In configargparse version < 0.12.0 ACTION_TYPES_THAT_DONT_NEED_A_VALUE is a set.'''
++        orig = configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE
++        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = set()
++        self._call("--old-option", 1)
++        self.assertEqual(len(configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE), 1)
++        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = orig
++
++    def test_when_configargparse_tuple(self):
++        '''In configargparse version >= 0.12.0 ACTION_TYPES_THAT_DONT_NEED_A_VALUE is a tuple.'''
++        orig = configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE
++        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = tuple()
++        self._call("--old-option", 1)
++        self.assertEqual(len(configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE), 1)
++        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = orig
++
+ 
+ class EnforceLeValidity(unittest.TestCase):
+     """Test enforce_le_validity."""

Property changes on: head/security/py-certbot/files/patch-certbot_tests_util__test.py
___________________________________________________________________
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/security/py-certbot/files/patch-certbot_util.py
===================================================================
--- head/security/py-certbot/files/patch-certbot_util.py	(nonexistent)
+++ head/security/py-certbot/files/patch-certbot_util.py	(revision 441335)
@@ -0,0 +1,23 @@
+From 42d07d756df0cf96c9d20b44e772858391d48384 Mon Sep 17 00:00:00 2001
+From: Ryan Pineo <ry@tsl.io>
+Date: Fri, 12 May 2017 15:45:54 -0400
+Subject: [PATCH] support version 0.12.0 of configargparse
+
+fixes #4648
+
+--- certbot/util.py.orig	2017-05-16 07:21:46 UTC
++++ certbot/util.py
+@@ -437,7 +437,12 @@ def add_deprecated_argument(add_argument
+             sys.stderr.write(
+                 "Use of {0} is deprecated.\n".format(option_string))
+ 
+-    configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE.add(ShowWarning)
++    # In version 0.12.0 ACTION_TYPES_THAT_DONT_NEED_A_VALUE was changed from a set
++    # to a tuple.
++    if isinstance(configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE, set):
++        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE.add(ShowWarning)
++    else:
++        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE += (ShowWarning,)
+     add_argument(argument_name, action=ShowWarning,
+                  help=argparse.SUPPRESS, nargs=nargs)
+ 

Property changes on: head/security/py-certbot/files/patch-certbot_util.py
___________________________________________________________________
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