5 files changed, 16 insertions, 55 deletions

diff --git a/devel/py-utils/Makefile b/devel/py-utils/Makefile
index 320ee06dd47f..85ec78547088 100644
--- a/devel/py-utils/Makefile
+++ b/devel/py-utils/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	utils
-PORTVERSION=	0.2.5
+PORTVERSION=	0.3.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.voidspace.org.uk/cgi-bin/voidspace/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,17 +15,19 @@ DISTNAME=	downman.py?file=pythonutils-${PORTVERSION}
 MAINTAINER=	daniel@netwalk.org
 COMMENT=	General utility modules that simplify common programming in Python
 
-USE_PYTHON=	2.2+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_PKGNAME=	pythonutils
 PYDISTUTILS_EGGINFODIR=	${PYTHONPREFIX_SITELIBDIR}/pythonutils
 WRKSRC=		${WRKDIR}/pythonutils-${PORTVERSION}
 USE_ZIP=	yes
 
+DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/docs/ ${DOCSDIR}
+	@(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-utils/distinfo b/devel/py-utils/distinfo
index 7fb222b5eace..264e54f89fbf 100644
--- a/devel/py-utils/distinfo
+++ b/devel/py-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (downman.py?file=pythonutils-0.2.5.zip) = 9193f93635e0272a22e651b09d4e278a
-SHA256 (downman.py?file=pythonutils-0.2.5.zip) = 634fb79e2d9c60a5fe9612900cf1e7dae4864c5197f3b436530aa31e770b6778
-SIZE (downman.py?file=pythonutils-0.2.5.zip) = 293531
+MD5 (downman.py?file=pythonutils-0.3.0.zip) = 3d56f4eb222de11fd8bd55963a2360aa
+SHA256 (downman.py?file=pythonutils-0.3.0.zip) = c277ed4206abd34c6c4aa7c68295b97f2adbc02e94ef0e3137faaacef4871a4a
+SIZE (downman.py?file=pythonutils-0.3.0.zip) = 346840
diff --git a/devel/py-utils/files/patch-python25 b/devel/py-utils/files/patch-python25
deleted file mode 100644
index f87e7c74aaec..000000000000
--- a/devel/py-utils/files/patch-python25
+++ /dev/null
@@ -1,35 +0,0 @@
---- pythonutils/pathutils.py.orig	Fri Mar 30 06:39:37 2007
-+++ pythonutils/pathutils.py	Fri Mar 30 06:39:49 2007
-@@ -14,13 +14,13 @@
- # Scripts maintained at http://www.voidspace.org.uk/python/index.shtml
- # E-mail fuzzyman@voidspace.org.uk
- 
-+from __future__ import generators
- """
- This module contains convenience functions for working with files and paths.
- """
- 
- __version__ = '0.2.4'
- 
--from __future__ import generators
- import os
- import sys
- import time
---- pythonutils/odict.py.orig	Fri Mar 30 06:41:25 2007
-+++ pythonutils/odict.py	Fri Mar 30 06:41:35 2007
-@@ -14,6 +14,7 @@
- # http://groups.google.com/group/pythonutils/
- # Comments, suggestions and bug reports welcome.
- 
-+from __future__ import generators
- """A dict that keeps keys in insertion order"""
- 
- __author__ = ('Nicola Larosa <nico-NoSp@m-tekNico.net>,'
-@@ -27,7 +28,6 @@
- 
- __all__ = ['OrderedDict', 'SequenceOrderedDict']
- 
--from __future__ import generators
- from warnings import warn
- from types import SliceType
- 
diff --git a/devel/py-utils/pkg-descr b/devel/py-utils/pkg-descr
index 4f35f382c2d5..afd86ca2463f 100644
--- a/devel/py-utils/pkg-descr
+++ b/devel/py-utils/pkg-descr
@@ -1,11 +1,10 @@
 The Voidspace Pythonutils package is a simple way of installing the Voidspace
 collection of modules. These are currently:
 
-    ConfigObj 4.1.0 - Easy config file reading/writing
-    validate 0.2.1 - Validation and type conversion system
-    listquote 1.4.0 - String to list conversion
-    StandOut 2.1.0 - Simple logging and output control object
-    pathutils 0.2.4 - For working with paths and files
+    ConfigObj 4.4.0 - Easy config file reading/writing
+    validate 0.2.3 - Validation and type conversion system
+    StandOut 3.0.0 - Simple logging and output control object
+    pathutils 0.2.5 - For working with paths and files
     cgiutils 0.3.5 - CGI helpers
     urlpath 0.1.0 - Functions for handling URLs
     odict 0.2.1 - Ordered Dictionary Class
diff --git a/devel/py-utils/pkg-plist b/devel/py-utils/pkg-plist
index 0e3cbfb80339..9cf0985eacec 100644
--- a/devel/py-utils/pkg-plist
+++ b/devel/py-utils/pkg-plist
@@ -1,3 +1,4 @@
+%%PYTHON_SITELIBDIR%%/pythonutils.pth
 %%PYTHON_SITELIBDIR%%/pythonutils/__init__.py
 %%PYTHON_SITELIBDIR%%/pythonutils/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pythonutils/__init__.pyo
@@ -7,9 +8,6 @@
 %%PYTHON_SITELIBDIR%%/pythonutils/configobj.py
 %%PYTHON_SITELIBDIR%%/pythonutils/configobj.pyc
 %%PYTHON_SITELIBDIR%%/pythonutils/configobj.pyo
-%%PYTHON_SITELIBDIR%%/pythonutils/listquote.py
-%%PYTHON_SITELIBDIR%%/pythonutils/listquote.pyc
-%%PYTHON_SITELIBDIR%%/pythonutils/listquote.pyo
 %%PYTHON_SITELIBDIR%%/pythonutils/odict.py
 %%PYTHON_SITELIBDIR%%/pythonutils/odict.pyc
 %%PYTHON_SITELIBDIR%%/pythonutils/odict.pyo
@@ -25,18 +23,15 @@
 %%PYTHON_SITELIBDIR%%/pythonutils/validate.py
 %%PYTHON_SITELIBDIR%%/pythonutils/validate.pyc
 %%PYTHON_SITELIBDIR%%/pythonutils/validate.pyo
-%%PYTHON_SITELIBDIR%%/pythonutils.pth
 %%PORTDOCS%%%%DOCSDIR%%/BSD-LICENSE.html
 %%PORTDOCS%%%%DOCSDIR%%/BSD-LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/cgiutils.html
 %%PORTDOCS%%%%DOCSDIR%%/cgiutils.txt
 %%PORTDOCS%%%%DOCSDIR%%/configobj.html
 %%PORTDOCS%%%%DOCSDIR%%/configobj.txt
+%%PORTDOCS%%%%DOCSDIR%%/images/PythonPowered.png
 %%PORTDOCS%%%%DOCSDIR%%/images/osi-certified-120x100.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/powered_by_python.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/PythonPowered.png
-%%PORTDOCS%%%%DOCSDIR%%/listquote.html
-%%PORTDOCS%%%%DOCSDIR%%/listquote.txt
 %%PORTDOCS%%%%DOCSDIR%%/odict.html
 %%PORTDOCS%%%%DOCSDIR%%/odict.txt
 %%PORTDOCS%%%%DOCSDIR%%/pathutils.html
@@ -58,8 +53,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/urlpath.txt
 %%PORTDOCS%%%%DOCSDIR%%/validate.html
 %%PORTDOCS%%%%DOCSDIR%%/validate.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/smilies
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/stylesheets
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/smilies
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/pythonutils