diff options
Diffstat (limited to 'www')
73 files changed, 198 insertions, 154 deletions
diff --git a/www/feedjack/Makefile b/www/feedjack/Makefile index 0ef744d9f231..b257f1a64870 100644 --- a/www/feedjack/Makefile +++ b/www/feedjack/Makefile @@ -22,6 +22,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedpars DIST_SUBDIR= python USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Feedjack +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PLIST_SUB= FEEDJACKVER=${PORTVERSION} \ PYTHONVER=${_PYTHON_VERSION} diff --git a/www/google-sitemapgen/Makefile b/www/google-sitemapgen/Makefile index d4bb58be56a9..1cec22869fbb 100644 --- a/www/google-sitemapgen/Makefile +++ b/www/google-sitemapgen/Makefile @@ -17,5 +17,6 @@ COMMENT= Script to analyze web server and generate Google Sitemap files USE_PYTHON= YES USE_PYDISTUTILS=YES +PYDISTUTILS_PKGNAME= sitemap_gen .include <bsd.port.mk> diff --git a/www/mod_python3/Makefile b/www/mod_python3/Makefile index 69ab43086a78..06fa35c163c3 100644 --- a/www/mod_python3/Makefile +++ b/www/mod_python3/Makefile @@ -18,6 +18,7 @@ COMMENT= Apache module that embeds the Python interpreter within the server USE_APACHE= 2.0+ USE_PYTHON= yes +INSTALLS_EGGINFO= yes LATEST_LINK= mod_python3 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}" \ diff --git a/www/moinmoin/Makefile b/www/moinmoin/Makefile index f0038e85f193..94f6802e47dc 100644 --- a/www/moinmoin/Makefile +++ b/www/moinmoin/Makefile @@ -17,6 +17,7 @@ COMMENT= A Python clone of WikiWiki USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= moin PLIST_SUB+= PYTHON_SITELIB=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||} SUB_FILES= pkg-install diff --git a/www/newsfeed/Makefile b/www/newsfeed/Makefile index 0cdd140305bb..e7e5398365ce 100644 --- a/www/newsfeed/Makefile +++ b/www/newsfeed/Makefile @@ -23,6 +23,7 @@ RUN_DEPENDS= py*-tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter \ USE_PYTHON= yes USE_TK= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= NewsFeed post-patch: @${REINPLACE_CMD} -e '/py_modules=/s|,.*|],|;/sounds/s|d.*|)|' ${WRKSRC}/setup.py diff --git a/www/plone/Makefile b/www/plone/Makefile index 2c14b212c33b..c31cdee6ec9d 100644 --- a/www/plone/Makefile +++ b/www/plone/Makefile @@ -77,4 +77,10 @@ post-install: @${CAT} ${PKGMESSAGE} .endif -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION} && defined(PACKAGE_BUILDING) +IGNORE= can't be built: the default Python version should be ${PYTHON_VERSION} in order to build a package in the build cluster +.endif + +.include <bsd.port.post.mk> diff --git a/www/plone3/Makefile b/www/plone3/Makefile index 2c14b212c33b..c31cdee6ec9d 100644 --- a/www/plone3/Makefile +++ b/www/plone3/Makefile @@ -77,4 +77,10 @@ post-install: @${CAT} ${PKGMESSAGE} .endif -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION} && defined(PACKAGE_BUILDING) +IGNORE= can't be built: the default Python version should be ${PYTHON_VERSION} in order to build a package in the build cluster +.endif + +.include <bsd.port.post.mk> diff --git a/www/py-beaker/Makefile b/www/py-beaker/Makefile index 6d870b519d69..20bebe6af36f 100644 --- a/www/py-beaker/Makefile +++ b/www/py-beaker/Makefile @@ -17,17 +17,8 @@ DISTNAME= Beaker-${PORTVERSION} MAINTAINER= dryice@FreeBSD.org COMMENT= A Session and Caching library with WSGI Middleware -BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools -RUN_DEPENDS+= ${BUILD_DEPENDS} - USE_PYTHON= yes -USE_PYDISTUTILS= yes - -PYBEAKER_EGG= Beaker-${PORTVERSION}-py${PYTHON_VER}.egg - -PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \ - PYBEAKER_EGG=${PYBEAKER_EGG} - -EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} +USE_PYDISTUTILS= easy_install +PYDISTUTILS_PKGNAME= Beaker .include <bsd.port.mk> diff --git a/www/py-beaker/pkg-plist b/www/py-beaker/pkg-plist index cac08f098f61..3b3b847eebf4 100644 --- a/www/py-beaker/pkg-plist +++ b/www/py-beaker/pkg-plist @@ -1,48 +1,46 @@ -@unexec %%EASY_INSTALL_CMD%% -N -m %D/%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%% -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/EGG-INFO/dependency_links.txt -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/EGG-INFO/entry_points.txt -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/EGG-INFO/not-zip-safe -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/EGG-INFO/PKG-INFO -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/EGG-INFO/SOURCES.txt -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/EGG-INFO/top_level.txt -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/cache.py -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/cache.pyc -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/cache.pyo -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/container.py -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/container.pyc -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/container.pyo -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/converters.py -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/converters.pyc -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/converters.pyo -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/exceptions.py -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/exceptions.pyc -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/exceptions.pyo -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/middleware.py -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/middleware.pyc -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/middleware.pyo -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/session.py -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/session.pyc -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/session.pyo -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/synchronization.py -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/synchronization.pyc -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/synchronization.pyo -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/util.py -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/util.pyc -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/util.pyo -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/__init__.py -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/__init__.pyc -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/__init__.pyo -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/database.py -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/database.pyc -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/database.pyo -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/memcached.py -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/memcached.pyc -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/memcached.pyo -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/__init__.py -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/__init__.pyc -%%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext/__init__.pyo -@dirrm %%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker/ext -@dirrm %%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/beaker -@dirrm %%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%%/EGG-INFO -@dirrm %%PYTHON_SITELIBDIR%%/%%PYBEAKER_EGG%% -@exec %%EASY_INSTALL_CMD%% -N %D/%%PYTHON_SITELIBDIR%%/PYBEAKER_EGG%% +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/cache.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/cache.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/cache.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/container.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/container.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/container.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/converters.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/converters.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/converters.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/exceptions.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/exceptions.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/exceptions.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/middleware.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/middleware.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/middleware.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/session.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/session.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/session.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/synchronization.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/synchronization.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/synchronization.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/util.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/util.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/util.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/__init__.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/__init__.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/__init__.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/database.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/database.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/database.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/memcached.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/memcached.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/memcached.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/__init__.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/__init__.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext/__init__.pyo +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker/ext +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/beaker +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% diff --git a/www/py-beautifulsoup/Makefile b/www/py-beautifulsoup/Makefile index f4a8e6a0807e..13e155a22825 100644 --- a/www/py-beautifulsoup/Makefile +++ b/www/py-beautifulsoup/Makefile @@ -17,5 +17,6 @@ COMMENT= HTML/XML Parser for Python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= BeautifulSoup .include <bsd.port.mk> diff --git a/www/py-beautifulsoup30/Makefile b/www/py-beautifulsoup30/Makefile index f4a8e6a0807e..13e155a22825 100644 --- a/www/py-beautifulsoup30/Makefile +++ b/www/py-beautifulsoup30/Makefile @@ -17,5 +17,6 @@ COMMENT= HTML/XML Parser for Python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= BeautifulSoup .include <bsd.port.mk> diff --git a/www/py-cherrypy-devel/Makefile b/www/py-cherrypy-devel/Makefile index 02f05d89adee..c724032401df 100644 --- a/www/py-cherrypy-devel/Makefile +++ b/www/py-cherrypy-devel/Makefile @@ -17,6 +17,7 @@ COMMENT= A pythonic, object-oriented web development framework USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= CherryPy LN_OPTS= -sf RM_OPTS= -r diff --git a/www/py-cherrypy-old/Makefile b/www/py-cherrypy-old/Makefile index 76f89fad6164..68571aac179c 100644 --- a/www/py-cherrypy-old/Makefile +++ b/www/py-cherrypy-old/Makefile @@ -20,6 +20,7 @@ COMMENT= A pythonic, object-oriented web development framework USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= CherryPy LN_OPTS= -sf RM_OPTS= -r diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile index 02f05d89adee..c724032401df 100644 --- a/www/py-cherrypy/Makefile +++ b/www/py-cherrypy/Makefile @@ -17,6 +17,7 @@ COMMENT= A pythonic, object-oriented web development framework USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= CherryPy LN_OPTS= -sf RM_OPTS= -r diff --git a/www/py-clientform/Makefile b/www/py-clientform/Makefile index 03b3a5e80217..c6a89ce9622f 100644 --- a/www/py-clientform/Makefile +++ b/www/py-clientform/Makefile @@ -21,6 +21,8 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= ClientForm +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PYCLIENTFORM_EGG= ClientForm-${PORTVERSION}-py${PYTHON_VER}.egg diff --git a/www/py-django-devel/Makefile b/www/py-django-devel/Makefile index 2785cd0e3001..b73dfb1ca3b8 100644 --- a/www/py-django-devel/Makefile +++ b/www/py-django-devel/Makefile @@ -24,6 +24,10 @@ USE_GETTEXT= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +INSTALLS_EGGINFO= yes +PYDISTUTILS_PKGNAME= Django +PYDISTUTILS_PKGVERSION= 0.97_pre + CONFLICTS= py2[0-9]-django-[0-9]* DOCSDIR= ${PREFIX}/share/doc/py-django diff --git a/www/py-django/Makefile b/www/py-django/Makefile index 0ebc37f53f99..3687cddf3fa6 100644 --- a/www/py-django/Makefile +++ b/www/py-django/Makefile @@ -20,6 +20,8 @@ COMMENT= High-level Python Web framework USE_GETTEXT= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Django +PYDISTUTILS_PKGVERSION= 0.96_None CONFLICTS= py2[0-9]-django-devel-[0-9]* diff --git a/www/py-django11/Makefile b/www/py-django11/Makefile index 0ebc37f53f99..3687cddf3fa6 100644 --- a/www/py-django11/Makefile +++ b/www/py-django11/Makefile @@ -20,6 +20,8 @@ COMMENT= High-level Python Web framework USE_GETTEXT= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Django +PYDISTUTILS_PKGVERSION= 0.96_None CONFLICTS= py2[0-9]-django-devel-[0-9]* diff --git a/www/py-django12/Makefile b/www/py-django12/Makefile index 0ebc37f53f99..3687cddf3fa6 100644 --- a/www/py-django12/Makefile +++ b/www/py-django12/Makefile @@ -20,6 +20,8 @@ COMMENT= High-level Python Web framework USE_GETTEXT= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Django +PYDISTUTILS_PKGVERSION= 0.96_None CONFLICTS= py2[0-9]-django-devel-[0-9]* diff --git a/www/py-django13/Makefile b/www/py-django13/Makefile index 0ebc37f53f99..3687cddf3fa6 100644 --- a/www/py-django13/Makefile +++ b/www/py-django13/Makefile @@ -20,6 +20,8 @@ COMMENT= High-level Python Web framework USE_GETTEXT= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Django +PYDISTUTILS_PKGVERSION= 0.96_None CONFLICTS= py2[0-9]-django-devel-[0-9]* diff --git a/www/py-flup/Makefile b/www/py-flup/Makefile index e5a77a8461b3..5317e47155ec 100644 --- a/www/py-flup/Makefile +++ b/www/py-flup/Makefile @@ -21,6 +21,8 @@ RUN_DEPENDS= ${BUILD_DEPENDES} USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 0.5 +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} diff --git a/www/py-forgethtml/Makefile b/www/py-forgethtml/Makefile index 7c49a71a70ea..7c2c9d4dc281 100644 --- a/www/py-forgethtml/Makefile +++ b/www/py-forgethtml/Makefile @@ -18,6 +18,8 @@ COMMENT= Python module for object-oriented HTML generation USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= forgetHTML +PYDISTUTILS_PKGVERSION= 0.8 WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/www/py-formencode/Makefile b/www/py-formencode/Makefile index c55a85a20ba2..f1f8bc2abe4f 100644 --- a/www/py-formencode/Makefile +++ b/www/py-formencode/Makefile @@ -25,6 +25,9 @@ USE_PYTHON= yes USE_PYDISTUTILS=yes USE_GETTEXT= yes +PYDISTUTILS_PKGNAME= FormEncode +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's + DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} EXAMPLESSDIR= ${PREFIX}/share/examples/py-${PORTNAME} FORMENCODEVER?= ${PORTVERSION} diff --git a/www/py-funkload/Makefile b/www/py-funkload/Makefile index 59551b58cfe0..4ba6c354999d 100644 --- a/www/py-funkload/Makefile +++ b/www/py-funkload/Makefile @@ -16,28 +16,14 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= lwhsu@FreeBSD.org COMMENT= FunkLoad is a functional and load web tester -BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools -RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \ - ${PYTHON_SITELIBDIR}/docutils/__init__.py:${PORTSDIR}/textproc/py-docutils \ +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/docutils/__init__.py:${PORTSDIR}/textproc/py-docutils \ ${PYTHON_SITELIBDIR}/gdchart.so:${PORTSDIR}/graphics/py-gdchart \ ${PYTHON_SITELIBDIR}/webunit/__init__.py:${PORTSDIR}/www/py-webunit \ ${PYXML} \ tcpwatch.py:${PORTSDIR}/net/tcpwatch USE_PYTHON= 2.4+ -USE_PYDISTUTILS= yes - -EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} - -PYDISTUTILS_BUILD_TARGET= bdist_egg -PYDISTUTILS_INSTALL_TARGET= easy_install -PYDISTUTILS_INSTALLARGS= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYFUNKLOAD_EGG} - -PYFUNKLOAD_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg - -PLIST_SUB+= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \ - PYFUNKLOAD_EGG=${PYFUNKLOAD_EGG} \ - PYFUNKLOAD_EGG_VER="${PORTNAME}==${PORTVERSION}" +USE_PYDISTUTILS= easy_install DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} diff --git a/www/py-funkload/pkg-plist b/www/py-funkload/pkg-plist index b26f8aa30408..f1916e775384 100644 --- a/www/py-funkload/pkg-plist +++ b/www/py-funkload/pkg-plist @@ -1,6 +1,4 @@ -@unexec %%EASY_INSTALL_CMD%% -q -m -S %D/%%PYTHON_SITELIBDIR%% %%PYFUNKLOAD_EGG_VER%% -%%PYTHON_SITELIBDIR%%/%%PYFUNKLOAD_EGG%% -@exec %%EASY_INSTALL_CMD%% -q -N -S %D/%%PYTHON_SITELIBDIR%% %%PYFUNKLOAD_EGG_VER%% +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% bin/fl-build-report bin/fl-credential-ctl bin/fl-import-from-tm-recorder diff --git a/www/py-imdbpy/Makefile b/www/py-imdbpy/Makefile index 3b5c96e7618e..a259b4ead1bc 100644 --- a/www/py-imdbpy/Makefile +++ b/www/py-imdbpy/Makefile @@ -18,6 +18,7 @@ COMMENT= Retrieve and manage the data of the IMDb movie database USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= IMDbPY .if !defined(NOPORTDOCS) DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} diff --git a/www/py-mechanize/Makefile b/www/py-mechanize/Makefile index d91c34aeb803..8d1872eef3a9 100644 --- a/www/py-mechanize/Makefile +++ b/www/py-mechanize/Makefile @@ -24,6 +24,8 @@ RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \ USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 0.1.6b +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} PYDISTUTILS_BUILD_TARGET= bdist_egg diff --git a/www/py-nevow/Makefile b/www/py-nevow/Makefile index 92b4361ac7ee..d0ffe2fc28a7 100644 --- a/www/py-nevow/Makefile +++ b/www/py-nevow/Makefile @@ -21,6 +21,7 @@ USE_PYDISTUTILS= yes USE_TWISTED= yes USE_GETTEXT= yes NO_BUILD= yes +PYDISTUTILS_PKGNAME= Nevow SUB_FILES= pkg-message PKGMESSAGE= ${WRKSRC}/pkg-message diff --git a/www/py-openssl-proxy/Makefile b/www/py-openssl-proxy/Makefile index 0802fbbd2165..581836a7be8a 100644 --- a/www/py-openssl-proxy/Makefile +++ b/www/py-openssl-proxy/Makefile @@ -19,5 +19,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-op USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pyOpenSSLProxy .include <bsd.port.mk> diff --git a/www/py-paste/Makefile b/www/py-paste/Makefile index be2c742901d7..2296691f9fd3 100644 --- a/www/py-paste/Makefile +++ b/www/py-paste/Makefile @@ -22,6 +22,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PASTEVER?= ${PORTVERSION} PYTHONVER?= ${_PYTHON_VERSION} PLIST_SUB= PASTEVER=${PASTEVER} \ diff --git a/www/py-pastedeploy/Makefile b/www/py-pastedeploy/Makefile index 4d4c95db7ae4..8fa8ce3a440d 100644 --- a/www/py-pastedeploy/Makefile +++ b/www/py-pastedeploy/Makefile @@ -23,6 +23,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PLIST_SUB= PYPASTEDEPLOY_EGG=${PYPASTEDEPLOY_EGG} diff --git a/www/py-pastescript/Makefile b/www/py-pastescript/Makefile index 1d3d8a64b5ce..b535066f65e8 100644 --- a/www/py-pastescript/Makefile +++ b/www/py-pastescript/Makefile @@ -31,6 +31,7 @@ NO_PACKAGE= no, not yet USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's SUB_FILES+= pkg-deinstall pkg-install SUB_LIST+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \ diff --git a/www/py-pullparser/Makefile b/www/py-pullparser/Makefile index 436d9f1df6d3..65d072d3856e 100644 --- a/www/py-pullparser/Makefile +++ b/www/py-pullparser/Makefile @@ -19,6 +19,7 @@ BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} PYDISTUTILS_BUILD_TARGET= bdist_egg diff --git a/www/py-pysearch/Makefile b/www/py-pysearch/Makefile index bd1b01c77bd5..ba84f91401f8 100644 --- a/www/py-pysearch/Makefile +++ b/www/py-pysearch/Makefile @@ -17,6 +17,7 @@ COMMENT= Yahoo Search Web Services SDK for Python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pYsearch DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} diff --git a/www/py-restclient/Makefile b/www/py-restclient/Makefile index 32a320949dab..f91f698c0257 100644 --- a/www/py-restclient/Makefile +++ b/www/py-restclient/Makefile @@ -14,25 +14,10 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= lwhsu@FreeBSD.org COMMENT= Convenient library for writing REST clients -BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools -RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \ - ${PYTHON_SITELIBDIR}/httplib2/__init__.py:${PORTSDIR}/www/py-httplib2 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/httplib2/__init__.py:${PORTSDIR}/www/py-httplib2 USE_PYTHON= yes -USE_PYDISTUTILS= yes - -EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} - -PYDISTUTILS_BUILD_TARGET= bdist_egg -PYDISTUTILS_INSTALL_TARGET= easy_install -PYDISTUTILS_INSTALLARGS= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYRESTCLIENT_EGG} - -PYRESTCLIENT_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg - -PLIST_SUB+= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \ - PYRESTCLIENT_EGG=${PYRESTCLIENT_EGG} \ - PYRESTCLIENT_EGG_VER="${PORTNAME}==${PORTVERSION}" - +USE_PYDISTUTILS= easy_install post-patch: ${REINPLACE_CMD} -e 's,install_requires.*,,' ${WRKSRC}/setup.py diff --git a/www/py-restclient/pkg-plist b/www/py-restclient/pkg-plist index b0d7671f2ffe..f4c33d3c76e7 100644 --- a/www/py-restclient/pkg-plist +++ b/www/py-restclient/pkg-plist @@ -1,20 +1,18 @@ -@unexec %%EASY_INSTALL_CMD%% -q -m -S %D/%%PYTHON_SITELIBDIR%% %%PYRESTCLIENT_EGG_VER%% -%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/EGG-INFO/PKG-INFO -%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/EGG-INFO/SOURCES.txt -%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/EGG-INFO/dependency_links.txt -%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/EGG-INFO/not-zip-safe -%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/EGG-INFO/top_level.txt -%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/__init__.py -%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/__init__.pyc -%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/__init__.pyo -%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/test/__init__.py -%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/test/__init__.pyc -%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/test/__init__.pyo -%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/test/test_everything.py -%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/test/test_everything.pyc -%%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/test/test_everything.pyo -@dirrm %%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient/test -@dirrm %%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/restclient -@dirrm %%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%%/EGG-INFO -@dirrm %%PYTHON_SITELIBDIR%%/%%PYRESTCLIENT_EGG%% -@exec %%EASY_INSTALL_CMD%% -q -N -S %D/%%PYTHON_SITELIBDIR%% %%PYRESTCLIENT_EGG_VER%% +%%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/not-zip-safe +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/__init__.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/__init__.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/__init__.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/__init__.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/__init__.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/__init__.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/test_everything.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/test_everything.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test/test_everything.pyo +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient/test +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/restclient +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% diff --git a/www/py-routes/Makefile b/www/py-routes/Makefile index 8a878a90c60c..ad35fc7c0419 100644 --- a/www/py-routes/Makefile +++ b/www/py-routes/Makefile @@ -17,17 +17,8 @@ DISTNAME= Routes-${PORTVERSION} MAINTAINER= dryice@FreeBSD.org COMMENT= A Routing package for Python that matches URLs to dicts and vice versa -BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools -RUN_DEPENDS+= ${BUILD_DEPENDS} - USE_PYTHON= yes -USE_PYDISTUTILS= yes - -PYROUTES_EGG= Routes-${PORTVERSION}-py${PYTHON_VER}.egg - -PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \ - PYROUTES_EGG=${PYROUTES_EGG} - -EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} +USE_PYDISTUTILS= easy_install +PYDISTUTILS_PKGNAME= Routes .include <bsd.port.mk> diff --git a/www/py-routes/pkg-plist b/www/py-routes/pkg-plist index 9026491e47bf..b5e843f8939b 100644 --- a/www/py-routes/pkg-plist +++ b/www/py-routes/pkg-plist @@ -1,25 +1,23 @@ -@unexec %%EASY_INSTALL_CMD%% -N -m %D/%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%% -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/EGG-INFO/dependency_links.txt -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/EGG-INFO/not-zip-safe -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/EGG-INFO/PKG-INFO -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/EGG-INFO/SOURCES.txt -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/EGG-INFO/top_level.txt -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/base.py -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/base.pyc -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/base.pyo -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/middleware.py -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/middleware.pyc -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/middleware.pyo -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/threadinglocal.py -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/threadinglocal.pyc -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/threadinglocal.pyo -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/util.py -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/util.pyc -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/util.pyo -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/__init__.py -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/__init__.pyc -%%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes/__init__.pyo -@dirrm %%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/routes -@dirrm %%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%%/EGG-INFO -@dirrm %%PYTHON_SITELIBDIR%%/%%PYROUTES_EGG%% -@exec %%EASY_INSTALL_CMD%% -N %D/%%PYTHON_SITELIBDIR%%/PYROUTES_EGG%% +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/base.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/base.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/base.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/middleware.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/middleware.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/middleware.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/threadinglocal.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/threadinglocal.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/threadinglocal.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/util.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/util.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/util.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/__init__.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/__init__.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes/__init__.pyo +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/routes +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% diff --git a/www/py-slimmer/Makefile b/www/py-slimmer/Makefile index f10f8ff7c269..fe27987dad2b 100644 --- a/www/py-slimmer/Makefile +++ b/www/py-slimmer/Makefile @@ -19,6 +19,7 @@ WRKSRC= ${WRKDIR}/slimmer USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGVERSION= 0.1.19 PLIST_FILES= %%PYTHON_SITELIBDIR%%/slimmer.py \ %%PYTHON_SITELIBDIR%%/slimmer.pyc \ diff --git a/www/py-tgwebservices/Makefile b/www/py-tgwebservices/Makefile index d97e70d5ee9f..581ce8ded933 100644 --- a/www/py-tgwebservices/Makefile +++ b/www/py-tgwebservices/Makefile @@ -23,6 +23,8 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's +PYDISTUTILS_PKGNAME= TGWebServices PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \ PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \ diff --git a/www/py-twistedWeb/Makefile b/www/py-twistedWeb/Makefile index 91f732a02114..a36f99c1d821 100644 --- a/www/py-twistedWeb/Makefile +++ b/www/py-twistedWeb/Makefile @@ -21,5 +21,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_BZIP2= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Twisted_Web .include <bsd.port.mk> diff --git a/www/py-twistedWeb2/Makefile b/www/py-twistedWeb2/Makefile index e01aa4fc19ce..062995290548 100644 --- a/www/py-twistedWeb2/Makefile +++ b/www/py-twistedWeb2/Makefile @@ -22,5 +22,6 @@ WRKSRC= ${WRKDIR}/TwistedWeb2-${PORTVERSION} USE_BZIP2= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Twisted_Web2 .include <bsd.port.mk> diff --git a/www/py-urljr/Makefile b/www/py-urljr/Makefile index 00a1b7f9dfe7..5f5743343cf5 100644 --- a/www/py-urljr/Makefile +++ b/www/py-urljr/Makefile @@ -19,5 +19,6 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/curl:${PORTSDIR}/ftp/py-curl USE_PYTHON= 2.2+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python-urljr .include <bsd.port.mk> diff --git a/www/quixote/Makefile b/www/quixote/Makefile index 75f8df9eba9d..3111974d3a20 100644 --- a/www/quixote/Makefile +++ b/www/quixote/Makefile @@ -17,6 +17,7 @@ COMMENT= A framework for developing web applications in Python USE_PYTHON= 2.3-2.4 USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Quixote .include <bsd.port.pre.mk> diff --git a/www/session2/Makefile b/www/session2/Makefile index 52d650a1c314..0aa520bfd23a 100644 --- a/www/session2/Makefile +++ b/www/session2/Makefile @@ -17,6 +17,7 @@ COMMENT= A quixote session manager with persistence support USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 0.6 OPTIONS= MYSQL "MySQLdb support" on OPTIONS+= POSTGRESQL "psycopg support" on diff --git a/www/trac-accountmanager/Makefile b/www/trac-accountmanager/Makefile index 17fb880e2960..f72d2a4e6fb2 100644 --- a/www/trac-accountmanager/Makefile +++ b/www/trac-accountmanager/Makefile @@ -24,6 +24,9 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= TracAccountManager +PYDISTUTILS_PKGVERSION= 0.1.3 +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's WRKSRC= ${WRKDIR}/accountmanagerplugin EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} diff --git a/www/trac-addcomment/Makefile b/www/trac-addcomment/Makefile index 8c57fec82013..333eb739e5db 100644 --- a/www/trac-addcomment/Makefile +++ b/www/trac-addcomment/Makefile @@ -23,6 +23,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}macro NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= TracAddCommentMacro +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} .include <bsd.port.mk> diff --git a/www/trac-bzr/Makefile b/www/trac-bzr/Makefile index fb3ff81a89dc..14c6486f56f4 100644 --- a/www/trac-bzr/Makefile +++ b/www/trac-bzr/Makefile @@ -19,8 +19,9 @@ BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools RUN_DEPENDS= ${BUILD_DEPENDS} RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac -USE_PYTHON= 2.4 +USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes USE_BZIP2= yes diff --git a/www/trac-calendar/Makefile b/www/trac-calendar/Makefile index ac6c7fddcdac..1e616e66ac61 100644 --- a/www/trac-calendar/Makefile +++ b/www/trac-calendar/Makefile @@ -23,5 +23,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-codetags/Makefile b/www/trac-codetags/Makefile index 5a7c3af20652..8a4d204743f4 100644 --- a/www/trac-codetags/Makefile +++ b/www/trac-codetags/Makefile @@ -23,5 +23,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-ctxtnavadd/Makefile b/www/trac-ctxtnavadd/Makefile index 82ee5258ceca..140533898e67 100644 --- a/www/trac-ctxtnavadd/Makefile +++ b/www/trac-ctxtnavadd/Makefile @@ -23,5 +23,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION:S/.r/_r/} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-down/Makefile b/www/trac-down/Makefile index c46e68446919..0ca94cf9f7a5 100644 --- a/www/trac-down/Makefile +++ b/www/trac-down/Makefile @@ -21,6 +21,9 @@ RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \ USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= TracDown +PYDISTUTILS_PKGVERSION= 0.0.1 +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} diff --git a/www/trac-hierwiki/Makefile b/www/trac-hierwiki/Makefile index 6850b55a8191..669cd0a36ff2 100644 --- a/www/trac-hierwiki/Makefile +++ b/www/trac-hierwiki/Makefile @@ -23,5 +23,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION:S/r/_r/} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-iniadmin/Makefile b/www/trac-iniadmin/Makefile index 09663dc8abbb..4b0308968e4a 100644 --- a/www/trac-iniadmin/Makefile +++ b/www/trac-iniadmin/Makefile @@ -24,5 +24,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-ldap/Makefile b/www/trac-ldap/Makefile index 761c0b5f9494..832226f4003c 100644 --- a/www/trac-ldap/Makefile +++ b/www/trac-ldap/Makefile @@ -24,5 +24,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION}dev PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-macropost/Makefile b/www/trac-macropost/Makefile index 17943177971e..e59fd4196056 100644 --- a/www/trac-macropost/Makefile +++ b/www/trac-macropost/Makefile @@ -23,5 +23,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-mastertickets/Makefile b/www/trac-mastertickets/Makefile index 038cf67ad101..b4ea3f2acb39 100644 --- a/www/trac-mastertickets/Makefile +++ b/www/trac-mastertickets/Makefile @@ -24,5 +24,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-nav/Makefile b/www/trac-nav/Makefile index 5c4935711922..93702e2380e3 100644 --- a/www/trac-nav/Makefile +++ b/www/trac-nav/Makefile @@ -23,5 +23,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-pagelist/Makefile b/www/trac-pagelist/Makefile index 141d0b4e1497..34b7e83a638b 100644 --- a/www/trac-pagelist/Makefile +++ b/www/trac-pagelist/Makefile @@ -23,5 +23,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-pagetopdf/Makefile b/www/trac-pagetopdf/Makefile index 998916a02c2d..13f06863bf22 100644 --- a/www/trac-pagetopdf/Makefile +++ b/www/trac-pagetopdf/Makefile @@ -25,6 +25,7 @@ NO_BUILD= yes USE_PYDISTUTILS=yes WRKSRC= ${WRKDIR}/${PORTNAME}plugin PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes do-build: @${DO_NADA} diff --git a/www/trac-pendingticket/Makefile b/www/trac-pendingticket/Makefile index 804e75c74ced..3f4c616a3304 100644 --- a/www/trac-pendingticket/Makefile +++ b/www/trac-pendingticket/Makefile @@ -23,6 +23,7 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes post-patch: cd ${WRKDIR}/${PORTNAME}plugin && ${PATCH} < ${PATCHDIR}/close_old_pending.py.patch diff --git a/www/trac-privatetickets/Makefile b/www/trac-privatetickets/Makefile index 5629e572efbf..a0c9219a33e5 100644 --- a/www/trac-privatetickets/Makefile +++ b/www/trac-privatetickets/Makefile @@ -21,6 +21,8 @@ RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \ USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= TracPrivateTickets +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} diff --git a/www/trac-restrictedarea/Makefile b/www/trac-restrictedarea/Makefile index a924d6f6b20a..2117b049225f 100644 --- a/www/trac-restrictedarea/Makefile +++ b/www/trac-restrictedarea/Makefile @@ -23,5 +23,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-robotstxt/Makefile b/www/trac-robotstxt/Makefile index 76f248d35540..52d86ccd20b1 100644 --- a/www/trac-robotstxt/Makefile +++ b/www/trac-robotstxt/Makefile @@ -28,6 +28,7 @@ EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} PYDISTUTILS_BUILD_TARGET= bdist_egg PYDISTUTILS_INSTALL_TARGET= easy_install PYDISTUTILS_INSTALLARGS= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${TRACROBO_EGG} +PYDISTUTILS_NOEGGINFO= yes TRACROBO_EGG= TracRobotsTxt-${PORTVERSION}-py${PYTHON_VER}.egg diff --git a/www/trac-simpleticket/Makefile b/www/trac-simpleticket/Makefile index e5b0cfe21edd..04ea0bc374ff 100644 --- a/www/trac-simpleticket/Makefile +++ b/www/trac-simpleticket/Makefile @@ -23,5 +23,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-tags/Makefile b/www/trac-tags/Makefile index f40d616681ec..c450abf3ad22 100644 --- a/www/trac-tags/Makefile +++ b/www/trac-tags/Makefile @@ -21,8 +21,10 @@ BUILD_DEPENDS+= easy_install:${PORTSDIR}/devel/py-setuptools USE_PYTHON= 2.3+ NO_BUILD= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= TracTags PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} WRKSRC= ${WRKDIR}/${PORTNAME}plugin +PYDISTUTILS_NOEGGINFO= yes do-build: @${DO_NADA} diff --git a/www/trac-ticketdelete/Makefile b/www/trac-ticketdelete/Makefile index 7829d482ab9f..2f4a609df9a0 100644 --- a/www/trac-ticketdelete/Makefile +++ b/www/trac-ticketdelete/Makefile @@ -24,5 +24,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-tocmacro/Makefile b/www/trac-tocmacro/Makefile index 9c2d0294cf60..be7c6ea510a1 100644 --- a/www/trac-tocmacro/Makefile +++ b/www/trac-tocmacro/Makefile @@ -22,5 +22,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-wantedpages/Makefile b/www/trac-wantedpages/Makefile index c429d4c84dbe..e0dd76ada685 100644 --- a/www/trac-wantedpages/Makefile +++ b/www/trac-wantedpages/Makefile @@ -23,5 +23,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-webadmin/Makefile b/www/trac-webadmin/Makefile index b44803a3d00e..75c513bfa285 100644 --- a/www/trac-webadmin/Makefile +++ b/www/trac-webadmin/Makefile @@ -22,6 +22,9 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= TracWebAdmin +PYDISTUTILS_PKGVERSION= 0.1.2 +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's WRKSRC= ${WRKDIR}/${PORTNAME} EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} diff --git a/www/trac-wikinegotiator/Makefile b/www/trac-wikinegotiator/Makefile index cf9808868f13..d0805ce1acdb 100644 --- a/www/trac-wikinegotiator/Makefile +++ b/www/trac-wikinegotiator/Makefile @@ -23,5 +23,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/trac-xmlrpc/Makefile b/www/trac-xmlrpc/Makefile index 8236970c29d0..f9dbe79244cd 100644 --- a/www/trac-xmlrpc/Makefile +++ b/www/trac-xmlrpc/Makefile @@ -23,5 +23,6 @@ NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} +PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.mk> diff --git a/www/xist/Makefile b/www/xist/Makefile index 6d841c0bcebe..854e33ba84b1 100644 --- a/www/xist/Makefile +++ b/www/xist/Makefile @@ -24,6 +24,7 @@ RUN_DEPENDS= ${PYXML} \ USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes USE_BZIP2= yes +PYDISTUTILS_PKGNAME= ll-xist post-install: .for file in doc2txt dtd2xsc tld2xsc |