Index: head/textproc/py-openpyxl/Makefile
===================================================================
--- head/textproc/py-openpyxl/Makefile	(revision 371214)
+++ head/textproc/py-openpyxl/Makefile	(revision 371215)
@@ -1,22 +1,22 @@
 # Created by: Antoine Brodin <antoine@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	openpyxl
-PORTVERSION=	2.0.5
+PORTVERSION=	2.1.1
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Python library to read/write Excel 2007 xlsx/xlsm files
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jdcal>=0:${PORTSDIR}/devel/py-jdcal
 
-CONFLICTS_INSTALL=	py*-openpyxl1-[0-9]*
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}openpyxl1-[0-9]*
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
Index: head/textproc/py-openpyxl/distinfo
===================================================================
--- head/textproc/py-openpyxl/distinfo	(revision 371214)
+++ head/textproc/py-openpyxl/distinfo	(revision 371215)
@@ -1,2 +1,2 @@
-SHA256 (openpyxl-2.0.5.tar.gz) = 874c2f1180b0b6c84173abac1b9de87f4cb4eef59b83b3095ef345f77c824a93
-SIZE (openpyxl-2.0.5.tar.gz) = 117014
+SHA256 (openpyxl-2.1.1.tar.gz) = 1d5bb62c1ed7c3c5afce386d70c2148145e9474c3aabf00496ceb0735ca83afe
+SIZE (openpyxl-2.1.1.tar.gz) = 148700
Index: head/textproc/py-openpyxl1/Makefile
===================================================================
--- head/textproc/py-openpyxl1/Makefile	(revision 371214)
+++ head/textproc/py-openpyxl1/Makefile	(revision 371215)
@@ -1,22 +1,22 @@
 # Created by: Antoine Brodin <antoine@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	openpyxl
 PORTVERSION=	1.8.6
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	1
 
 MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Python library to read/write Excel 2007 xlsx/xlsm files
 
 LICENSE=	MIT
 
 DEPRECATED=	Use textproc/py-openpyxl instead
-CONFLICTS_INSTALL=	py*-openpyxl-[0-9]*
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}openpyxl-[0-9]*
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>