diff --git a/devel/py-ply/Makefile b/devel/py-ply/Makefile
index e9f8d7aa59b4..3fbd8003be5a 100644
--- a/devel/py-ply/Makefile
+++ b/devel/py-ply/Makefile
@@ -10,26 +10,26 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Python Lex-Yacc
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+LICENSE=	BSD3CLAUSE
+
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 PORTDOCS=	ply.html internal.html README
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 pre-configure:
 	@${REINPLACE_CMD} -e 's|from setuptools import setup|from distutils.core import setup|' \
 		${WRKSRC}/setup.py
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/ply.html ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/internal.html ${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/example/ ${EXAMPLESDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/ply.html ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/internal.html ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${CP} -R ${WRKSRC}/example/ ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-ply/pkg-plist b/devel/py-ply/pkg-plist
index 16e0cffdb3ff..87c563da164d 100644
--- a/devel/py-ply/pkg-plist
+++ b/devel/py-ply/pkg-plist
@@ -1,18 +1,3 @@
-%%PYTHON_SITELIBDIR%%/ply/__init__.py
-%%PYTHON_SITELIBDIR%%/ply/__init__.pyc
-%%PYTHON_SITELIBDIR%%/ply/__init__.pyo
-%%PYTHON_SITELIBDIR%%/ply/cpp.py
-%%PYTHON_SITELIBDIR%%/ply/cpp.pyc
-%%PYTHON_SITELIBDIR%%/ply/cpp.pyo
-%%PYTHON_SITELIBDIR%%/ply/ctokens.py
-%%PYTHON_SITELIBDIR%%/ply/ctokens.pyc
-%%PYTHON_SITELIBDIR%%/ply/ctokens.pyo
-%%PYTHON_SITELIBDIR%%/ply/lex.py
-%%PYTHON_SITELIBDIR%%/ply/lex.pyc
-%%PYTHON_SITELIBDIR%%/ply/lex.pyo
-%%PYTHON_SITELIBDIR%%/ply/yacc.py
-%%PYTHON_SITELIBDIR%%/ply/yacc.pyc
-%%PYTHON_SITELIBDIR%%/ply/yacc.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ansic/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ansic/clex.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ansic/cparse.py
@@ -65,4 +50,3 @@
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/calc
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/ansic
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/ply