From 1e34739b64d384b87ee2c57027df596b464c79ab Mon Sep 17 00:00:00 2001 From: William Grzybowski Date: Sun, 15 Dec 2013 16:22:17 +0000 Subject: [PATCH] Use setuptools for all Python ports. Setuptools is the preferred method to manage Python distributions after many changes to the packaging ecosystem over the past couple of years. Only ports using USE_PYDISTUTILS= yes are affected by this commit, ports using USE_PYDISTUTILS= easy_install remains the same however this usage is now deprecated and should be converted to USE_PYDISTUTILS= yes. Some Python distributions do not work with setuptools out of the box because they extend the install command from distutils and not setuptools, and so they need to be patched accordingly. pip (which leverages setuptools) works around the issue by using eggs, however we want to get rid of those as well, as support for "flat" installation is unavailable or has other issues associated with it. This work allows us to unify how python packages are built, ensure that Python distributions are installed consistently, reduces complexity for Python port maintainers and paves the way for simplifying the Python ports framework in the future. With hat on: python Reviewed by: koobs, antoine Exp-run: bdrewery Approved by: bdrewery (portmgr) --- Mk/bsd.python.mk | 44 +- audio/picard/Makefile | 1 + audio/py-eyed3/Makefile | 10 +- databases/py-bsddb/Makefile | 6 +- databases/py-gdbm/Makefile | 5 +- databases/py-sqlite3/Makefile | 5 +- deskutils/tel/Makefile | 7 +- deskutils/x-tile/Makefile | 5 +- devel/fnorb/Makefile | 7 +- devel/fnorb/pkg-plist | 1 + devel/hgview/Makefile | 7 +- devel/py-anonfunc/Makefile | 7 +- devel/py-anonfunc/pkg-plist | 5 - devel/py-cxx/Makefile | 5 + devel/py-gyp-devel/files/patch-setup.py | 11 + devel/py-libplist/Makefile | 3 +- devel/py-mx-experimental/Makefile | 6 +- devel/py-protocols/Makefile | 4 + devel/py-setuptools/Makefile | 3 +- devel/py-yaml/Makefile | 4 +- devel/scons/Makefile | 9 +- devel/scons/pkg-plist | 597 ------------------ dns/py-dnspython/Makefile | 4 +- dns/py-dnspython/pkg-plist-py2 | 260 -------- dns/py-dnspython/pkg-plist-py3 | 97 --- editors/zim/Makefile | 5 +- games/balazarbrothers/Makefile | 5 + games/balazarbrothers/pkg-plist | 1 + games/gnomesudoku/Makefile | 8 +- graphics/py-soya3d/Makefile | 4 +- japanese/tegaki-recognize/Makefile | 14 +- mail/postfix-policyd-spf-python/Makefile | 2 +- mail/svnmailer/Makefile | 5 +- math/py-numeric/Makefile | 57 +- math/py-numeric/pkg-plist | 94 --- multimedia/freevo/Makefile | 10 +- multimedia/freevo/pkg-plist | 1 + multimedia/gaupol/Makefile | 11 +- net/py-ldaptor/Makefile | 2 + net/py-ldaptor/files/patch-setup.py | 10 + science/veusz/Makefile | 6 + security/umit/Makefile | 5 +- security/zenmap/Makefile | 10 +- textproc/py-4suite-xml/Makefile | 5 +- textproc/py-4suite-xml/pkg-plist | 1 + textproc/pychm/Makefile | 8 +- www/py-prewikka/Makefile | 11 +- www/py-prewikka/files/patch-setup.py | 15 + www/py-prewikka/pkg-plist | 1 + www/py-utidy/Makefile | 8 +- www/py-utidy/pkg-plist | 13 - www/trac-wysiwyg/Makefile | 2 +- x11-toolkits/py-fltk/Makefile | 7 +- x11-toolkits/py-tkinter/Makefile | 6 +- x11-toolkits/py-wxPython26/Makefile | 1 + .../py-wxPython26/files/patch-config.py | 26 + x11-toolkits/py-wxPython28/Makefile | 5 +- .../py-wxPython28/files/patch-config.py | 35 + x11-toolkits/py-wxPython28/pkg-plist | 1 - .../files/patch-hotwire__ui_renderers_file.py | 3 - x11/hotwire-shell/files/patch-setup.py | 16 +- x11/terminator/Makefile | 4 +- 62 files changed, 315 insertions(+), 1216 deletions(-) delete mode 100644 devel/py-anonfunc/pkg-plist create mode 100644 devel/py-gyp-devel/files/patch-setup.py delete mode 100644 devel/scons/pkg-plist delete mode 100644 dns/py-dnspython/pkg-plist-py2 delete mode 100644 dns/py-dnspython/pkg-plist-py3 delete mode 100644 math/py-numeric/pkg-plist create mode 100644 net/py-ldaptor/files/patch-setup.py create mode 100644 www/py-prewikka/files/patch-setup.py delete mode 100644 www/py-utidy/pkg-plist create mode 100644 x11-toolkits/py-wxPython26/files/patch-config.py create mode 100644 x11-toolkits/py-wxPython28/files/patch-config.py diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk index 1031b0962c37..5cddb89716f9 100644 --- a/Mk/bsd.python.mk +++ b/Mk/bsd.python.mk @@ -420,9 +420,13 @@ PYTHONPREFIX_INCLUDEDIR= ${PYTHON_INCLUDEDIR:S;${PYTHONBASE};${PREFIX};} PYTHONPREFIX_LIBDIR= ${PYTHON_LIBDIR:S;${PYTHONBASE};${PREFIX};} PYTHONPREFIX_SITELIBDIR= ${PYTHON_SITELIBDIR:S;${PYTHONBASE};${PREFIX};} +_CURRENTPORT:= ${PKGNAMEPREFIX}${PORTNAME} +.if defined(USE_PYDISTUTILS) && ${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:${PORTSDIR}/devel/py-setuptools +.endif + # setuptools support .if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install" -BUILD_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools RUN_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools PYDISTUTILS_BUILD_TARGET?= bdist_egg @@ -487,33 +491,47 @@ post-install: stage-python-compileall # distutils support PYSETUP?= setup.py +PYDISTUTILS_SETUP?= -c "import setuptools; __file__='${PYSETUP}'; execfile(__file__)" PYDISTUTILS_CONFIGUREARGS?= PYDISTUTILS_BUILDARGS?= PYDISTUTILS_INSTALLARGS?= -c -O1 --prefix=${PREFIX} -.if !defined(NO_STAGE) && defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} != "easy_install" +.if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} != "easy_install" +. if !defined(PYDISTUTILS_INSTALLNOSINGLE) +PYDISTUTILS_INSTALLARGS+= --single-version-externally-managed +. endif +. if !defined(NO_STAGE) PYDISTUTILS_INSTALLARGS+= --root=${STAGEDIR} +. endif .endif +_PYTHONPKGLIST= ${WRKDIR}/.PLIST.pymodtmp +PYDISTUTILS_INSTALLARGS:= --record ${_PYTHONPKGLIST} \ + ${PYDISTUTILS_INSTALLARGS} + PYDISTUTILS_PKGNAME?= ${PORTNAME} PYDISTUTILS_PKGVERSION?=${PORTVERSION} PYDISTUTILS_EGGINFO?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info -PYDISTUTILS_EGGINFODIR?=${PYTHONPREFIX_SITELIBDIR} +PYDISTUTILS_EGGINFODIR?=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} +add-plist-egginfo: .if !defined(PYDISTUTILS_NOEGGINFO) && \ !defined(PYDISTUTILS_AUTOPLIST) && \ (defined(INSTALLS_EGGINFO) || \ (defined(USE_PYDISTUTILS) && \ ${USE_PYDISTUTILS} != "easy_install")) && \ defined(PYTHON_REL) -. for egg in ${PYDISTUTILS_EGGINFO} -PLIST_FILES+= ${PYDISTUTILS_EGGINFODIR:S;${PREFIX}/;;}/${egg} +. for egginfo in ${PYDISTUTILS_EGGINFO} + if [ -d "${PYDISTUTILS_EGGINFODIR}/${egginfo}" ]; then \ + ${LS} ${PYDISTUTILS_EGGINFODIR}/${egginfo} | while read f; do \ + ${ECHO_CMD} ${PYDISTUTILS_EGGINFODIR:S;^${STAGEDIR}${PYTHONBASE}/;;}/${egginfo}/$${f} >> ${TMPPLIST}; \ + done; \ + ${ECHO_CMD} "@unexec rmdir \"%D/${PYDISTUTILS_EGGINFODIR:S;${STAGEDIR}${PYTHONBASE}/;;}/${egginfo}\" 2>/dev/null || true" >> ${TMPPLIST}; \ + fi; . endfor +.else + @${DO_NADA} .endif .if defined(PYDISTUTILS_AUTOPLIST) && defined(USE_PYDISTUTILS) -_PYTHONPKGLIST= ${WRKDIR}/.PLIST.pymodtmp -PYDISTUTILS_INSTALLARGS:= --record ${_PYTHONPKGLIST} \ - ${PYDISTUTILS_INSTALLARGS} - _RELSITELIBDIR= ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} _RELLIBDIR= ${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;} @@ -637,19 +655,21 @@ MAKE_ENV+= LDSHARED="${LDSHARED}" PYTHONDONTWRITEBYTECODE= PYTHONOPTIMIZE= .if !target(do-configure) && !defined(HAS_CONFIGURE) && !defined(GNU_CONFIGURE) do-configure: - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} ${PYDISTUTILS_CONFIGURE_TARGET} ${PYDISTUTILS_CONFIGUREARGS}) + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_CONFIGURE_TARGET} ${PYDISTUTILS_CONFIGUREARGS}) .endif .if !target(do-build) do-build: - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) .endif .if !target(do-install) do-install: - @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) + @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) .endif +add-plist-post: add-plist-egginfo + .if defined(PYEASYINSTALL_ARCHDEP) .if !target(easyinstall-setopt) easyinstall-setopt: diff --git a/audio/picard/Makefile b/audio/picard/Makefile index c8f89738dfb2..e9f22428c258 100644 --- a/audio/picard/Makefile +++ b/audio/picard/Makefile @@ -45,6 +45,7 @@ RUN_DEPENDS+= metaflac:${PORTSDIR}/audio/flac \ post-patch: @${REINPLACE_CMD} -e "s|'picard.plugins',|'picard.plugins', 'picard.plugins.lastfm', 'picard.plugins.lastfmplus', 'picard.plugins.replaygain',|" \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ ${WRKSRC}/setup.py @${CP} -R ${WRKSRC}/contrib/plugins/ ${WRKSRC}/picard/plugins diff --git a/audio/py-eyed3/Makefile b/audio/py-eyed3/Makefile index a166ff4eeff4..b2ae289f2603 100644 --- a/audio/py-eyed3/Makefile +++ b/audio/py-eyed3/Makefile @@ -12,7 +12,8 @@ MAINTAINER= rm@FreeBSD.org COMMENT= Python module for processing ID3 tags LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:${PORTSDIR}/devel/py-setuptools USE_PYTHON= 2.6-2.7 NO_STAGE= yes @@ -21,7 +22,8 @@ USES= gmake GNU_CONFIGURE= yes CONFIGURE_ENV= PYTHON="${PYTHON_CMD}" MAKE_ENV= SETUP_ARGS_BUILD="${PYDISTUTILS_BUILDARGS}" \ - SETUP_ARGS_INSTALL="${PYDISTUTILS_INSTALLARGS}" + SETUP_ARGS_INSTALL="${PYDISTUTILS_INSTALLARGS}" \ + SETUP_COMMAND="${PYDISTUTILS_SETUP:S,",\",g}" DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} MAN1= eyeD3.1 @@ -34,8 +36,8 @@ post-patch: ${REINPLACE_CMD} -e 's,PYTHON="",,g' -e 's,/usr/local,${LOCALBASE},g' \ -e 's,2\\\.\[23456789\]\\\.,2.[23456789],g' \ ${WRKSRC}/configure - ${REINPLACE_CMD} -e 's,\(setup.py build\),\1 $${SETUP_ARGS_BUILD},g' \ - -e 's,\(setup.py install\),\1 $${SETUP_ARGS_INSTALL} ,g' \ + ${REINPLACE_CMD} -e 's,\(setup.py build\),$${SETUP_COMMAND} build $${SETUP_ARGS_BUILD},g' \ + -e 's,\(setup.py install\),$${SETUP_COMMAND} install $${SETUP_ARGS_INSTALL} ,g' \ -e 's,^docdir:=.*,docdir:=${DOCSDIR},g' \ ${WRKSRC}/Makefile.in .if defined(NOPORTDOCS) diff --git a/databases/py-bsddb/Makefile b/databases/py-bsddb/Makefile index 911307d484e7..1e198c600ed4 100644 --- a/databases/py-bsddb/Makefile +++ b/databases/py-bsddb/Makefile @@ -25,15 +25,11 @@ DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo WRKSRC= ${PYTHON_WRKSRC}/Modules PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload -PYDISTUTILS_NOEGGINFO= yes -PYDISTUTILS_PKGNAME= _bsddb +PYDISTUTILS_AUTOPLIST= yes MAKE_ENV= BSDDB_VERSION=${BDB_LIB_NAME} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-py${PYTHON_SUFFIX}-_bsddb.c -PLIST_FILES= %%PYTHON_LIBDIR%%/lib-dynload/_bsddb.so - -NO_STAGE= yes .include .if ${PYTHON_REL} >= 300 diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile index 4cf8d344502e..43dd006dc3a5 100644 --- a/databases/py-gdbm/Makefile +++ b/databases/py-gdbm/Makefile @@ -26,11 +26,8 @@ DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo WRKSRC= ${PYTHON_WRKSRC}/Modules PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload -PYDISTUTILS_NOEGGINFO= yes +PYDISTUTILS_AUTOPLIST= yes -PLIST_FILES= %%PYTHON_LIBDIR%%/lib-dynload/gdbm.so - -NO_STAGE= yes .include post-extract: diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile index 13ab031f45e4..9e51110cf6e7 100644 --- a/databases/py-sqlite3/Makefile +++ b/databases/py-sqlite3/Makefile @@ -26,11 +26,8 @@ DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo WRKSRC= ${PYTHON_WRKSRC}/Modules PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload -PYDISTUTILS_NOEGGINFO= yes +PYDISTUTILS_AUTOPLIST= yes -PLIST_FILES= %%PYTHON_LIBDIR%%/lib-dynload/_sqlite3.so - -NO_STAGE= yes .include post-extract: diff --git a/deskutils/tel/Makefile b/deskutils/tel/Makefile index 77263911e740..714bd537dd86 100644 --- a/deskutils/tel/Makefile +++ b/deskutils/tel/Makefile @@ -14,6 +14,11 @@ USE_BZIP2= yes USES= gettext USE_PYTHON= yes USE_PYDISTUTILS=yes - NO_STAGE= yes + +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/appdistutils.py + .include diff --git a/deskutils/x-tile/Makefile b/deskutils/x-tile/Makefile index 1c3fd3d51e4f..9e3dfca47dba 100644 --- a/deskutils/x-tile/Makefile +++ b/deskutils/x-tile/Makefile @@ -8,7 +8,7 @@ CATEGORIES= deskutils devel python MASTER_SITES= http://www.giuspen.com/software/ MAINTAINER= sawp@sawp.com.br -COMMENT= A GNOME applet to tile the opened windows +COMMENT= GNOME applet to tile the opened windows LICENSE= GPLv2 @@ -33,5 +33,8 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \ ${WRKSRC}/x-tile ${WRKSRC}/linux/x-tile.desktop \ ${WRKSRC}/modules/cons.py + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py .include diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile index d3d56988f327..72f47b86aa8c 100644 --- a/devel/fnorb/Makefile +++ b/devel/fnorb/Makefile @@ -13,7 +13,12 @@ COMMENT= A CORBA 2.0 ORB written in Python RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter USE_PYTHON= yes -USE_PYDISTUTILS= yes +USE_PYDISTUTILS=yes +PYDISTUTILS_INSTALLNOSINGLE= yes +PYDISTUTILS_NOEGGINFO= yes +PYDISTUTILS_SETUP= ${PYSETUP} + +PLIST_SUB= PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} NO_STAGE= yes .include diff --git a/devel/fnorb/pkg-plist b/devel/fnorb/pkg-plist index a8d4f5ac063a..388261351ab4 100644 --- a/devel/fnorb/pkg-plist +++ b/devel/fnorb/pkg-plist @@ -271,6 +271,7 @@ bin/fnping %%PYTHON_SITELIBDIR%%/Fnorb/script/fnping.py %%PYTHON_SITELIBDIR%%/Fnorb/script/fnping.pyc %%PYTHON_SITELIBDIR%%/Fnorb/script/fnping.pyo +%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%% %%DOCSDIR%%/CHANGES %%DOCSDIR%%/LICENSE.HTML %%DOCSDIR%%/MANIFEST.in diff --git a/devel/hgview/Makefile b/devel/hgview/Makefile index ec23ef643be6..4ad9534d9908 100644 --- a/devel/hgview/Makefile +++ b/devel/hgview/Makefile @@ -8,7 +8,7 @@ CATEGORIES= devel MASTER_SITES= LOGILAB MAINTAINER= ports@FreeBSD.org -COMMENT= A fast Mercurial log navigator written in pyqt4 +COMMENT= Fast Mercurial log navigator written in pyqt4 RUN_DEPENDS= hg:${PORTSDIR}/devel/mercurial \ ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \ @@ -22,7 +22,7 @@ BUILD_DEPENDS= hg:${PORTSDIR}/devel/mercurial \ USE_PYTHON= yes USE_PYDISTUTILS=yes -USE_GMAKE= yes +USES= gmake PORTDOCS= * MAN1= hgview.1 @@ -38,6 +38,9 @@ post-patch: @${REINPLACE_CMD} -e 's|path/to.*hgview.py|${PYTHON_SITELIBDIR}/hgext/hgview.py|' \ ${WRKSRC}/README @${REINPLACE_CMD} -e 's|'make'|'${GMAKE}'|' ${WRKSRC}/setup.py + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py post-install: .if ${PORT_OPTIONS:MDOCS} diff --git a/devel/py-anonfunc/Makefile b/devel/py-anonfunc/Makefile index f284495e38ba..49ae810328eb 100644 --- a/devel/py-anonfunc/Makefile +++ b/devel/py-anonfunc/Makefile @@ -14,6 +14,11 @@ COMMENT= Python module that provides easy anonymous function USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_AUTOPLIST= yes + +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py -NO_STAGE= yes .include diff --git a/devel/py-anonfunc/pkg-plist b/devel/py-anonfunc/pkg-plist deleted file mode 100644 index 48c3d0d22bed..000000000000 --- a/devel/py-anonfunc/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -%%PYTHON_SITELIBDIR%%/anonfunc.pth -%%PYTHON_SITELIBDIR%%/anonfunc.so -%%PYTHON_SITELIBDIR%%/anonfuncalias.py -%%PYTHON_SITELIBDIR%%/anonfuncalias.pyc -%%PYTHON_SITELIBDIR%%/anonfuncalias.pyo diff --git a/devel/py-cxx/Makefile b/devel/py-cxx/Makefile index 297251aaf60b..3a9f9370aca5 100644 --- a/devel/py-cxx/Makefile +++ b/devel/py-cxx/Makefile @@ -27,4 +27,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/Doc/PyCXX.html ${DOCSDIR} .endif +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py + .include diff --git a/devel/py-gyp-devel/files/patch-setup.py b/devel/py-gyp-devel/files/patch-setup.py new file mode 100644 index 000000000000..e696ed229da6 --- /dev/null +++ b/devel/py-gyp-devel/files/patch-setup.py @@ -0,0 +1,11 @@ +--- setup.py.orig 2013-12-13 12:37:02.344425745 -0200 ++++ setup.py 2013-12-13 12:37:14.480426995 -0200 +@@ -20,7 +20,7 @@ + packages=['gyp', 'gyp.generator'], + + scripts = ['gyp'], +- cmdclass = {'install': install, ++ cmdclass = { + 'install_lib': install_lib, + 'install_scripts': install_scripts}, + ) diff --git a/devel/py-libplist/Makefile b/devel/py-libplist/Makefile index f623d8ee0ca3..8bea46bbfead 100644 --- a/devel/py-libplist/Makefile +++ b/devel/py-libplist/Makefile @@ -8,7 +8,8 @@ MAINTAINER= avilla@FreeBSD.org COMMENT= Python bindings for libplist LIB_DEPENDS= plist:${PORTSDIR}/${MASTER_PORT} -BUILD_DEPENDS= cython:${PORTSDIR}/lang/cython \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:${PORTSDIR}/devel/py-setuptools \ + cython:${PORTSDIR}/lang/cython \ swig2.0:${PORTSDIR}/devel/swig20 USE_PYTHON= yes diff --git a/devel/py-mx-experimental/Makefile b/devel/py-mx-experimental/Makefile index b634eb613c23..d6ecbf8e8949 100644 --- a/devel/py-mx-experimental/Makefile +++ b/devel/py-mx-experimental/Makefile @@ -16,11 +16,13 @@ BUILD_DEPENDS= ${LOCALBASE}/include/gmp.h:${PORTSDIR}/math/gmp #RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:${PORTSDIR}/lang/py-mx-base USE_PYTHON= yes -USE_PYDISTUTILS= yes +USE_PYDISTUTILS=yes PYDISTUTILS_PKGNAME= egenix-mx-experimental -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e "s|LIBGMPH|${PREFIX}/include|" ${WRKSRC}/mxEXPERIMENTAL.py + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/mxSetup.py .include diff --git a/devel/py-protocols/Makefile b/devel/py-protocols/Makefile index 4aa330bec3fb..abbdbbe954d4 100644 --- a/devel/py-protocols/Makefile +++ b/devel/py-protocols/Makefile @@ -17,4 +17,8 @@ USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= PyProtocols NO_STAGE= yes + +post-patch: + @${RM} -rf ${WRKSRC}/setuptools + .include diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile index b00529860e88..111a4e49de5c 100644 --- a/devel/py-setuptools/Makefile +++ b/devel/py-setuptools/Makefile @@ -20,7 +20,8 @@ PLIST_SUB= PYVER=${PYTHON_VER} VERSION=${PORTVERSION} \ PYDISTUTILS_NOEGGINFO= yes USE_PYTHON= yes -USE_PYDISTUTILS=yes +USE_PYDISTUTILS= yes +PYDISTUTILS_SETUP= ${PYSETUP} PYTHON_PY3K_PLIST_HACK= yes SUB_LIST= IF_DEFAULT=${IF_DEFAULT} diff --git a/devel/py-yaml/Makefile b/devel/py-yaml/Makefile index 250a92fec9e4..de7d5102945c 100644 --- a/devel/py-yaml/Makefile +++ b/devel/py-yaml/Makefile @@ -38,7 +38,7 @@ post-install: .endif .if ${PORT_OPTIONS:MLIBYAML} -PYSETUP= setup.py --with-libyaml +PYDISTUTILS_SETUP+= --with-libyaml PYDISTUTILS_BUILD_TARGET= build_ext PYDISTUTILS_BUILDARGS+= --include-dirs=${LOCALBASE}/include \ --library-dirs=${LOCALBASE}/lib @@ -47,7 +47,7 @@ LIB_DEPENDS+= yaml-0.2:${PORTSDIR}/textproc/libyaml PLIST_SUB+= LIBYAML="" .else -PYSETUP= setup.py --without-libyaml +PYDISTUTILS_SETUP+= --without-libyaml PLIST_SUB+= LIBYAML="@comment " .endif diff --git a/devel/scons/Makefile b/devel/scons/Makefile index 3aad5869f03f..dc077cebfc4f 100644 --- a/devel/scons/Makefile +++ b/devel/scons/Makefile @@ -13,10 +13,17 @@ RUN_DEPENDS+= python2:${PORTSDIR}/lang/python2 USE_PYTHON= yes USE_PYDISTUTILS= yes -PYDISTUTILS_EGGINFODIR= ${PREFIX}/lib/scons-${PORTVERSION} +PYDISTUTILS_AUTOPLIST= yes PLIST_SUB+= SCONS_VER=${PORTVERSION} USE_PYTHON= -2.7 + +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install$$,setuptools\.command\.install,' \ + -e 's,distutils\.command\.install\.,setuptools\.command\.install\.,' \ + ${WRKSRC}/setup.py + .include diff --git a/devel/scons/pkg-plist b/devel/scons/pkg-plist deleted file mode 100644 index 63137a54469b..000000000000 --- a/devel/scons/pkg-plist +++ /dev/null @@ -1,597 +0,0 @@ -bin/scons -bin/scons-%%SCONS_VER%% -bin/scons-time -bin/scons-time-%%SCONS_VER%% -bin/sconsign -bin/sconsign-%%SCONS_VER%% -lib/scons-%%SCONS_VER%%/SCons/Action.py -lib/scons-%%SCONS_VER%%/SCons/Action.pyc -lib/scons-%%SCONS_VER%%/SCons/Action.pyo -lib/scons-%%SCONS_VER%%/SCons/Builder.py -lib/scons-%%SCONS_VER%%/SCons/Builder.pyc -lib/scons-%%SCONS_VER%%/SCons/Builder.pyo -lib/scons-%%SCONS_VER%%/SCons/CacheDir.py -lib/scons-%%SCONS_VER%%/SCons/CacheDir.pyc -lib/scons-%%SCONS_VER%%/SCons/CacheDir.pyo -lib/scons-%%SCONS_VER%%/SCons/Conftest.py -lib/scons-%%SCONS_VER%%/SCons/Conftest.pyc -lib/scons-%%SCONS_VER%%/SCons/Conftest.pyo -lib/scons-%%SCONS_VER%%/SCons/Debug.py -lib/scons-%%SCONS_VER%%/SCons/Debug.pyc -lib/scons-%%SCONS_VER%%/SCons/Debug.pyo -lib/scons-%%SCONS_VER%%/SCons/Defaults.py -lib/scons-%%SCONS_VER%%/SCons/Defaults.pyc -lib/scons-%%SCONS_VER%%/SCons/Defaults.pyo -lib/scons-%%SCONS_VER%%/SCons/Environment.py -lib/scons-%%SCONS_VER%%/SCons/Environment.pyc -lib/scons-%%SCONS_VER%%/SCons/Environment.pyo -lib/scons-%%SCONS_VER%%/SCons/Errors.py -lib/scons-%%SCONS_VER%%/SCons/Errors.pyc -lib/scons-%%SCONS_VER%%/SCons/Errors.pyo -lib/scons-%%SCONS_VER%%/SCons/Executor.py -lib/scons-%%SCONS_VER%%/SCons/Executor.pyc -lib/scons-%%SCONS_VER%%/SCons/Executor.pyo -lib/scons-%%SCONS_VER%%/SCons/Job.py -lib/scons-%%SCONS_VER%%/SCons/Job.pyc -lib/scons-%%SCONS_VER%%/SCons/Job.pyo -lib/scons-%%SCONS_VER%%/SCons/Memoize.py -lib/scons-%%SCONS_VER%%/SCons/Memoize.pyc -lib/scons-%%SCONS_VER%%/SCons/Memoize.pyo -lib/scons-%%SCONS_VER%%/SCons/Node/Alias.py -lib/scons-%%SCONS_VER%%/SCons/Node/Alias.pyc -lib/scons-%%SCONS_VER%%/SCons/Node/Alias.pyo -lib/scons-%%SCONS_VER%%/SCons/Node/FS.py -lib/scons-%%SCONS_VER%%/SCons/Node/FS.pyc -lib/scons-%%SCONS_VER%%/SCons/Node/FS.pyo -lib/scons-%%SCONS_VER%%/SCons/Node/Python.py -lib/scons-%%SCONS_VER%%/SCons/Node/Python.pyc -lib/scons-%%SCONS_VER%%/SCons/Node/Python.pyo -lib/scons-%%SCONS_VER%%/SCons/Node/__init__.py -lib/scons-%%SCONS_VER%%/SCons/Node/__init__.pyc -lib/scons-%%SCONS_VER%%/SCons/Node/__init__.pyo -lib/scons-%%SCONS_VER%%/SCons/Options/BoolOption.py -lib/scons-%%SCONS_VER%%/SCons/Options/BoolOption.pyc -lib/scons-%%SCONS_VER%%/SCons/Options/BoolOption.pyo -lib/scons-%%SCONS_VER%%/SCons/Options/EnumOption.py -lib/scons-%%SCONS_VER%%/SCons/Options/EnumOption.pyc -lib/scons-%%SCONS_VER%%/SCons/Options/EnumOption.pyo -lib/scons-%%SCONS_VER%%/SCons/Options/ListOption.py -lib/scons-%%SCONS_VER%%/SCons/Options/ListOption.pyc -lib/scons-%%SCONS_VER%%/SCons/Options/ListOption.pyo -lib/scons-%%SCONS_VER%%/SCons/Options/PackageOption.py -lib/scons-%%SCONS_VER%%/SCons/Options/PackageOption.pyc -lib/scons-%%SCONS_VER%%/SCons/Options/PackageOption.pyo -lib/scons-%%SCONS_VER%%/SCons/Options/PathOption.py -lib/scons-%%SCONS_VER%%/SCons/Options/PathOption.pyc -lib/scons-%%SCONS_VER%%/SCons/Options/PathOption.pyo -lib/scons-%%SCONS_VER%%/SCons/Options/__init__.py -lib/scons-%%SCONS_VER%%/SCons/Options/__init__.pyc -lib/scons-%%SCONS_VER%%/SCons/Options/__init__.pyo -lib/scons-%%SCONS_VER%%/SCons/PathList.py -lib/scons-%%SCONS_VER%%/SCons/PathList.pyc -lib/scons-%%SCONS_VER%%/SCons/PathList.pyo -lib/scons-%%SCONS_VER%%/SCons/Platform/__init__.py -lib/scons-%%SCONS_VER%%/SCons/Platform/__init__.pyc -lib/scons-%%SCONS_VER%%/SCons/Platform/__init__.pyo -lib/scons-%%SCONS_VER%%/SCons/Platform/aix.py -lib/scons-%%SCONS_VER%%/SCons/Platform/aix.pyc -lib/scons-%%SCONS_VER%%/SCons/Platform/aix.pyo -lib/scons-%%SCONS_VER%%/SCons/Platform/cygwin.py -lib/scons-%%SCONS_VER%%/SCons/Platform/cygwin.pyc -lib/scons-%%SCONS_VER%%/SCons/Platform/cygwin.pyo -lib/scons-%%SCONS_VER%%/SCons/Platform/darwin.py -lib/scons-%%SCONS_VER%%/SCons/Platform/darwin.pyc -lib/scons-%%SCONS_VER%%/SCons/Platform/darwin.pyo -lib/scons-%%SCONS_VER%%/SCons/Platform/hpux.py -lib/scons-%%SCONS_VER%%/SCons/Platform/hpux.pyc -lib/scons-%%SCONS_VER%%/SCons/Platform/hpux.pyo -lib/scons-%%SCONS_VER%%/SCons/Platform/irix.py -lib/scons-%%SCONS_VER%%/SCons/Platform/irix.pyc -lib/scons-%%SCONS_VER%%/SCons/Platform/irix.pyo -lib/scons-%%SCONS_VER%%/SCons/Platform/os2.py -lib/scons-%%SCONS_VER%%/SCons/Platform/os2.pyc -lib/scons-%%SCONS_VER%%/SCons/Platform/os2.pyo -lib/scons-%%SCONS_VER%%/SCons/Platform/posix.py -lib/scons-%%SCONS_VER%%/SCons/Platform/posix.pyc -lib/scons-%%SCONS_VER%%/SCons/Platform/posix.pyo -lib/scons-%%SCONS_VER%%/SCons/Platform/sunos.py -lib/scons-%%SCONS_VER%%/SCons/Platform/sunos.pyc -lib/scons-%%SCONS_VER%%/SCons/Platform/sunos.pyo -lib/scons-%%SCONS_VER%%/SCons/Platform/win32.py -lib/scons-%%SCONS_VER%%/SCons/Platform/win32.pyc -lib/scons-%%SCONS_VER%%/SCons/Platform/win32.pyo -lib/scons-%%SCONS_VER%%/SCons/SConf.py -lib/scons-%%SCONS_VER%%/SCons/SConf.pyc -lib/scons-%%SCONS_VER%%/SCons/SConf.pyo -lib/scons-%%SCONS_VER%%/SCons/SConsign.py -lib/scons-%%SCONS_VER%%/SCons/SConsign.pyc -lib/scons-%%SCONS_VER%%/SCons/SConsign.pyo -lib/scons-%%SCONS_VER%%/SCons/Scanner/C.py -lib/scons-%%SCONS_VER%%/SCons/Scanner/C.pyc -lib/scons-%%SCONS_VER%%/SCons/Scanner/C.pyo -lib/scons-%%SCONS_VER%%/SCons/Scanner/D.py -lib/scons-%%SCONS_VER%%/SCons/Scanner/D.pyc -lib/scons-%%SCONS_VER%%/SCons/Scanner/D.pyo -lib/scons-%%SCONS_VER%%/SCons/Scanner/Dir.py -lib/scons-%%SCONS_VER%%/SCons/Scanner/Dir.pyc -lib/scons-%%SCONS_VER%%/SCons/Scanner/Dir.pyo -lib/scons-%%SCONS_VER%%/SCons/Scanner/Fortran.py -lib/scons-%%SCONS_VER%%/SCons/Scanner/Fortran.pyc -lib/scons-%%SCONS_VER%%/SCons/Scanner/Fortran.pyo -lib/scons-%%SCONS_VER%%/SCons/Scanner/IDL.py -lib/scons-%%SCONS_VER%%/SCons/Scanner/IDL.pyc -lib/scons-%%SCONS_VER%%/SCons/Scanner/IDL.pyo -lib/scons-%%SCONS_VER%%/SCons/Scanner/LaTeX.py -lib/scons-%%SCONS_VER%%/SCons/Scanner/LaTeX.pyc -lib/scons-%%SCONS_VER%%/SCons/Scanner/LaTeX.pyo -lib/scons-%%SCONS_VER%%/SCons/Scanner/Prog.py -lib/scons-%%SCONS_VER%%/SCons/Scanner/Prog.pyc -lib/scons-%%SCONS_VER%%/SCons/Scanner/Prog.pyo -lib/scons-%%SCONS_VER%%/SCons/Scanner/RC.py -lib/scons-%%SCONS_VER%%/SCons/Scanner/RC.pyc -lib/scons-%%SCONS_VER%%/SCons/Scanner/RC.pyo -lib/scons-%%SCONS_VER%%/SCons/Scanner/__init__.py -lib/scons-%%SCONS_VER%%/SCons/Scanner/__init__.pyc -lib/scons-%%SCONS_VER%%/SCons/Scanner/__init__.pyo -lib/scons-%%SCONS_VER%%/SCons/Script/Interactive.py -lib/scons-%%SCONS_VER%%/SCons/Script/Interactive.pyc -lib/scons-%%SCONS_VER%%/SCons/Script/Interactive.pyo -lib/scons-%%SCONS_VER%%/SCons/Script/Main.py -lib/scons-%%SCONS_VER%%/SCons/Script/Main.pyc -lib/scons-%%SCONS_VER%%/SCons/Script/Main.pyo -lib/scons-%%SCONS_VER%%/SCons/Script/SConsOptions.py -lib/scons-%%SCONS_VER%%/SCons/Script/SConsOptions.pyc -lib/scons-%%SCONS_VER%%/SCons/Script/SConsOptions.pyo -lib/scons-%%SCONS_VER%%/SCons/Script/SConscript.py -lib/scons-%%SCONS_VER%%/SCons/Script/SConscript.pyc -lib/scons-%%SCONS_VER%%/SCons/Script/SConscript.pyo -lib/scons-%%SCONS_VER%%/SCons/Script/__init__.py -lib/scons-%%SCONS_VER%%/SCons/Script/__init__.pyc -lib/scons-%%SCONS_VER%%/SCons/Script/__init__.pyo -lib/scons-%%SCONS_VER%%/SCons/Sig.py -lib/scons-%%SCONS_VER%%/SCons/Sig.pyc -lib/scons-%%SCONS_VER%%/SCons/Sig.pyo -lib/scons-%%SCONS_VER%%/SCons/Subst.py -lib/scons-%%SCONS_VER%%/SCons/Subst.pyc -lib/scons-%%SCONS_VER%%/SCons/Subst.pyo -lib/scons-%%SCONS_VER%%/SCons/Taskmaster.py -lib/scons-%%SCONS_VER%%/SCons/Taskmaster.pyc -lib/scons-%%SCONS_VER%%/SCons/Taskmaster.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/386asm.py -lib/scons-%%SCONS_VER%%/SCons/Tool/386asm.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/386asm.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/BitKeeper.py -lib/scons-%%SCONS_VER%%/SCons/Tool/BitKeeper.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/BitKeeper.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/CVS.py -lib/scons-%%SCONS_VER%%/SCons/Tool/CVS.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/CVS.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/FortranCommon.py -lib/scons-%%SCONS_VER%%/SCons/Tool/FortranCommon.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/FortranCommon.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/GettextCommon.py -lib/scons-%%SCONS_VER%%/SCons/Tool/GettextCommon.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/GettextCommon.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/JavaCommon.py -lib/scons-%%SCONS_VER%%/SCons/Tool/JavaCommon.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/JavaCommon.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/__init__.py -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/__init__.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/__init__.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/arch.py -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/arch.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/arch.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/common.py -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/common.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/common.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/netframework.py -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/netframework.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/netframework.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/sdk.py -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/sdk.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/sdk.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/vc.py -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/vc.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/vc.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/vs.py -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/vs.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon/vs.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/Perforce.py -lib/scons-%%SCONS_VER%%/SCons/Tool/Perforce.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/Perforce.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/PharLapCommon.py -lib/scons-%%SCONS_VER%%/SCons/Tool/PharLapCommon.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/PharLapCommon.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/RCS.py -lib/scons-%%SCONS_VER%%/SCons/Tool/RCS.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/RCS.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/SCCS.py -lib/scons-%%SCONS_VER%%/SCons/Tool/SCCS.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/SCCS.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/Subversion.py -lib/scons-%%SCONS_VER%%/SCons/Tool/Subversion.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/Subversion.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/__init__.py -lib/scons-%%SCONS_VER%%/SCons/Tool/__init__.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/__init__.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/aixc++.py -lib/scons-%%SCONS_VER%%/SCons/Tool/aixc++.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/aixc++.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/aixcc.py -lib/scons-%%SCONS_VER%%/SCons/Tool/aixcc.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/aixcc.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/aixf77.py -lib/scons-%%SCONS_VER%%/SCons/Tool/aixf77.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/aixf77.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/aixlink.py -lib/scons-%%SCONS_VER%%/SCons/Tool/aixlink.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/aixlink.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/applelink.py -lib/scons-%%SCONS_VER%%/SCons/Tool/applelink.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/applelink.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/ar.py -lib/scons-%%SCONS_VER%%/SCons/Tool/ar.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/ar.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/as.py -lib/scons-%%SCONS_VER%%/SCons/Tool/as.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/as.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/bcc32.py -lib/scons-%%SCONS_VER%%/SCons/Tool/bcc32.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/bcc32.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/c++.py -lib/scons-%%SCONS_VER%%/SCons/Tool/c++.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/c++.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/cc.py -lib/scons-%%SCONS_VER%%/SCons/Tool/cc.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/cc.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/cvf.py -lib/scons-%%SCONS_VER%%/SCons/Tool/cvf.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/cvf.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/default.py -lib/scons-%%SCONS_VER%%/SCons/Tool/default.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/default.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/dmd.py -lib/scons-%%SCONS_VER%%/SCons/Tool/dmd.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/dmd.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/dvi.py -lib/scons-%%SCONS_VER%%/SCons/Tool/dvi.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/dvi.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/dvipdf.py -lib/scons-%%SCONS_VER%%/SCons/Tool/dvipdf.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/dvipdf.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/dvips.py -lib/scons-%%SCONS_VER%%/SCons/Tool/dvips.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/dvips.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/f03.py -lib/scons-%%SCONS_VER%%/SCons/Tool/f03.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/f03.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/f77.py -lib/scons-%%SCONS_VER%%/SCons/Tool/f77.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/f77.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/f90.py -lib/scons-%%SCONS_VER%%/SCons/Tool/f90.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/f90.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/f95.py -lib/scons-%%SCONS_VER%%/SCons/Tool/f95.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/f95.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/filesystem.py -lib/scons-%%SCONS_VER%%/SCons/Tool/filesystem.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/filesystem.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/fortran.py -lib/scons-%%SCONS_VER%%/SCons/Tool/fortran.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/fortran.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/g++.py -lib/scons-%%SCONS_VER%%/SCons/Tool/g++.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/g++.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/g77.py -lib/scons-%%SCONS_VER%%/SCons/Tool/g77.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/g77.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/gas.py -lib/scons-%%SCONS_VER%%/SCons/Tool/gas.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/gas.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/gcc.py -lib/scons-%%SCONS_VER%%/SCons/Tool/gcc.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/gcc.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/gettext.py -lib/scons-%%SCONS_VER%%/SCons/Tool/gettext.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/gettext.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/gfortran.py -lib/scons-%%SCONS_VER%%/SCons/Tool/gfortran.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/gfortran.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/gnulink.py -lib/scons-%%SCONS_VER%%/SCons/Tool/gnulink.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/gnulink.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/gs.py -lib/scons-%%SCONS_VER%%/SCons/Tool/gs.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/gs.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/hpc++.py -lib/scons-%%SCONS_VER%%/SCons/Tool/hpc++.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/hpc++.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/hpcc.py -lib/scons-%%SCONS_VER%%/SCons/Tool/hpcc.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/hpcc.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/hplink.py -lib/scons-%%SCONS_VER%%/SCons/Tool/hplink.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/hplink.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/icc.py -lib/scons-%%SCONS_VER%%/SCons/Tool/icc.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/icc.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/icl.py -lib/scons-%%SCONS_VER%%/SCons/Tool/icl.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/icl.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/ifl.py -lib/scons-%%SCONS_VER%%/SCons/Tool/ifl.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/ifl.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/ifort.py -lib/scons-%%SCONS_VER%%/SCons/Tool/ifort.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/ifort.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/ilink.py -lib/scons-%%SCONS_VER%%/SCons/Tool/ilink.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/ilink.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/ilink32.py -lib/scons-%%SCONS_VER%%/SCons/Tool/ilink32.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/ilink32.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/install.py -lib/scons-%%SCONS_VER%%/SCons/Tool/install.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/install.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/intelc.py -lib/scons-%%SCONS_VER%%/SCons/Tool/intelc.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/intelc.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/ipkg.py -lib/scons-%%SCONS_VER%%/SCons/Tool/ipkg.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/ipkg.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/jar.py -lib/scons-%%SCONS_VER%%/SCons/Tool/jar.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/jar.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/javac.py -lib/scons-%%SCONS_VER%%/SCons/Tool/javac.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/javac.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/javah.py -lib/scons-%%SCONS_VER%%/SCons/Tool/javah.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/javah.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/latex.py -lib/scons-%%SCONS_VER%%/SCons/Tool/latex.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/latex.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/lex.py -lib/scons-%%SCONS_VER%%/SCons/Tool/lex.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/lex.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/link.py -lib/scons-%%SCONS_VER%%/SCons/Tool/link.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/link.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/linkloc.py -lib/scons-%%SCONS_VER%%/SCons/Tool/linkloc.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/linkloc.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/m4.py -lib/scons-%%SCONS_VER%%/SCons/Tool/m4.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/m4.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/masm.py -lib/scons-%%SCONS_VER%%/SCons/Tool/masm.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/masm.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/midl.py -lib/scons-%%SCONS_VER%%/SCons/Tool/midl.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/midl.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/mingw.py -lib/scons-%%SCONS_VER%%/SCons/Tool/mingw.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/mingw.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/msgfmt.py -lib/scons-%%SCONS_VER%%/SCons/Tool/msgfmt.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/msgfmt.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/msginit.py -lib/scons-%%SCONS_VER%%/SCons/Tool/msginit.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/msginit.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/msgmerge.py -lib/scons-%%SCONS_VER%%/SCons/Tool/msgmerge.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/msgmerge.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/mslib.py -lib/scons-%%SCONS_VER%%/SCons/Tool/mslib.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/mslib.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/mslink.py -lib/scons-%%SCONS_VER%%/SCons/Tool/mslink.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/mslink.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/mssdk.py -lib/scons-%%SCONS_VER%%/SCons/Tool/mssdk.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/mssdk.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/msvc.py -lib/scons-%%SCONS_VER%%/SCons/Tool/msvc.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/msvc.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/msvs.py -lib/scons-%%SCONS_VER%%/SCons/Tool/msvs.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/msvs.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/mwcc.py -lib/scons-%%SCONS_VER%%/SCons/Tool/mwcc.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/mwcc.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/mwld.py -lib/scons-%%SCONS_VER%%/SCons/Tool/mwld.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/mwld.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/nasm.py -lib/scons-%%SCONS_VER%%/SCons/Tool/nasm.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/nasm.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/__init__.py -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/__init__.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/__init__.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/ipk.py -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/ipk.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/ipk.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/msi.py -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/msi.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/msi.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/rpm.py -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/rpm.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/rpm.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/src_tarbz2.py -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/src_tarbz2.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/src_tarbz2.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/src_targz.py -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/src_targz.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/src_targz.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/src_zip.py -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/src_zip.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/src_zip.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/tarbz2.py -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/tarbz2.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/tarbz2.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/targz.py -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/targz.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/targz.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/zip.py -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/zip.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/packaging/zip.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/pdf.py -lib/scons-%%SCONS_VER%%/SCons/Tool/pdf.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/pdf.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/pdflatex.py -lib/scons-%%SCONS_VER%%/SCons/Tool/pdflatex.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/pdflatex.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/pdftex.py -lib/scons-%%SCONS_VER%%/SCons/Tool/pdftex.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/pdftex.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/qt.py -lib/scons-%%SCONS_VER%%/SCons/Tool/qt.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/qt.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/rmic.py -lib/scons-%%SCONS_VER%%/SCons/Tool/rmic.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/rmic.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/rpcgen.py -lib/scons-%%SCONS_VER%%/SCons/Tool/rpcgen.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/rpcgen.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/rpm.py -lib/scons-%%SCONS_VER%%/SCons/Tool/rpm.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/rpm.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/rpmutils.py -lib/scons-%%SCONS_VER%%/SCons/Tool/rpmutils.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/rpmutils.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/sgiar.py -lib/scons-%%SCONS_VER%%/SCons/Tool/sgiar.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/sgiar.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/sgic++.py -lib/scons-%%SCONS_VER%%/SCons/Tool/sgic++.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/sgic++.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/sgicc.py -lib/scons-%%SCONS_VER%%/SCons/Tool/sgicc.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/sgicc.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/sgilink.py -lib/scons-%%SCONS_VER%%/SCons/Tool/sgilink.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/sgilink.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/sunar.py -lib/scons-%%SCONS_VER%%/SCons/Tool/sunar.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/sunar.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/sunc++.py -lib/scons-%%SCONS_VER%%/SCons/Tool/sunc++.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/sunc++.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/suncc.py -lib/scons-%%SCONS_VER%%/SCons/Tool/suncc.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/suncc.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/sunf77.py -lib/scons-%%SCONS_VER%%/SCons/Tool/sunf77.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/sunf77.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/sunf90.py -lib/scons-%%SCONS_VER%%/SCons/Tool/sunf90.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/sunf90.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/sunf95.py -lib/scons-%%SCONS_VER%%/SCons/Tool/sunf95.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/sunf95.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/sunlink.py -lib/scons-%%SCONS_VER%%/SCons/Tool/sunlink.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/sunlink.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/swig.py -lib/scons-%%SCONS_VER%%/SCons/Tool/swig.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/swig.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/tar.py -lib/scons-%%SCONS_VER%%/SCons/Tool/tar.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/tar.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/tex.py -lib/scons-%%SCONS_VER%%/SCons/Tool/tex.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/tex.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/textfile.py -lib/scons-%%SCONS_VER%%/SCons/Tool/textfile.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/textfile.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/tlib.py -lib/scons-%%SCONS_VER%%/SCons/Tool/tlib.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/tlib.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/wix.py -lib/scons-%%SCONS_VER%%/SCons/Tool/wix.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/wix.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/xgettext.py -lib/scons-%%SCONS_VER%%/SCons/Tool/xgettext.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/xgettext.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/yacc.py -lib/scons-%%SCONS_VER%%/SCons/Tool/yacc.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/yacc.pyo -lib/scons-%%SCONS_VER%%/SCons/Tool/zip.py -lib/scons-%%SCONS_VER%%/SCons/Tool/zip.pyc -lib/scons-%%SCONS_VER%%/SCons/Tool/zip.pyo -lib/scons-%%SCONS_VER%%/SCons/Util.py -lib/scons-%%SCONS_VER%%/SCons/Util.pyc -lib/scons-%%SCONS_VER%%/SCons/Util.pyo -lib/scons-%%SCONS_VER%%/SCons/Variables/BoolVariable.py -lib/scons-%%SCONS_VER%%/SCons/Variables/BoolVariable.pyc -lib/scons-%%SCONS_VER%%/SCons/Variables/BoolVariable.pyo -lib/scons-%%SCONS_VER%%/SCons/Variables/EnumVariable.py -lib/scons-%%SCONS_VER%%/SCons/Variables/EnumVariable.pyc -lib/scons-%%SCONS_VER%%/SCons/Variables/EnumVariable.pyo -lib/scons-%%SCONS_VER%%/SCons/Variables/ListVariable.py -lib/scons-%%SCONS_VER%%/SCons/Variables/ListVariable.pyc -lib/scons-%%SCONS_VER%%/SCons/Variables/ListVariable.pyo -lib/scons-%%SCONS_VER%%/SCons/Variables/PackageVariable.py -lib/scons-%%SCONS_VER%%/SCons/Variables/PackageVariable.pyc -lib/scons-%%SCONS_VER%%/SCons/Variables/PackageVariable.pyo -lib/scons-%%SCONS_VER%%/SCons/Variables/PathVariable.py -lib/scons-%%SCONS_VER%%/SCons/Variables/PathVariable.pyc -lib/scons-%%SCONS_VER%%/SCons/Variables/PathVariable.pyo -lib/scons-%%SCONS_VER%%/SCons/Variables/__init__.py -lib/scons-%%SCONS_VER%%/SCons/Variables/__init__.pyc -lib/scons-%%SCONS_VER%%/SCons/Variables/__init__.pyo -lib/scons-%%SCONS_VER%%/SCons/Warnings.py -lib/scons-%%SCONS_VER%%/SCons/Warnings.pyc -lib/scons-%%SCONS_VER%%/SCons/Warnings.pyo -lib/scons-%%SCONS_VER%%/SCons/__init__.py -lib/scons-%%SCONS_VER%%/SCons/__init__.pyc -lib/scons-%%SCONS_VER%%/SCons/__init__.pyo -lib/scons-%%SCONS_VER%%/SCons/compat/__init__.py -lib/scons-%%SCONS_VER%%/SCons/compat/__init__.pyc -lib/scons-%%SCONS_VER%%/SCons/compat/__init__.pyo -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_builtins.py -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_builtins.pyc -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_builtins.pyo -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_collections.py -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_collections.pyc -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_collections.pyo -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_dbm.py -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_dbm.pyc -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_dbm.pyo -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_hashlib.py -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_hashlib.pyc -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_hashlib.pyo -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_io.py -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_io.pyc -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_io.pyo -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_sets.py -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_sets.pyc -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_sets.pyo -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_subprocess.py -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_subprocess.pyc -lib/scons-%%SCONS_VER%%/SCons/compat/_scons_subprocess.pyo -lib/scons-%%SCONS_VER%%/SCons/cpp.py -lib/scons-%%SCONS_VER%%/SCons/cpp.pyc -lib/scons-%%SCONS_VER%%/SCons/cpp.pyo -lib/scons-%%SCONS_VER%%/SCons/dblite.py -lib/scons-%%SCONS_VER%%/SCons/dblite.pyc -lib/scons-%%SCONS_VER%%/SCons/dblite.pyo -lib/scons-%%SCONS_VER%%/SCons/exitfuncs.py -lib/scons-%%SCONS_VER%%/SCons/exitfuncs.pyc -lib/scons-%%SCONS_VER%%/SCons/exitfuncs.pyo -man/man1/scons-time.1.gz -man/man1/scons.1.gz -man/man1/sconsign.1.gz -@dirrm lib/scons-%%SCONS_VER%%/SCons/compat -@dirrm lib/scons-%%SCONS_VER%%/SCons/Variables -@dirrm lib/scons-%%SCONS_VER%%/SCons/Tool/packaging -@dirrm lib/scons-%%SCONS_VER%%/SCons/Tool/MSCommon -@dirrm lib/scons-%%SCONS_VER%%/SCons/Tool -@dirrm lib/scons-%%SCONS_VER%%/SCons/Script -@dirrm lib/scons-%%SCONS_VER%%/SCons/Scanner -@dirrm lib/scons-%%SCONS_VER%%/SCons/Platform -@dirrm lib/scons-%%SCONS_VER%%/SCons/Options -@dirrm lib/scons-%%SCONS_VER%%/SCons/Node -@dirrm lib/scons-%%SCONS_VER%%/SCons -@dirrm lib/scons-%%SCONS_VER%% diff --git a/dns/py-dnspython/Makefile b/dns/py-dnspython/Makefile index 98f53af2571e..7b68eab5c241 100644 --- a/dns/py-dnspython/Makefile +++ b/dns/py-dnspython/Makefile @@ -13,8 +13,8 @@ COMMENT= DNS toolkit for Python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes PYDISTUTILS_PKGNAME= ${PORTNAME}${PORTVERSIONSUFFIX} -PYDISTUTILS_NOEGGINFO= yes OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_DEFINE= PYCRYPTO @@ -32,10 +32,8 @@ NO_STAGE= yes .if ${PYTHON_MAJOR_VER} < 3 PORTVERSIONSUFFIX= -PLIST= ${PKGDIR}/pkg-plist-py2 .else PORTVERSIONSUFFIX=3 -PLIST= ${PKGDIR}/pkg-plist-py3 EXAMPLESDIR:= ${EXAMPLESDIR}3 .endif diff --git a/dns/py-dnspython/pkg-plist-py2 b/dns/py-dnspython/pkg-plist-py2 deleted file mode 100644 index 65c1225d268a..000000000000 --- a/dns/py-dnspython/pkg-plist-py2 +++ /dev/null @@ -1,260 +0,0 @@ -%%PYTHON_SITELIBDIR%%/dns/__init__.py -%%PYTHON_SITELIBDIR%%/dns/__init__.pyc -%%PYTHON_SITELIBDIR%%/dns/__init__.pyo -%%PYTHON_SITELIBDIR%%/dns/dnssec.py -%%PYTHON_SITELIBDIR%%/dns/dnssec.pyc -%%PYTHON_SITELIBDIR%%/dns/dnssec.pyo -%%PYTHON_SITELIBDIR%%/dns/e164.py -%%PYTHON_SITELIBDIR%%/dns/e164.pyc -%%PYTHON_SITELIBDIR%%/dns/e164.pyo -%%PYTHON_SITELIBDIR%%/dns/edns.py -%%PYTHON_SITELIBDIR%%/dns/edns.pyc -%%PYTHON_SITELIBDIR%%/dns/edns.pyo -%%PYTHON_SITELIBDIR%%/dns/entropy.py -%%PYTHON_SITELIBDIR%%/dns/entropy.pyc -%%PYTHON_SITELIBDIR%%/dns/entropy.pyo -%%PYTHON_SITELIBDIR%%/dns/exception.py -%%PYTHON_SITELIBDIR%%/dns/exception.pyc -%%PYTHON_SITELIBDIR%%/dns/exception.pyo -%%PYTHON_SITELIBDIR%%/dns/flags.py -%%PYTHON_SITELIBDIR%%/dns/flags.pyc -%%PYTHON_SITELIBDIR%%/dns/flags.pyo -%%PYTHON_SITELIBDIR%%/dns/grange.py -%%PYTHON_SITELIBDIR%%/dns/grange.pyc -%%PYTHON_SITELIBDIR%%/dns/grange.pyo -%%PYTHON_SITELIBDIR%%/dns/hash.py -%%PYTHON_SITELIBDIR%%/dns/hash.pyc -%%PYTHON_SITELIBDIR%%/dns/hash.pyo -%%PYTHON_SITELIBDIR%%/dns/inet.py -%%PYTHON_SITELIBDIR%%/dns/inet.pyc -%%PYTHON_SITELIBDIR%%/dns/inet.pyo -%%PYTHON_SITELIBDIR%%/dns/ipv4.py -%%PYTHON_SITELIBDIR%%/dns/ipv4.pyc -%%PYTHON_SITELIBDIR%%/dns/ipv4.pyo -%%PYTHON_SITELIBDIR%%/dns/ipv6.py -%%PYTHON_SITELIBDIR%%/dns/ipv6.pyc -%%PYTHON_SITELIBDIR%%/dns/ipv6.pyo -%%PYTHON_SITELIBDIR%%/dns/message.py -%%PYTHON_SITELIBDIR%%/dns/message.pyc -%%PYTHON_SITELIBDIR%%/dns/message.pyo -%%PYTHON_SITELIBDIR%%/dns/name.py -%%PYTHON_SITELIBDIR%%/dns/name.pyc -%%PYTHON_SITELIBDIR%%/dns/name.pyo -%%PYTHON_SITELIBDIR%%/dns/namedict.py -%%PYTHON_SITELIBDIR%%/dns/namedict.pyc -%%PYTHON_SITELIBDIR%%/dns/namedict.pyo -%%PYTHON_SITELIBDIR%%/dns/node.py -%%PYTHON_SITELIBDIR%%/dns/node.pyc -%%PYTHON_SITELIBDIR%%/dns/node.pyo -%%PYTHON_SITELIBDIR%%/dns/opcode.py -%%PYTHON_SITELIBDIR%%/dns/opcode.pyc -%%PYTHON_SITELIBDIR%%/dns/opcode.pyo -%%PYTHON_SITELIBDIR%%/dns/query.py -%%PYTHON_SITELIBDIR%%/dns/query.pyc -%%PYTHON_SITELIBDIR%%/dns/query.pyo -%%PYTHON_SITELIBDIR%%/dns/rcode.py -%%PYTHON_SITELIBDIR%%/dns/rcode.pyc -%%PYTHON_SITELIBDIR%%/dns/rcode.pyo -%%PYTHON_SITELIBDIR%%/dns/rdata.py -%%PYTHON_SITELIBDIR%%/dns/rdata.pyc -%%PYTHON_SITELIBDIR%%/dns/rdata.pyo -%%PYTHON_SITELIBDIR%%/dns/rdataclass.py -%%PYTHON_SITELIBDIR%%/dns/rdataclass.pyc -%%PYTHON_SITELIBDIR%%/dns/rdataclass.pyo -%%PYTHON_SITELIBDIR%%/dns/rdataset.py -%%PYTHON_SITELIBDIR%%/dns/rdataset.pyc -%%PYTHON_SITELIBDIR%%/dns/rdataset.pyo -%%PYTHON_SITELIBDIR%%/dns/rdatatype.py -%%PYTHON_SITELIBDIR%%/dns/rdatatype.pyc -%%PYTHON_SITELIBDIR%%/dns/rdatatype.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/AFSDB.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/AFSDB.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/AFSDB.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/CERT.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/CERT.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/CERT.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/CNAME.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/CNAME.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/CNAME.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DLV.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DLV.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DLV.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DNAME.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DNAME.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DNAME.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DNSKEY.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DNSKEY.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DNSKEY.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DS.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DS.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DS.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/GPOS.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/GPOS.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/GPOS.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/HINFO.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/HINFO.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/HINFO.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/HIP.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/HIP.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/HIP.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/ISDN.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/ISDN.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/ISDN.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/LOC.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/LOC.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/LOC.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/MX.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/MX.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/MX.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NS.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NS.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NS.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NSEC.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NSEC.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NSEC.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NSEC3.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NSEC3.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NSEC3.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NSEC3PARAM.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NSEC3PARAM.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NSEC3PARAM.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/PTR.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/PTR.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/PTR.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/RP.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/RP.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/RP.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/RRSIG.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/RRSIG.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/RRSIG.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/RT.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/RT.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/RT.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SOA.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SOA.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SOA.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SPF.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SPF.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SPF.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SSHFP.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SSHFP.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SSHFP.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/TLSA.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/TLSA.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/TLSA.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/TXT.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/TXT.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/TXT.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/X25.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/X25.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/X25.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/__init__.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/__init__.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/__init__.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/A.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/A.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/A.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/AAAA.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/AAAA.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/AAAA.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/APL.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/APL.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/APL.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/DHCID.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/DHCID.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/DHCID.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/IPSECKEY.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/IPSECKEY.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/IPSECKEY.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/KX.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/KX.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/KX.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/NAPTR.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/NAPTR.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/NAPTR.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/NSAP.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/NSAP.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/NSAP.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/NSAP_PTR.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/NSAP_PTR.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/NSAP_PTR.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/PX.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/PX.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/PX.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/SRV.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/SRV.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/SRV.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/WKS.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/WKS.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/WKS.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/__init__.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/__init__.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/__init__.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/__init__.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/__init__.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/__init__.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/dsbase.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/dsbase.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/dsbase.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/mxbase.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/mxbase.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/mxbase.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/nsbase.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/nsbase.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/nsbase.pyo -%%PYTHON_SITELIBDIR%%/dns/rdtypes/txtbase.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/txtbase.pyc -%%PYTHON_SITELIBDIR%%/dns/rdtypes/txtbase.pyo -%%PYTHON_SITELIBDIR%%/dns/renderer.py -%%PYTHON_SITELIBDIR%%/dns/renderer.pyc -%%PYTHON_SITELIBDIR%%/dns/renderer.pyo -%%PYTHON_SITELIBDIR%%/dns/resolver.py -%%PYTHON_SITELIBDIR%%/dns/resolver.pyc -%%PYTHON_SITELIBDIR%%/dns/resolver.pyo -%%PYTHON_SITELIBDIR%%/dns/reversename.py -%%PYTHON_SITELIBDIR%%/dns/reversename.pyc -%%PYTHON_SITELIBDIR%%/dns/reversename.pyo -%%PYTHON_SITELIBDIR%%/dns/rrset.py -%%PYTHON_SITELIBDIR%%/dns/rrset.pyc -%%PYTHON_SITELIBDIR%%/dns/rrset.pyo -%%PYTHON_SITELIBDIR%%/dns/set.py -%%PYTHON_SITELIBDIR%%/dns/set.pyc -%%PYTHON_SITELIBDIR%%/dns/set.pyo -%%PYTHON_SITELIBDIR%%/dns/tokenizer.py -%%PYTHON_SITELIBDIR%%/dns/tokenizer.pyc -%%PYTHON_SITELIBDIR%%/dns/tokenizer.pyo -%%PYTHON_SITELIBDIR%%/dns/tsig.py -%%PYTHON_SITELIBDIR%%/dns/tsig.pyc -%%PYTHON_SITELIBDIR%%/dns/tsig.pyo -%%PYTHON_SITELIBDIR%%/dns/tsigkeyring.py -%%PYTHON_SITELIBDIR%%/dns/tsigkeyring.pyc -%%PYTHON_SITELIBDIR%%/dns/tsigkeyring.pyo -%%PYTHON_SITELIBDIR%%/dns/ttl.py -%%PYTHON_SITELIBDIR%%/dns/ttl.pyc -%%PYTHON_SITELIBDIR%%/dns/ttl.pyo -%%PYTHON_SITELIBDIR%%/dns/update.py -%%PYTHON_SITELIBDIR%%/dns/update.pyc -%%PYTHON_SITELIBDIR%%/dns/update.pyo -%%PYTHON_SITELIBDIR%%/dns/version.py -%%PYTHON_SITELIBDIR%%/dns/version.pyc -%%PYTHON_SITELIBDIR%%/dns/version.pyo -%%PYTHON_SITELIBDIR%%/dns/wiredata.py -%%PYTHON_SITELIBDIR%%/dns/wiredata.pyc -%%PYTHON_SITELIBDIR%%/dns/wiredata.pyo -%%PYTHON_SITELIBDIR%%/dns/zone.py -%%PYTHON_SITELIBDIR%%/dns/zone.pyc -%%PYTHON_SITELIBDIR%%/dns/zone.pyo -%%PYTHON_SITELIBDIR%%/dnspython-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ddns.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/e164.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mx.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/name.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reverse.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reverse_name.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfr.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zonediff.py -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -@dirrm %%PYTHON_SITELIBDIR%%/dns/rdtypes/IN -@dirrm %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY -@dirrm %%PYTHON_SITELIBDIR%%/dns/rdtypes -@dirrm %%PYTHON_SITELIBDIR%%/dns diff --git a/dns/py-dnspython/pkg-plist-py3 b/dns/py-dnspython/pkg-plist-py3 deleted file mode 100644 index 0e66130b663b..000000000000 --- a/dns/py-dnspython/pkg-plist-py3 +++ /dev/null @@ -1,97 +0,0 @@ -%%PYTHON_SITELIBDIR%%/dns/__init__.py -%%PYTHON_SITELIBDIR%%/dns/dnssec.py -%%PYTHON_SITELIBDIR%%/dns/e164.py -%%PYTHON_SITELIBDIR%%/dns/edns.py -%%PYTHON_SITELIBDIR%%/dns/entropy.py -%%PYTHON_SITELIBDIR%%/dns/exception.py -%%PYTHON_SITELIBDIR%%/dns/flags.py -%%PYTHON_SITELIBDIR%%/dns/grange.py -%%PYTHON_SITELIBDIR%%/dns/hash.py -%%PYTHON_SITELIBDIR%%/dns/inet.py -%%PYTHON_SITELIBDIR%%/dns/ipv4.py -%%PYTHON_SITELIBDIR%%/dns/ipv6.py -%%PYTHON_SITELIBDIR%%/dns/message.py -%%PYTHON_SITELIBDIR%%/dns/name.py -%%PYTHON_SITELIBDIR%%/dns/namedict.py -%%PYTHON_SITELIBDIR%%/dns/node.py -%%PYTHON_SITELIBDIR%%/dns/opcode.py -%%PYTHON_SITELIBDIR%%/dns/query.py -%%PYTHON_SITELIBDIR%%/dns/rcode.py -%%PYTHON_SITELIBDIR%%/dns/rdata.py -%%PYTHON_SITELIBDIR%%/dns/rdataclass.py -%%PYTHON_SITELIBDIR%%/dns/rdataset.py -%%PYTHON_SITELIBDIR%%/dns/rdatatype.py -%%PYTHON_SITELIBDIR%%/dns/renderer.py -%%PYTHON_SITELIBDIR%%/dns/resolver.py -%%PYTHON_SITELIBDIR%%/dns/reversename.py -%%PYTHON_SITELIBDIR%%/dns/rrset.py -%%PYTHON_SITELIBDIR%%/dns/set.py -%%PYTHON_SITELIBDIR%%/dns/tokenizer.py -%%PYTHON_SITELIBDIR%%/dns/tsig.py -%%PYTHON_SITELIBDIR%%/dns/tsigkeyring.py -%%PYTHON_SITELIBDIR%%/dns/ttl.py -%%PYTHON_SITELIBDIR%%/dns/update.py -%%PYTHON_SITELIBDIR%%/dns/util.py -%%PYTHON_SITELIBDIR%%/dns/version.py -%%PYTHON_SITELIBDIR%%/dns/wiredata.py -%%PYTHON_SITELIBDIR%%/dns/zone.py -%%PYTHON_SITELIBDIR%%/dnspython-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info -%%PYTHON_SITELIBDIR%%/dns/rdtypes/__init__.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/dsbase.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/mxbase.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/nsbase.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/txtbase.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/__init__.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/A.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/AAAA.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/APL.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/DHCID.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/IPSECKEY.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/KX.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/NAPTR.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/NSAP.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/NSAP_PTR.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/PX.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/SRV.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/IN/WKS.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/__init__.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/AFSDB.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/CERT.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/CNAME.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DLV.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DNAME.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DNSKEY.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/DS.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/GPOS.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/HINFO.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/HIP.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/ISDN.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/LOC.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/MX.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NS.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NSEC.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NSEC3.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NSEC3PARAM.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/PTR.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/RP.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/RRSIG.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/RT.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SOA.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SPF.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SSHFP.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/TLSA.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/TXT.py -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/X25.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ddns.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/e164.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mx.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/name.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reverse.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reverse_name.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xfr.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zonediff.py -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -@dirrm %%PYTHON_SITELIBDIR%%/dns/rdtypes/IN -@dirrm %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY -@dirrm %%PYTHON_SITELIBDIR%%/dns/rdtypes -@dirrm %%PYTHON_SITELIBDIR%%/dns diff --git a/editors/zim/Makefile b/editors/zim/Makefile index 5460f066b047..943a05f319c0 100644 --- a/editors/zim/Makefile +++ b/editors/zim/Makefile @@ -64,7 +64,10 @@ RUN_DEPENDS+= ditaa:${PORTSDIR}/graphics/ditaa .endif post-patch: - @${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/setup.py + @${REINPLACE_CMD} \ + -e 's|share/man|man|' \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py @${REINPLACE_CMD} -e "s|decode('utf-8')|decode('utf-8','replace')|g" ${WRKSRC}/zim/utils.py post-install: diff --git a/games/balazarbrothers/Makefile b/games/balazarbrothers/Makefile index ad12c9742567..3169e827adf4 100644 --- a/games/balazarbrothers/Makefile +++ b/games/balazarbrothers/Makefile @@ -27,8 +27,13 @@ USE_GMAKE= yes PYDISTUTILS_PKGNAME= BalazarBrothers PYDISTUTILS_EGGINFODIR= ${PREFIX}/share +PYDISTUTILS_SETUP= ${PYSETUP} +PYDISTUTILS_NOEGGINFO= yes +PYDISTUTILS_INSTALLNOSINGLE= yes DATADIR= share/balazar_brothers +PLIST_SUB= PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} + OPTIONS_DEFINE= OPENAL OPTIONS_DEFAULT= OPENAL diff --git a/games/balazarbrothers/pkg-plist b/games/balazarbrothers/pkg-plist index 7477b8507367..41edd477bc26 100644 --- a/games/balazarbrothers/pkg-plist +++ b/games/balazarbrothers/pkg-plist @@ -367,6 +367,7 @@ bin/balazar_brothers %%DATADIR%%/worlds/scn-tree5.data %%DATADIR%%/worlds/sign_brother_surf.data %%DATADIR%%/worlds/sign_u_turn.data +share/%%PYDISTUTILS_EGGINFO%% @dirrm %%DATADIR%%/fonts @dirrm %%DATADIR%%/images @dirrm %%DATADIR%%/levels diff --git a/games/gnomesudoku/Makefile b/games/gnomesudoku/Makefile index d1e278835e99..ecc496dc5a2b 100644 --- a/games/gnomesudoku/Makefile +++ b/games/gnomesudoku/Makefile @@ -14,7 +14,7 @@ COMMENT= GNOME Sudoku game RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric \ ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging -USE_PYTHON= 2.5+ +USE_PYTHON= yes USE_PYDISTUTILS=yes USES= pathfix display USE_GNOME= gnomeprefix pygnome2 pygnomedesktop @@ -22,4 +22,10 @@ USE_GNOME= gnomeprefix pygnome2 pygnomedesktop PYDISTUTILS_PKGNAME= gnome-sudoku NO_STAGE= yes + + +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/tools/gsudoku_distutils.py .include diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile index 86604c25a1d4..825f12f38614 100644 --- a/graphics/py-soya3d/Makefile +++ b/graphics/py-soya3d/Makefile @@ -26,12 +26,14 @@ USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_OPENAL= al alut -USE_GL= glew +USE_GL= glew glu USE_GMAKE= yes USE_SDL= sdl PYDISTUTILS_PKGNAME= Soya +LDFLAGS+= -L${LOCALBASE}/lib -lGLU + MANDIR= ${WRKDIR}/${DISTNAME}/manpage/man1 MAN1= soya_editor.1 INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} diff --git a/japanese/tegaki-recognize/Makefile b/japanese/tegaki-recognize/Makefile index a87166cb15db..5a6bda1fc477 100644 --- a/japanese/tegaki-recognize/Makefile +++ b/japanese/tegaki-recognize/Makefile @@ -1,11 +1,6 @@ +# Created by: Timothy Beyer # $FreeBSD$ -# Date created: 15 Aug 2010 -# Whom: Timothy Beyer -# -# $FreeBSD$ -# - PORTNAME= tegaki PORTVERSION= 0.3.1.2 CATEGORIES= japanese python @@ -18,7 +13,7 @@ COMMENT= Open-Source Chinese and Japanese Handwriting Recognition LICENSE= GPLv2 -LIB_DEPENDS= zinnia.0:${PORTSDIR}/japanese/zinnia +LIB_DEPENDS= libzinnia.so:${PORTSDIR}/japanese/zinnia RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tegakigtk/recognizer.py:${PORTSDIR}/japanese/py-tegaki-gtk USE_PYTHON= -2.7 @@ -37,4 +32,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py + .include diff --git a/mail/postfix-policyd-spf-python/Makefile b/mail/postfix-policyd-spf-python/Makefile index 762699d1a2d2..3c624850b5d1 100644 --- a/mail/postfix-policyd-spf-python/Makefile +++ b/mail/postfix-policyd-spf-python/Makefile @@ -57,7 +57,7 @@ post-patch: do-install: @# Install data to an unused directory to ensure it doesn't pollute the system - @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} \ + @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} \ ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS} \ --install-data ${WRKDIR}/tmp-datadump-dir) ${INSTALL_MAN} ${WRKSRC}/policyd-spf.1 ${MANPREFIX}/man/man1 diff --git a/mail/svnmailer/Makefile b/mail/svnmailer/Makefile index 448a31009176..09a28a668c8d 100644 --- a/mail/svnmailer/Makefile +++ b/mail/svnmailer/Makefile @@ -31,7 +31,10 @@ PYDISTUTILS_INSTALLARGS+= --no-install-docs .endif post-patch: - @${REINPLACE_CMD} -e "1s|^.*|#!${PYTHON_CMD}|" ${WRKSRC}/setup.py + @${REINPLACE_CMD} \ + -e "1s|^.*|#!${PYTHON_CMD}|" \ + -e 's,distutils\.command import install ,setuptools\.command import install ,' \ + ${WRKSRC}/setup.py @${REINPLACE_CMD} -e "1s|^.*|#!${PYTHON_CMD}|" ${WRKSRC}/src/svn-mailer .include diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile index fc4345a40fcc..83f4859d7165 100644 --- a/math/py-numeric/Makefile +++ b/math/py-numeric/Makefile @@ -17,45 +17,19 @@ COMMENT= The Numeric Extension to Python USE_PYTHON= yes USE_PYDISTUTILS= yes -PYDISTUTILS_PKGNAME= Numeric -PYDISTUTILS_EGGINFODIR= ${PYTHONPREFIX_SITELIBDIR}/Numeric - -# PYDISTUTILS_NOEGGINFO is used as a temporary workaround to fix the plist -PYDISTUTILS_NOEGGINFO= yes +PYDISTUTILS_AUTOPLIST= yes WRKSRC= ${WRKDIR}/Numeric-${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/py-numeric EXAMPLESDIR= ${PREFIX}/share/examples/py-numeric +PORTDOCS= * +PORTEXAMPLES= * + +OPTIONS_DEFINE= DOCS EXAMPLES -NO_STAGE= yes .include -.if exists(${LOCALBASE}/bin/easy_install-${PYTHON_VER}) -# py-setuptools is installed - adjust pkg-plist to work with -# implicit usage in setup.py -EASY="" -NOTEASY="@comment " -.else -# py-setuptools is not installed - adjust pkg-plist -EASY="@comment " -NOTEASY="" -.endif - -# Adjusting pkg-plist gets weirder here. Python 2.5+ incorporates -# install_egg_info functionality into distutils, so if py-numeric -# is installed into a lesser Python version, make sure all egg-related -# pkg-plist entries are omitted -.if ${PYTHON_SUFFIX} < 25 -NOEGGINFO="@comment " -.else -NOEGGINFO="" -.endif - -PLIST_SUB+= EASY=${EASY} NOTEASY=${NOTEASY} \ - PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} \ - NOEGGINFO=${NOEGGINFO} - post-extract: @${CP} ${DISTDIR}/numpy.pdf ${WRKDIR} # @@ -64,18 +38,17 @@ post-extract: # the correct one, because if one has setuptools and another # doesn't, that could mess with how pkg-plist is constructed. # - @${REINPLACE_CMD} -e "s|/usr/bin/env python|/usr/bin/env python${PYTHON_VER}|" ${WRKSRC}/setup.py + @${REINPLACE_CMD} \ + -e "s|/usr/bin/env python|/usr/bin/env python${PYTHON_VER}|" \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py post-install: -.if !defined(NOPORTEXAMPLES) - @${INSTALL} -d ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${EXAMPLESDIR} - @${INSTALL} -d ${EXAMPLESDIR}/NumTut - ${INSTALL_DATA} ${WRKSRC}/Demo/NumTut/* ${EXAMPLESDIR}/NumTut -.endif -.if !defined(NOPORTDOCS) - @${INSTALL} -d ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/numpy.pdf ${DOCSDIR} -.endif + @${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${STAGEDIR}${EXAMPLESDIR} + @${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}/NumTut + ${INSTALL_DATA} ${WRKSRC}/Demo/NumTut/* ${STAGEDIR}${EXAMPLESDIR}/NumTut + @${INSTALL} -d ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/numpy.pdf ${STAGEDIR}${DOCSDIR} .include diff --git a/math/py-numeric/pkg-plist b/math/py-numeric/pkg-plist deleted file mode 100644 index 781163d16acf..000000000000 --- a/math/py-numeric/pkg-plist +++ /dev/null @@ -1,94 +0,0 @@ -%%PYTHON_INCLUDEDIR%%/Numeric/arrayobject.h -%%PYTHON_INCLUDEDIR%%/Numeric/f2c.h -%%PYTHON_INCLUDEDIR%%/Numeric/ranlib.h -%%PYTHON_INCLUDEDIR%%/Numeric/ufuncobject.h -%%PYTHON_SITELIBDIR%%/Numeric.pth -%%PYTHON_SITELIBDIR%%/Numeric/ArrayPrinter.py -%%PYTHON_SITELIBDIR%%/Numeric/ArrayPrinter.pyc -%%PYTHON_SITELIBDIR%%/Numeric/ArrayPrinter.pyo -%%PYTHON_SITELIBDIR%%/Numeric/FFT/FFT.py -%%PYTHON_SITELIBDIR%%/Numeric/FFT/FFT.pyc -%%PYTHON_SITELIBDIR%%/Numeric/FFT/FFT.pyo -%%PYTHON_SITELIBDIR%%/Numeric/FFT/__init__.py -%%PYTHON_SITELIBDIR%%/Numeric/FFT/__init__.pyc -%%PYTHON_SITELIBDIR%%/Numeric/FFT/__init__.pyo -%%PYTHON_SITELIBDIR%%/Numeric/FFT/fftpack.so -%%PYTHON_SITELIBDIR%%/Numeric/LinearAlgebra.py -%%PYTHON_SITELIBDIR%%/Numeric/LinearAlgebra.pyc -%%PYTHON_SITELIBDIR%%/Numeric/LinearAlgebra.pyo -%%PYTHON_SITELIBDIR%%/Numeric/MA/MA.py -%%PYTHON_SITELIBDIR%%/Numeric/MA/MA.pyc -%%PYTHON_SITELIBDIR%%/Numeric/MA/MA.pyo -%%PYTHON_SITELIBDIR%%/Numeric/MA/MA_version.py -%%PYTHON_SITELIBDIR%%/Numeric/MA/MA_version.pyc -%%PYTHON_SITELIBDIR%%/Numeric/MA/MA_version.pyo -%%PYTHON_SITELIBDIR%%/Numeric/MA/__init__.py -%%PYTHON_SITELIBDIR%%/Numeric/MA/__init__.pyc -%%PYTHON_SITELIBDIR%%/Numeric/MA/__init__.pyo -%%PYTHON_SITELIBDIR%%/Numeric/MLab.py -%%PYTHON_SITELIBDIR%%/Numeric/MLab.pyc -%%PYTHON_SITELIBDIR%%/Numeric/MLab.pyo -%%PYTHON_SITELIBDIR%%/Numeric/Matrix.py -%%PYTHON_SITELIBDIR%%/Numeric/Matrix.pyc -%%PYTHON_SITELIBDIR%%/Numeric/Matrix.pyo -%%NOEGGINFO%%%%NOTEASY%%%%PYTHON_SITELIBDIR%%/Numeric/%%PYDISTUTILS_EGGINFO%% -%%NOEGGINFO%%%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/%%PYDISTUTILS_EGGINFO%%/PKG-INFO -%%NOEGGINFO%%%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/%%PYDISTUTILS_EGGINFO%%/SOURCES.txt -%%NOEGGINFO%%%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/%%PYDISTUTILS_EGGINFO%%/dependency_links.txt -%%NOEGGINFO%%%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/%%PYDISTUTILS_EGGINFO%%/not-zip-safe -%%NOEGGINFO%%%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/%%PYDISTUTILS_EGGINFO%%/top_level.txt -%%PYTHON_SITELIBDIR%%/Numeric/Numeric.py -%%PYTHON_SITELIBDIR%%/Numeric/Numeric.pyc -%%PYTHON_SITELIBDIR%%/Numeric/Numeric.pyo -%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric/arrayobject.h -%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric/f2c.h -%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric/ranlib.h -%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric/ufuncobject.h -%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/__init__.py -%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/__init__.pyc -%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/__init__.pyo -%%PYTHON_SITELIBDIR%%/Numeric/Precision.py -%%PYTHON_SITELIBDIR%%/Numeric/Precision.pyc -%%PYTHON_SITELIBDIR%%/Numeric/Precision.pyo -%%PYTHON_SITELIBDIR%%/Numeric/RNG/RNG.so -%%PYTHON_SITELIBDIR%%/Numeric/RNG/Statistics.py -%%PYTHON_SITELIBDIR%%/Numeric/RNG/Statistics.pyc -%%PYTHON_SITELIBDIR%%/Numeric/RNG/Statistics.pyo -%%PYTHON_SITELIBDIR%%/Numeric/RNG/__init__.py -%%PYTHON_SITELIBDIR%%/Numeric/RNG/__init__.pyc -%%PYTHON_SITELIBDIR%%/Numeric/RNG/__init__.pyo -%%PYTHON_SITELIBDIR%%/Numeric/RandomArray.py -%%PYTHON_SITELIBDIR%%/Numeric/RandomArray.pyc -%%PYTHON_SITELIBDIR%%/Numeric/RandomArray.pyo -%%PYTHON_SITELIBDIR%%/Numeric/UserArray.py -%%PYTHON_SITELIBDIR%%/Numeric/UserArray.pyc -%%PYTHON_SITELIBDIR%%/Numeric/UserArray.pyo -%%PYTHON_SITELIBDIR%%/Numeric/_numpy.so -%%PYTHON_SITELIBDIR%%/Numeric/arrayfns.so -%%PYTHON_SITELIBDIR%%/Numeric/lapack_lite.so -%%PYTHON_SITELIBDIR%%/Numeric/multiarray.so -%%PYTHON_SITELIBDIR%%/Numeric/numeric_version.py -%%PYTHON_SITELIBDIR%%/Numeric/numeric_version.pyc -%%PYTHON_SITELIBDIR%%/Numeric/numeric_version.pyo -%%PYTHON_SITELIBDIR%%/Numeric/ranlib.so -%%PYTHON_SITELIBDIR%%/Numeric/umath.so -%%PORTDOCS%%%%DOCSDIR%%/numpy.pdf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/NumTut/__init__.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/NumTut/greece.pik -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/NumTut/mkpic.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/NumTut/testview.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/NumTut/view.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/life.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mandelbrot.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sieve.py -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/NumTut -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%PYTHON_SITELIBDIR%%/Numeric/RNG -%%EASY%%@dirrm %%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric -@dirrm %%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers -%%NOEGGINFO%%%%EASY%%@dirrm %%PYTHON_SITELIBDIR%%/Numeric/%%PYDISTUTILS_EGGINFO%% -@dirrm %%PYTHON_SITELIBDIR%%/Numeric/MA -@dirrm %%PYTHON_SITELIBDIR%%/Numeric/FFT -@dirrm %%PYTHON_SITELIBDIR%%/Numeric -@dirrm %%PYTHON_INCLUDEDIR%%/Numeric diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile index 94f6ff9dd209..d7f6f3f6b6e6 100644 --- a/multimedia/freevo/Makefile +++ b/multimedia/freevo/Makefile @@ -22,7 +22,6 @@ RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \ ${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 \ ${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \ ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \ - ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twisted \ ${PYTHON_SITELIBDIR}/Numeric/Numeric_headers/__init__.py:${PORTSDIR}/math/py-numeric FREEVO_USER= freevo @@ -40,8 +39,14 @@ SUB_LIST+= PYTHON_VERSION=${PYTHON_DEFAULT_VERSION} \ FREEVO_HOME=${FREEVO_HOME} SUB_FILES= pkg-message pkg-install pkg-deinstall +USES= twisted:web USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_INSTALLNOSINGLE= yes +PYDISTUTILS_NOEGGINFO= yes +PYDISTUTILS_SETUP= ${PYSETUP} + +PLIST_SUB= PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} USE_RC_SUBR= ${PORTNAME} RC_SCRIPT= ${PREFIX}/etc/rc.d/${PORTNAME} @@ -73,6 +78,9 @@ post-patch: ${WRKSRC}/src/www/htdocs/guidechannel.rpy.orig ${WRKSRC}/src/www/htdocs/proginfo.rpy.orig \ ${WRKSRC}/src/www/htdocs/vlcwin.rpy.orig +do-configure: + @${DO_NADA} + post-install: @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL ${MKDIR} ${CONFDIR} diff --git a/multimedia/freevo/pkg-plist b/multimedia/freevo/pkg-plist index ad0b5779c57d..37eccf9c105d 100644 --- a/multimedia/freevo/pkg-plist +++ b/multimedia/freevo/pkg-plist @@ -1074,6 +1074,7 @@ etc/freevo/local_conf.py.example %%PYTHON_SITELIBDIR%%/freevo/www/web_types.py %%PYTHON_SITELIBDIR%%/freevo/www/web_types.pyc %%PYTHON_SITELIBDIR%%/freevo/www/web_types.pyo +%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%% %%DOCSDIR%%/COPYING %%DOCSDIR%%/CREDITS %%DOCSDIR%%/ChangeLog diff --git a/multimedia/gaupol/Makefile b/multimedia/gaupol/Makefile index 5715ea5a794a..d4b3f91e8961 100644 --- a/multimedia/gaupol/Makefile +++ b/multimedia/gaupol/Makefile @@ -17,9 +17,10 @@ RUN_DEPENDS= iso-codes>=0:${PORTSDIR}/misc/iso-codes \ py*-chardet>=0:${PORTSDIR}/textproc/py-chardet \ py*-enchant>=1.5.1:${PORTSDIR}/textproc/py-enchant -USE_GNOME= pygtk2 desktopfileutils -USE_PYTHON= 2.6+ +USE_GNOME= pygtk2 +USE_PYTHON= yes USE_PYDISTUTILS=yes +USES= desktop-file-utils INSTALLS_ICONS= yes MAN1= ${PORTNAME}.1 @@ -35,6 +36,10 @@ PLIST_SUB+= NLS="@comment " .endif post-patch: - @${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py + @${REINPLACE_CMD} \ + -e 's|share/man|man|g' \ + -e 's,distutils\.command\.install$$,setuptools\.command\.install,g' \ + -e 's,distutils\.command\.install\.,setuptools\.command\.install\.,g' \ + ${WRKSRC}/setup.py .include diff --git a/net/py-ldaptor/Makefile b/net/py-ldaptor/Makefile index d98357531468..f0aabb88c892 100644 --- a/net/py-ldaptor/Makefile +++ b/net/py-ldaptor/Makefile @@ -21,6 +21,8 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGVERSION= 0.0.0 PYDISTUTILS_PKGNAME= ldaptor +PYDISTUTILS_INSTALL_TARGET= install_locale install +PYDISTUTILS_BUILD_TARGET= build_locale build NO_STAGE= yes .include diff --git a/net/py-ldaptor/files/patch-setup.py b/net/py-ldaptor/files/patch-setup.py new file mode 100644 index 000000000000..758ad1db1e06 --- /dev/null +++ b/net/py-ldaptor/files/patch-setup.py @@ -0,0 +1,10 @@ +--- setup.py.orig 2013-12-13 13:49:46.929425897 -0200 ++++ setup.py 2013-12-13 13:49:58.999423613 -0200 +@@ -154,7 +154,6 @@ + 'build_locale': build_locale, + 'clean': clean, + 'clean_locale': clean_locale, +- 'install': install, + 'install_locale': install_locale, + }, + diff --git a/science/veusz/Makefile b/science/veusz/Makefile index 3e3b51b74e06..88f8475163f9 100644 --- a/science/veusz/Makefile +++ b/science/veusz/Makefile @@ -22,4 +22,10 @@ USE_PYDISTUTILS= yes INSTALLS_EGGINFO= yes NO_STAGE= yes + +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py + .include diff --git a/security/umit/Makefile b/security/umit/Makefile index b960ed09afe3..8278244468ff 100644 --- a/security/umit/Makefile +++ b/security/umit/Makefile @@ -23,6 +23,9 @@ USE_PYDISTUTILS= yes NO_STAGE= yes post-patch: - ${REINPLACE_CMD} 's/self.build_html_doc()//' ${WRKSRC}/setup.py + ${REINPLACE_CMD} \ + -e 's/self.build_html_doc()//' \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py .include diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile index 008aa444c729..bafee9a12fa2 100644 --- a/security/zenmap/Makefile +++ b/security/zenmap/Makefile @@ -43,9 +43,13 @@ post-patch: @${REINPLACE_CMD} -e 's|su-to-zenmap.sh %F|su-to-zenmap.sh ${PORTNAME}|' \ ${WRKSRC}/install_scripts/unix/zenmap-root.desktop @${REINPLACE_CMD} \ - -e '/self.create_uninstaller/s|^|#|' ${WRKSRC}/setup.py + -e '/self.create_uninstaller/s|^|#|' \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py @${REINPLACE_CMD} \ - -e 's|share/man/man1|man/man1|' ${WRKSRC}/../ndiff/setup.py + -e 's|share/man/man1|man/man1|' \ + -e 's,"install": checked_install,,' \ + ${WRKSRC}/../ndiff/setup.py .if ! ${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -i '' '/locale_dir, mo_find, /d' ${WRKSRC}/setup.py .endif @@ -57,6 +61,6 @@ post-build: post-install: ${INSTALL_MAN} ${WRKSRC}/../docs/zenmap.1 ${MAN1PREFIX}/man/man1 @(cd ${WRKSRC}/../ndiff \ - && ${PYTHON_CMD} setup.py install --prefix ${PREFIX}) + && ${PYTHON_CMD} setup.py install --prefix=${PREFIX}) .include diff --git a/textproc/py-4suite-xml/Makefile b/textproc/py-4suite-xml/Makefile index 60214902cd16..67a65441bcf4 100644 --- a/textproc/py-4suite-xml/Makefile +++ b/textproc/py-4suite-xml/Makefile @@ -15,6 +15,8 @@ USE_BZIP2= yes REINPLACE_ARGS= -i "" -E USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_SETUP= ${PYSETUP} +PYDISTUTILS_NOEGGINFO= yes CONFLICTS= py*-4suite-[01]* @@ -31,7 +33,8 @@ LOCALEDIR= share/locale PLIST_SUB+= PACKAGE_DIR=Ft BINDIR=${BINDIR} SYSCONFDIR=${SYSCONFDIR} \ LIBDIR=${LIBDIR} LOCALSTATEDIR=${LOCALSTATEDIR} \ - DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} LOCALEDIR=${LOCALEDIR} + DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} LOCALEDIR=${LOCALEDIR} \ + PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} SUB_FILES= pkg-message SUB_LIST+= PACKAGE_DIR=Ft BINDIR=${BINDIR} SYSCONFDIR=${SYSCONFDIR} \ diff --git a/textproc/py-4suite-xml/pkg-plist b/textproc/py-4suite-xml/pkg-plist index 6993d383359f..835a63856afa 100644 --- a/textproc/py-4suite-xml/pkg-plist +++ b/textproc/py-4suite-xml/pkg-plist @@ -805,6 +805,7 @@ %%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/__config__.py %%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/__init__.py %%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/__init__.pyc +%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%% %%DATADIR%%/Data/Stylesheets/commandline.css %%DATADIR%%/Data/Stylesheets/commandline_html.xslt %%DATADIR%%/Data/Stylesheets/docbook_html-css.xslt diff --git a/textproc/pychm/Makefile b/textproc/pychm/Makefile index c3f6aff33f53..a6b483bfa08b 100644 --- a/textproc/pychm/Makefile +++ b/textproc/pychm/Makefile @@ -14,8 +14,10 @@ LIB_DEPENDS= chm.0:${PORTSDIR}/misc/chmlib NO_BUILD= yes USE_PYTHON= yes USE_PYDISTUTILS= yes -PYDISTUTILS_INSTALLARGS= build_ext -I${LOCALBASE}/include -L${LOCALBASE}/lib \ - install -c -O1 --prefix=${PREFIX} NO_STAGE= yes -.include +.include + +PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS} build_ext -I${LOCALBASE}/include -L${LOCALBASE}/lib + +.include diff --git a/www/py-prewikka/Makefile b/www/py-prewikka/Makefile index ab3fc07e998e..e2743f9f3ecc 100644 --- a/www/py-prewikka/Makefile +++ b/www/py-prewikka/Makefile @@ -11,13 +11,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Frontend for the Prelude IDS BUILD_DEPENDS= cheetah-compile:${PORTSDIR}/devel/py-cheetah -LIB_DEPENDS= prelude:${PORTSDIR}/security/libprelude \ - preludedb:${PORTSDIR}/security/libpreludedb +LIB_DEPENDS= libprelude.so:${PORTSDIR}/security/libprelude \ + libpreludedb.so:${PORTSDIR}/security/libpreludedb USE_PYTHON= -2.7 USE_PYDISTUTILS= yes -NO_STAGE= yes .include .if ${PORT_OPTIONS:MNLS} @@ -36,10 +35,4 @@ post-patch: ${WRKSRC}/setup.py .endif -post-install: - @if [ ! -f ${PREFIX}/etc/prewikka/prewikka.conf ]; then \ - ${CP} -p ${PREFIX}/etc/prewikka/prewikka.conf-dist \ - ${PREFIX}/etc/prewikka/prewikka.conf ; \ - fi - .include diff --git a/www/py-prewikka/files/patch-setup.py b/www/py-prewikka/files/patch-setup.py new file mode 100644 index 000000000000..bf85e5550f75 --- /dev/null +++ b/www/py-prewikka/files/patch-setup.py @@ -0,0 +1,15 @@ +--- setup.py.orig 2013-12-13 13:00:13.747424982 -0200 ++++ setup.py 2013-12-13 13:01:10.453423405 -0200 +@@ -27,9 +27,9 @@ + from distutils.dist import Distribution + from distutils.core import setup + from distutils.command.build import build +-from distutils.command.build_py import build_py +-from distutils.command.install import install +-from distutils.command.install_scripts import install_scripts ++from setuptools.command.build_py import build_py ++from setuptools.command.install import install ++from setuptools.command.install_scripts import install_scripts + from distutils.command.install_data import install_data + from distutils.core import Command + diff --git a/www/py-prewikka/pkg-plist b/www/py-prewikka/pkg-plist index 85dcbbd577de..223b8713bd75 100644 --- a/www/py-prewikka/pkg-plist +++ b/www/py-prewikka/pkg-plist @@ -236,6 +236,7 @@ etc/prewikka/prewikka.conf-dist %%DATADIR%%/htdocs/images/table_order_up.gif %%DATADIR%%/htdocs/js/functions.js %%DATADIR%%/htdocs/js/jquery.js +@exec mkdir -p %%DATADIR%%/htdocs/generated_images @dirrm %%DATADIR%%/htdocs/js @dirrm %%DATADIR%%/htdocs/images @dirrm %%DATADIR%%/htdocs/generated_images diff --git a/www/py-utidy/Makefile b/www/py-utidy/Makefile index b63ca869d035..d467d6bfd49b 100644 --- a/www/py-utidy/Makefile +++ b/www/py-utidy/Makefile @@ -19,7 +19,11 @@ LIB_DEPENDS= tidy-0.99.0:${PORTSDIR}/www/tidy-lib USE_ZIP= yes USE_PYTHON= -2.7 USE_PYDISTUTILS= yes -PYDISTUTILS_PKGNAME= uTidylib +PYDISTUTILS_AUTOPLIST= yes + +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py -NO_STAGE= yes .include diff --git a/www/py-utidy/pkg-plist b/www/py-utidy/pkg-plist deleted file mode 100644 index fd202ee825ec..000000000000 --- a/www/py-utidy/pkg-plist +++ /dev/null @@ -1,13 +0,0 @@ -%%PYTHON_SITELIBDIR%%/tidy/__init__.py -%%PYTHON_SITELIBDIR%%/tidy/__init__.pyc -%%PYTHON_SITELIBDIR%%/tidy/__init__.pyo -%%PYTHON_SITELIBDIR%%/tidy/error.py -%%PYTHON_SITELIBDIR%%/tidy/error.pyc -%%PYTHON_SITELIBDIR%%/tidy/error.pyo -%%PYTHON_SITELIBDIR%%/tidy/lib.py -%%PYTHON_SITELIBDIR%%/tidy/lib.pyc -%%PYTHON_SITELIBDIR%%/tidy/lib.pyo -%%PYTHON_SITELIBDIR%%/tidy/test_tidy.py -%%PYTHON_SITELIBDIR%%/tidy/test_tidy.pyc -%%PYTHON_SITELIBDIR%%/tidy/test_tidy.pyo -@dirrm %%PYTHON_SITELIBDIR%%/tidy diff --git a/www/trac-wysiwyg/Makefile b/www/trac-wysiwyg/Makefile index 787d1c514e90..a4adde4de3a1 100644 --- a/www/trac-wysiwyg/Makefile +++ b/www/trac-wysiwyg/Makefile @@ -19,7 +19,7 @@ USE_BZIP2= yes USE_PYTHON= -2.7 USE_PYDISTUTILS= easy_install PYDISTUTILS_PKGNAME= TracWysiwyg -PYDISTUTILS_PKGVERSION= 0.12.${PORTVERSION:R} +PYDISTUTILS_PKGVERSION= 0.12.0.4 PLIST_FILES= %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% NO_STAGE= yes diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile index 517dd972153a..b143c2f0795c 100644 --- a/x11-toolkits/py-fltk/Makefile +++ b/x11-toolkits/py-fltk/Makefile @@ -13,9 +13,9 @@ DISTNAME= pyFltk-${PORTVERSION:S/.b/b/} MAINTAINER= ports@FreeBSD.org COMMENT= Python interface to FLTK window toolkit -LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk +LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk -USE_PYTHON= 2.5+ +USE_PYTHON= yes USE_PYDISTUTILS= yes USE_XORG= x11 @@ -34,8 +34,7 @@ post-patch: post-build: ${REINPLACE_CMD} -e "s|\.\./docs|${DOCSDIR}/html|g" ${WRKSRC}/fltk/test/help.py -do-install: - @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} install ${PYDISTUTILS_INSTALLARGS}) +post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR}/html ${INSTALL_DATA} ${WRKSRC}/fltk/docs/*.html ${DOCSDIR}/html diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile index 39725471bceb..b20f0dffb873 100644 --- a/x11-toolkits/py-tkinter/Makefile +++ b/x11-toolkits/py-tkinter/Makefile @@ -25,12 +25,8 @@ DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo WRKSRC= ${PYTHON_WRKSRC}/Modules PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload -PYDISTUTILS_NOEGGINFO= yes -PYDISTUTILS_PKGNAME= Tkinter +PYDISTUTILS_AUTOPLIST= yes -PLIST_FILES= %%PYTHON_LIBDIR%%/lib-dynload/_tkinter.so - -NO_STAGE= yes .include post-extract: diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile index 22dba0c977c5..0d2d909ffe96 100644 --- a/x11-toolkits/py-wxPython26/Makefile +++ b/x11-toolkits/py-wxPython26/Makefile @@ -151,6 +151,7 @@ post-install: # fix installation permissions ${CHMOD} -R a+rX \ ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/${WX_PYTHON_DIR} + @${RM} -rf ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/${WX_PYTHON_DIR}/*egg-info .endif ## # wxversion wxPython available list diff --git a/x11-toolkits/py-wxPython26/files/patch-config.py b/x11-toolkits/py-wxPython26/files/patch-config.py new file mode 100644 index 000000000000..726c809bb852 --- /dev/null +++ b/x11-toolkits/py-wxPython26/files/patch-config.py @@ -0,0 +1,26 @@ +--- config.py.orig 2006-07-15 18:20:18.000000000 -0300 ++++ config.py 2013-12-13 11:41:13.788425136 -0200 +@@ -27,7 +27,7 @@ + from distutils.dep_util import newer + from distutils.spawn import spawn + +-import distutils.command.install ++import setuptools.command.install + import distutils.command.install_data + import distutils.command.install_headers + import distutils.command.clean +@@ -448,12 +448,12 @@ + + + +-class wx_install(distutils.command.install.install): ++class wx_install(setuptools.command.install.install): + """ + Turns off install_path_file + """ + def initialize_options(self): +- distutils.command.install.install.initialize_options(self) ++ setuptools.command.install.install.initialize_options(self) + self.install_path_file = 0 + + diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile index 85ca4d0951a0..abf71d47a3ee 100644 --- a/x11-toolkits/py-wxPython28/Makefile +++ b/x11-toolkits/py-wxPython28/Makefile @@ -27,7 +27,7 @@ PYDISTUTILS_BUILDARGS= \ WX_CONFIG="${WX_CONFIG}" \ WXPORT="${WXPORT}" PYDISTUTILS_CONFIGUREARGS= ${PYDISTUTILS_BUILDARGS} -PYDISTUTILS_NOEGGINFO= yes +PYDISTUTILS_EGGINFODIR= ${PYTHONPREFIX_SITELIBDIR}/${WX_PYTHON_DIR} USE_WX= 2.8 WX_COMPS= contrib WX_PREMK= yes @@ -138,7 +138,8 @@ post-install: ${CHMOD} -R a+rX \ ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/${WX_PYTHON_DIR} # Remove unwanted .egg-info - ${RM} ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/wxPython_common-*.egg-info + ${RM} -rf ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/wxPython_common-*.egg-info + ${RM} -rf ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/${WX_PYTHON_DIR}/*.egg-info .endif ## # wxversion wxPython available list diff --git a/x11-toolkits/py-wxPython28/files/patch-config.py b/x11-toolkits/py-wxPython28/files/patch-config.py new file mode 100644 index 000000000000..1783fdc2b502 --- /dev/null +++ b/x11-toolkits/py-wxPython28/files/patch-config.py @@ -0,0 +1,35 @@ +--- config.py.orig 2013-12-13 11:26:53.752427019 -0200 ++++ config.py 2013-12-13 11:28:04.575423576 -0200 +@@ -38,7 +38,7 @@ + from distutils.dep_util import newer + from distutils.spawn import spawn + +-import distutils.command.install ++import setuptools.command.install + import distutils.command.install_data + import distutils.command.install_headers + import distutils.command.clean +@@ -480,7 +480,7 @@ + # is used in our package build. If we detect that the current + # distutils does not have it then make sure that it is removed from + # the command-line options, otherwise the build will fail. +-for item in distutils.command.install.install.user_options: ++for item in setuptools.command.install.install.user_options: + if item[0] == 'install-layout=': + break + else: +@@ -491,12 +491,12 @@ + + + +-class wx_install(distutils.command.install.install): ++class wx_install(setuptools.command.install.install): + """ + Turns off install_path_file + """ + def initialize_options(self): +- distutils.command.install.install.initialize_options(self) ++ setuptools.command.install.install.initialize_options(self) + self.install_path_file = 0 + + diff --git a/x11-toolkits/py-wxPython28/pkg-plist b/x11-toolkits/py-wxPython28/pkg-plist index d2d834c6fd57..4cffd6c61a4c 100644 --- a/x11-toolkits/py-wxPython28/pkg-plist +++ b/x11-toolkits/py-wxPython28/pkg-plist @@ -2146,7 +2146,6 @@ %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/xrc.py %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/xrc.pyc %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/xrc.pyo -%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython-2.8.12.1-py%%PYTHON_VER%%.egg-info %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/__init__.py %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/__init__.pyc %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/__init__.pyo diff --git a/x11/hotwire-shell/files/patch-hotwire__ui_renderers_file.py b/x11/hotwire-shell/files/patch-hotwire__ui_renderers_file.py index e38cdf95547d..9d6b772e1cd0 100644 --- a/x11/hotwire-shell/files/patch-hotwire__ui_renderers_file.py +++ b/x11/hotwire-shell/files/patch-hotwire__ui_renderers_file.py @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- hotwire_ui/renderers/file.py.orig +++ hotwire_ui/renderers/file.py @@ -245,7 +245,10 @@ diff --git a/x11/hotwire-shell/files/patch-setup.py b/x11/hotwire-shell/files/patch-setup.py index 227c1847df07..d2ad452cc933 100644 --- a/x11/hotwire-shell/files/patch-setup.py +++ b/x11/hotwire-shell/files/patch-setup.py @@ -1,14 +1,10 @@ - -$FreeBSD$ - ---- setup.py.orig -+++ setup.py -@@ -103,7 +103,7 @@ - if os.name == 'posix': +--- setup.py.orig 2008-03-23 16:15:12.000000000 -0300 ++++ setup.py 2013-12-13 11:36:29.526423229 -0200 +@@ -104,7 +104,6 @@ if self.root is None: print "Running gtk-update-icon-cache" -- subprocess.call(['gtk-update-icon-cache', os.path.join(self.install_data, 'icons')]) -+ subprocess.call(['gtk-update-icon-cache', os.path.join(self.install_data, 'share', 'icons', 'hicolor')]) - kwargs['cmdclass']['install'] = HotInstall + subprocess.call(['gtk-update-icon-cache', os.path.join(self.install_data, 'icons')]) +-kwargs['cmdclass']['install'] = HotInstall setup(name='hotwire', + version=__version__, diff --git a/x11/terminator/Makefile b/x11/terminator/Makefile index 09b559df7abf..939832d901b1 100644 --- a/x11/terminator/Makefile +++ b/x11/terminator/Makefile @@ -21,7 +21,7 @@ OPTIONS_DEFINE= NLS GCONF GCONF_DESC= Use GNOME Terminal settings OPTIONS_DEFAULT= NLS GCONF -USE_PYTHON= 2.5+ +USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= Terminator @@ -42,7 +42,7 @@ PYSETUP+= --without-gettext .include -PYSETUP+= --without-icon-cache +PYDISTUTILS_SETUP+= --without-icon-cache .if ${PORT_OPTIONS:MGCONF} USE_GNOME+= pygnome2