Index: head/misc/py-yolk/Makefile
===================================================================
--- head/misc/py-yolk/Makefile	(revision 357560)
+++ head/misc/py-yolk/Makefile	(revision 357561)
@@ -1,51 +1,44 @@
 # Created by: Nicola Vitale <nivit@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	yolk
 PORTVERSION=	0.4.3
 PORTREVISION=	0
 CATEGORIES=	misc python
 MASTER_SITES=	${MASTER_SITE_CHEESESHOP}
 MASTER_SITE_SUBDIR=	source/y/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Command-line tool for querying PyPI and Python packages installed
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
-OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
-OPTIONS_DEFINE=	EXAMPLES MANPAGES
-OPTIONS_DEFAULT=	MANPAGES
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	EXAMPLES
 
-.if ${PORT_OPTIONS:MMANPAGES}
-MAN1=	${PORTNAME}.1
-.endif
+USE_PYTHON=	2
+USE_PYDISTUTILS=	yes
 
+.include <bsd.port.options.mk>
+
 .if ${PORT_OPTIONS:MEXAMPLES}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 .endif
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
-
 post-install:
-.if ${PORT_OPTIONS:MMANPAGES}
-	${INSTALL_DATA} ${WRKSRC}/docs/${PORTNAME}.1 ${MANPREFIX}/man/man1/${PORTNAME}.1
-.endif
+	${INSTALL_DATA} ${WRKSRC}/docs/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PORTNAME}.1
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	@cd ${WRKSRC}/examples && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} ";"
-	cd ${WRKSRC}/examples && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} ";"
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@cd ${WRKSRC}/examples && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/{} ";"
+	cd ${WRKSRC}/examples && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/{} ";"
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} == 271 || ${PYTHON_REL} == 320
 IGNORE=	does not work with ${PYTHON_VERSION} (see http://goo.gl/SZpDN)
 .endif
 
 .include <bsd.port.post.mk>
Index: head/misc/py-yolk/pkg-plist
===================================================================
--- head/misc/py-yolk/pkg-plist	(revision 357560)
+++ head/misc/py-yolk/pkg-plist	(revision 357561)
@@ -1,13 +1,12 @@
-bin/yolk
+man/man1/yolk.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plugins/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plugins/yolk_pkg_manager/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plugins/yolk_pkg_manager/setup.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plugins/yolk_pkg_manager/yolk_acme.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plugins/yolk_portage/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plugins/yolk_portage/setup.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plugins/yolk_portage/yolk_portage.py
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/plugins/yolk_pkg_manager
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/plugins/yolk_portage
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/plugins
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%