diff options
103 files changed, 1218 insertions, 631 deletions
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk index 046ccf3a64d6..a48cba2a8fe4 100644 --- a/Mk/bsd.python.mk +++ b/Mk/bsd.python.mk @@ -83,9 +83,9 @@ Python_Include_MAINTAINER= python@FreeBSD.org # # PYTHON_DEFAULT_VERSION # - Version of the default python binary in your ${PATH}, in -# the format "python2.5". Set this in your /etc/make.conf +# the format "python2.6". Set this in your /etc/make.conf # in case you want to use an older version as a default. -# default: python2.5 +# default: python2.6 # # PYTHON_WRKSRC - The ${WRKSRC} for your python version. Needed for # extensions like Tkinter, py-gdbm and py-expat, which @@ -213,8 +213,8 @@ Python_Include_MAINTAINER= python@FreeBSD.org # specific version of zope. # -_PYTHON_PORTBRANCH= 2.5 -_PYTHON_ALLBRANCHES= 2.5 2.6 2.4 2.3 3.0 # preferred first +_PYTHON_PORTBRANCH= 2.6 +_PYTHON_ALLBRANCHES= 2.6 2.5 2.4 2.3 3.0 # preferred first _ZOPE_PORTBRANCH= 2.7 _ZOPE_ALLBRANCHES= 2.7 2.8 2.9 2.10 3.2 @@ -379,9 +379,9 @@ PYTHON_VER= 3.0 # Python-2.6 .elif ${PYTHON_VERSION} == "python2.6" -PYTHON_PORTVERSION?=2.6.1 +PYTHON_PORTVERSION?=2.6.2 PYTHON_PORTSDIR= ${PORTSDIR}/lang/python26 -PYTHON_REL= 261 +PYTHON_REL= 262 PYTHON_SUFFIX= 26 PYTHON_VER= 2.6 @@ -425,8 +425,8 @@ check-makevars:: @${ECHO} "Legal values are:" @${ECHO} " python2.3" @${ECHO} " python2.4" - @${ECHO} " python2.5 (default)" - @${ECHO} " python2.6" + @${ECHO} " python2.5" + @${ECHO} " python2.6 (default)" @${ECHO} " python3.0" @${FALSE} .endif @@ -6,6 +6,35 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20090608: + AFFECTS: users of lang/python* and py-* + AUTHOR: miwi@FreeBSD.org + + The default version of Python has been changed from 2.5.x to 2.6.x. + If you have 2.5.x installed, perform an upgrade of lang/python25 to + lang/python26 with one of the following commands like: + + # portupgrade -o lang/python26 lang/python25 + # portmaster -o lang/python26 lang/python25 + + If you want to remain 2.5.x as default Python version, set the + PYTHON_DEFAULT_VERSION variable to 'python2.5' without quotes in + make.conf, then go to lang/python and perform one of the following + commands: + + # portupgrade -R python + # portmaster -r python\* + + Once the installed Python has been updated to 2.6, by using one of the + methods above, it is required to run the upgrade-site-packages target in + lang/python to assure that site-packages are made available to the new Python + version. + + # cd /usr/ports/lang/python && make upgrade-site-packages + + This Makefile target requires ports-mgmt/portupgrade to be installed. + For portmaster users, please setting PORTUPGRADE_CMD to portmaster. + 20090606: AFFECTS: users of java/eclipse AUTHOR: glewis@FreeBSD.org diff --git a/biology/pymol/Makefile b/biology/pymol/Makefile index 4de0aacb983b..8d428956fe93 100644 --- a/biology/pymol/Makefile +++ b/biology/pymol/Makefile @@ -6,7 +6,7 @@ PORTNAME= pymol PORTVERSION= 1.0r2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= biology python MASTER_SITES= ${MASTER_SITE_LOCAL:S|%SUBDIR%|maho/pymol|} @@ -23,6 +23,7 @@ WRKSRC= ${WRKDIR}/pymol-${PORTVERSION} USE_GL= glut USE_GMAKE= yes USE_PYTHON= yes +PLIST_SUB= PYTHON_VER=${PYTHON_VER} pre-build: @${REINPLACE_CMD} -e "s+%%LOCALBASE%%+${LOCALBASE}+" ${WRKSRC}/setup.py diff --git a/biology/pymol/pkg-plist b/biology/pymol/pkg-plist index a92b916da244..c3075955864a 100644 --- a/biology/pymol/pkg-plist +++ b/biology/pymol/pkg-plist @@ -124,7 +124,6 @@ bin/pymol %%PYTHON_SITELIBDIR%%/pymol/completing.pyc %%PYTHON_SITELIBDIR%%/pymol/externing.pyc %%PYTHON_SITELIBDIR%%/pymol/preset.pyc -%%PYTHON_SITELIBDIR%%/pymol/api.pyc %%PYTHON_SITELIBDIR%%/pymol/parsing.pyc %%PYTHON_SITELIBDIR%%/pymol/menu.pyc %%PYTHON_SITELIBDIR%%/pymol/fitting.pyc @@ -571,7 +570,7 @@ bin/pymol %%PYTHON_SITELIBDIR%%/pymol/pymol_path/examples/package/redhat/pymol-0.96-1.rh90.py22.spec %%PYTHON_SITELIBDIR%%/pymol/pymol_path/examples/package/redhat/pymol-0.96-1.rh73.py22.spec %%PYTHON_SITELIBDIR%%/pymol/pymol_path/LICENSE -%%PYTHON_SITELIBDIR%%/pymol-1.0.0-py2.5.egg-info +%%PYTHON_SITELIBDIR%%/pymol-1.0.0-py%%PYTHON_VER%%.egg-info %%PYTHON_SITELIBDIR%%/chempy/cpv.py %%PYTHON_SITELIBDIR%%/chempy/xyz.py %%PYTHON_SITELIBDIR%%/chempy/__init__.py @@ -628,7 +627,6 @@ bin/pymol %%PYTHON_SITELIBDIR%%/chempy/champ/formal_charges.pyc %%PYTHON_SITELIBDIR%%/chempy/champ/assign.pyc %%PYTHON_SITELIBDIR%%/chempy/fast/__init__.py -%%PYTHON_SITELIBDIR%%/chempy/fast/__init__.pyc %%PYTHON_SITELIBDIR%%/chempy/fragments/__init__.py %%PYTHON_SITELIBDIR%%/chempy/fragments/__init__.pyc %%PYTHON_SITELIBDIR%%/chempy/tinker/__init__.py diff --git a/cad/pythoncad/Makefile b/cad/pythoncad/Makefile index 02c8c7e90c72..2af346e446a9 100644 --- a/cad/pythoncad/Makefile +++ b/cad/pythoncad/Makefile @@ -8,7 +8,7 @@ PORTNAME= pythoncad PORTVERSION= 36 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= http://www.pythoncad.org/releases/ DISTNAME= PythonCAD-DS1-R${PORTVERSION} diff --git a/cad/pythoncad/pkg-plist b/cad/pythoncad/pkg-plist index a00943a53aec..41d355a5a724 100644 --- a/cad/pythoncad/pkg-plist +++ b/cad/pythoncad/pkg-plist @@ -32,6 +32,7 @@ bin/gtkpycad %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/keywords.py %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/layer.py %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/leader.py +%%PYTHON_SITELIBDIR%%/PythonCAD/Generic/leader.pyc %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/linetype.py %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/logger.py %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/maptree.py @@ -92,8 +93,6 @@ bin/gtkpycad %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/imageio.pyc %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/intersections.pyc %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/keywords.pyc -%%PYTHON_SITELIBDIR%%/PythonCAD/Generic/layer.pyc -%%PYTHON_SITELIBDIR%%/PythonCAD/Generic/leader.pyc %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/linetype.pyc %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/logger.pyc %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/maptree.pyc @@ -154,7 +153,6 @@ bin/gtkpycad %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/imageio.pyo %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/intersections.pyo %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/keywords.pyo -%%PYTHON_SITELIBDIR%%/PythonCAD/Generic/layer.pyo %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/leader.pyo %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/linetype.pyo %%PYTHON_SITELIBDIR%%/PythonCAD/Generic/logger.pyo diff --git a/databases/gadfly/Makefile b/databases/gadfly/Makefile index 48b1347749da..82637a50a5a1 100644 --- a/databases/gadfly/Makefile +++ b/databases/gadfly/Makefile @@ -7,7 +7,7 @@ PORTNAME= gadfly PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= SF diff --git a/databases/gadfly/pkg-plist b/databases/gadfly/pkg-plist index 045a2c81abb9..502a064efd84 100644 --- a/databases/gadfly/pkg-plist +++ b/databases/gadfly/pkg-plist @@ -4,8 +4,6 @@ bin/gfserver %%PYTHON_SITELIBDIR%%/gadfly/__init__.pyc %%PYTHON_SITELIBDIR%%/gadfly/__init__.pyo %%PYTHON_SITELIBDIR%%/gadfly/bindings.py -%%PYTHON_SITELIBDIR%%/gadfly/bindings.pyc -%%PYTHON_SITELIBDIR%%/gadfly/bindings.pyo %%PYTHON_SITELIBDIR%%/gadfly/client.py %%PYTHON_SITELIBDIR%%/gadfly/client.pyc %%PYTHON_SITELIBDIR%%/gadfly/client.pyo diff --git a/databases/skytools/Makefile b/databases/skytools/Makefile index 607c2ffdcea8..deee584b201b 100644 --- a/databases/skytools/Makefile +++ b/databases/skytools/Makefile @@ -7,6 +7,7 @@ PORTNAME= skytools PORTVERSION= 2.1.7 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://pgfoundry.org/frs/download.php/1813/ diff --git a/databases/skytools/pkg-plist b/databases/skytools/pkg-plist index cf2920d67bc0..d3eae70055d3 100644 --- a/databases/skytools/pkg-plist +++ b/databases/skytools/pkg-plist @@ -39,7 +39,6 @@ bin/walmgr.py %%PYTHON_SITELIBDIR%%/pgq/producer.py %%PYTHON_SITELIBDIR%%/pgq/producer.pyc %%PYTHON_SITELIBDIR%%/pgq/status.py -%%PYTHON_SITELIBDIR%%/pgq/status.pyc %%PYTHON_SITELIBDIR%%/pgq/ticker.py %%PYTHON_SITELIBDIR%%/pgq/ticker.pyc %%PYTHON_SITELIBDIR%%/skytools/__init__.py diff --git a/databases/zodb3/Makefile b/databases/zodb3/Makefile index dca3dba9c116..aac9c457c862 100644 --- a/databases/zodb3/Makefile +++ b/databases/zodb3/Makefile @@ -7,6 +7,7 @@ PORTNAME= zodb PORTVERSION= 3.6.0 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://www.zope.org/Products/ZODB3.6/ZODB%20${PORTVERSION}/ PKGNAMESUFFIX= -py${PYTHON_SUFFIX} diff --git a/databases/zodb3/pkg-plist b/databases/zodb3/pkg-plist index eda9a09a536b..75a616bb4c7e 100644 --- a/databases/zodb3/pkg-plist +++ b/databases/zodb3/pkg-plist @@ -817,8 +817,6 @@ bin/zodbload.py %%PYTHON_SITELIBDIR%%/zope/interface/_flatten.pyo %%PYTHON_SITELIBDIR%%/zope/interface/_zope_interface_coptimizations.so %%PYTHON_SITELIBDIR%%/zope/interface/adapter.py -%%PYTHON_SITELIBDIR%%/zope/interface/adapter.pyc -%%PYTHON_SITELIBDIR%%/zope/interface/adapter.pyo %%PYTHON_SITELIBDIR%%/zope/interface/adapter.txt %%PYTHON_SITELIBDIR%%/zope/interface/advice.py %%PYTHON_SITELIBDIR%%/zope/interface/advice.pyc diff --git a/deskutils/libopensync-plugin-python-devel/Makefile b/deskutils/libopensync-plugin-python-devel/Makefile index 54a2817cd1de..9aa66f56ef27 100644 --- a/deskutils/libopensync-plugin-python-devel/Makefile +++ b/deskutils/libopensync-plugin-python-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= libopensync-plugin-python PORTVERSION= 0.36 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= http://www.opensync.org/download/releases/${PORTVERSION}/ PKGNAMESUFFIX= -devel @@ -21,10 +21,24 @@ CONFLICTS= libopensync-plugin-python-0.2* USE_BZIP2= yes USE_CMAKE= yes -CMAKE_ARGS+= -Wno-dev +USE_PYTHON= yes +USE_GNOME= pkgconfig +CMAKE_ARGS+= -Wno-dev \ + -DPYTHON_INCLUDE_PATH:PATH=${PYTHON_INCLUDEDIR} \ + -DPYTHON_LIBRARY:PATH=${PYTHON_LIBDIR}/config/lib${PYTHON_VERSION}.so + +# This hack is meant to respect PREFIX, and should be +# enhanced to use pkg-config or cmake. +OS_PLUGIN_DIR= ${PREFIX}/lib/opensync-1.0/plugins +OS_PYPLUGIN_DIR=${PREFIX}/lib/opensync-1.0/python-plugins pre-patch: @${REINPLACE_CMD} -e "s|MESSAGE|# MESSAGE|" \ ${WRKSRC}/cmake/modules/MacroEnsureOutOfSourceBuild.cmake +do-install: + ${MKDIR} -p ${OS_PLUGIN_DIR} ${OS_PYPLUGIN_DIR} + ${INSTALL_DATA} ${WRKSRC}/src/python-module.so ${OS_PLUGIN_DIR} + ${INSTALL_DATA} ${WRKSRC}/src/sample.py ${OS_PYPLUGIN_DIR} + .include <bsd.port.mk> diff --git a/devel/aap/Makefile b/devel/aap/Makefile index 651029e5e41d..4028e654c3e7 100644 --- a/devel/aap/Makefile +++ b/devel/aap/Makefile @@ -7,6 +7,7 @@ PORTNAME= aap PORTVERSION= 1.090 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= a-a-p @@ -29,6 +30,12 @@ FULLDOCS=yes FULLDOCS=no .endif +.include <bsd.port.pre.mk> + +.if ${PYTHON_VER} >= 2.5 +EXTRA_PATCHES= ${FILESDIR}/extra-Sign.py +.endif + do-install: @cd ${WRKSRC} && \ ${PYTHON_CMD} ./aap PREFIX="${PREFIX}" FULLDOCS=${FULLDOCS} \ @@ -41,4 +48,4 @@ test: install x-generate-plist: (${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX}|${SED} -E 's,.*share/nls/.+$$,,g;s,${PORTVERSION},%%PORTVERSION%%,g;s,^(lib/aap/Exec-%%PORTVERSION%%/doc/),%%PORTDOCS%%\1,g;s,^share/doc/aap/.*,,g'|${TR} -s '\n') > temp-pkg-plist -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/aap/files/extra-Sign.py b/devel/aap/files/extra-Sign.py new file mode 100644 index 000000000000..18c12c39725a --- /dev/null +++ b/devel/aap/files/extra-Sign.py @@ -0,0 +1,40 @@ +--- Sign.py.orig 2009-05-27 14:09:55.000000000 +0200 ++++ Sign.py 2009-05-27 14:13:27.000000000 +0200 +@@ -11,7 +11,7 @@ + import os + import os.path + import string +-import md5 ++import hashlib + import time + + from Util import * +@@ -272,7 +272,7 @@ + + try: + f = open(fname, "rb") +- m = md5.new() ++ m = hashlib.md5() + while 1: + # Read big blocks at a time for speed, but don't read the whole + # file at once to reduce memory usage. +@@ -301,7 +301,7 @@ + % fname) + str(e)) + return "unknown" + +- m = md5.new() ++ m = hashlib.md5() + + inquote = 0 + incomment = 0 +@@ -404,7 +404,9 @@ + + def buildcheckstr2sign(str): + """Compute a signature from a string for the buildcheck.""" +- return hexdigest(md5.new(str)) ++ m = hashlib.md5() ++ m.update(str) ++ return hexdigest(m) + + + def _sign_lookup(signatures, name, key): diff --git a/devel/aap/files/patch-Filetype.py b/devel/aap/files/patch-Filetype.py new file mode 100644 index 000000000000..4fa4f1f71f23 --- /dev/null +++ b/devel/aap/files/patch-Filetype.py @@ -0,0 +1,35 @@ +--- Filetype.py.orig 2009-05-14 15:19:42.000000000 +0200 ++++ Filetype.py 2009-05-14 15:20:50.000000000 +0200 +@@ -1414,12 +1414,12 @@ + rline = items[1] + rline_len = len(rline) + # isolate first argument, which may be in quotes +- as = 0 +- if as < rline_len: +- if rline[as] == '"' or rline[as] == "'": +- quote = rline[as] +- as = as + 1 +- ae = as ++ vas = 0 ++ if vas < rline_len: ++ if rline[vas] == '"' or rline[vas] == "'": ++ quote = rline[vas] ++ vas = vas + 1 ++ ae = vas + while ae < rline_len and rline[ae] != quote: + ae = ae + 1 + if ae == rline_len: +@@ -1427,11 +1427,11 @@ + % (line_idx + recipe_line_nr, line)) + n = ae + 1 + else: +- ae = as ++ ae = vas + while ae < rline_len and rline[ae] != ' ' and rline[ae] != '\t': + ae = ae + 1 + n = ae +- arg1 = rline[as:ae] ++ arg1 = rline[vas:ae] + else: + arg1 = '' + n = rline_len diff --git a/devel/gaphor/Makefile b/devel/gaphor/Makefile index 1594517d8c1e..2134bc585957 100644 --- a/devel/gaphor/Makefile +++ b/devel/gaphor/Makefile @@ -7,7 +7,7 @@ PORTNAME= gaphor PORTVERSION= 0.9.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/devel/gaphor/pkg-plist b/devel/gaphor/pkg-plist index 889706f35c91..e481d87df5c2 100644 --- a/devel/gaphor/pkg-plist +++ b/devel/gaphor/pkg-plist @@ -442,8 +442,6 @@ bin/gaphorconvert %%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/request.pyc %%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/request.pyo %%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_adapter.py -%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_adapter.pyc -%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_adapter.pyo %%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_api.py %%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_api.pyc %%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_api.pyo @@ -502,8 +500,6 @@ bin/gaphorconvert %%PYTHON_SITELIBDIR%%/zope/interface/_flatten.pyc %%PYTHON_SITELIBDIR%%/zope/interface/_flatten.pyo %%PYTHON_SITELIBDIR%%/zope/interface/adapter.py -%%PYTHON_SITELIBDIR%%/zope/interface/adapter.pyc -%%PYTHON_SITELIBDIR%%/zope/interface/adapter.pyo %%PYTHON_SITELIBDIR%%/zope/interface/advice.py %%PYTHON_SITELIBDIR%%/zope/interface/advice.pyc %%PYTHON_SITELIBDIR%%/zope/interface/advice.pyo diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile index 2be8637047ea..0513a16e9003 100644 --- a/devel/libopensync/Makefile +++ b/devel/libopensync/Makefile @@ -7,7 +7,7 @@ PORTNAME= libopensync PORTVERSION= 0.36 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.opensync.org/download/releases/${PORTVERSION}/ @@ -27,6 +27,7 @@ CMAKE_USE_PTHREAD= yes USE_GNOME= glib20 libxml2 USE_PYTHON= yes USE_LDCONFIG= yes +CMAKE_ARGS+= -DPYTHON_INCLUDE_PATH:PATH=${PYTHON_INCLUDEDIR} .include <bsd.port.pre.mk> diff --git a/devel/libopensync/pkg-plist b/devel/libopensync/pkg-plist index 12aca52e90ec..d0fd11f6f8ac 100644 --- a/devel/libopensync/pkg-plist +++ b/devel/libopensync/pkg-plist @@ -85,8 +85,6 @@ share/opensync-1.0/cmake/modules/OpenSyncPackaging.cmake share/opensync-1.0/cmake/modules/OpenSyncTesting.cmake share/opensync-1.0/cmake/modules/OpenSyncPlugin.cmake share/opensync-1.0/cmake/modules/OpenSyncInternal.cmake -%%PYTHON_SITELIBDIR%%/_opensync.so -%%PYTHON_SITELIBDIR%%/opensync.py @dirrm share/opensync-1.0/schemas @dirrm share/opensync-1.0/descriptions @dirrm share/opensync-1.0/cmake/modules diff --git a/devel/nx/Makefile b/devel/nx/Makefile index b6d7521798a5..bc818173bfa8 100644 --- a/devel/nx/Makefile +++ b/devel/nx/Makefile @@ -8,6 +8,7 @@ PORTNAME= nx PORTVERSION= 0.37 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://networkx.lanl.gov/download/networkx/ DISTNAME= networkx-${PORTVERSION} @@ -27,6 +28,7 @@ USE_PYTHON= 2.3+ USE_PYDISTUTILS= easy_install PYDISTUTILS_PKGNAME= networkx PORTDOCS= * +PLIST_SUB= PYTHON_VER=${PYTHON_VER} post-install: .ifndef(NOPORTDOCS) diff --git a/devel/nx/pkg-plist b/devel/nx/pkg-plist index 9930a6e59bf5..2ddc3ad30a6f 100644 --- a/devel/nx/pkg-plist +++ b/devel/nx/pkg-plist @@ -1,250 +1,250 @@ -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/__init__.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/centrality.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cliques.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cluster.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/component.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/convert.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cores.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/dag.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/digraph.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/distance.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/exception.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/function.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/graph.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/hybrid.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/info.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/isomorph.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/isomorphvf2.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/matching.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/operators.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/path.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/release.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/search.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/spectrum.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tree.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/threshold.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/ubigraph.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/utils.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/xdigraph.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/xgraph.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/__init__.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/centrality.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cliques.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cluster.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/component.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/convert.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cores.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/dag.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/digraph.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/distance.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/exception.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/function.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/graph.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/hybrid.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/info.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/isomorph.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/isomorphvf2.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/matching.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/__init__.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/layout.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_agraph.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_pydot.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_pylab.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_vtk.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/__init__.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/layout.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_agraph.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_pydot.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_pylab.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_vtk.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/__init__.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/layout.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_agraph.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_pydot.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_pylab.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_vtk.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/operators.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/path.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/release.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/search.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/spectrum.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tree.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/threshold.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/ubigraph.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/utils.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/xdigraph.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/xgraph.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/__init__.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/atlas.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/bipartite.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/classic.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/degree_seq.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/directed.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/geometric.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/random_graphs.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/small.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/__init__.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/atlas.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/bipartite.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/classic.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/degree_seq.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/directed.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/geometric.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/random_graphs.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/small.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/__init__.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/atlas.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/bipartite.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/classic.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/degree_seq.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/directed.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/geometric.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/random_graphs.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/small.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/__init__.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/adjlist.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/edgelist.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/gml.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/gpickle.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/graphml.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/leda.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/nx_yaml.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/p2g.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/pajek.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/sparsegraph6.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/__init__.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/adjlist.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/edgelist.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/gml.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/gpickle.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/graphml.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/leda.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/nx_yaml.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/p2g.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/pajek.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/sparsegraph6.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/__init__.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/adjlist.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/edgelist.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/gml.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/gpickle.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/graphml.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/leda.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/nx_yaml.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/p2g.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/pajek.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/sparsegraph6.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/__init__.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/benchmark.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/test.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/centrality.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/cliques.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/cluster.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/component.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/convert.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/convert_numpy.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/convert_scipy.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/cores.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/dag.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/digraph_DiGraph.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/distance.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/exception.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/forest.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/function.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/graph_Graph.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/hybrid.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/isomorph.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/isomorphvf2.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/__init__.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/layout.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/nx_agraph.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/nx_pydot.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/nx_pygraphviz.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/nx_pylab.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/__init__.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/__init__.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/matching.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/operators.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/search.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/shortest_path.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/spectrum.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/threshold.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/tree.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/utils.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/xdigraph_XDiGraph.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/xgraph_XGraph.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/xgraph_XGraph_multiedges_selfloops.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/__init__.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/benchmark.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/test.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/__init__.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/atlas.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/bipartite.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/classic.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/degree_seq.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/directed.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/geometric.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/random_graphs.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/small.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/__init__.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/__init__.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/__init__.py -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/adjlist.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/edgelist.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/gml.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/gpickle.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/graphml.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/leda.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/nx_yaml.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/p2g.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/pajek.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/sparsegraph6.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/__init__.pyc -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/__init__.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/__init__.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/benchmark.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/test.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/__init__.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/centrality.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cliques.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cluster.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/component.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/convert.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cores.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/dag.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/digraph.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/distance.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/exception.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/function.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/graph.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/hybrid.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/info.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/isomorph.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/isomorphvf2.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/matching.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/operators.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/path.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/release.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/search.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/spectrum.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tree.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/threshold.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/ubigraph.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/utils.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/xdigraph.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/xgraph.pyo -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/EGG-INFO/PKG-INFO -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/EGG-INFO/SOURCES.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/EGG-INFO/dependency_links.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/EGG-INFO/top_level.txt -%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/EGG-INFO/not-zip-safe -@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite -@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators -@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing -@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests -@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite -@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators -@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing -@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx -@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/EGG-INFO -@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg +%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.6.egg/networkx/__init__.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/centrality.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cliques.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cluster.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/component.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/convert.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cores.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/dag.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/digraph.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/distance.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/exception.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/function.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/graph.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/hybrid.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/info.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/isomorph.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/isomorphvf2.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/matching.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/operators.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/path.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/release.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/search.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/spectrum.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tree.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/threshold.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/ubigraph.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/utils.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/xdigraph.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/xgraph.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/__init__.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/centrality.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cliques.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cluster.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/component.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/convert.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cores.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/dag.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/digraph.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/distance.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/exception.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/function.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/graph.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/hybrid.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/info.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/isomorph.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/isomorphvf2.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/matching.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/__init__.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/layout.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_agraph.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_pydot.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_pylab.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_vtk.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/__init__.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/layout.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_agraph.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_pydot.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_pylab.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_vtk.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/__init__.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/layout.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_agraph.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_pydot.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_pylab.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_vtk.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/operators.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/path.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/release.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/search.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/spectrum.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tree.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/threshold.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/ubigraph.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/utils.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/xdigraph.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/xgraph.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/__init__.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/atlas.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/bipartite.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/classic.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/degree_seq.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/directed.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/geometric.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/random_graphs.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/small.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/__init__.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/atlas.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/bipartite.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/classic.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/degree_seq.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/directed.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/geometric.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/random_graphs.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/small.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/__init__.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/atlas.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/bipartite.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/classic.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/degree_seq.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/directed.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/geometric.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/random_graphs.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/small.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/__init__.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/adjlist.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/edgelist.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/gml.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/gpickle.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/graphml.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/leda.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/nx_yaml.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/p2g.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/pajek.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/sparsegraph6.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/__init__.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/adjlist.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/edgelist.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/gml.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/gpickle.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/graphml.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/leda.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/nx_yaml.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/p2g.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/pajek.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/sparsegraph6.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/__init__.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/adjlist.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/edgelist.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/gml.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/gpickle.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/graphml.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/leda.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/nx_yaml.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/p2g.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/pajek.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/sparsegraph6.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/__init__.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/benchmark.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/test.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/centrality.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/cliques.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/cluster.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/component.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/convert.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/convert_numpy.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/convert_scipy.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/cores.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/dag.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/digraph_DiGraph.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/distance.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/exception.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/forest.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/function.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/graph_Graph.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/hybrid.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/isomorph.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/isomorphvf2.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/__init__.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/layout.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/nx_agraph.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/nx_pydot.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/nx_pygraphviz.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/nx_pylab.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/__init__.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/__init__.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/matching.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/operators.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/search.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/shortest_path.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/spectrum.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/threshold.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/tree.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/utils.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/xdigraph_XDiGraph.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/xgraph_XGraph.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/xgraph_XGraph_multiedges_selfloops.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/__init__.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/benchmark.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/test.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/__init__.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/atlas.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/bipartite.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/classic.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/degree_seq.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/directed.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/geometric.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/random_graphs.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/small.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/__init__.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/__init__.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/__init__.py +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/adjlist.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/edgelist.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/gml.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/gpickle.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/graphml.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/leda.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/nx_yaml.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/p2g.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/pajek.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/sparsegraph6.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/__init__.pyc +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/__init__.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/__init__.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/benchmark.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/test.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/__init__.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/centrality.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cliques.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cluster.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/component.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/convert.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cores.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/dag.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/digraph.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/distance.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/exception.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/function.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/graph.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/hybrid.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/info.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/isomorph.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/isomorphvf2.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/matching.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/operators.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/path.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/release.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/search.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/spectrum.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tree.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/threshold.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/ubigraph.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/utils.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/xdigraph.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/xgraph.pyo +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/EGG-INFO/PKG-INFO +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/EGG-INFO/SOURCES.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/EGG-INFO/dependency_links.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/EGG-INFO/top_level.txt +%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/EGG-INFO/not-zip-safe +@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite +@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators +@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing +@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests +@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite +@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators +@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing +@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx +@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/EGG-INFO +@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg diff --git a/devel/py-parsing/Makefile b/devel/py-parsing/Makefile index d8cdfcd7b203..d785cc208f3d 100644 --- a/devel/py-parsing/Makefile +++ b/devel/py-parsing/Makefile @@ -7,6 +7,7 @@ PORTNAME= parsing PORTVERSION= 1.5.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= SF/pyparsing PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-parsing/pkg-plist b/devel/py-parsing/pkg-plist index 38d1c30a6d4c..cf09e6bf32c9 100644 --- a/devel/py-parsing/pkg-plist +++ b/devel/py-parsing/pkg-plist @@ -2,6 +2,8 @@ %%PYTHON_SITELIBDIR%%/pyparsing.pyc %%PYTHON_SITELIBDIR%%/pyparsing.pyo %%PYTHON_SITELIBDIR%%/pyparsing_py3.py +%%PYTHON_SITELIBDIR%%/pyparsing_py3.pyc +%%PYTHON_SITELIBDIR%%/pyparsing_py3.pyo %%PORTDOCS%%%%DOCSDIR%%/api-objects.txt %%PORTDOCS%%%%DOCSDIR%%/class-tree.html %%PORTDOCS%%%%DOCSDIR%%/crarr.png diff --git a/devel/py-pmock/Makefile b/devel/py-pmock/Makefile index 8cec085b759e..88346b3aed61 100644 --- a/devel/py-pmock/Makefile +++ b/devel/py-pmock/Makefile @@ -6,6 +6,7 @@ PORTNAME= pmock PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= pmock diff --git a/devel/py-pmock/pkg-plist b/devel/py-pmock/pkg-plist index d0111c4553ba..d8a072047f08 100644 --- a/devel/py-pmock/pkg-plist +++ b/devel/py-pmock/pkg-plist @@ -1,6 +1,4 @@ %%PYTHON_SITELIBDIR%%/pmock.py -%%PYTHON_SITELIBDIR%%/pmock.pyc -%%PYTHON_SITELIBDIR%%/pmock.pyo %%PORTDOCS%%%%EXAMPLESDIR%%/errors.py %%PORTDOCS%%%%EXAMPLESDIR%%/greeting.py %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% diff --git a/devel/py-ruledispatch/Makefile b/devel/py-ruledispatch/Makefile index f35f7a8cc967..544beecb8f23 100644 --- a/devel/py-ruledispatch/Makefile +++ b/devel/py-ruledispatch/Makefile @@ -7,6 +7,7 @@ PORTNAME= RuleDispatch PORTVERSION= 0.5.a1.r2506 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= http://nivi.interfree.it/distfiles/${PORTNAME}/ \ http://peak.telecommunity.com/snapshots/ diff --git a/devel/py-ruledispatch/files/patch-src-dispatch___init__.py b/devel/py-ruledispatch/files/patch-src-dispatch___init__.py new file mode 100644 index 000000000000..58ce9f28ffd6 --- /dev/null +++ b/devel/py-ruledispatch/files/patch-src-dispatch___init__.py @@ -0,0 +1,20 @@ +--- src/dispatch/__init__.py.orig 2009-05-14 22:55:09.000000000 +0200 ++++ src/dispatch/__init__.py 2009-05-14 22:55:45.000000000 +0200 +@@ -95,7 +95,7 @@ + return decorate_assignment(callback) + + +-def as(*decorators): ++def fas(*decorators): + """Use Python 2.4 decorators w/Python 2.2+ + + Example: +@@ -103,7 +103,7 @@ + import dispatch + + class Foo(object): +- [dispatch.as(classmethod)] ++ [dispatch.fas(classmethod)] + def something(cls,etc): + \"""This is a classmethod\""" + """ diff --git a/devel/py-ruledispatch/files/patch-src-dispatch_predicates.py b/devel/py-ruledispatch/files/patch-src-dispatch_predicates.py new file mode 100644 index 000000000000..645e1a10157b --- /dev/null +++ b/devel/py-ruledispatch/files/patch-src-dispatch_predicates.py @@ -0,0 +1,29 @@ +--- src/dispatch/predicates.py.orig 2009-05-14 22:55:57.000000000 +0200 ++++ src/dispatch/predicates.py 2009-05-14 22:56:15.000000000 +0200 +@@ -236,7 +236,7 @@ + + return or_, (EXPR_GETTER_ID,) + +- [as(classmethod)] ++ [fas(classmethod)] + def immediate(klass,seq): + for item in seq: + if item: +@@ -260,7 +260,7 @@ + + return and_, (EXPR_GETTER_ID,) + +- [as(classmethod)] ++ [fas(classmethod)] + def immediate(klass,seq): + for item in seq: + if not item: +@@ -278,7 +278,7 @@ + return get(argIds[2]) + return ifelse, (EXPR_GETTER_ID,) + +- [as(classmethod)] ++ [fas(classmethod)] + def immediate(klass,seq): + if seq[1]: return seq[0] + return seq[2] diff --git a/devel/py-shapely/Makefile b/devel/py-shapely/Makefile index 9d84fc6246c1..7b6d704dd0e8 100644 --- a/devel/py-shapely/Makefile +++ b/devel/py-shapely/Makefile @@ -17,7 +17,7 @@ COMMENT= Python Package for Manipulation 2D Geospatial Geometry LIB_DEPENDS= geos_c.6:${PORTSDIR}/graphics/geos -USE_PYTHON= 2.5 +USE_PYTHON= 2.5+ USE_PYDISTUTILS= easy_install .include <bsd.port.mk> diff --git a/devel/py-simpleparse/Makefile b/devel/py-simpleparse/Makefile index 16d80d56b82a..8d12073e963e 100644 --- a/devel/py-simpleparse/Makefile +++ b/devel/py-simpleparse/Makefile @@ -8,6 +8,7 @@ PORTNAME= simpleparse PORTVERSION= 2.1.0.a1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/devel/py-simpleparse/pkg-plist b/devel/py-simpleparse/pkg-plist index 14c53e3dd060..2d9efea7d2d3 100644 --- a/devel/py-simpleparse/pkg-plist +++ b/devel/py-simpleparse/pkg-plist @@ -53,9 +53,7 @@ %%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/mxTextTools/mxTextTools.so %%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/mxTextTools/__init__.pyc %%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/mxTextTools/__init__.pyo -%%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/TextTools.pyc %%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/__init__.pyc -%%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/TextTools.pyo %%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/__init__.pyo %%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/LICENSE %%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/README diff --git a/devel/py-ydbf/Makefile b/devel/py-ydbf/Makefile index 310ea394a6eb..407b490517ff 100644 --- a/devel/py-ydbf/Makefile +++ b/devel/py-ydbf/Makefile @@ -15,12 +15,12 @@ DISTNAME= YDbf-0.0.1dev-20080514 MAINTAINER= andrey.polyakov@unix.net COMMENT= Yelded DBF reader/writer for Python -BUILD_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools - -PLIST_FILES= lib/${PYTHON_VERSION}/site-packages/YDbf-0.0.1dev_20080514-py2.5.egg +PLIST_FILES= ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PYEASYINSTALL_EGG} USE_PYTHON= yes -USE_PYDISTUTILS= yes +USE_PYDISTUTILS= easy_install PYDISTUTILS_NOEGGINFO= yes +PYDISTUTILS_PKGNAME= YDbf +PYDISTUTILS_PKGVERSION= 0.0.1dev_20080514 .include <bsd.port.mk> diff --git a/devel/pyrex/Makefile b/devel/pyrex/Makefile index fea3fa7c6218..d8c1bac5223f 100644 --- a/devel/pyrex/Makefile +++ b/devel/pyrex/Makefile @@ -7,6 +7,7 @@ PORTNAME= pyrex PORTVERSION= 0.9.8.5 +PORTREVISION= 1 CATEGORIES= devel lang python MASTER_SITES= http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/ PKGNAMEPREFIX= ${PYTHONPKGNAMEPREFIX} diff --git a/devel/pyrex/files/patch-Pyrex-Compiler_Errors.py b/devel/pyrex/files/patch-Pyrex-Compiler_Errors.py new file mode 100644 index 000000000000..23218766ec99 --- /dev/null +++ b/devel/pyrex/files/patch-Pyrex-Compiler_Errors.py @@ -0,0 +1,11 @@ +--- Pyrex/Compiler/Errors.py.orig 2009-05-18 12:29:49.000000000 +0200 ++++ Pyrex/Compiler/Errors.py 2009-05-18 12:32:21.000000000 +0200 +@@ -14,7 +14,7 @@ + + def __init__(self, position = None, message = ""): + self.position = position +- self.message = message ++ self._message = message + if position: + pos_str = "%s:%d:%d: " % position + else: diff --git a/devel/zeroinstall-injector/Makefile b/devel/zeroinstall-injector/Makefile index e95a312b271e..0f518b75c9ee 100644 --- a/devel/zeroinstall-injector/Makefile +++ b/devel/zeroinstall-injector/Makefile @@ -7,6 +7,7 @@ PORTNAME= zeroinstall-injector PORTVERSION= 0.39 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= SF MASTER_SITE_SUBDIR=zero-install @@ -22,6 +23,7 @@ RUN_DEPENDS+= lzma:${PORTSDIR}/archivers/lzma USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS=yes +PLIST_SUB= PYTHON_VER=${PYTHON_VER} MAN1= 0launch.1 0alias.1 0store.1 0store-secure-add.1 0desktop.1 diff --git a/devel/zeroinstall-injector/pkg-plist b/devel/zeroinstall-injector/pkg-plist index 9ed01801eecc..f7699cdf5dc9 100644 --- a/devel/zeroinstall-injector/pkg-plist +++ b/devel/zeroinstall-injector/pkg-plist @@ -182,7 +182,7 @@ etc/xdg/menus/applications-merged/zeroinstall.menu %%PYTHON_SITELIBDIR%%/zeroinstall/zerostore/unpack.py %%PYTHON_SITELIBDIR%%/zeroinstall/zerostore/unpack.pyc %%PYTHON_SITELIBDIR%%/zeroinstall/zerostore/unpack.pyo -%%PYTHON_SITELIBDIR%%/zeroinstall_injector-0.39-py2.5.egg-info +%%PYTHON_SITELIBDIR%%/zeroinstall_injector-0.39-py%%PYTHON_VER%%.egg-info share/applications/zeroinstall-add.desktop share/applications/zeroinstall-manage.desktop share/desktop-directories/zeroinstall.directory diff --git a/graphics/imgseek/Makefile b/graphics/imgseek/Makefile index 548a7a8a762f..e5f58179e295 100644 --- a/graphics/imgseek/Makefile +++ b/graphics/imgseek/Makefile @@ -7,7 +7,7 @@ PORTNAME= imgSeek PORTVERSION= 0.8.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SFE diff --git a/graphics/imgseek/pkg-plist b/graphics/imgseek/pkg-plist index a00ae77a04f1..7eede168ae96 100644 --- a/graphics/imgseek/pkg-plist +++ b/graphics/imgseek/pkg-plist @@ -64,8 +64,6 @@ bin/imgSeekCmd %%PYTHON_SITELIBDIR%%/imgSeekLib/MetaWnd.pyc %%PYTHON_SITELIBDIR%%/imgSeekLib/MetaWnd.pyo %%PYTHON_SITELIBDIR%%/imgSeekLib/RenameForm.py -%%PYTHON_SITELIBDIR%%/imgSeekLib/RenameForm.pyc -%%PYTHON_SITELIBDIR%%/imgSeekLib/RenameForm.pyo %%PYTHON_SITELIBDIR%%/imgSeekLib/RenameWiz.py %%PYTHON_SITELIBDIR%%/imgSeekLib/RenameWiz.pyc %%PYTHON_SITELIBDIR%%/imgSeekLib/RenameWiz.pyo diff --git a/graphics/py-cgkit/Makefile b/graphics/py-cgkit/Makefile index aad73b2eac00..2bf673248a67 100644 --- a/graphics/py-cgkit/Makefile +++ b/graphics/py-cgkit/Makefile @@ -8,7 +8,7 @@ PORTNAME= cgkit PORTVERSION= 2.0.0a7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/graphics/py-cgkit/pkg-plist b/graphics/py-cgkit/pkg-plist index ae3d25f609bc..4efcd2930ada 100644 --- a/graphics/py-cgkit/pkg-plist +++ b/graphics/py-cgkit/pkg-plist @@ -165,8 +165,6 @@ bin/viewer.py %%PYTHON_SITELIBDIR%%/cgkit/expression.pyc %%PYTHON_SITELIBDIR%%/cgkit/expression.pyo %%PYTHON_SITELIBDIR%%/cgkit/flockofbirds.py -%%PYTHON_SITELIBDIR%%/cgkit/flockofbirds.pyc -%%PYTHON_SITELIBDIR%%/cgkit/flockofbirds.pyo %%PYTHON_SITELIBDIR%%/cgkit/fob.py %%PYTHON_SITELIBDIR%%/cgkit/fob.pyc %%PYTHON_SITELIBDIR%%/cgkit/fob.pyo diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile index b3ca245a668f..3479a7c4f285 100644 --- a/lang/python-doc-html/Makefile +++ b/lang/python-doc-html/Makefile @@ -30,24 +30,24 @@ DOCFORMAT?= html .if ${PYTHON_REL} < 260 .if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf-a4" && ${DOCFORMAT} != "pdf-letter" && ${DOCFORMAT} != "postscript-a4" && ${DOCFORMAT} != "postscript-letter" -.BEGIN: - @${ECHO} "ERROR: invalid value for DOCFORMAT: \"${DOCFORMAT}\"" - @${ECHO} "Possible values are: html, pdf-a4, pdf-letter," - @${ECHO} "postscript-a4, postscript-letter." - @${FALSE} +IGNORE= invalid value for DOCFORMAT: "${DOCFORMAT}", possible values are: html, pdf-a4, pdf-letter, postscript-a4, postscript-letter .endif .else # ${PYTHON_REL} >= 260 -.if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf-a4" && ${DOCFORMAT} != "pdf-letter" -.BEGIN: - @${ECHO} "ERROR: invalid value for DOCFORMAT: \"${DOCFORMAT}\"" - @${ECHO} "Possible values are: html, pdf-a4, pdf-letter." - @${FALSE} +.if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf-a4" && ${DOCFORMAT} != "pdf-letter" && ${DOCFORMAT} != "text" +IGNORE= invalid value for DOCFORMAT: "${DOCFORMAT}", possible values are: text, html, pdf-a4, pdf-letter .endif +.if ${PYTHON_REL} < 260 DISTNAME= python-docs-${DOCFORMAT} +.else +DISTNAME= python-${PORTVERSION}-docs-${DOCFORMAT} +.endif DIST_SUBDIR= python${PYTHON_REL} + .if ${DOCFORMAT} == "html" WRKSRC= ${WRKDIR}/${DISTNAME} +.elif ${DOCFORMAT} == "text" +WRKSRC= ${WRKDIR}/${DISTNAME} .else WRKSRC= ${WRKDIR}/docs-pdf .endif # ${DOCSFORMAT} == "html" @@ -64,6 +64,6 @@ pre-install: do-install: @${MKDIR} ${DOCDIR} - @${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${DOCDIR} -xf - + @${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${DOCDIR} -xf - .include <bsd.port.post.mk> diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo index c3130e2004c5..131598080ca1 100644 --- a/lang/python-doc-html/distinfo +++ b/lang/python-doc-html/distinfo @@ -117,9 +117,15 @@ MD5 (python/postscript-letter-2.5.tar.bz2) = 9f5aaba82f37fce8435c2bcc9886e2bf MD5 (python260/python-docs-html.tar.bz2) = cfcd4b9b00ba1e7496b5d823692370a4 MD5 (python260/python-docs-pdf-a4.tar.bz2) = d5e1fd4e178887d2b42a619da15bfcbd MD5 (python260/python-docs-pdf-letter.tar.bz2) = 7b7ee0c4fe014eaa14862a1a4c71701e +MD5 (python260/python-docs-text.tar.bz2) = e2d4dea9a16b150327f5e80413dbc41e MD5 (python261/python-docs-html.tar.bz2) = 269233817c4275f32c4163fa5883514b MD5 (python261/python-docs-pdf-a4.tar.bz2) = 7b5359211bf6fc986b0b6ed42c8a15e5 MD5 (python261/python-docs-pdf-letter.tar.bz2) = 3519a319ab0b14df186991ac101b246c +MD5 (python261/python-docs-text.tar.bz2) = 0786ef8140a2a0f4a22aef2fa7e53ad1 +MD5 (python262/python-2.6.2-docs-html.tar.bz2) = 15a2dac727692e4ff8fe92958d4e633c +MD5 (python262/python-2.6.2-docs-pdf-a4.tar.bz2) = 42a2cccfea5b8623ddd210a95fa5f6fa +MD5 (python262/python-2.6.2-docs-pdf-letter.tar.bz2) = b3b522bbd2d5c3330814fabc66c76f75 +MD5 (python262/python-2.6.2-docs-text.tar.bz2) = 86630b32c2df6af25d9cb03678e2d8d1 SHA256 (python/html-2.0.1.tar.bz2) = d42308dda686cc3a27f11d93bdb05c400f4754f51c8e9734435a3b600ea0689e SHA256 (python/html-2.0.tar.bz2) = 0462f3ba3cea3867be268232e974e2de3b641a6408045ee7bfe94b790c973e1b SHA256 (python/html-2.1.1.tar.bz2) = 4694db0306f86b76a1a9fd92c20abf896950c3334e6ca736bb37e6cdb624fb96 @@ -239,9 +245,15 @@ SHA256 (python/postscript-letter-2.5.tar.bz2) = c2be9ac9cca88cebb2f48b4cc467f6d4 SHA256 (python260/python-docs-html.tar.bz2) = e9c39e51fc19c6ec367f41cd47c0831bc1e4f4c6d615dccfd37337cd7843ae0a SHA256 (python260/python-docs-pdf-a4.tar.bz2) = efddc99e33933c6ca898551db9252592fd0a3f18904f53a5b0c0d41d4de393a4 SHA256 (python260/python-docs-pdf-letter.tar.bz2) = a3bc9b18b2a77fdd73c2779632324e6c83e5c56472dfd80ba60714073b963887 +SHA256 (python260/python-docs-text.tar.bz2) = 72607230bbb1e4cabb171a469031abcc8251384324d22e1c077008505f77983b SHA256 (python261/python-docs-html.tar.bz2) = 941015c02b15a9e94f228f4c9df745a00295d6a3e05362ed4b39f45f771756bc SHA256 (python261/python-docs-pdf-a4.tar.bz2) = dc7c505509a26e03f276b8b5602fe488a37a02529ccc1cc75305fc611934883d SHA256 (python261/python-docs-pdf-letter.tar.bz2) = f61492f6064efadc06c1fcbb2e8c96036fc6c41d892720bc40b28d1bf271eb19 +SHA256 (python261/python-docs-text.tar.bz2) = ada6830413c1aca87d6c1b87c1aa2704f80b49b5ebfe28a499ec84ec661ea4f7 +SHA256 (python262/python-2.6.2-docs-html.tar.bz2) = 63f844a24155536eaeb2cede72bba5a4b4a404d790e52e210e374360840817aa +SHA256 (python262/python-2.6.2-docs-pdf-a4.tar.bz2) = a40d6ffb0ffbe9f3ace1d28559a96beb19218f2e5fa366c66dd42520b18bdc27 +SHA256 (python262/python-2.6.2-docs-pdf-letter.tar.bz2) = 20409bd1e33930be17b1a0d7fb5e098641be10c252b68bcac3205efa5aa21ef2 +SHA256 (python262/python-2.6.2-docs-text.tar.bz2) = f7d8c6aaece010bfaf374322cc782816fffe232f7fb440f34f585adfd6e94b04 SIZE (python/html-2.0.1.tar.bz2) = 704567 SIZE (python/html-2.0.tar.bz2) = 699404 SIZE (python/html-2.1.1.tar.bz2) = 792096 @@ -360,6 +372,12 @@ SIZE (python/postscript-letter-2.5.tar.bz2) = 1813655 SIZE (python260/python-docs-html.tar.bz2) = 3445776 SIZE (python260/python-docs-pdf-a4.tar.bz2) = 8804548 SIZE (python260/python-docs-pdf-letter.tar.bz2) = 8847332 +SIZE (python260/python-docs-text.tar.bz2) = 1212751 SIZE (python261/python-docs-html.tar.bz2) = 3669921 SIZE (python261/python-docs-pdf-a4.tar.bz2) = 8599690 SIZE (python261/python-docs-pdf-letter.tar.bz2) = 8644103 +SIZE (python261/python-docs-text.tar.bz2) = 1275822 +SIZE (python262/python-2.6.2-docs-html.tar.bz2) = 3660453 +SIZE (python262/python-2.6.2-docs-pdf-a4.tar.bz2) = 8589380 +SIZE (python262/python-2.6.2-docs-pdf-letter.tar.bz2) = 8626189 +SIZE (python262/python-2.6.2-docs-text.tar.bz2) = 1297095 diff --git a/lang/python/distinfo b/lang/python/distinfo index 3ee527e0090f..1289b492d8d2 100644 --- a/lang/python/distinfo +++ b/lang/python/distinfo @@ -26,6 +26,7 @@ MD5 (python/Python-2.5.4.tgz) = ad47b23778f64edadaaa8b5534986eed MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95 MD5 (python/Python-2.6.tgz) = d16d29a77db2cd3af882a591f431a403 MD5 (python/Python-2.6.1.tgz) = 52b3d421f42bacfdcaf55f56c0ff9be4 +MD5 (python/Python-2.6.2.tgz) = 60e64fe55eb4e23abdd4d77fdad08c3d MD5 (python/Python-3.0.tgz) = ac1d8aa55bd6d04232cd96abfa445ac4 MD5 (python/Python-3.0.1.tgz) = 220b73f0a1a20c4b1cdf9f9db4cd52fe SHA256 (python/Python-2.1.1.tgz) = 6a5455b2ab72642feffc060a04e8ea543de2d0671a3f9c335b52f2e1e41edc5f @@ -56,6 +57,7 @@ SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee92322 SHA256 (python/Python-2.6.tgz) = 7c2f21a968a737a59ed0729f4b1dc154dc3aa183c20be96055186fe43c6742d0 SHA256 (python/Python-2.5.4.tgz) = 3d3b205611ee503a38a9433d5645a571668420bb219242c7f51af85f05664da6 SHA256 (python/Python-2.6.1.tgz) = fb65e93678e1327e3e8559cc56e1e00ed8c07162b21287a3502677892c5c515c +SHA256 (python/Python-2.6.2.tgz) = e37ecdf249f248f4fea227adbca09c778670b64fcb5e45947ec3e093cbc12c86 SHA256 (python/Python-3.0.tgz) = 4d5d6ab2f893144a382ae1ea1de88a7825eb98111e26cfde627b9f3d9fd462b4 SHA256 (python/Python-3.0.1.tgz) = 7d5f2feae9035f1d3d9e6bb7f092dbf374d6bb4b25abd0d2d11f13bba1cb04de SIZE (python/Python-2.1.1.tgz) = 6187808 @@ -85,6 +87,7 @@ SIZE (python/Python-2.5.2.tgz) = 11583114 SIZE (python/Python-2.5.tgz) = 11019675 SIZE (python/Python-2.6.tgz) = 13023860 SIZE (python/Python-2.6.1.tgz) = 13046455 +SIZE (python/Python-2.6.2.tgz) = 13281177 SIZE (python/Python-2.5.4.tgz) = 11604497 SIZE (python/Python-3.0.tgz) = 11191348 SIZE (python/Python-3.0.1.tgz) = 11258272 diff --git a/lang/python23/Makefile b/lang/python23/Makefile index b01cee877452..4212063fe6e0 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -23,6 +23,7 @@ CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" USE_LDCONFIG= yes INSTALL_TARGET= altinstall +MAKE_JOBS_SAFE= yes MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 1fc6ef5ef260..80c45a90a5a0 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -23,6 +23,7 @@ CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" USE_LDCONFIG= yes INSTALL_TARGET= altinstall +MAKE_JOBS_SAFE= yes MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes diff --git a/lang/python25/Makefile b/lang/python25/Makefile index bba457978abf..4d17a756badd 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -24,6 +24,7 @@ CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" USE_LDCONFIG= yes INSTALL_TARGET= altinstall +MAKE_JOBS_SAFE= yes MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes diff --git a/lang/python26/Makefile b/lang/python26/Makefile index f1c4fd4179c2..f5af28376c72 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python26 -PORTVERSION= 2.6.1 -PORTREVISION= 2 +PORTVERSION= 2.6.2 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -23,6 +22,7 @@ CONFIGURE_SCRIPT= ../configure # must be relative CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" USE_LDCONFIG= yes +MAKE_JOBS_SAFE= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 diff --git a/lang/python26/distinfo b/lang/python26/distinfo index 9873696d2db4..508577e84313 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,3 +1,3 @@ -MD5 (python/Python-2.6.1.tgz) = 52b3d421f42bacfdcaf55f56c0ff9be4 -SHA256 (python/Python-2.6.1.tgz) = fb65e93678e1327e3e8559cc56e1e00ed8c07162b21287a3502677892c5c515c -SIZE (python/Python-2.6.1.tgz) = 13046455 +MD5 (python/Python-2.6.2.tgz) = 60e64fe55eb4e23abdd4d77fdad08c3d +SHA256 (python/Python-2.6.2.tgz) = e37ecdf249f248f4fea227adbca09c778670b64fcb5e45947ec3e093cbc12c86 +SIZE (python/Python-2.6.2.tgz) = 13281177 diff --git a/lang/python26/files/patch-Python2.6-Lib_local.py b/lang/python26/files/patch-Python2.6-Lib_local.py new file mode 100644 index 000000000000..63e722f38839 --- /dev/null +++ b/lang/python26/files/patch-Python2.6-Lib_local.py @@ -0,0 +1,11 @@ +--- Lib/locale.py.foo 2009-05-11 22:57:00.000000000 +0200 ++++ Lib/locale.py 2009-05-11 22:57:23.000000000 +0200 +@@ -601,7 +601,7 @@ + 'tactis': 'TACTIS', + 'euc_jp': 'eucJP', + 'euc_kr': 'eucKR', +- 'utf_8': 'UTF8', ++ 'utf_8': 'UTF-8', + 'koi8_r': 'KOI8-R', + 'koi8_u': 'KOI8-U', + # XXX This list is still incomplete. If you know more diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist index d671d39276de..0159a76637c5 100644 --- a/lang/python26/pkg-plist +++ b/lang/python26/pkg-plist @@ -342,12 +342,17 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/distutils/tests/test_build_ext.py %%PYTHON_LIBDIR%%/distutils/tests/test_build_py.py %%PYTHON_LIBDIR%%/distutils/tests/test_build_scripts.py +%%PYTHON_LIBDIR%%/distutils/tests/test_bdist_wininst.py %%PYTHON_LIBDIR%%/distutils/tests/test_config.py %%PYTHON_LIBDIR%%/distutils/tests/test_core.py +%%PYTHON_LIBDIR%%/distutils/tests/test_filelist.py %%PYTHON_LIBDIR%%/distutils/tests/test_dist.py %%PYTHON_LIBDIR%%/distutils/tests/test_install.py %%PYTHON_LIBDIR%%/distutils/tests/test_install_scripts.py +%%PYTHON_LIBDIR%%/distutils/tests/test_msvc9compiler.py %%PYTHON_LIBDIR%%/distutils/tests/test_sysconfig.py +%%PYTHON_LIBDIR%%/distutils/tests/test_sdist.py +%%PYTHON_LIBDIR%%/distutils/tests/test_register.py %%PYTHON_LIBDIR%%/distutils/tests/test_upload.py %%PYTHON_LIBDIR%%/distutils/tests/test_versionpredicate.py %%PYTHON_LIBDIR%%/distutils/text_file.py @@ -685,9 +690,9 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/json/tool.py %%PYTHON_LIBDIR%%/keyword.py %%PYTHON_LIBDIR%%/lib2to3/Grammar.txt -%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.1.final.0.pickle +%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.2.final.0.pickle %%PYTHON_LIBDIR%%/lib2to3/PatternGrammar.txt -%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.1.final.0.pickle +%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.2.final.0.pickle %%PYTHON_LIBDIR%%/lib2to3/__init__.py %%PYTHON_LIBDIR%%/lib2to3/fixer_base.py %%PYTHON_LIBDIR%%/lib2to3/fixer_util.py @@ -701,16 +706,13 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_exec.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.py -%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.pyc -%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.pyc -%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.pyo -%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.pyo %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_execfile.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_filter.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_funcattrs.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_future.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_has_key.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_idioms.py +%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_isinstance.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_import.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_imports.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_imports2.py @@ -732,6 +734,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_raw_input.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_renames.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_repr.py +%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_reduce.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_standarderror.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_sys_exc.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_throw.py @@ -758,7 +761,6 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib2to3/pytree.py %%PYTHON_LIBDIR%%/lib2to3/refactor.py %%PYTHON_LIBDIR%%/lib2to3/tests/__init__.py -%%PYTHON_LIBDIR%%/lib2to3/tests/benchmark.py %%PYTHON_LIBDIR%%/lib2to3/tests/pytree_idempotency.py %%PYTHON_LIBDIR%%/lib2to3/tests/support.py %%PYTHON_LIBDIR%%/lib2to3/tests/test_all_fixers.py @@ -1002,8 +1004,6 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/cmath_testcases.txt %%PYTHON_LIBDIR%%/test/curses_tests.py %%PYTHON_LIBDIR%%/test/test_future5.py -%%PYTHON_LIBDIR%%/test/test_future5.pyc -%%PYTHON_LIBDIR%%/test/test_future5.pyo %%PYTHON_LIBDIR%%/test/decimaltestdata/abs.decTest %%PYTHON_LIBDIR%%/test/decimaltestdata/add.decTest %%PYTHON_LIBDIR%%/test/decimaltestdata/and.decTest @@ -1555,6 +1555,8 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_zipfile.py %%PYTHON_LIBDIR%%/test/test_zipfile64.py %%PYTHON_LIBDIR%%/test/test_zipimport.py +%%PYTHON_LIBDIR%%/test/test_zipimport_support.py +%%PYTHON_LIBDIR%%/test/zipdir.zip %%PYTHON_LIBDIR%%/test/test_zlib.py %%PYTHON_LIBDIR%%/test/testall.py %%PYTHON_LIBDIR%%/test/testcodec.py @@ -1625,6 +1627,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/xmllib.py %%PYTHON_LIBDIR%%/xmlrpclib.py %%PYTHON_LIBDIR%%/zipfile.py +lib/libpython2.6.a %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/cgi0.sh @@ -2102,6 +2105,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/pysource.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/redemo.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/reindent.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/reindent-rst.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/setup.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/smtpd.py @@ -2162,7 +2166,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/bgen/bgen %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/bgen %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/audiopy -%%PORTDOCS%%@unexec /bin/rm -fr %D/share/%%PYTHON_VERSION%%/Tools || true +%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%% %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/zlib %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/xml diff --git a/lang/python27/Makefile b/lang/python27/Makefile index f1c4fd4179c2..f5af28376c72 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python26 -PORTVERSION= 2.6.1 -PORTREVISION= 2 +PORTVERSION= 2.6.2 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -23,6 +22,7 @@ CONFIGURE_SCRIPT= ../configure # must be relative CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" USE_LDCONFIG= yes +MAKE_JOBS_SAFE= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 diff --git a/lang/python27/distinfo b/lang/python27/distinfo index 9873696d2db4..508577e84313 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1,3 +1,3 @@ -MD5 (python/Python-2.6.1.tgz) = 52b3d421f42bacfdcaf55f56c0ff9be4 -SHA256 (python/Python-2.6.1.tgz) = fb65e93678e1327e3e8559cc56e1e00ed8c07162b21287a3502677892c5c515c -SIZE (python/Python-2.6.1.tgz) = 13046455 +MD5 (python/Python-2.6.2.tgz) = 60e64fe55eb4e23abdd4d77fdad08c3d +SHA256 (python/Python-2.6.2.tgz) = e37ecdf249f248f4fea227adbca09c778670b64fcb5e45947ec3e093cbc12c86 +SIZE (python/Python-2.6.2.tgz) = 13281177 diff --git a/lang/python27/files/patch-Python2.6-Lib_local.py b/lang/python27/files/patch-Python2.6-Lib_local.py new file mode 100644 index 000000000000..63e722f38839 --- /dev/null +++ b/lang/python27/files/patch-Python2.6-Lib_local.py @@ -0,0 +1,11 @@ +--- Lib/locale.py.foo 2009-05-11 22:57:00.000000000 +0200 ++++ Lib/locale.py 2009-05-11 22:57:23.000000000 +0200 +@@ -601,7 +601,7 @@ + 'tactis': 'TACTIS', + 'euc_jp': 'eucJP', + 'euc_kr': 'eucKR', +- 'utf_8': 'UTF8', ++ 'utf_8': 'UTF-8', + 'koi8_r': 'KOI8-R', + 'koi8_u': 'KOI8-U', + # XXX This list is still incomplete. If you know more diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist index d671d39276de..0159a76637c5 100644 --- a/lang/python27/pkg-plist +++ b/lang/python27/pkg-plist @@ -342,12 +342,17 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/distutils/tests/test_build_ext.py %%PYTHON_LIBDIR%%/distutils/tests/test_build_py.py %%PYTHON_LIBDIR%%/distutils/tests/test_build_scripts.py +%%PYTHON_LIBDIR%%/distutils/tests/test_bdist_wininst.py %%PYTHON_LIBDIR%%/distutils/tests/test_config.py %%PYTHON_LIBDIR%%/distutils/tests/test_core.py +%%PYTHON_LIBDIR%%/distutils/tests/test_filelist.py %%PYTHON_LIBDIR%%/distutils/tests/test_dist.py %%PYTHON_LIBDIR%%/distutils/tests/test_install.py %%PYTHON_LIBDIR%%/distutils/tests/test_install_scripts.py +%%PYTHON_LIBDIR%%/distutils/tests/test_msvc9compiler.py %%PYTHON_LIBDIR%%/distutils/tests/test_sysconfig.py +%%PYTHON_LIBDIR%%/distutils/tests/test_sdist.py +%%PYTHON_LIBDIR%%/distutils/tests/test_register.py %%PYTHON_LIBDIR%%/distutils/tests/test_upload.py %%PYTHON_LIBDIR%%/distutils/tests/test_versionpredicate.py %%PYTHON_LIBDIR%%/distutils/text_file.py @@ -685,9 +690,9 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/json/tool.py %%PYTHON_LIBDIR%%/keyword.py %%PYTHON_LIBDIR%%/lib2to3/Grammar.txt -%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.1.final.0.pickle +%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.2.final.0.pickle %%PYTHON_LIBDIR%%/lib2to3/PatternGrammar.txt -%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.1.final.0.pickle +%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.2.final.0.pickle %%PYTHON_LIBDIR%%/lib2to3/__init__.py %%PYTHON_LIBDIR%%/lib2to3/fixer_base.py %%PYTHON_LIBDIR%%/lib2to3/fixer_util.py @@ -701,16 +706,13 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_exec.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.py -%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.pyc -%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.pyc -%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_getcwdu.pyo -%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_set_literal.pyo %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_execfile.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_filter.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_funcattrs.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_future.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_has_key.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_idioms.py +%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_isinstance.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_import.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_imports.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_imports2.py @@ -732,6 +734,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_raw_input.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_renames.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_repr.py +%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_reduce.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_standarderror.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_sys_exc.py %%PYTHON_LIBDIR%%/lib2to3/fixes/fix_throw.py @@ -758,7 +761,6 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib2to3/pytree.py %%PYTHON_LIBDIR%%/lib2to3/refactor.py %%PYTHON_LIBDIR%%/lib2to3/tests/__init__.py -%%PYTHON_LIBDIR%%/lib2to3/tests/benchmark.py %%PYTHON_LIBDIR%%/lib2to3/tests/pytree_idempotency.py %%PYTHON_LIBDIR%%/lib2to3/tests/support.py %%PYTHON_LIBDIR%%/lib2to3/tests/test_all_fixers.py @@ -1002,8 +1004,6 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/cmath_testcases.txt %%PYTHON_LIBDIR%%/test/curses_tests.py %%PYTHON_LIBDIR%%/test/test_future5.py -%%PYTHON_LIBDIR%%/test/test_future5.pyc -%%PYTHON_LIBDIR%%/test/test_future5.pyo %%PYTHON_LIBDIR%%/test/decimaltestdata/abs.decTest %%PYTHON_LIBDIR%%/test/decimaltestdata/add.decTest %%PYTHON_LIBDIR%%/test/decimaltestdata/and.decTest @@ -1555,6 +1555,8 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_zipfile.py %%PYTHON_LIBDIR%%/test/test_zipfile64.py %%PYTHON_LIBDIR%%/test/test_zipimport.py +%%PYTHON_LIBDIR%%/test/test_zipimport_support.py +%%PYTHON_LIBDIR%%/test/zipdir.zip %%PYTHON_LIBDIR%%/test/test_zlib.py %%PYTHON_LIBDIR%%/test/testall.py %%PYTHON_LIBDIR%%/test/testcodec.py @@ -1625,6 +1627,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/xmllib.py %%PYTHON_LIBDIR%%/xmlrpclib.py %%PYTHON_LIBDIR%%/zipfile.py +lib/libpython2.6.a %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/cgi0.sh @@ -2102,6 +2105,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/pysource.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/redemo.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/reindent.py +%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/reindent-rst.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/setup.py %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/smtpd.py @@ -2162,7 +2166,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/bgen/bgen %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/bgen %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/audiopy -%%PORTDOCS%%@unexec /bin/rm -fr %D/share/%%PYTHON_VERSION%%/Tools || true +%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%% %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/zlib %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/xml diff --git a/mail/mixminion/Makefile b/mail/mixminion/Makefile index 80a1a877b546..522a5538b795 100644 --- a/mail/mixminion/Makefile +++ b/mail/mixminion/Makefile @@ -7,7 +7,7 @@ PORTNAME= Mixminion DISTVERSION= 0.0.8alpha2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail security MASTER_SITES= http://www.mixminion.net/dist/${DISTVERSION}/ diff --git a/mail/mixminion/pkg-plist b/mail/mixminion/pkg-plist index 5a98500a3493..6a48e37e03c5 100644 --- a/mail/mixminion/pkg-plist +++ b/mail/mixminion/pkg-plist @@ -115,14 +115,10 @@ etc/mixminiond.conf.sample %%PYTHON_SITELIBDIR%%/mixminion/server/ServerMain.pyc %%PYTHON_SITELIBDIR%%/mixminion/server/ServerMain.pyo %%PYTHON_SITELIBDIR%%/mixminion/server/ServerQueue.py -%%PYTHON_SITELIBDIR%%/mixminion/server/ServerQueue.pyc -%%PYTHON_SITELIBDIR%%/mixminion/server/ServerQueue.pyo %%PYTHON_SITELIBDIR%%/mixminion/server/__init__.py %%PYTHON_SITELIBDIR%%/mixminion/server/__init__.pyc %%PYTHON_SITELIBDIR%%/mixminion/server/__init__.pyo %%PYTHON_SITELIBDIR%%/mixminion/test.py -%%PYTHON_SITELIBDIR%%/mixminion/test.pyc -%%PYTHON_SITELIBDIR%%/mixminion/test.pyo %%PYTHON_SITELIBDIR%%/mixminion/testSupport.py %%PYTHON_SITELIBDIR%%/mixminion/testSupport.pyc %%PYTHON_SITELIBDIR%%/mixminion/testSupport.pyo diff --git a/misc/bigboard/Makefile b/misc/bigboard/Makefile index 6d49539ab3b3..da057e531744 100644 --- a/misc/bigboard/Makefile +++ b/misc/bigboard/Makefile @@ -7,6 +7,7 @@ PORTNAME= bigboard PORTVERSION= 0.5.38 +PORTREVISION= 1 CATEGORIES= misc gnome MASTER_SITES= GNOME diff --git a/misc/bigboard/pkg-plist b/misc/bigboard/pkg-plist index ed9ed06a7b54..f513a669b6c8 100644 --- a/misc/bigboard/pkg-plist +++ b/misc/bigboard/pkg-plist @@ -256,8 +256,6 @@ libdata/bonobo/servers/GNOME_OnlineDesktop_BigBoardFactory.server %%PYTHON_SITELIBDIR%%/bigboard/themes/default.pyo %%PYTHON_SITELIBDIR%%/bigboard/themes/fedora.css %%PYTHON_SITELIBDIR%%/bigboard/themes/fedora.py -%%PYTHON_SITELIBDIR%%/bigboard/themes/fedora.pyc -%%PYTHON_SITELIBDIR%%/bigboard/themes/fedora.pyo %%PYTHON_SITELIBDIR%%/bigboard/workboard.py %%PYTHON_SITELIBDIR%%/bigboard/workboard.pyc %%PYTHON_SITELIBDIR%%/bigboard/workboard.pyo diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile index e6e6fd471619..b70ffdeb684b 100644 --- a/misc/kdeedu3/Makefile +++ b/misc/kdeedu3/Makefile @@ -7,6 +7,7 @@ PORTNAME= kdeedu PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/misc/kdeedu3/pkg-plist b/misc/kdeedu3/pkg-plist index 6418819f7408..88ccbdfc6f18 100644 --- a/misc/kdeedu3/pkg-plist +++ b/misc/kdeedu3/pkg-plist @@ -379,7 +379,6 @@ share/apps/kanagram/sounds/chalk.ogg share/apps/kanagram/sounds/right.ogg share/apps/kanagram/sounds/wrong.ogg share/apps/katepart/syntax/logohighlightstyle.en_US.xml -share/apps/katepart/syntax/python-kig.xml share/apps/kbruch/kbruchui.rc share/apps/keduca/icons/crystalsvg/16x16/actions/addquestion.png share/apps/keduca/icons/crystalsvg/16x16/actions/control.png diff --git a/net-mgmt/py-yapsnmp/Makefile b/net-mgmt/py-yapsnmp/Makefile index b7ae4ec4cfd2..06a650b00667 100644 --- a/net-mgmt/py-yapsnmp/Makefile +++ b/net-mgmt/py-yapsnmp/Makefile @@ -6,7 +6,7 @@ PORTNAME= yapsnmp PORTVERSION= 0.7.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= yapsnmp @@ -21,8 +21,9 @@ USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_PYTHON= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${PYTHON_INCLUDEDIR}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CONFIGURE_ARGS+=--enable-site-packages-prefix=${PREFIX} post-patch: ${REINPLACE_CMD} -e "s,-lsnmp,-lnetsnmp," \ diff --git a/net-mgmt/py-yapsnmp/files/patch-configure b/net-mgmt/py-yapsnmp/files/patch-configure index 1837464b7cc2..01a14e5ecb66 100644 --- a/net-mgmt/py-yapsnmp/files/patch-configure +++ b/net-mgmt/py-yapsnmp/files/patch-configure @@ -5,7 +5,7 @@ -for PYTHONINCPATH in python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 -+for PYTHONINCPATH in python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 ++for PYTHONINCPATH in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 do as_ac_Header=`echo "ac_cv_header_$PYTHONINCPATH/Python.h" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/net-p2p/btqueue/Makefile b/net-p2p/btqueue/Makefile index ad0f8a33aa69..1a92cb0f3b47 100644 --- a/net-p2p/btqueue/Makefile +++ b/net-p2p/btqueue/Makefile @@ -7,6 +7,7 @@ PORTNAME= btqueue PORTVERSION= 0.1.3 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/net-p2p/btqueue/pkg-plist b/net-p2p/btqueue/pkg-plist index 586ac0893f73..0630c664d0cd 100644 --- a/net-p2p/btqueue/pkg-plist +++ b/net-p2p/btqueue/pkg-plist @@ -453,8 +453,6 @@ bin/btshowmetainfo.py %%PYTHON_SITELIBDIR%%/khashmir/test_khashmir.pyc %%PYTHON_SITELIBDIR%%/khashmir/test_khashmir.pyo %%PYTHON_SITELIBDIR%%/khashmir/test_krpc.py -%%PYTHON_SITELIBDIR%%/khashmir/test_krpc.pyc -%%PYTHON_SITELIBDIR%%/khashmir/test_krpc.pyo %%PYTHON_SITELIBDIR%%/khashmir/test_kstore.py %%PYTHON_SITELIBDIR%%/khashmir/test_kstore.pyc %%PYTHON_SITELIBDIR%%/khashmir/test_kstore.pyo diff --git a/net-p2p/py-bittorrent/Makefile b/net-p2p/py-bittorrent/Makefile index 2b23b86ee74e..c37e4aed7136 100644 --- a/net-p2p/py-bittorrent/Makefile +++ b/net-p2p/py-bittorrent/Makefile @@ -7,7 +7,7 @@ PORTNAME= BitTorrent PORTVERSION= 5.2.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES?= net-p2p python MASTER_SITES= http://download.bittorrent.com/dl/ diff --git a/net-p2p/py-bittorrent/pkg-plist b/net-p2p/py-bittorrent/pkg-plist index b0dcd7e1cd10..e08dbc2fa21e 100644 --- a/net-p2p/py-bittorrent/pkg-plist +++ b/net-p2p/py-bittorrent/pkg-plist @@ -554,8 +554,6 @@ bin/torrentinfo-console %%PYTHON_SITELIBDIR%%/khashmir/test_khashmir.pyc %%PYTHON_SITELIBDIR%%/khashmir/test_khashmir.pyo %%PYTHON_SITELIBDIR%%/khashmir/test_krpc.py -%%PYTHON_SITELIBDIR%%/khashmir/test_krpc.pyc -%%PYTHON_SITELIBDIR%%/khashmir/test_krpc.pyo %%PYTHON_SITELIBDIR%%/khashmir/test_kstore.py %%PYTHON_SITELIBDIR%%/khashmir/test_kstore.pyc %%PYTHON_SITELIBDIR%%/khashmir/test_kstore.pyo diff --git a/net/cyphesis/Makefile b/net/cyphesis/Makefile index 09d685c49061..2ae3548721aa 100644 --- a/net/cyphesis/Makefile +++ b/net/cyphesis/Makefile @@ -7,6 +7,7 @@ PORTNAME= cyphesis PORTVERSION= 0.5.20 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=worldforge @@ -31,6 +32,8 @@ USE_LDCONFIG= yes USE_PGSQL= yes USE_PYTHON= yes +CFLAGS+= -I${LOCALBASE}/include + MAN1= cyclient.1 cycmd.1 cyphesis.1 cyphesis-tools.1 cyaddrules.1 \ cyconvertrules.1 cydumprules.1 cyloadrules.1 cypasswd.1 @@ -39,10 +42,12 @@ MAN1= cyclient.1 cycmd.1 cyphesis.1 cyphesis-tools.1 cyaddrules.1 \ post-patch: @${REINPLACE_CMD} -e 's| install-dist_docDATA | |g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's| install-confbackupDATA | |g' ${WRKSRC}/data/Makefile.in - @${REINPLACE_CMD} -e 's|-lpython|${PTHREAD_LIBS} &|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + -e 's|-lpython|${PTHREAD_LIBS} &|' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ ${REINPLACE_CMD} -e 's|$$(datadir)/cyphesis|${DATADIR}|g' @${REINPLACE_CMD} -e 's|/bash|/sh|' ${WRKSRC}/scripts/extract_revision.sh + @${REINPLACE_CMD} -e '1s|python|${LOCALBASE}/bin/${PYTHON_VERSION}|' ${WRKSRC}/scripts/gen_buildid.py post-install: .if !defined(NOPORTDOCS) diff --git a/net/cyphesis/files/patch-configure b/net/cyphesis/files/patch-configure new file mode 100644 index 000000000000..70f39e726269 --- /dev/null +++ b/net/cyphesis/files/patch-configure @@ -0,0 +1,252 @@ +--- configure.orig 2009-05-31 11:22:02.000000000 +0200 ++++ configure 2009-05-31 11:22:33.000000000 +0200 +@@ -4565,8 +4565,7 @@ + fi + + +- +-python_prefix=/usr ++python_prefix=%%LOCALBASE%% + + # Check whether --with-python was given. + if test "${with_python+set}" = set; then +@@ -6196,6 +6195,153 @@ + + + ++ ++if test "${ac_cv_header_python2_6_Python_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for python2.6/Python.h" >&5 ++echo $ECHO_N "checking for python2.6/Python.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_python2_6_Python_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_python2_6_Python_h" >&5 ++echo "${ECHO_T}$ac_cv_header_python2_6_Python_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking python2.6/Python.h usability" >&5 ++echo $ECHO_N "checking python2.6/Python.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <python2.6/Python.h> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking python2.6/Python.h presence" >&5 ++echo $ECHO_N "checking python2.6/Python.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <python2.6/Python.h> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: python2.6/Python.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: python2.6/Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: python2.6/Python.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: python2.6/Python.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: python2.6/Python.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: python2.6/Python.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: python2.6/Python.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: python2.6/Python.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: python2.6/Python.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: python2.6/Python.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: python2.6/Python.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: python2.6/Python.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: python2.6/Python.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: python2.6/Python.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: python2.6/Python.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: python2.6/Python.h: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++## --------------------------------------- ## ++## Report this to alriddoch@googlemail.com ## ++## --------------------------------------- ## ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for python2.6/Python.h" >&5 ++echo $ECHO_N "checking for python2.6/Python.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_python2_6_Python_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_python2_6_Python_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_python2_6_Python_h" >&5 ++echo "${ECHO_T}$ac_cv_header_python2_6_Python_h" >&6; } ++ ++fi ++if test $ac_cv_header_python2_6_Python_h = yes; then ++ ++ python_include_path=-I${python_prefix}/include/python2.6 ++ python_version=2.6 ++ ++else ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + if test "${ac_cv_header_python2_5_Python_h+set}" = set; then + { echo "$as_me:$LINENO: checking for python2.5/Python.h" >&5 + echo $ECHO_N "checking for python2.5/Python.h... $ECHO_C" >&6; } +@@ -6771,6 +6917,9 @@ + fi + + ++fi ++ ++ + + PYTHON_VERSION=${python_version} + PYTHON_INCLUDES=${python_include_path} +@@ -7175,13 +7324,13 @@ + if test x"$link_static" = "xfalse"; then + + as_ac_Lib=`echo "ac_cv_lib_python${python_version}''_Py_Initialize" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for Py_Initialize in -lpython${python_version}" >&5 +-echo $ECHO_N "checking for Py_Initialize in -lpython${python_version}... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking for Py_Initialize in -pthread -lpython${python_version}" >&5 ++echo $ECHO_N "checking for Py_Initialize in -pthread -lpython${python_version}... $ECHO_C" >&6; } + if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpython${python_version} $LIBS" ++LIBS="-pthread -lpython${python_version} $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -7239,19 +7388,19 @@ + echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_Lib'}'` = yes; then + +- python_libs="-lpython${python_version}" ++ python_libs="-pthread -lpython${python_version}" + PYTHON_UTIL_LIBS= + + else + + as_ac_Lib=`echo "ac_cv_lib_python${python_version}''_Py_Initialize" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for Py_Initialize in -lpython${python_version}" >&5 +-echo $ECHO_N "checking for Py_Initialize in -lpython${python_version}... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking for Py_Initialize in -pthread -lpython${python_version}" >&5 ++echo $ECHO_N "checking for Py_Initialize in -pthread -lpython${python_version}... $ECHO_C" >&6; } + if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpython${python_version} -L${python_lib_path} ${PYTHON_UTIL_LIBS} $LIBS" ++LIBS="-pthread -lpython${python_version} -L${python_lib_path} ${PYTHON_UTIL_LIBS} $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -7309,7 +7458,7 @@ + echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_Lib'}'` = yes; then + +- python_libs="-L${python_lib_path} -lpython${python_version}" ++ python_libs="-L${python_lib_path} -pthread -lpython${python_version}" + PYTHON_LINKER_FLAGS="-export-dynamic" + + else +@@ -7329,13 +7478,13 @@ + else + + as_ac_Lib=`echo "ac_cv_lib_python${python_version}''_Py_Initialize" | $as_tr_sh` +-{ echo "$as_me:$LINENO: checking for Py_Initialize in -lpython${python_version}" >&5 +-echo $ECHO_N "checking for Py_Initialize in -lpython${python_version}... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking for Py_Initialize in -pthread -lpython${python_version}" >&5 ++echo $ECHO_N "checking for Py_Initialize in -pthread -lpython${python_version}... $ECHO_C" >&6; } + if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpython${python_version} -L${python_lib_path} ${PYTHON_UTIL_LIBS} $LIBS" ++LIBS="-pthread -lpython${python_version} -L${python_lib_path} ${PYTHON_UTIL_LIBS} $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -7393,7 +7542,7 @@ + echo "${ECHO_T}$ac_res" >&6; } + if test `eval echo '${'$as_ac_Lib'}'` = yes; then + +- python_libs="-L${python_lib_path} -lpython${python_version}" ++ python_libs="-L${python_lib_path} -pthread -lpython${python_version}" + PYTHON_LINKER_FLAGS="-export-dynamic" + + else diff --git a/net/py-dpkt/Makefile b/net/py-dpkt/Makefile index 555c3e0a617d..03803bdbd5cd 100644 --- a/net/py-dpkt/Makefile +++ b/net/py-dpkt/Makefile @@ -7,6 +7,7 @@ PORTNAME= dpkt PORTVERSION= 1.6 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/net/py-dpkt/files/patch-dpkt.py b/net/py-dpkt/files/patch-dpkt.py new file mode 100644 index 000000000000..e9b0f819f4d2 --- /dev/null +++ b/net/py-dpkt/files/patch-dpkt.py @@ -0,0 +1,20 @@ +--- dpkt/bgp.py.orig 2006-10-01 08:41:30.000000000 +0200 ++++ dpkt/bgp.py 2009-06-06 18:04:02.000000000 +0200 +@@ -675,7 +675,7 @@ + self.failUnless(a.len == 12) + self.failUnless(len(a.communities.list) == 3) + c = a.communities.list[0] +- self.failUnless(c.as == 65215) ++ self.failUnless(c._as == 65215) + self.failUnless(c.value == 1) + r = b2.update.announced[0] + self.failUnless(r.len == 22) +@@ -712,7 +712,7 @@ + b4 = BGP(self.bgp4) + self.failUnless(b4.len == 45) + self.failUnless(b4.type == OPEN) +- self.failUnless(b4.open.as == 237) ++ self.failUnless(b4.open._as == 237) + self.failUnless(b4.open.param_len == 16) + self.failUnless(len(b4.open.parameters) == 3) + p = b4.open.parameters[0] diff --git a/print/py-fonttools/Makefile b/print/py-fonttools/Makefile index b6638c627745..e0574c2a4956 100644 --- a/print/py-fonttools/Makefile +++ b/print/py-fonttools/Makefile @@ -7,6 +7,7 @@ PORTNAME= fonttools PORTVERSION= 2.2 +PORTREVISION= 1 CATEGORIES= print python MASTER_SITES= SF PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/print/py-fonttools/pkg-plist b/print/py-fonttools/pkg-plist index 0637b4e89b1e..1da1b7bf69f9 100644 --- a/print/py-fonttools/pkg-plist +++ b/print/py-fonttools/pkg-plist @@ -245,8 +245,6 @@ bin/ttx %%PYTHON_SITELIBDIR%%/FontTools/fontTools/ttLib/tables/otTables.pyc %%PYTHON_SITELIBDIR%%/FontTools/fontTools/ttLib/tables/otTables.pyo %%PYTHON_SITELIBDIR%%/FontTools/fontTools/ttLib/tables/ttProgram.py -%%PYTHON_SITELIBDIR%%/FontTools/fontTools/ttLib/tables/ttProgram.pyc -%%PYTHON_SITELIBDIR%%/FontTools/fontTools/ttLib/tables/ttProgram.pyo %%PYTHON_SITELIBDIR%%/FontTools/fontTools/ttLib/test/__init__.py %%PYTHON_SITELIBDIR%%/FontTools/fontTools/ttLib/test/__init__.pyc %%PYTHON_SITELIBDIR%%/FontTools/fontTools/ttLib/test/__init__.pyo diff --git a/print/py-pyscript/Makefile b/print/py-pyscript/Makefile index 18e6c7615980..01878022433b 100644 --- a/print/py-pyscript/Makefile +++ b/print/py-pyscript/Makefile @@ -7,7 +7,7 @@ PORTNAME= pyscript PORTVERSION= 0.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -28,11 +28,10 @@ PYSCRIPT_EXAMPLES= doc/examples/*.py PYSCRIPT_MANUAL= doc/manual/pyscript.pdf .if defined(WITHOUT_EXAMPLES) -PORTEXAMPLES= "@comment " +PLIST_SUB= PORTEXAMPLES="@comment " .else -PORTEXAMPLES= "" +PLIST_SUB= PORTEXAMPLES="" .endif -PLIST_SUB+= PORTEXAMPLES=${PORTEXAMPLES} post-install: diff --git a/print/py-pyscript/files/patch-pyscript_groups.py b/print/py-pyscript/files/patch-pyscript_groups.py new file mode 100644 index 000000000000..185908262bee --- /dev/null +++ b/print/py-pyscript/files/patch-pyscript_groups.py @@ -0,0 +1,32 @@ +--- pyscript/groups.py.orig 2009-05-15 12:02:45.000000000 +0200 ++++ pyscript/groups.py 2009-05-15 12:02:18.000000000 +0200 +@@ -387,10 +387,10 @@ + assert a2 in ["n", "ne", "e", "se", "s", "sw", "w", "nw", "c"] + + # note the swap: +- as = options.get('as', a2) ++ vas = options.get('as', a2) + ae = options.get('ae', a1) + +- assert as in ["n", "ne", "e", "se", "s", "sw", "w", "nw", "c"] ++ assert vas in ["n", "ne", "e", "se", "s", "sw", "w", "nw", "c"] + assert ae in ["n", "ne", "e", "se", "s", "sw", "w", "nw", "c"] + + # these two have to be present +@@ -424,14 +424,14 @@ + + # place items at the edges + # ---first object---- +- ov = getattr(items[0].bbox(), as)-p1 ++ ov = getattr(items[0].bbox(), vas)-p1 + + # how much we need to move by + mv = -pv.U*ov*pv.U + items[0].move(mv) + + space -= abs(( getattr(items[0].bbox(), a1) +- - getattr(items[0].bbox(), as) )*pv.U) ++ - getattr(items[0].bbox(), vas) )*pv.U) + + # ---second object--- + ov = getattr(items[-1].bbox(), ae)-p2 diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile index d5337cbb7c7b..413af3c9c808 100644 --- a/print/py-reportlab/Makefile +++ b/print/py-reportlab/Makefile @@ -7,6 +7,7 @@ PORTNAME= reportlab PORTVERSION= 1.21.2 +PORTREVISION= 1 CATEGORIES= print python MASTER_SITES= http://www.reportlab.org/ftp/ \ ftp://ftp.reportlab.org/ \ diff --git a/print/py-reportlab/pkg-plist b/print/py-reportlab/pkg-plist index 9359ebfdd9f0..5a68d0acfe4b 100644 --- a/print/py-reportlab/pkg-plist +++ b/print/py-reportlab/pkg-plist @@ -210,8 +210,6 @@ %%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/signsandsymbols.pyc %%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/signsandsymbols.pyo %%PYTHON_SITELIBDIR%%/reportlab/lib/PyFontify.py -%%PYTHON_SITELIBDIR%%/reportlab/lib/PyFontify.pyc -%%PYTHON_SITELIBDIR%%/reportlab/lib/PyFontify.pyo %%PYTHON_SITELIBDIR%%/reportlab/lib/__init__.py %%PYTHON_SITELIBDIR%%/reportlab/lib/__init__.pyc %%PYTHON_SITELIBDIR%%/reportlab/lib/__init__.pyo diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index 7ce74074986d..281a997a85f7 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -8,7 +8,7 @@ PORTNAME= scribus PORTVERSION= 1.3.3.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.scribus.net/downloads/${PORTVERSION}/ @@ -31,6 +31,7 @@ USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= yes USE_GMAKE= yes USE_PERL5_BUILD=yes +CONFIGURE_ARGS= --enable-scripter2 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/print/scribus-devel/pkg-plist b/print/scribus-devel/pkg-plist index 6a553ea0b438..eace538703db 100644 --- a/print/scribus-devel/pkg-plist +++ b/print/scribus-devel/pkg-plist @@ -48,9 +48,9 @@ include/scribus/fontprefs.h include/scribus/fontreplacedialog.h include/scribus/fparser.h include/scribus/fpconfig.h -include/scribus/fptypes.h include/scribus/fpoint.h include/scribus/fpointarray.h +include/scribus/fptypes.h include/scribus/frameedit.h include/scribus/gradienteditor.h include/scribus/gtaction.h @@ -83,10 +83,10 @@ include/scribus/linecombo.h include/scribus/lineformats.h include/scribus/linkbutton.h include/scribus/loremipsum.h -include/scribus/md5.h -include/scribus/mdup.h include/scribus/margindialog.h include/scribus/marginwidget.h +include/scribus/md5.h +include/scribus/mdup.h include/scribus/measurements.h include/scribus/menumanager.h include/scribus/mergedoc.h @@ -124,30 +124,30 @@ include/scribus/prefstable.h include/scribus/preview.h include/scribus/query.h include/scribus/rc4.h -include/scribus/rulermover.h include/scribus/reformdoc.h +include/scribus/rulermover.h include/scribus/sampleitem.h include/scribus/sccolor.h +include/scribus/scfontmetrics.h include/scribus/scfonts.h include/scribus/scfonts_ttf.h -include/scribus/scfontmetrics.h include/scribus/scmenu.h include/scribus/scmessagebox.h include/scribus/scpainter.h include/scribus/scpaths.h -include/scribus/scrap.h +include/scribus/scpixmapcache.h include/scribus/scplugin.h include/scribus/scpreview.h include/scribus/scraction.h +include/scribus/scrap.h include/scribus/scribus.h +include/scribus/scribusXml.h include/scribus/scribusapp.h include/scribus/scribusdoc.h include/scribus/scribusstructs.h include/scribus/scribusview.h include/scribus/scribuswin.h -include/scribus/scribusXml.h include/scribus/scrpalettebase.h -include/scribus/scpixmapcache.h include/scribus/search.h include/scribus/seiten.h include/scribus/selection.h @@ -178,6 +178,27 @@ include/scribus/unzip.h include/scribus/vgradient.h include/scribus/vruler.h include/scribus/werktoolb.h +lib/scribus/dicts/README_ca_ES.txt +lib/scribus/dicts/README_cs_CZ.txt +lib/scribus/dicts/README_cy_GB.txt +lib/scribus/dicts/README_de_DE.txt +lib/scribus/dicts/README_en_EN.txt +lib/scribus/dicts/README_en_GB.txt +lib/scribus/dicts/README_es_ES.txt +lib/scribus/dicts/README_fi_FI.txt +lib/scribus/dicts/README_hu_HU.txt +lib/scribus/dicts/README_hyph_da_DK.txt +lib/scribus/dicts/README_hyph_is_IS.txt +lib/scribus/dicts/README_hyph_pl_PL.txt +lib/scribus/dicts/README_lt_LT.txt +lib/scribus/dicts/README_no_NO.txt +lib/scribus/dicts/README_pt_BR.txt +lib/scribus/dicts/README_pt_PT.txt +lib/scribus/dicts/README_ru_RU_0.txt +lib/scribus/dicts/README_sk_SK.txt +lib/scribus/dicts/README_sl_SI.txt +lib/scribus/dicts/README_sv_SE.txt +lib/scribus/dicts/README_uk_UA.txt lib/scribus/dicts/hyph_af.dic lib/scribus/dicts/hyph_ca.dic lib/scribus/dicts/hyph_cs.dic @@ -205,102 +226,78 @@ lib/scribus/dicts/hyph_sk.dic lib/scribus/dicts/hyph_sl.dic lib/scribus/dicts/hyph_sv.dic lib/scribus/dicts/hyph_uk.dic -lib/scribus/dicts/README_ca_ES.txt -lib/scribus/dicts/README_en_EN.txt -lib/scribus/dicts/README_cs_CZ.txt -lib/scribus/dicts/README_cy_GB.txt -lib/scribus/dicts/README_hyph_da_DK.txt -lib/scribus/dicts/README_de_DE.txt -lib/scribus/dicts/README_en_GB.txt -lib/scribus/dicts/README_es_ES.txt -lib/scribus/dicts/README_fi_FI.txt -lib/scribus/dicts/README_hu_HU.txt -lib/scribus/dicts/README_hyph_is_IS.txt -lib/scribus/dicts/README_lt_LT.txt -lib/scribus/dicts/README_no_NO.txt -lib/scribus/dicts/README_hyph_pl_PL.txt -lib/scribus/dicts/README_pt_BR.txt -lib/scribus/dicts/README_pt_PT.txt -lib/scribus/dicts/README_ru_RU_0.txt -lib/scribus/dicts/README_sk_SK.txt -lib/scribus/dicts/README_sl_SI.txt -lib/scribus/dicts/README_sv_SE.txt -lib/scribus/dicts/README_uk_UA.txt +lib/scribus/import.prolog lib/scribus/keysets/scribus13.ksxml -lib/scribus/profiles/ReadMe -lib/scribus/profiles/srgb.license -lib/scribus/profiles/sRGB.icm -lib/scribus/profiles/GenericCMYK.icm -lib/scribus/profiles/GenericCMYK.txt -lib/scribus/swatches/Scribus_SVG.txt -lib/scribus/swatches/Scribus_X11Grey.txt -lib/scribus/swatches/Scribus_Gnome.txt -lib/scribus/swatches/Scribus_X11.txt -lib/scribus/swatches/Scribus_OpenOffice.txt -lib/scribus/plugins/libscribusshortwords.so.0 -lib/scribus/plugins/libscribusshortwords.so -lib/scribus/plugins/libscribusshortwords.la -lib/scribus/plugins/libsvgexplugin.so.0 -lib/scribus/plugins/libsvgexplugin.so -lib/scribus/plugins/libsvgexplugin.la -lib/scribus/plugins/libsvgimplugin.so.0 -lib/scribus/plugins/libsvgimplugin.so -lib/scribus/plugins/libsvgimplugin.la -lib/scribus/plugins/libimportps.so.0 -lib/scribus/plugins/libimportps.so -lib/scribus/plugins/libimportps.la -lib/scribus/plugins/libfontpreview.so.0 -lib/scribus/plugins/libfontpreview.so -lib/scribus/plugins/libfontpreview.la -lib/scribus/plugins/libscribusexportpixmap.so.0 -lib/scribus/plugins/gettext/libhtmlim.so.0 -lib/scribus/plugins/gettext/libhtmlim.so -lib/scribus/plugins/gettext/libhtmlim.la -lib/scribus/plugins/gettext/libtxtim.so.0 -lib/scribus/plugins/gettext/libtxtim.so -lib/scribus/plugins/gettext/libtxtim.la -lib/scribus/plugins/gettext/libcsvim.so.0 -lib/scribus/plugins/gettext/libcsvim.so lib/scribus/plugins/gettext/libcsvim.la -lib/scribus/plugins/gettext/libsxwimplugin.so.0 -lib/scribus/plugins/gettext/libsxwimplugin.so -lib/scribus/plugins/gettext/libsxwimplugin.la -lib/scribus/plugins/gettext/libtextfilterplugin.so.0 -lib/scribus/plugins/gettext/libtextfilterplugin.so -lib/scribus/plugins/gettext/libtextfilterplugin.la -lib/scribus/plugins/gettext/libodtimplugin.so.0 -lib/scribus/plugins/gettext/libodtimplugin.so +lib/scribus/plugins/gettext/libcsvim.so +lib/scribus/plugins/gettext/libcsvim.so.0 +lib/scribus/plugins/gettext/libdocim.la +lib/scribus/plugins/gettext/libdocim.so +lib/scribus/plugins/gettext/libdocim.so.0 +lib/scribus/plugins/gettext/libhtmlim.la +lib/scribus/plugins/gettext/libhtmlim.so +lib/scribus/plugins/gettext/libhtmlim.so.0 lib/scribus/plugins/gettext/libodtimplugin.la +lib/scribus/plugins/gettext/libodtimplugin.so +lib/scribus/plugins/gettext/libodtimplugin.so.0 +lib/scribus/plugins/gettext/libpdbim.la lib/scribus/plugins/gettext/libpdbim.so lib/scribus/plugins/gettext/libpdbim.so.0 -lib/scribus/plugins/gettext/libpdbim.la -lib/scribus/plugins/gettext/libdocim.so.0 -lib/scribus/plugins/gettext/libdocim.so -lib/scribus/plugins/gettext/libdocim.la -lib/scribus/plugins/libscribusexportpixmap.so -lib/scribus/plugins/libscribusexportpixmap.la -lib/scribus/plugins/libnewfromtemplateplugin.so.0 -lib/scribus/plugins/libnewfromtemplateplugin.so +lib/scribus/plugins/gettext/libsxwimplugin.la +lib/scribus/plugins/gettext/libsxwimplugin.so +lib/scribus/plugins/gettext/libsxwimplugin.so.0 +lib/scribus/plugins/gettext/libtextfilterplugin.la +lib/scribus/plugins/gettext/libtextfilterplugin.so +lib/scribus/plugins/gettext/libtextfilterplugin.so.0 +lib/scribus/plugins/gettext/libtxtim.la +lib/scribus/plugins/gettext/libtxtim.so +lib/scribus/plugins/gettext/libtxtim.so.0 +lib/scribus/plugins/libbarcodegenerator.la +lib/scribus/plugins/libbarcodegenerator.so +lib/scribus/plugins/libbarcodegenerator.so.0 +lib/scribus/plugins/libcolorwheel.la +lib/scribus/plugins/libcolorwheel.so +lib/scribus/plugins/libcolorwheel.so.0 +lib/scribus/plugins/libfontpreview.la +lib/scribus/plugins/libfontpreview.so +lib/scribus/plugins/libfontpreview.so.0 +lib/scribus/plugins/libimportps.la +lib/scribus/plugins/libimportps.so +lib/scribus/plugins/libimportps.so.0 lib/scribus/plugins/libnewfromtemplateplugin.la -lib/scribus/plugins/libsaveastemplateplugin.so.0 -lib/scribus/plugins/libsaveastemplateplugin.so -lib/scribus/plugins/libsaveastemplateplugin.la -lib/scribus/plugins/liboodrawimp.so.0 -lib/scribus/plugins/liboodrawimp.so -lib/scribus/plugins/liboodrawimp.la -lib/scribus/plugins/liboldscribusformat.so.0 -lib/scribus/plugins/liboldscribusformat.so +lib/scribus/plugins/libnewfromtemplateplugin.so +lib/scribus/plugins/libnewfromtemplateplugin.so.0 lib/scribus/plugins/liboldscribusformat.la -lib/scribus/plugins/libscriptplugin.so.0 -lib/scribus/plugins/libscriptplugin.so -lib/scribus/plugins/libscriptplugin.la -lib/scribus/plugins/libcolorwheel.so.0 -lib/scribus/plugins/libcolorwheel.so -lib/scribus/plugins/libcolorwheel.la -lib/scribus/plugins/libbarcodegenerator.so.0 -lib/scribus/plugins/libbarcodegenerator.so -lib/scribus/plugins/libbarcodegenerator.la -lib/scribus/import.prolog +lib/scribus/plugins/liboldscribusformat.so +lib/scribus/plugins/liboldscribusformat.so.0 +lib/scribus/plugins/liboodrawimp.la +lib/scribus/plugins/liboodrawimp.so +lib/scribus/plugins/liboodrawimp.so.0 +lib/scribus/plugins/libsaveastemplateplugin.la +lib/scribus/plugins/libsaveastemplateplugin.so +lib/scribus/plugins/libsaveastemplateplugin.so.0 +lib/scribus/plugins/libscribusexportpixmap.la +lib/scribus/plugins/libscribusexportpixmap.so +lib/scribus/plugins/libscribusexportpixmap.so.0 +lib/scribus/plugins/libscribusshortwords.la +lib/scribus/plugins/libscribusshortwords.so +lib/scribus/plugins/libscribusshortwords.so.0 +lib/scribus/plugins/libsvgexplugin.la +lib/scribus/plugins/libsvgexplugin.so +lib/scribus/plugins/libsvgexplugin.so.0 +lib/scribus/plugins/libsvgimplugin.la +lib/scribus/plugins/libsvgimplugin.so +lib/scribus/plugins/libsvgimplugin.so.0 +lib/scribus/profiles/GenericCMYK.icm +lib/scribus/profiles/GenericCMYK.txt +lib/scribus/profiles/ReadMe +lib/scribus/profiles/sRGB.icm +lib/scribus/profiles/srgb.license +lib/scribus/swatches/Scribus_Gnome.txt +lib/scribus/swatches/Scribus_OpenOffice.txt +lib/scribus/swatches/Scribus_SVG.txt +lib/scribus/swatches/Scribus_X11.txt +lib/scribus/swatches/Scribus_X11Grey.txt %%DOCSDIR%%-%%SCRIBUS_VERSION%%/en/tutorials/scribus-short-words/menu.xml %%DOCSDIR%%-%%SCRIBUS_VERSION%%/en/tutorials/scribus-short-words/after_short_words.png %%DOCSDIR%%-%%SCRIBUS_VERSION%%/en/tutorials/scribus-short-words/before_short_words.png @@ -1139,31 +1136,31 @@ lib/scribus/import.prolog %%DATADIR%%/loremipsum/slovenian.xml %%DATADIR%%/plugins/scribus-short-words.rc %%DATADIR%%/plugins/barcode.ps -%%DATADIR%%/samples/boilerplate.py -%%DATADIR%%/samples/golden-mean.py -%%DATADIR%%/samples/quote.py -%%DATADIR%%/samples/wordcount.py -%%DATADIR%%/samples/Sample1.py -%%DATADIR%%/samples/trait_de_coupe.py -%%DATADIR%%/samples/Calendar.py -%%DATADIR%%/samples/pochette_cd.py -%%DATADIR%%/samples/3columnUSLTR.py -%%DATADIR%%/samples/3columnA4.py -%%DATADIR%%/samples/legende.py -%%DATADIR%%/samples/moins_10_pourcent_group.py -%%DATADIR%%/samples/plus_10_pourcent_group.py -%%DATADIR%%/samples/ReadMe -%%DATADIR%%/samples/sample_db_usage.py -%%DATADIR%%/samples/extract_text.py -%%DATADIR%%/scripts/ReadMe -%%DATADIR%%/scripts/ChangeLog -%%DATADIR%%/scripts/NEWS -%%DATADIR%%/scripts/TODO -%%DATADIR%%/scripts/FontSample.py -%%DATADIR%%/scripts/CalendarWizard.py +@comment %%DATADIR%%/samples/boilerplate.py +@comment %%DATADIR%%/samples/golden-mean.py +@comment %%DATADIR%%/samples/quote.py +@comment %%DATADIR%%/samples/wordcount.py +@comment %%DATADIR%%/samples/Sample1.py +@comment %%DATADIR%%/samples/trait_de_coupe.py +@comment %%DATADIR%%/samples/Calendar.py +@comment %%DATADIR%%/samples/pochette_cd.py +@comment %%DATADIR%%/samples/3columnUSLTR.py +@comment %%DATADIR%%/samples/3columnA4.py +@comment %%DATADIR%%/samples/legende.py +@comment %%DATADIR%%/samples/moins_10_pourcent_group.py +@comment %%DATADIR%%/samples/plus_10_pourcent_group.py +@comment %%DATADIR%%/samples/ReadMe +@comment %%DATADIR%%/samples/sample_db_usage.py +@comment %%DATADIR%%/samples/extract_text.py +@comment %%DATADIR%%/scripts/ReadMe +@comment %%DATADIR%%/scripts/ChangeLog +@comment %%DATADIR%%/scripts/NEWS +@comment %%DATADIR%%/scripts/TODO +@comment %%DATADIR%%/scripts/FontSample.py +@comment %%DATADIR%%/scripts/CalendarWizard.py share/mime/packages/scribus.xml -@dirrm %%DATADIR%%/scripts -@dirrm %%DATADIR%%/samples +@comment @dirrm %%DATADIR%%/scripts +@comment @dirrm %%DATADIR%%/samples @dirrm %%DATADIR%%/plugins @dirrm %%DATADIR%%/loremipsum @dirrm %%DATADIR%%/dtd diff --git a/print/scribus/Makefile b/print/scribus/Makefile index 7ce74074986d..281a997a85f7 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -8,7 +8,7 @@ PORTNAME= scribus PORTVERSION= 1.3.3.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.scribus.net/downloads/${PORTVERSION}/ @@ -31,6 +31,7 @@ USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= yes USE_GMAKE= yes USE_PERL5_BUILD=yes +CONFIGURE_ARGS= --enable-scripter2 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/print/scribus/pkg-plist b/print/scribus/pkg-plist index 6a553ea0b438..eace538703db 100644 --- a/print/scribus/pkg-plist +++ b/print/scribus/pkg-plist @@ -48,9 +48,9 @@ include/scribus/fontprefs.h include/scribus/fontreplacedialog.h include/scribus/fparser.h include/scribus/fpconfig.h -include/scribus/fptypes.h include/scribus/fpoint.h include/scribus/fpointarray.h +include/scribus/fptypes.h include/scribus/frameedit.h include/scribus/gradienteditor.h include/scribus/gtaction.h @@ -83,10 +83,10 @@ include/scribus/linecombo.h include/scribus/lineformats.h include/scribus/linkbutton.h include/scribus/loremipsum.h -include/scribus/md5.h -include/scribus/mdup.h include/scribus/margindialog.h include/scribus/marginwidget.h +include/scribus/md5.h +include/scribus/mdup.h include/scribus/measurements.h include/scribus/menumanager.h include/scribus/mergedoc.h @@ -124,30 +124,30 @@ include/scribus/prefstable.h include/scribus/preview.h include/scribus/query.h include/scribus/rc4.h -include/scribus/rulermover.h include/scribus/reformdoc.h +include/scribus/rulermover.h include/scribus/sampleitem.h include/scribus/sccolor.h +include/scribus/scfontmetrics.h include/scribus/scfonts.h include/scribus/scfonts_ttf.h -include/scribus/scfontmetrics.h include/scribus/scmenu.h include/scribus/scmessagebox.h include/scribus/scpainter.h include/scribus/scpaths.h -include/scribus/scrap.h +include/scribus/scpixmapcache.h include/scribus/scplugin.h include/scribus/scpreview.h include/scribus/scraction.h +include/scribus/scrap.h include/scribus/scribus.h +include/scribus/scribusXml.h include/scribus/scribusapp.h include/scribus/scribusdoc.h include/scribus/scribusstructs.h include/scribus/scribusview.h include/scribus/scribuswin.h -include/scribus/scribusXml.h include/scribus/scrpalettebase.h -include/scribus/scpixmapcache.h include/scribus/search.h include/scribus/seiten.h include/scribus/selection.h @@ -178,6 +178,27 @@ include/scribus/unzip.h include/scribus/vgradient.h include/scribus/vruler.h include/scribus/werktoolb.h +lib/scribus/dicts/README_ca_ES.txt +lib/scribus/dicts/README_cs_CZ.txt +lib/scribus/dicts/README_cy_GB.txt +lib/scribus/dicts/README_de_DE.txt +lib/scribus/dicts/README_en_EN.txt +lib/scribus/dicts/README_en_GB.txt +lib/scribus/dicts/README_es_ES.txt +lib/scribus/dicts/README_fi_FI.txt +lib/scribus/dicts/README_hu_HU.txt +lib/scribus/dicts/README_hyph_da_DK.txt +lib/scribus/dicts/README_hyph_is_IS.txt +lib/scribus/dicts/README_hyph_pl_PL.txt +lib/scribus/dicts/README_lt_LT.txt +lib/scribus/dicts/README_no_NO.txt +lib/scribus/dicts/README_pt_BR.txt +lib/scribus/dicts/README_pt_PT.txt +lib/scribus/dicts/README_ru_RU_0.txt +lib/scribus/dicts/README_sk_SK.txt +lib/scribus/dicts/README_sl_SI.txt +lib/scribus/dicts/README_sv_SE.txt +lib/scribus/dicts/README_uk_UA.txt lib/scribus/dicts/hyph_af.dic lib/scribus/dicts/hyph_ca.dic lib/scribus/dicts/hyph_cs.dic @@ -205,102 +226,78 @@ lib/scribus/dicts/hyph_sk.dic lib/scribus/dicts/hyph_sl.dic lib/scribus/dicts/hyph_sv.dic lib/scribus/dicts/hyph_uk.dic -lib/scribus/dicts/README_ca_ES.txt -lib/scribus/dicts/README_en_EN.txt -lib/scribus/dicts/README_cs_CZ.txt -lib/scribus/dicts/README_cy_GB.txt -lib/scribus/dicts/README_hyph_da_DK.txt -lib/scribus/dicts/README_de_DE.txt -lib/scribus/dicts/README_en_GB.txt -lib/scribus/dicts/README_es_ES.txt -lib/scribus/dicts/README_fi_FI.txt -lib/scribus/dicts/README_hu_HU.txt -lib/scribus/dicts/README_hyph_is_IS.txt -lib/scribus/dicts/README_lt_LT.txt -lib/scribus/dicts/README_no_NO.txt -lib/scribus/dicts/README_hyph_pl_PL.txt -lib/scribus/dicts/README_pt_BR.txt -lib/scribus/dicts/README_pt_PT.txt -lib/scribus/dicts/README_ru_RU_0.txt -lib/scribus/dicts/README_sk_SK.txt -lib/scribus/dicts/README_sl_SI.txt -lib/scribus/dicts/README_sv_SE.txt -lib/scribus/dicts/README_uk_UA.txt +lib/scribus/import.prolog lib/scribus/keysets/scribus13.ksxml -lib/scribus/profiles/ReadMe -lib/scribus/profiles/srgb.license -lib/scribus/profiles/sRGB.icm -lib/scribus/profiles/GenericCMYK.icm -lib/scribus/profiles/GenericCMYK.txt -lib/scribus/swatches/Scribus_SVG.txt -lib/scribus/swatches/Scribus_X11Grey.txt -lib/scribus/swatches/Scribus_Gnome.txt -lib/scribus/swatches/Scribus_X11.txt -lib/scribus/swatches/Scribus_OpenOffice.txt -lib/scribus/plugins/libscribusshortwords.so.0 -lib/scribus/plugins/libscribusshortwords.so -lib/scribus/plugins/libscribusshortwords.la -lib/scribus/plugins/libsvgexplugin.so.0 -lib/scribus/plugins/libsvgexplugin.so -lib/scribus/plugins/libsvgexplugin.la -lib/scribus/plugins/libsvgimplugin.so.0 -lib/scribus/plugins/libsvgimplugin.so -lib/scribus/plugins/libsvgimplugin.la -lib/scribus/plugins/libimportps.so.0 -lib/scribus/plugins/libimportps.so -lib/scribus/plugins/libimportps.la -lib/scribus/plugins/libfontpreview.so.0 -lib/scribus/plugins/libfontpreview.so -lib/scribus/plugins/libfontpreview.la -lib/scribus/plugins/libscribusexportpixmap.so.0 -lib/scribus/plugins/gettext/libhtmlim.so.0 -lib/scribus/plugins/gettext/libhtmlim.so -lib/scribus/plugins/gettext/libhtmlim.la -lib/scribus/plugins/gettext/libtxtim.so.0 -lib/scribus/plugins/gettext/libtxtim.so -lib/scribus/plugins/gettext/libtxtim.la -lib/scribus/plugins/gettext/libcsvim.so.0 -lib/scribus/plugins/gettext/libcsvim.so lib/scribus/plugins/gettext/libcsvim.la -lib/scribus/plugins/gettext/libsxwimplugin.so.0 -lib/scribus/plugins/gettext/libsxwimplugin.so -lib/scribus/plugins/gettext/libsxwimplugin.la -lib/scribus/plugins/gettext/libtextfilterplugin.so.0 -lib/scribus/plugins/gettext/libtextfilterplugin.so -lib/scribus/plugins/gettext/libtextfilterplugin.la -lib/scribus/plugins/gettext/libodtimplugin.so.0 -lib/scribus/plugins/gettext/libodtimplugin.so +lib/scribus/plugins/gettext/libcsvim.so +lib/scribus/plugins/gettext/libcsvim.so.0 +lib/scribus/plugins/gettext/libdocim.la +lib/scribus/plugins/gettext/libdocim.so +lib/scribus/plugins/gettext/libdocim.so.0 +lib/scribus/plugins/gettext/libhtmlim.la +lib/scribus/plugins/gettext/libhtmlim.so +lib/scribus/plugins/gettext/libhtmlim.so.0 lib/scribus/plugins/gettext/libodtimplugin.la +lib/scribus/plugins/gettext/libodtimplugin.so +lib/scribus/plugins/gettext/libodtimplugin.so.0 +lib/scribus/plugins/gettext/libpdbim.la lib/scribus/plugins/gettext/libpdbim.so lib/scribus/plugins/gettext/libpdbim.so.0 -lib/scribus/plugins/gettext/libpdbim.la -lib/scribus/plugins/gettext/libdocim.so.0 -lib/scribus/plugins/gettext/libdocim.so -lib/scribus/plugins/gettext/libdocim.la -lib/scribus/plugins/libscribusexportpixmap.so -lib/scribus/plugins/libscribusexportpixmap.la -lib/scribus/plugins/libnewfromtemplateplugin.so.0 -lib/scribus/plugins/libnewfromtemplateplugin.so +lib/scribus/plugins/gettext/libsxwimplugin.la +lib/scribus/plugins/gettext/libsxwimplugin.so +lib/scribus/plugins/gettext/libsxwimplugin.so.0 +lib/scribus/plugins/gettext/libtextfilterplugin.la +lib/scribus/plugins/gettext/libtextfilterplugin.so +lib/scribus/plugins/gettext/libtextfilterplugin.so.0 +lib/scribus/plugins/gettext/libtxtim.la +lib/scribus/plugins/gettext/libtxtim.so +lib/scribus/plugins/gettext/libtxtim.so.0 +lib/scribus/plugins/libbarcodegenerator.la +lib/scribus/plugins/libbarcodegenerator.so +lib/scribus/plugins/libbarcodegenerator.so.0 +lib/scribus/plugins/libcolorwheel.la +lib/scribus/plugins/libcolorwheel.so +lib/scribus/plugins/libcolorwheel.so.0 +lib/scribus/plugins/libfontpreview.la +lib/scribus/plugins/libfontpreview.so +lib/scribus/plugins/libfontpreview.so.0 +lib/scribus/plugins/libimportps.la +lib/scribus/plugins/libimportps.so +lib/scribus/plugins/libimportps.so.0 lib/scribus/plugins/libnewfromtemplateplugin.la -lib/scribus/plugins/libsaveastemplateplugin.so.0 -lib/scribus/plugins/libsaveastemplateplugin.so -lib/scribus/plugins/libsaveastemplateplugin.la -lib/scribus/plugins/liboodrawimp.so.0 -lib/scribus/plugins/liboodrawimp.so -lib/scribus/plugins/liboodrawimp.la -lib/scribus/plugins/liboldscribusformat.so.0 -lib/scribus/plugins/liboldscribusformat.so +lib/scribus/plugins/libnewfromtemplateplugin.so +lib/scribus/plugins/libnewfromtemplateplugin.so.0 lib/scribus/plugins/liboldscribusformat.la -lib/scribus/plugins/libscriptplugin.so.0 -lib/scribus/plugins/libscriptplugin.so -lib/scribus/plugins/libscriptplugin.la -lib/scribus/plugins/libcolorwheel.so.0 -lib/scribus/plugins/libcolorwheel.so -lib/scribus/plugins/libcolorwheel.la -lib/scribus/plugins/libbarcodegenerator.so.0 -lib/scribus/plugins/libbarcodegenerator.so -lib/scribus/plugins/libbarcodegenerator.la -lib/scribus/import.prolog +lib/scribus/plugins/liboldscribusformat.so +lib/scribus/plugins/liboldscribusformat.so.0 +lib/scribus/plugins/liboodrawimp.la +lib/scribus/plugins/liboodrawimp.so +lib/scribus/plugins/liboodrawimp.so.0 +lib/scribus/plugins/libsaveastemplateplugin.la +lib/scribus/plugins/libsaveastemplateplugin.so +lib/scribus/plugins/libsaveastemplateplugin.so.0 +lib/scribus/plugins/libscribusexportpixmap.la +lib/scribus/plugins/libscribusexportpixmap.so +lib/scribus/plugins/libscribusexportpixmap.so.0 +lib/scribus/plugins/libscribusshortwords.la +lib/scribus/plugins/libscribusshortwords.so +lib/scribus/plugins/libscribusshortwords.so.0 +lib/scribus/plugins/libsvgexplugin.la +lib/scribus/plugins/libsvgexplugin.so +lib/scribus/plugins/libsvgexplugin.so.0 +lib/scribus/plugins/libsvgimplugin.la +lib/scribus/plugins/libsvgimplugin.so +lib/scribus/plugins/libsvgimplugin.so.0 +lib/scribus/profiles/GenericCMYK.icm +lib/scribus/profiles/GenericCMYK.txt +lib/scribus/profiles/ReadMe +lib/scribus/profiles/sRGB.icm +lib/scribus/profiles/srgb.license +lib/scribus/swatches/Scribus_Gnome.txt +lib/scribus/swatches/Scribus_OpenOffice.txt +lib/scribus/swatches/Scribus_SVG.txt +lib/scribus/swatches/Scribus_X11.txt +lib/scribus/swatches/Scribus_X11Grey.txt %%DOCSDIR%%-%%SCRIBUS_VERSION%%/en/tutorials/scribus-short-words/menu.xml %%DOCSDIR%%-%%SCRIBUS_VERSION%%/en/tutorials/scribus-short-words/after_short_words.png %%DOCSDIR%%-%%SCRIBUS_VERSION%%/en/tutorials/scribus-short-words/before_short_words.png @@ -1139,31 +1136,31 @@ lib/scribus/import.prolog %%DATADIR%%/loremipsum/slovenian.xml %%DATADIR%%/plugins/scribus-short-words.rc %%DATADIR%%/plugins/barcode.ps -%%DATADIR%%/samples/boilerplate.py -%%DATADIR%%/samples/golden-mean.py -%%DATADIR%%/samples/quote.py -%%DATADIR%%/samples/wordcount.py -%%DATADIR%%/samples/Sample1.py -%%DATADIR%%/samples/trait_de_coupe.py -%%DATADIR%%/samples/Calendar.py -%%DATADIR%%/samples/pochette_cd.py -%%DATADIR%%/samples/3columnUSLTR.py -%%DATADIR%%/samples/3columnA4.py -%%DATADIR%%/samples/legende.py -%%DATADIR%%/samples/moins_10_pourcent_group.py -%%DATADIR%%/samples/plus_10_pourcent_group.py -%%DATADIR%%/samples/ReadMe -%%DATADIR%%/samples/sample_db_usage.py -%%DATADIR%%/samples/extract_text.py -%%DATADIR%%/scripts/ReadMe -%%DATADIR%%/scripts/ChangeLog -%%DATADIR%%/scripts/NEWS -%%DATADIR%%/scripts/TODO -%%DATADIR%%/scripts/FontSample.py -%%DATADIR%%/scripts/CalendarWizard.py +@comment %%DATADIR%%/samples/boilerplate.py +@comment %%DATADIR%%/samples/golden-mean.py +@comment %%DATADIR%%/samples/quote.py +@comment %%DATADIR%%/samples/wordcount.py +@comment %%DATADIR%%/samples/Sample1.py +@comment %%DATADIR%%/samples/trait_de_coupe.py +@comment %%DATADIR%%/samples/Calendar.py +@comment %%DATADIR%%/samples/pochette_cd.py +@comment %%DATADIR%%/samples/3columnUSLTR.py +@comment %%DATADIR%%/samples/3columnA4.py +@comment %%DATADIR%%/samples/legende.py +@comment %%DATADIR%%/samples/moins_10_pourcent_group.py +@comment %%DATADIR%%/samples/plus_10_pourcent_group.py +@comment %%DATADIR%%/samples/ReadMe +@comment %%DATADIR%%/samples/sample_db_usage.py +@comment %%DATADIR%%/samples/extract_text.py +@comment %%DATADIR%%/scripts/ReadMe +@comment %%DATADIR%%/scripts/ChangeLog +@comment %%DATADIR%%/scripts/NEWS +@comment %%DATADIR%%/scripts/TODO +@comment %%DATADIR%%/scripts/FontSample.py +@comment %%DATADIR%%/scripts/CalendarWizard.py share/mime/packages/scribus.xml -@dirrm %%DATADIR%%/scripts -@dirrm %%DATADIR%%/samples +@comment @dirrm %%DATADIR%%/scripts +@comment @dirrm %%DATADIR%%/samples @dirrm %%DATADIR%%/plugins @dirrm %%DATADIR%%/loremipsum @dirrm %%DATADIR%%/dtd diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile index 139a91a16ec4..71de928854aa 100644 --- a/print/system-config-printer/Makefile +++ b/print/system-config-printer/Makefile @@ -8,6 +8,7 @@ PORTNAME= system-config-printer PORTVERSION= 1.0.15 +PORTREVISION= 1 CATEGORIES= print gnome MASTER_SITES= http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}.x/ @@ -33,6 +34,7 @@ USE_GETTEXT= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" USE_GNOME= pygtk2 MAN1= system-config-printer-applet.1 system-config-printer.1 +PLIST_SUB= PYTHON_VER=${PYTHON_VER} post-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ diff --git a/print/system-config-printer/pkg-plist b/print/system-config-printer/pkg-plist index a7c40711380e..b1408928a6a8 100644 --- a/print/system-config-printer/pkg-plist +++ b/print/system-config-printer/pkg-plist @@ -3,7 +3,7 @@ bin/system-config-printer bin/system-config-printer-applet etc/dbus-1/system.d/newprinternotification.conf etc/xdg/autostart/redhat-print-applet.desktop -%%PYTHON_SITELIBDIR%%/cupshelpers-1.0-py2.5.egg-info +%%PYTHON_SITELIBDIR%%/cupshelpers-1.0-py%%PYTHON_VER%%.egg-info %%PYTHON_SITELIBDIR%%/cupshelpers/__init__.py %%PYTHON_SITELIBDIR%%/cupshelpers/__init__.pyc %%PYTHON_SITELIBDIR%%/cupshelpers/cupshelpers.py diff --git a/sysutils/isomd5sum/Makefile b/sysutils/isomd5sum/Makefile index 863d98df24c3..de8afefb5a48 100644 --- a/sysutils/isomd5sum/Makefile +++ b/sysutils/isomd5sum/Makefile @@ -7,6 +7,7 @@ PORTNAME= isomd5sum PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://fedorahosted.org/releases/i/s/isomd5sum/ diff --git a/sysutils/isomd5sum/pkg-plist b/sysutils/isomd5sum/pkg-plist index cfc74b0be8b5..64f7573d427d 100644 --- a/sysutils/isomd5sum/pkg-plist +++ b/sysutils/isomd5sum/pkg-plist @@ -4,4 +4,4 @@ include/libimplantisomd5.h include/libcheckisomd5.h lib/libimplantisomd5.a lib/libcheckisomd5.a -lib/python2.5/site-packages/pyisomd5sum.so +%%PYTHON_SITELIBDIR%%/pyisomd5sum.so diff --git a/sysutils/kleansweep/Makefile b/sysutils/kleansweep/Makefile index 143342a436eb..3d6deef41de6 100644 --- a/sysutils/kleansweep/Makefile +++ b/sysutils/kleansweep/Makefile @@ -7,7 +7,7 @@ PORTNAME= kleansweep PORTVERSION= 0.2.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://linux.bydg.org/~yogin/ @@ -22,6 +22,11 @@ USE_KDELIBS_VER=3 post-extract: (cd ${WRKSRC} && ${TAR} xzf admin/scons-mini.tar.bz2) +post-patch: +# `as' is reserved word in python 2.6, rename module + @cd ${WRKSRC}/scons-local-0.96.1/SCons/Tool && ${MV} as.py asm.py + @${REINPLACE_CMD} -e 's|as\.gen|asm.gen|; /import/ s|as|asm|' \ + ${WRKSRC}/scons-local-0.96.1/SCons/Tool/gas.py do-configure: (cd ${WRKSRC} && ./scons configure prefix=${PREFIX}) diff --git a/textproc/py-Tempita/Makefile b/textproc/py-Tempita/Makefile index f1ef91561706..c47415a5da9b 100644 --- a/textproc/py-Tempita/Makefile +++ b/textproc/py-Tempita/Makefile @@ -14,7 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wenheping@gmail.com COMMENT= A very small text templating language -USE_PYTHON= 2.5 +USE_PYTHON= 2.5+ USE_PYDISTUTILS= easy_install .include <bsd.port.mk> diff --git a/textproc/py-lucene/Makefile b/textproc/py-lucene/Makefile index 31825ba9c972..4dcbcee659bf 100644 --- a/textproc/py-lucene/Makefile +++ b/textproc/py-lucene/Makefile @@ -42,7 +42,13 @@ MAKE_ARGS+= PREFIX=${PREFIX} PREFIX_PYTHON=${LOCALBASE} PYTHON=${PYTHON_CMD} \ pre-build: ${CP} -R ${WRKDIR}/../../lucene/work/lucene-${LUCENE_VER} ${WRKSRC}/lucene-java-${LUCENE_VER} +.include <bsd.port.pre.mk> + +.if ${PYTHON_REL} > 250 +BROKEN= Doesn't build with ${PYTHON_VERSION} +.endif + #regression-test: # cd ${WRKSRC}; env ${MAKE_ENV} ${GMAKE} test -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile index fe013661f1ad..3849da072783 100644 --- a/textproc/py-xml/Makefile +++ b/textproc/py-xml/Makefile @@ -7,6 +7,7 @@ PORTNAME= xml PORTVERSION= 0.8.4 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= pyxml diff --git a/textproc/py-xml/pkg-plist b/textproc/py-xml/pkg-plist index 4129e958ba1c..792c96a32e69 100644 --- a/textproc/py-xml/pkg-plist +++ b/textproc/py-xml/pkg-plist @@ -532,11 +532,7 @@ bin/xmlproc_val %%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/NamespaceNode.pyc %%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/NamespaceNode.pyo %%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedAbsoluteLocationPath.py -%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedAbsoluteLocationPath.pyc -%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedAbsoluteLocationPath.pyo %%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedRelativeLocationPath.py -%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedRelativeLocationPath.pyc -%%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbbreviatedRelativeLocationPath.pyo %%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbsoluteLocationPath.py %%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbsoluteLocationPath.pyc %%XPATH%%%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/xpath/ParsedAbsoluteLocationPath.pyo diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile index b88ea663fb7a..0ee10cbff643 100644 --- a/textproc/skim/Makefile +++ b/textproc/skim/Makefile @@ -34,6 +34,10 @@ CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ .include <bsd.port.pre.mk> +.if ${PYTHON_REL} > 250 +BROKEN= Doesn't build with ${PYTHON_VERSION} +.endif + post-patch: ${REINPLACE_CMD} s,bash,sh,g ${WRKSRC}/src/scim-panel-kde.in diff --git a/www/py-WebError/Makefile b/www/py-WebError/Makefile index 28ad0ad11c0a..9472f566159d 100644 --- a/www/py-WebError/Makefile +++ b/www/py-WebError/Makefile @@ -7,6 +7,7 @@ PORTNAME= WebError PORTVERSION= 0.10.1 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.7:${PORTSDIR}/www/py-paste \ ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:${PORTSDIR}/www/py-webob \ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.8:${PORTSDIR}/devel/py-simplejson -USE_PYTHON= 2.5 +USE_PYTHON= 2.5+ USE_PYDISTUTILS= easy_install .include <bsd.port.mk> diff --git a/www/py-pylons/Makefile b/www/py-pylons/Makefile index 07ce1a30475f..9a2d6c3e8d14 100644 --- a/www/py-pylons/Makefile +++ b/www/py-pylons/Makefile @@ -7,6 +7,7 @@ PORTNAME= pylons PORTVERSION= 0.9.6.2 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= http://pylonshq.com/download/0.9.6.2/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -28,7 +29,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.3:${PORTSDIR}/www/py-paste \ ${PYTHON_PKGNAMEPREFIX}webhelpers>=0.3.2:${PORTSDIR}/www/py-webhelpers \ myghty>=1.1:${PORTSDIR}/www/myghty -USE_PYTHON= 2.5 +USE_PYTHON= 2.5+ USE_PYDISTUTILS= easy_install PYDISTUTILS_PKGNAME= Pylons PYDISTUTILS_NOEGGINFO= yes diff --git a/www/py-webhelpers/Makefile b/www/py-webhelpers/Makefile index b6062c374d96..2746b6d5cfbc 100644 --- a/www/py-webhelpers/Makefile +++ b/www/py-webhelpers/Makefile @@ -18,7 +18,7 @@ COMMENT= Python helper functions for writing templates in web applications RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=1.1:${PORTSDIR}/www/py-routes \ ${PYTHON_PKGNAMEPREFIX}simplejson>=1.4:${PORTSDIR}/devel/py-simplejson -USE_PYTHON= 2.5 +USE_PYTHON= 2.5+ USE_PYDISTUTILS= easy_install PYDISTUTILS_PKGNAME= WebHelpers diff --git a/www/roundup/Makefile b/www/roundup/Makefile index 277623da68de..c058d189bce8 100644 --- a/www/roundup/Makefile +++ b/www/roundup/Makefile @@ -7,6 +7,7 @@ PORTNAME= roundup PORTVERSION= 1.4.8 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP @@ -49,7 +50,7 @@ SCRIPTS= roundup-admin roundup-demo roundup-gettext roundup-mailgw \ roundup-server roundup-xmlrpc-server post-install: - @${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/build/scripts-2.5/,} ${PREFIX}/bin + @${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/build/scripts-${PYTHON_VER}/,} ${PREFIX}/bin .if !defined(NO_INSTALL_MANPAGES) @${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/share/man/man1/,} ${MAN1PREFIX}/man/man1 .endif diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile index d31d1347ffc9..7de11173b3b0 100644 --- a/x11-toolkits/py-gtk/Makefile +++ b/x11-toolkits/py-gtk/Makefile @@ -7,7 +7,7 @@ PORTNAME= py-gtk PORTVERSION= 0.6.11 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-toolkits python MASTER_SITES= GNOME DISTNAME= gnome-python-1.4.4 diff --git a/x11-toolkits/py-gtk/pkg-plist b/x11-toolkits/py-gtk/pkg-plist index 34751c649b11..72bf4998ce49 100644 --- a/x11-toolkits/py-gtk/pkg-plist +++ b/x11-toolkits/py-gtk/pkg-plist @@ -25,8 +25,6 @@ include/pygtk/pygtk.h %%PYTHON_SITELIBDIR%%/gtk-1.2/gdkpixbufmodule.la %%PYTHON_SITELIBDIR%%/gtk-1.2/gdkpixbufmodule.so %%PYTHON_SITELIBDIR%%/gtk-1.2/gtk.py -%%PYTHON_SITELIBDIR%%/gtk-1.2/gtk.pyc -%%PYTHON_SITELIBDIR%%/gtk-1.2/gtk.pyo %%PYTHON_SITELIBDIR%%/gtk-1.2/gtkgl.py %%PYTHON_SITELIBDIR%%/gtk-1.2/gtkgl.pyc %%PYTHON_SITELIBDIR%%/gtk-1.2/gtkgl.pyo diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile index 0964b33087dd..dbc86ae6f26f 100644 --- a/x11-toolkits/py-gui/Makefile +++ b/x11-toolkits/py-gui/Makefile @@ -6,7 +6,7 @@ PORTNAME= gui PORTVERSION= 1.7.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits python MASTER_SITES= http://www.cosc.canterbury.ac.nz/~greg/python_gui/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/x11-toolkits/py-gui/pkg-plist b/x11-toolkits/py-gui/pkg-plist index eeb9a15919b0..86d7d88604d4 100644 --- a/x11-toolkits/py-gui/pkg-plist +++ b/x11-toolkits/py-gui/pkg-plist @@ -247,8 +247,6 @@ %%PYTHON_SITELIBDIR%%/GUI/Gtk/Frames.pyc %%PYTHON_SITELIBDIR%%/GUI/Gtk/Frames.pyo %%PYTHON_SITELIBDIR%%/GUI/Gtk/GL.py -%%PYTHON_SITELIBDIR%%/GUI/Gtk/GL.pyc -%%PYTHON_SITELIBDIR%%/GUI/Gtk/GL.pyo %%PYTHON_SITELIBDIR%%/GUI/Gtk/GLContexts.py %%PYTHON_SITELIBDIR%%/GUI/Gtk/GLContexts.pyc %%PYTHON_SITELIBDIR%%/GUI/Gtk/GLContexts.pyo diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile index 3939c1833062..132d04a3eda0 100644 --- a/x11-toolkits/py-wxPython28/Makefile +++ b/x11-toolkits/py-wxPython28/Makefile @@ -7,7 +7,7 @@ PORTNAME= wxPython PORTVERSION= 2.8.7.1 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11-toolkits python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= wxpython @@ -25,6 +25,8 @@ USE_BZIP2= yes USE_GMAKE= yes USE_PYTHON= yes USE_PYDISTUTILS=yes +PLIST_SUB= PYTHON_VER=${PYTHON_VER} + PYDISTUTILS_BUILDARGS= \ WX_CONFIG="${WX_CONFIG}" \ WXPORT="${WXPORT}" diff --git a/x11-toolkits/py-wxPython28/pkg-plist b/x11-toolkits/py-wxPython28/pkg-plist index 3b866d381621..c0fdbe0da653 100644 --- a/x11-toolkits/py-wxPython28/pkg-plist +++ b/x11-toolkits/py-wxPython28/pkg-plist @@ -1134,7 +1134,7 @@ %%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.7.1-py2.5.egg-info +%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython-2.8.7.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 @@ -1420,7 +1420,7 @@ %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/xrc.py %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/xrc.pyc %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/xrc.pyo -%%PYTHON_SITELIBDIR%%/wxaddons-2.8.7.1-py2.5.egg-info +%%PYTHON_SITELIBDIR%%/wxaddons-2.8.7.1-py%%PYTHON_VER%%.egg-info %%PYTHON_SITELIBDIR%%/wxaddons/__init__.py %%PYTHON_SITELIBDIR%%/wxaddons/__init__.pyc %%PYTHON_SITELIBDIR%%/wxaddons/__init__.pyo diff --git a/x11-wm/plwm/Makefile b/x11-wm/plwm/Makefile index 5ccfaedc0801..e53996a2dbc1 100644 --- a/x11-wm/plwm/Makefile +++ b/x11-wm/plwm/Makefile @@ -7,6 +7,7 @@ PORTNAME= plwm PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= x11-wm python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/x11-wm/plwm/files/patch-plwm_outline.py b/x11-wm/plwm/files/patch-plwm_outline.py new file mode 100644 index 000000000000..cb6f011c291d --- /dev/null +++ b/x11-wm/plwm/files/patch-plwm_outline.py @@ -0,0 +1,43 @@ +--- plwm/outline.py.orig 2001-11-26 14:48:21.000000000 +0100 ++++ plwm/outline.py 2009-06-06 17:47:13.000000000 +0200 +@@ -63,7 +63,7 @@ + + if name: + self.outline_gc.set_clip_rectangles(0, 0, [coords], X.YXSorted) +- sx, sy, sw, sh, as = namepos ++ sx, sy, sw, sh, _as = namepos + self.screen.root.draw_text(self.outline_gc, sx, sy, name) + self.outline_name = (sx, sy, name) + else: +@@ -138,8 +138,8 @@ + height = s[3] - s[1] + 1) + + if name: +- sx, sy, sw, sh, as = namepos +- self.outline_name_window.configure(x = sx, y = sy - as, ++ sx, sy, sw, sh, _as = namepos ++ self.outline_name_window.configure(x = sx, y = sy - _as, + width = sw, height = sh) + + if not self.outline_mapped: +@@ -155,7 +155,7 @@ + # disappear otherwise... + if name: + self.outline_name_window.image_text(self.outline_name_gc, +- 0, as, name) ++ 0, _as, name) + + def outline_hide(self): + if self.outline_mapped: +@@ -246,8 +246,8 @@ + + sw = min(r.overall_width, w) + sh = min(r.overall_ascent + r.overall_descent, h) +- as = r.overall_ascent ++ _as = r.overall_ascent + else: +- sx = sy = sw = sh = as = 0 ++ sx = sy = sw = sh = _as = 0 + +- return (x, y, w, h), s, (sx, sy, sw, sh, as) ++ return (x, y, w, h), s, (sx, sy, sw, sh, _as) |