3 files changed, 21 insertions, 72 deletions

diff --git a/misc/py-yolk/Makefile b/misc/py-yolk/Makefile
index 10a225b5a0ff..72df63265fc5 100644
--- a/misc/py-yolk/Makefile
+++ b/misc/py-yolk/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	yolk
-PORTVERSION=	0.0.6
+PORTVERSION=	0.0.7
 CATEGORIES=	misc python
-MASTER_SITES=	http://cheeseshop.python.org/packages/source/y/${PORTNAME}/ \
+MASTER_SITES=	${MASTER_SITE_CHEESESHOP} \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
+MASTER_SITE_SUBDIR=	source/y/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
@@ -24,12 +25,9 @@ OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
-.if !defined (NOPORTDOCS)
-DOCSDIR=	${TARGETDIR}/share/doc/py-${PORTNAME}
 .if !defined (NO_INSTALL_MAN)
 MAN1=	${PORTNAME}.1
 .endif
-.endif
 
 PYDISTUTILS_BUILD_TARGET=	bdist_egg
 PYDISTUTILS_INSTALL_TARGET=	easy_install
@@ -47,16 +45,12 @@ PYYOLK_EGG_VER=	"${PORTNAME}==${PORTVERSION}"
 .include <bsd.port.pre.mk>
 
 post-install:
-.if !defined (NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}/docs && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} ";"
-	@cd ${WRKSRC}/docs && ${FIND} api -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} ";"
 .if !defined (NO_INSTALL_MAN)
 	@${INSTALL_DATA} ${WRKSRC}/docs/${PORTNAME}.1 ${MANPREFIX}/man/man1/${PORTNAME}.1
 .endif
-.endif
-.if !defined (WITHOUT_EXAMPLES)
+.if defined (WITH_EXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
+	@cd ${WRKSRC}/examples && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} ";"
 	@cd ${WRKSRC}/examples && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} ";"
 .endif
 
@@ -64,11 +58,11 @@ post-install:
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree
 .endif
 
-.if defined (WITHOUT_EXAMPLES)
-PORTEXAMPLES=	"@comment "
-.else
+.if defined (WITH_EXAMPLES)
 EXAMPLESDIR=	${TARGETDIR}/share/examples/py-${PORTNAME}
 PORTEXAMPLES=	""
+.else
+PORTEXAMPLES=	"@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/misc/py-yolk/distinfo b/misc/py-yolk/distinfo
index 798fcdd25909..63121c25b02c 100644
--- a/misc/py-yolk/distinfo
+++ b/misc/py-yolk/distinfo
@@ -1,3 +1,3 @@
-MD5 (yolk-0.0.6.tar.gz) = 94f62413f17e66cd61b22942bb59a49d
-SHA256 (yolk-0.0.6.tar.gz) = c5c83831ab708a1ee51f4b14ab96b549c21721bc83b5a39957b29d0d283165f1
-SIZE (yolk-0.0.6.tar.gz) = 34682
+MD5 (yolk-0.0.7.tar.gz) = c0622b9727cbfe150f203b345d3f50e8
+SHA256 (yolk-0.0.7.tar.gz) = 10440e4d37b1c9f52e1437b5a789b629061eb9cbf05a5afb08d673840a190437
+SIZE (yolk-0.0.7.tar.gz) = 29441
diff --git a/misc/py-yolk/pkg-plist b/misc/py-yolk/pkg-plist
index 3cb0724aee6a..d807ab317ef4 100644
--- a/misc/py-yolk/pkg-plist
+++ b/misc/py-yolk/pkg-plist
@@ -1,60 +1,15 @@
 @comment $FreeBSD$
 bin/yolk
-%%PORTDOCS%%%%DOCSDIR%%/api/epydoc.css
-%%PORTDOCS%%%%DOCSDIR%%/api/index.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/epydoc.css
-%%PORTDOCS%%%%DOCSDIR%%/api/private/exceptions.Exception-class.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/frames.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/help.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/index.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/indices.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/toc-everything.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/toc-yolk-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/toc-yolk.__version__-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/toc-yolk.cli-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/toc-yolk.metadata-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/toc-yolk.pypi-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/toc-yolk.yolklib-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/toc.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/trees.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/yolk-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/yolk.__version__-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/yolk.cli-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/yolk.cli.Usage-class.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/yolk.metadata-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/yolk.pypi-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/yolk.pypi.CheeseShop-class.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/yolk.yolklib-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/private/yolk.yolklib.Distributions-class.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/epydoc.css
-%%PORTDOCS%%%%DOCSDIR%%/api/public/exceptions.Exception-class.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/frames.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/help.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/index.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/indices.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/toc-everything.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/toc-yolk-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/toc-yolk.__version__-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/toc-yolk.cli-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/toc-yolk.metadata-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/toc-yolk.pypi-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/toc-yolk.yolklib-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/toc.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/trees.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/yolk-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/yolk.__version__-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/yolk.cli-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/yolk.cli.Usage-class.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/yolk.metadata-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/yolk.pypi-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/yolk.pypi.CheeseShop-class.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/yolk.yolklib-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/public/yolk.yolklib.Distributions-class.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rss_feed.py
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/private
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api/public
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%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%%
 @unexec %%EASY_INSTALL_CMD%% -q -x -m -N -S %D/%%PYTHON_SITELIBDIR%% %%PYYOLK_EGG_VER%%
 %%PYTHON_SITELIBDIR%%/%%PYYOLK_EGG%%