Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -9387,3 +9387,4 @@
 multimedia/rubygem-av-rails5||2017-05-15|Has expired: Use multimedia/rubygem-av instead
 devel/rubygem-cocaine-rails5||2017-05-15|Has expired: Use devel/rubygem-cocaine instead
 devel/rubygem-climate_control-rails5||2017-05-15|Has expired: Use devel/rubygem-climate_control instead
+net/py-twitter|net/py-python-twitter|2017-05-15|Renamed to reflect official name at PyPI/Github
Index: head/net/Makefile
===================================================================
--- head/net/Makefile
+++ head/net/Makefile
@@ -1033,6 +1033,7 @@
     SUBDIR += py-python-novaclient
     SUBDIR += py-python-ntlm
     SUBDIR += py-python-openstackclient
+    SUBDIR += py-python-twitter
     SUBDIR += py-pyvmomi
     SUBDIR += py-pyzmq
     SUBDIR += py-qt4-network
@@ -1059,7 +1060,6 @@
     SUBDIR += py-tofu
     SUBDIR += py-tweepy
     SUBDIR += py-twistedPair
-    SUBDIR += py-twitter
     SUBDIR += py-twitter-tools
     SUBDIR += py-txamqp
     SUBDIR += py-txrestapi
Index: head/net/py-python-twitter/Makefile
===================================================================
--- head/net/py-python-twitter/Makefile
+++ head/net/py-python-twitter/Makefile
@@ -0,0 +1,23 @@
+# Created by: ijliao
+# $FreeBSD$
+
+PORTNAME=	python-twitter
+PORTVERSION=	3.2.1
+CATEGORIES=	net python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	python@FreeBSD.org
+COMMENT=	Python wrapper around the Twitter API
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib
+
+NO_ARCH=	yes
+USES=		python
+USE_PYTHON=	autoplist distutils
+
+.include <bsd.port.mk>
Index: head/net/py-python-twitter/distinfo
===================================================================
--- head/net/py-python-twitter/distinfo
+++ head/net/py-python-twitter/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1485179216
+SHA256 (python-twitter-3.2.1.tar.gz) = f621e035e114435114967a35a34d3346e59544df4c69fbedb1e382d9677087db
+SIZE (python-twitter-3.2.1.tar.gz) = 84189
Index: head/net/py-python-twitter/files/patch-setup.py
===================================================================
--- head/net/py-python-twitter/files/patch-setup.py
+++ head/net/py-python-twitter/files/patch-setup.py
@@ -0,0 +1,10 @@
+--- setup.py.orig	2016-12-23 00:11:09 UTC
++++ setup.py
+@@ -57,7 +57,6 @@ setup(
+     packages=find_packages(exclude=('tests', 'docs')),
+     platforms=['Any'],
+     install_requires=['future', 'requests', 'requests-oauthlib'],
+-    setup_requires=['pytest-runner'],
+     tests_require=['pytest'],
+     keywords='twitter api',
+     classifiers=[
Index: head/net/py-python-twitter/pkg-descr
===================================================================
--- head/net/py-python-twitter/pkg-descr
+++ head/net/py-python-twitter/pkg-descr
@@ -0,0 +1,7 @@
+This library provides a pure python interface for the Twitter API.
+
+Twitter provides a service that allows people to connect via the web, IM, and
+SMS. Twitter exposes a web services API and this library is intended to make it
+even easier for python programmers to use.
+
+WWW: https://github.com/bear/python-twitter
Index: head/net/py-twitter/Makefile
===================================================================
--- head/net/py-twitter/Makefile
+++ head/net/py-twitter/Makefile
@@ -1,24 +0,0 @@
-# Created by: ijliao
-# $FreeBSD$
-
-PORTNAME=	twitter
-PORTVERSION=	3.2.1
-CATEGORIES=	net python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	python-${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	python@FreeBSD.org
-COMMENT=	Python wrapper around the Twitter API
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib
-
-NO_ARCH=	yes
-USES=		python
-USE_PYTHON=	autoplist distutils
-
-.include <bsd.port.mk>
Index: head/net/py-twitter/distinfo
===================================================================
--- head/net/py-twitter/distinfo
+++ head/net/py-twitter/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1485179216
-SHA256 (python-twitter-3.2.1.tar.gz) = f621e035e114435114967a35a34d3346e59544df4c69fbedb1e382d9677087db
-SIZE (python-twitter-3.2.1.tar.gz) = 84189
Index: head/net/py-twitter/files/patch-setup.py
===================================================================
--- head/net/py-twitter/files/patch-setup.py
+++ head/net/py-twitter/files/patch-setup.py
@@ -1,10 +0,0 @@
---- setup.py.orig	2016-12-23 00:11:09 UTC
-+++ setup.py
-@@ -57,7 +57,6 @@ setup(
-     packages=find_packages(exclude=('tests', 'docs')),
-     platforms=['Any'],
-     install_requires=['future', 'requests', 'requests-oauthlib'],
--    setup_requires=['pytest-runner'],
-     tests_require=['pytest'],
-     keywords='twitter api',
-     classifiers=[
Index: head/net/py-twitter/pkg-descr
===================================================================
--- head/net/py-twitter/pkg-descr
+++ head/net/py-twitter/pkg-descr
@@ -1,7 +0,0 @@
-This library provides a pure python interface for the Twitter API.
-
-Twitter provides a service that allows people to connect via the web, IM, and
-SMS. Twitter exposes a web services API and this library is intended to make it
-even easier for python programmers to use.
-
-WWW: https://github.com/bear/python-twitter