Index: /usr/ports/textproc/Makefile
===================================================================
--- /usr/ports/textproc/Makefile	(revision 517170)
+++ /usr/ports/textproc/Makefile	(working copy)
@@ -1257,7 +1257,7 @@
     SUBDIR += py-elasticsearch
     SUBDIR += py-elasticsearch-async
     SUBDIR += py-elasticsearch-curator
-    SUBDIR += py-elasticsearch-dsl
+    SUBDIR += py-elasticsearch-dsl6
     SUBDIR += py-elasticsearch5
     SUBDIR += py-elasticsearch6
     SUBDIR += py-elib.intl
Index: /usr/ports/textproc/py-elasticsearch-dsl/Makefile
===================================================================
--- /usr/ports/textproc/py-elasticsearch-dsl/Makefile	(revision 517170)
+++ /usr/ports/textproc/py-elasticsearch-dsl/Makefile	(nonexistent)
@@ -1,26 +0,0 @@
-# Created by: Dan Langille <dvl@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	elasticsearch-dsl
-PORTVERSION=	6.4.0
-PORTREVISION=	1
-CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	jbaggs2016@gmail.com
-COMMENT=	High level Python client for Elasticsearch
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}elasticsearch6>=6.2.1:textproc/py-elasticsearch6@${PY_FLAVOR} \
-		${PY_IPADDRESS} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
-
-USES=		python
-USE_PYTHON=	autoplist concurrent distutils
-NO_ARCH=	yes
-
-.include <bsd.port.mk>

Property changes on: /usr/ports/textproc/py-elasticsearch-dsl/Makefile
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: /usr/ports/textproc/py-elasticsearch-dsl/distinfo
===================================================================
--- /usr/ports/textproc/py-elasticsearch-dsl/distinfo	(revision 517170)
+++ /usr/ports/textproc/py-elasticsearch-dsl/distinfo	(nonexistent)
@@ -1,3 +0,0 @@
-TIMESTAMP = 1567231186
-SHA256 (elasticsearch-dsl-6.4.0.tar.gz) = 26416f4dd46ceca43d62ef74970d9de4bdd6f4b0f163316f0b432c9e61a08bec
-SIZE (elasticsearch-dsl-6.4.0.tar.gz) = 52534

Property changes on: /usr/ports/textproc/py-elasticsearch-dsl/distinfo
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: /usr/ports/textproc/py-elasticsearch-dsl/pkg-descr
===================================================================
--- /usr/ports/textproc/py-elasticsearch-dsl/pkg-descr	(revision 517170)
+++ /usr/ports/textproc/py-elasticsearch-dsl/pkg-descr	(nonexistent)
@@ -1,17 +0,0 @@
-Elasticsearch DSL is a high-level library whose aim is to help with writing
-and running queries against Elasticsearch. It is built on top of the official
-low-level client (elasticsearch-py).
-
-It provides a more convenient and idiomatic way to write and manipulate
-queries. It stays close to the Elasticsearch JSON DSL, mirroring its terminology
-and structure. It exposes the whole range of the DSL from Python either directly
-using defined classes or a queryset-like expressions.
-
-It also provides an optional wrapper for working with documents as Python
-objects: defining mappings, retrieving and saving documents, wrapping the
-document data in user-defined classes.
-
-To use the other Elasticsearch APIs (eg. cluster health) just use the underlying
-client.
-
-WWW: https://pypi.org/project/elasticsearch-dsl/

Property changes on: /usr/ports/textproc/py-elasticsearch-dsl/pkg-descr
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: /usr/ports/textproc/py-elasticsearch-dsl6/Makefile
===================================================================
--- /usr/ports/textproc/py-elasticsearch-dsl6/Makefile	(nonexistent)
+++ /usr/ports/textproc/py-elasticsearch-dsl6/Makefile	(working copy)
@@ -0,0 +1,27 @@
+# Created by: Dan Langille <dvl@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	elasticsearch-dsl
+PORTVERSION=	6.4.0
+PORTREVISION=	2	
+CATEGORIES=	textproc python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=  6
+
+MAINTAINER=	jbaggs2016@gmail.com
+COMMENT=	High level Python client for Elasticsearch
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}elasticsearch6>=6.2.1:textproc/py-elasticsearch6@${PY_FLAVOR} \
+		${PY_IPADDRESS} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+NO_ARCH=	yes
+
+.include <bsd.port.mk>

Property changes on: /usr/ports/textproc/py-elasticsearch-dsl6/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: /usr/ports/textproc/py-elasticsearch-dsl6/distinfo
===================================================================
--- /usr/ports/textproc/py-elasticsearch-dsl6/distinfo	(nonexistent)
+++ /usr/ports/textproc/py-elasticsearch-dsl6/distinfo	(working copy)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1571957194
+SHA256 (elasticsearch-dsl-6.4.0.tar.gz) = 26416f4dd46ceca43d62ef74970d9de4bdd6f4b0f163316f0b432c9e61a08bec
+SIZE (elasticsearch-dsl-6.4.0.tar.gz) = 52534

Property changes on: /usr/ports/textproc/py-elasticsearch-dsl6/distinfo
___________________________________________________________________
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: /usr/ports/textproc/py-elasticsearch-dsl6/pkg-descr
===================================================================
--- /usr/ports/textproc/py-elasticsearch-dsl6/pkg-descr	(nonexistent)
+++ /usr/ports/textproc/py-elasticsearch-dsl6/pkg-descr	(working copy)
@@ -0,0 +1,17 @@
+Elasticsearch DSL is a high-level library whose aim is to help with writing
+and running queries against Elasticsearch. It is built on top of the official
+low-level client (elasticsearch-py).
+
+It provides a more convenient and idiomatic way to write and manipulate
+queries. It stays close to the Elasticsearch JSON DSL, mirroring its terminology
+and structure. It exposes the whole range of the DSL from Python either directly
+using defined classes or a queryset-like expressions.
+
+It also provides an optional wrapper for working with documents as Python
+objects: defining mappings, retrieving and saving documents, wrapping the
+document data in user-defined classes.
+
+To use the other Elasticsearch APIs (eg. cluster health) just use the underlying
+client.
+
+WWW: https://pypi.org/project/elasticsearch-dsl/

Property changes on: /usr/ports/textproc/py-elasticsearch-dsl6/pkg-descr
___________________________________________________________________
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