From 24cfbd56285b4c249fc849c7f090f6382fcce3ef Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sun, 23 Aug 2020 08:14:33 +0000
Subject: [PATCH] Move to python3 only. Add missing RDEP on intltool
 (DistUtilsExtra/command/build_i18n.py).

---
 devel/Makefile                     |  3 +--
 devel/py-distutils-extra/Makefile  | 13 +++++++++----
 devel/py-distutils-extra/pkg/PLIST |  4 +++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/devel/Makefile b/devel/Makefile
index 24145ea8611..e6b17af3369 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2009 2020/08/22 23:02:54 abieber Exp $
+# $OpenBSD: Makefile,v 1.2010 2020/08/23 08:14:33 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += 64tass
@@ -1424,7 +1424,6 @@
      SUBDIR += py-dill,python3
      SUBDIR += py-dispatcher
      SUBDIR += py-dispatcher,python3
-     SUBDIR += py-distutils-extra
      SUBDIR += py-distutils-extra,python3
      SUBDIR += py-docopt
      SUBDIR += py-docopt,python3
diff --git a/devel/py-distutils-extra/Makefile b/devel/py-distutils-extra/Makefile
index 632791031ed..ce5452f0d40 100755
--- a/devel/py-distutils-extra/Makefile
+++ b/devel/py-distutils-extra/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.15 2020/07/03 21:12:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2020/08/23 08:14:33 ajacoutot Exp $
 
 COMMENT=		add support for i18n, documentation and icons to distutils
 
 MODPY_EGG_VERSION=	2.38
 DISTNAME=		python-distutils-extra-${MODPY_EGG_VERSION}
 PKGNAME=		py-distutils-extra-${MODPY_EGG_VERSION}
-REVISION=		4
+REVISION=		5
 
 CATEGORIES=		devel
 
@@ -17,8 +17,13 @@ PERMIT_PACKAGE=	Yes
 MASTER_SITES=		https://launchpad.net/python-distutils-extra/trunk/${MODPY_EGG_VERSION}/+download/
 
 MODULES=		lang/python
+
 MODPY_SETUPTOOLS=	Yes
-FLAVORS =		python3
-FLAVOR ?=
+
+# DistUtilsExtra/command/build_i18n.py
+RUN_DEPENDS=		textproc/intltool
+
+FLAVORS=		python3
+FLAVOR=			python3
 
 .include <bsd.port.mk>
diff --git a/devel/py-distutils-extra/pkg/PLIST b/devel/py-distutils-extra/pkg/PLIST
index 75936370b77..ab04ca49100 100755
--- a/devel/py-distutils-extra/pkg/PLIST
+++ b/devel/py-distutils-extra/pkg/PLIST
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.4 2015/04/05 13:22:29 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.5 2020/08/23 08:14:34 ajacoutot Exp $
+@conflict py-distutils-extra-*
+@pkgpath devel/py-distutils-extra
 lib/python${MODPY_VERSION}/site-packages/DistUtilsExtra/
 lib/python${MODPY_VERSION}/site-packages/DistUtilsExtra/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/DistUtilsExtra/${MODPY_PYCACHE}/