- Update to 4.5.3

- Remove PORTDOCS=*
- Use ${COPYTREE_SHARE} to install docs
- Use ${PKGNAMEPREFIX} instead of py- inside DOCSDIR

3 files changed, 29 insertions, 8 deletions

diff --git a/devel/py-configobj/Makefile b/devel/py-configobj/Makefile
index fdb74246d755..b65f7cc30671 100644
--- a/devel/py-configobj/Makefile
+++ b/devel/py-configobj/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	configobj
-PORTVERSION=	4.5.2
+PORTVERSION=	4.5.3
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,12 +22,12 @@ USE_PYDISTUTILS=	yes
 # www/py-turbogears requires (and installs) a Python egg for ConfigObj
 CONFLICTS=	py*-TurboGears-[0-9]*
 
-PORTDOCS=	*
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${CP} -r ${WRKSRC}/docs/* ${DOCSDIR}
+	${MKDIR} ${DOCSDIR} && \
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-configobj/distinfo b/devel/py-configobj/distinfo
index f93d8dab63db..4055b9c142fe 100644
--- a/devel/py-configobj/distinfo
+++ b/devel/py-configobj/distinfo
@@ -1,3 +1,3 @@
-MD5 (configobj-4.5.2.zip) = b84e6ce4f8ef5fa1c466cc3561099a66
-SHA256 (configobj-4.5.2.zip) = f67b86831c04c6259226e16a5c433833384bdc1ebaedd09ec977afed8d8bf4d9
-SIZE (configobj-4.5.2.zip) = 166376
+MD5 (configobj-4.5.3.zip) = abd4eec2ff08bea466018bccdcf91aab
+SHA256 (configobj-4.5.3.zip) = a9e9f3294639a9a88f0e1cae0556b26a84a6ef30909c089be330ec4888936ee2
+SIZE (configobj-4.5.3.zip) = 168527
diff --git a/devel/py-configobj/pkg-plist b/devel/py-configobj/pkg-plist
index 1b9b6e741c83..d1a8f8774549 100644
--- a/devel/py-configobj/pkg-plist
+++ b/devel/py-configobj/pkg-plist
@@ -1,7 +1,28 @@
-@comment $FreeBSD$
 %%PYTHON_SITELIBDIR%%/configobj.py
 %%PYTHON_SITELIBDIR%%/configobj.pyc
 %%PYTHON_SITELIBDIR%%/configobj.pyo
 %%PYTHON_SITELIBDIR%%/validate.py
 %%PYTHON_SITELIBDIR%%/validate.pyc
 %%PYTHON_SITELIBDIR%%/validate.pyo
+%%PORTDOCS%%%%DOCSDIR%%/BSD-LICENSE.html
+%%PORTDOCS%%%%DOCSDIR%%/BSD-LICENSE.txt
+%%PORTDOCS%%%%DOCSDIR%%/configobj.html
+%%PORTDOCS%%%%DOCSDIR%%/configobj.txt
+%%PORTDOCS%%%%DOCSDIR%%/images/new_python.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/osi-certified-120x100.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/pythonbanner.gif
+%%PORTDOCS%%%%DOCSDIR%%/smilies/biggrin.gif
+%%PORTDOCS%%%%DOCSDIR%%/smilies/cool.gif
+%%PORTDOCS%%%%DOCSDIR%%/smilies/exclaim.gif
+%%PORTDOCS%%%%DOCSDIR%%/smilies/sad.gif
+%%PORTDOCS%%%%DOCSDIR%%/smilies/smile.gif
+%%PORTDOCS%%%%DOCSDIR%%/smilies/wink.gif
+%%PORTDOCS%%%%DOCSDIR%%/stylesheets/default.css
+%%PORTDOCS%%%%DOCSDIR%%/stylesheets/pysrc.css
+%%PORTDOCS%%%%DOCSDIR%%/stylesheets/voidspace_docutils.css
+%%PORTDOCS%%%%DOCSDIR%%/validate.html
+%%PORTDOCS%%%%DOCSDIR%%/validate.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/stylesheets
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/smilies
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%