2 files changed, 4 insertions, 78 deletions

diff --git a/net/py-netaddr/Makefile b/net/py-netaddr/Makefile
index f4b0fe125a7e..342111446533 100644
--- a/net/py-netaddr/Makefile
+++ b/net/py-netaddr/Makefile
@@ -8,27 +8,23 @@ MASTER_SITES=	https://github.com/downloads/drkjam/netaddr/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A python library for the manipulation of network addresses
+COMMENT=	Python library for the manipulation of network addresses
 
 LICENSE=	BSD
 
 FETCH_ARGS=	-pRr
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
 PORTDOCS=	AUTHORS CHANGELOG README
 TESTFILES=	__init__.py
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 regression-test:
 .for f in ${TESTFILES}
diff --git a/net/py-netaddr/pkg-plist b/net/py-netaddr/pkg-plist
deleted file mode 100644
index bfa0732960c9..000000000000
--- a/net/py-netaddr/pkg-plist
+++ /dev/null
@@ -1,70 +0,0 @@
-bin/netaddr
-%%PYTHON_SITELIBDIR%%/netaddr/__init__.py
-%%PYTHON_SITELIBDIR%%/netaddr/__init__.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/__init__.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/compat.py
-%%PYTHON_SITELIBDIR%%/netaddr/compat.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/compat.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/core.py
-%%PYTHON_SITELIBDIR%%/netaddr/core.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/core.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/eui/__init__.py
-%%PYTHON_SITELIBDIR%%/netaddr/eui/__init__.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/eui/__init__.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/eui/iab.idx
-%%PYTHON_SITELIBDIR%%/netaddr/eui/iab.txt
-%%PYTHON_SITELIBDIR%%/netaddr/eui/ieee.py
-%%PYTHON_SITELIBDIR%%/netaddr/eui/ieee.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/eui/ieee.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/eui/oui.idx
-%%PYTHON_SITELIBDIR%%/netaddr/eui/oui.txt
-%%PYTHON_SITELIBDIR%%/netaddr/fbsocket.py
-%%PYTHON_SITELIBDIR%%/netaddr/fbsocket.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/fbsocket.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/ip/__init__.py
-%%PYTHON_SITELIBDIR%%/netaddr/ip/__init__.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/ip/__init__.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/ip/glob.py
-%%PYTHON_SITELIBDIR%%/netaddr/ip/glob.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/ip/glob.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/ip/iana.py
-%%PYTHON_SITELIBDIR%%/netaddr/ip/iana.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/ip/iana.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/ip/intset.py
-%%PYTHON_SITELIBDIR%%/netaddr/ip/intset.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/ip/intset.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/ip/ipv4-address-space.xml
-%%PYTHON_SITELIBDIR%%/netaddr/ip/ipv6-address-space.xml
-%%PYTHON_SITELIBDIR%%/netaddr/ip/multicast-addresses.xml
-%%PYTHON_SITELIBDIR%%/netaddr/ip/nmap.py
-%%PYTHON_SITELIBDIR%%/netaddr/ip/nmap.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/ip/nmap.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/ip/rfc1924.py
-%%PYTHON_SITELIBDIR%%/netaddr/ip/rfc1924.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/ip/rfc1924.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/ip/sets.py
-%%PYTHON_SITELIBDIR%%/netaddr/ip/sets.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/ip/sets.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/strategy/__init__.py
-%%PYTHON_SITELIBDIR%%/netaddr/strategy/__init__.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/strategy/__init__.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/strategy/eui48.py
-%%PYTHON_SITELIBDIR%%/netaddr/strategy/eui48.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/strategy/eui48.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/strategy/eui64.py
-%%PYTHON_SITELIBDIR%%/netaddr/strategy/eui64.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/strategy/eui64.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/strategy/ipv4.py
-%%PYTHON_SITELIBDIR%%/netaddr/strategy/ipv4.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/strategy/ipv4.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/strategy/ipv6.py
-%%PYTHON_SITELIBDIR%%/netaddr/strategy/ipv6.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/strategy/ipv6.pyo
-%%PYTHON_SITELIBDIR%%/netaddr/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/netaddr/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/netaddr/tests/__init__.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/netaddr/eui
-@dirrm %%PYTHON_SITELIBDIR%%/netaddr/ip
-@dirrm %%PYTHON_SITELIBDIR%%/netaddr/strategy
-@dirrm %%PYTHON_SITELIBDIR%%/netaddr/tests
-@dirrmtry %%PYTHON_SITELIBDIR%%/netaddr