From 18763ca2029a1d6534be597c4b2fb55446138047 Mon Sep 17 00:00:00 2001
From: antoine <antoine@FreeBSD.org>
Date: Sun, 19 Oct 2014 22:32:49 +0000
Subject: - Update to 2.1.1 - Tighten CONFLICTS

---
 textproc/py-openpyxl/Makefile  | 4 ++--
 textproc/py-openpyxl/distinfo  | 4 ++--
 textproc/py-openpyxl1/Makefile | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/textproc/py-openpyxl/Makefile b/textproc/py-openpyxl/Makefile
index bd933009a0de..df01fca3a925 100644
--- a/textproc/py-openpyxl/Makefile
+++ b/textproc/py-openpyxl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openpyxl
-PORTVERSION=	2.0.5
+PORTVERSION=	2.1.1
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ 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
diff --git a/textproc/py-openpyxl/distinfo b/textproc/py-openpyxl/distinfo
index fb5b19af52d0..0ea8dbe3519d 100644
--- a/textproc/py-openpyxl/distinfo
+++ b/textproc/py-openpyxl/distinfo
@@ -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
diff --git a/textproc/py-openpyxl1/Makefile b/textproc/py-openpyxl1/Makefile
index 52b59c2444a4..60b0602d23db 100644
--- a/textproc/py-openpyxl1/Makefile
+++ b/textproc/py-openpyxl1/Makefile
@@ -14,7 +14,7 @@ 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
-- 
cgit