svn commit: r358456 - head/textproc/py-genshi-devel

Marcus von Appen mva at FreeBSD.org
Thu Jun 19 18:59:39 UTC 2014 

Author: mva
Date: Thu Jun 19 18:59:38 2014
New Revision: 358456
URL: http://svnweb.freebsd.org/changeset/ports/358456
QAT: https://qat.redports.org/buildarchive/r358456/

Log:
  - Enable stagedir support
  - Remove easy_install dependency
  - Convert to PYDISTUTILS_AUTOPLIST
  - Bump PORTREVISION to enforce a cleanup for the easy_install references
  
  With hat:	python@
  Approved by:	portmgr (implicit)

Modified:
  head/textproc/py-genshi-devel/Makefile
  head/textproc/py-genshi-devel/pkg-plist

Modified: head/textproc/py-genshi-devel/Makefile
==============================================================================
--- head/textproc/py-genshi-devel/Makefile	Thu Jun 19 18:57:57 2014	(r358455)
+++ head/textproc/py-genshi-devel/Makefile	Thu Jun 19 18:59:38 2014	(r358456)
@@ -3,7 +3,7 @@
 
 PORTNAME=	Genshi
 PORTVERSION=	0.6.1052
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc www python
 MASTER_SITES=	ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,47 +12,20 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	alexey at renatasystems.org
 COMMENT=	Python toolkit for stream-based generation of output for the web
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 WRKSRC=		${WRKDIR}/genshi
 CONFLICTS=	py-genshi-[0-9]*
 
-PYEASYINSTALL_ARCHDEP=	yes
-PYDISTUTILS_PKGVERSION=	${PORTVERSION:R}dev
-PYDISTUTILS_INSTALLARGS=	-Z -O 1 -N \
-				-S ${PYTHONPREFIX_SITELIBDIR}/site-packages \
-				-d ${PYTHONPREFIX_SITELIBDIR} \
-				${WRKSRC}/dist/${PYEASYINSTALL_EGG}
-
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
-# This target is only meant to be used by the port maintainer.
-NO_STAGE=	yes
-x-generate-plist:
-	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
-	| ${SED} -E \
-		's,.*share/nls/.+$$,,g \
-		;s, at dirrm share/man(/.*)?$$,,g \
-		;s,${PYTHON_SITELIBDIR:S,^${PYTHONBASE}/,,},%%PYTHON_SITELIBDIR%%,g \
-		;s,^${DOCSDIR_REL},%%PORTDOCS%%%%DOCSDIR%%,g \
-		;s, at dirrm ${DOCSDIR_REL},%%PORTDOCS%%@dirrm %%DOCSDIR%%,g \
-		;s,^${EXAMPLESDIR_REL},%%PORTEXAMPLES%%%%EXAMPLESDIR%%,g \
-		;s, at dirrm ${EXAMPLESDIR_REL},%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%,g \
-		;s,${PYEASYINSTALL_EGG},%%PYEASYINSTALL_EGG%%,g \
-		;s, at dirrm (%%PYTHON_SITELIBDIR%%|${PYTHON_LIBDIR:S,${PYTHONBASE}/,,})$$,,g \
-		' | ${TR} -s '\n') > temp-pkg-plist
-
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${DOCSDIR}
-.endif
-
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
-.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/textproc/py-genshi-devel/pkg-plist
==============================================================================
--- head/textproc/py-genshi-devel/pkg-plist	Thu Jun 19 18:57:57 2014	(r358455)
+++ head/textproc/py-genshi-devel/pkg-plist	Thu Jun 19 18:59:38 2014	(r358456)
@@ -1,87 +1,3 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/_speedups.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/_speedups.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/_speedups.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/_speedups.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/builder.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/builder.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/builder.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/core.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/core.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/core.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/html.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/html.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/html.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/i18n.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/i18n.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/i18n.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/transform.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/transform.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/transform.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/input.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/input.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/input.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/output.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/output.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/output.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/path.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/path.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/path.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/_ast24.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/_ast24.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/_ast24.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/ast24.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/ast24.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/ast24.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/astgae.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/astgae.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/astgae.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/astutil.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/astutil.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/astutil.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/base.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/base.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/directives.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/directives.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/directives.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/eval.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/eval.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/eval.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/interpolation.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/interpolation.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/interpolation.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/loader.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/loader.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/loader.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/markup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/markup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/markup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/plugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/plugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/plugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/text.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/text.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/text.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/util.pyo
 %%PORTDOCS%%%%DOCSDIR%%/2000ft.graffle
 %%PORTDOCS%%%%DOCSDIR%%/2000ft.png
 %%PORTDOCS%%%%DOCSDIR%%/common/COPYING
@@ -188,8 +104,3 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/common/conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/common
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
- at dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%

More information about the svn-ports-all mailing list