Index: head/security/py-certbot/Makefile
===================================================================
--- head/security/py-certbot/Makefile	(revision 487413)
+++ head/security/py-certbot/Makefile	(revision 487414)
@@ -1,49 +1,48 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	certbot
 PORTVERSION=	${ACME_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Let's Encrypt client #'
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>=1.2:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}josepy>=0:security/py-josepy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}parsedatetime>=1.3:devel/py-parsedatetime@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
 
 # Actually 2.7,3.3+
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's|/etc/|${LOCALBASE}/etc/|' \
-		-e 's|/var/lib|/var/db|' \
-		${WRKSRC}/${PORTNAME}/constants.py
+		s,%%LOCALBASE%%,${LOCALBASE}, \
+		${WRKSRC}/${PORTNAME}/compat.py
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include "${.CURDIR}/../py-acme/version.mk"
 .include <bsd.port.mk>
Index: head/security/py-certbot/files/patch-certbot_compat.py
===================================================================
--- head/security/py-certbot/files/patch-certbot_compat.py	(nonexistent)
+++ head/security/py-certbot/files/patch-certbot_compat.py	(revision 487414)
@@ -0,0 +1,36 @@
+# Incorrect config file path since update to 0.29.1
+# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=233909
+# TODO: Upstream
+
+--- certbot/compat.py.orig	2018-12-05 23:47:58 UTC
++++ certbot/compat.py
+@@ -183,6 +183,11 @@ LINUX_DEFAULT_FOLDERS = {
+     'work': '/var/lib/letsencrypt',
+     'logs': '/var/log/letsencrypt',
+ }
++FREEBSD_DEFAULT_FOLDERS = {
++    'config': '%%LOCALBASE%%/etc/letsencrypt',
++    'work': '/var/db/letsencrypt',
++    'logs': '/var/log/letsencrypt',
++}
+ 
+ def get_default_folder(folder_type):
+     """
+@@ -195,7 +200,13 @@ def get_default_folder(folder_type):
+ 
+     """
+     if 'fcntl' in sys.modules:
+-        # Linux specific
+-        return LINUX_DEFAULT_FOLDERS[folder_type]
+-    # Windows specific
+-    return WINDOWS_DEFAULT_FOLDERS[folder_type]
++        # Unix-like
++        if sys.platform.startswith('freebsd') or sys.platform.startswith('dragonfly'):
++            # FreeBSD specific
++            return FREEBSD_DEFAULT_FOLDERS[folder_type]
++        else:
++            # Linux specific
++            return LINUX_DEFAULT_FOLDERS[folder_type]
++    else:
++        # Windows specific
++        return WINDOWS_DEFAULT_FOLDERS[folder_type]

Property changes on: head/security/py-certbot/files/patch-certbot_compat.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-setup.py
===================================================================
--- head/security/py-certbot/files/patch-setup.py	(revision 487413)
+++ head/security/py-certbot/files/patch-setup.py	(revision 487414)
@@ -1,18 +1,18 @@
---- setup.py.orig	2018-03-08 22:20:34 UTC
+--- setup.py.orig	2018-12-05 23:47:59 UTC
 +++ setup.py
-@@ -44,7 +44,6 @@ install_requires = [
+@@ -39,7 +39,6 @@ install_requires = [
      'configobj',
      'cryptography>=1.2',  # load_pem_x509_certificate
      'josepy',
 -    'mock',
      'parsedatetime>=1.3',  # Calendar.parseDT
      'pyrfc3339',
      'pytz',
-@@ -58,6 +57,7 @@ dev_extras = [
+@@ -53,6 +52,7 @@ dev_extras = [
      'astroid==1.3.5',
      'coverage',
      'ipdb',
 +    'mock',
      'pytest',
      'pytest-cov',
      'pytest-xdist',