4 files changed, 51 insertions, 17 deletions

diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 204efeb0b3a7..6f5566d74032 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -6,31 +6,42 @@
 #
 
 PORTNAME=	reportlab
-PORTVERSION=	1.20
+PORTVERSION=	1.21.1
 CATEGORIES=	print python
-MASTER_SITES=	http://216.92.220.143/ftp/ \
-		ftp://ftp.reportlab.com/ \
-		http://people.freebsd.org/~perky/distfiles/:accel
+MASTER_SITES=	http://www.reportlab.org/ftp/ \
+		ftp://ftp.reportlab.org/ \
+		http://people.freebsd.org/~erwin/distfiles/:accel \
+		http://www.cs.nctu.edu.tw/~lwhsu/ports/distfiles/:accel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES=	ReportLab_${PORTVERSION:S/./_/}.tgz \
-		rl_accel-2544.tar.gz:accel
+DISTFILES=	ReportLab_${PORTVERSION:S/./_/g}.tgz \
+		rl_accel-3004.tgz:accel
 
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	Library to create PDF documents using the Python language
 
-USE_PYTHON=	yes
+USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
-USE_PYTHON_PREFIX=	yes
-WRKSRC=		${WRKDIR}/reportlab_${PORTVERSION:S/./_/}/reportlab
+
+WRKSRC=		${WRKDIR}/reportlab_${PORTVERSION:S/./_/g}/reportlab
 MAKE_ENV=	PACKAGE_PATH="${REPORTLABDIR}"
 
 REPORTLABDIR=	${PYTHONPREFIX_SITELIBDIR}/reportlab
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+DOCS=	RML_UserGuide.pdf RML_UserGuide_1_0.pdf diagradoc.pdf graphguide.pdf \
+	graphics_reference.pdf reference.pdf userguide.pdf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/rl_config.py
 
+.include <bsd.port.pre.mk>
+
 post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in ${DOCS}
+	${CP} ${WRKSRC}/docs/${i} ${DOCSDIR}
+.endfor
+.endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/py-reportlab/distinfo b/print/py-reportlab/distinfo
index 1171ea376db6..0d247bdff385 100644
--- a/print/py-reportlab/distinfo
+++ b/print/py-reportlab/distinfo
@@ -1,6 +1,6 @@
-MD5 (ReportLab_1_20.tgz) = 8d374b9b6f7db3fc0821082347d5e6b5
-SHA256 (ReportLab_1_20.tgz) = d9d573aab7ab3703d51457ac016d0f5ba71aa48ed5c8e57b01fbc1f54d808e87
-SIZE (ReportLab_1_20.tgz) = 2457390
-MD5 (rl_accel-2544.tar.gz) = 9969fb009f18b912281116663763a239
-SHA256 (rl_accel-2544.tar.gz) = c46cdc8b37e3683236c9266f64e43035c445c52bb2f2d76a7690c39b9b2ae795
-SIZE (rl_accel-2544.tar.gz) = 109999
+MD5 (ReportLab_1_21_1.tgz) = 1d626995d10c8fb73d2718fa8aa00afb
+SHA256 (ReportLab_1_21_1.tgz) = 52be1905f8f3b9a4cefa2c0c3b92aabe29a4a397689839a34482c3d027308190
+SIZE (ReportLab_1_21_1.tgz) = 3467163
+MD5 (rl_accel-3004.tgz) = dd218da2e18fd7bec1a71b4281b35811
+SHA256 (rl_accel-3004.tgz) = a2ac1b7dbf5f37e98c5f5a80cd364fa682d830561a9694328460430a04baf20d
+SIZE (rl_accel-3004.tgz) = 58569
diff --git a/print/py-reportlab/pkg-descr b/print/py-reportlab/pkg-descr
index 31315ffa536a..2131b071a7d2 100644
--- a/print/py-reportlab/pkg-descr
+++ b/print/py-reportlab/pkg-descr
@@ -20,4 +20,4 @@ following contexts:
 - Going from XML to PDF in one step!
 
 
-WWW: http://www.reportlab.com/
+WWW:	http://www.reportlab.org/rl_toolkit.html
diff --git a/print/py-reportlab/pkg-plist b/print/py-reportlab/pkg-plist
index b406e2e39b8b..9359ebfdd9f0 100644
--- a/print/py-reportlab/pkg-plist
+++ b/print/py-reportlab/pkg-plist
@@ -6,6 +6,7 @@
 %%PYTHON_SITELIBDIR%%/reportlab/__init__.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/__init__.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/changes
+%%PYTHON_SITELIBDIR%%/reportlab/demos/colors/colortest.py
 %%PYTHON_SITELIBDIR%%/reportlab/demos/gadflypaper/00readme.txt
 %%PYTHON_SITELIBDIR%%/reportlab/demos/gadflypaper/gfe.py
 %%PYTHON_SITELIBDIR%%/reportlab/demos/odyssey/00readme.txt
@@ -283,6 +284,7 @@
 %%PYTHON_SITELIBDIR%%/reportlab/lib/yaml.py
 %%PYTHON_SITELIBDIR%%/reportlab/lib/yaml.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/lib/yaml.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/license.txt
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/__init__.py
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/__init__.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/__init__.pyo
@@ -373,6 +375,12 @@
 %%PYTHON_SITELIBDIR%%/reportlab/test/__init__.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/test/doctest.py
+%%PYTHON_SITELIBDIR%%/reportlab/test/doctest.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/test/doctest.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/test/linecache_copy.py
+%%PYTHON_SITELIBDIR%%/reportlab/test/linecache_copy.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/test/linecache_copy.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/test/pythonpowered.gif
 %%PYTHON_SITELIBDIR%%/reportlab/test/runAll.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/runAll.pyc
@@ -479,6 +487,9 @@
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_indents.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_indents.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_indents.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_leftright.py
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_leftright.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_leftright.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_paragraphs.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_paragraphs.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_paragraphs.pyo
@@ -512,6 +523,9 @@
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_tools_pythonpoint.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_tools_pythonpoint.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_tools_pythonpoint.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_utils.py
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_utils.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_utils.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_widgetbase_tpc.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_widgetbase_tpc.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_widgetbase_tpc.pyo
@@ -650,5 +664,14 @@
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/demos/rlzope
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/demos/odyssey
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/demos/gadflypaper
+@dirrm %%PYTHON_SITELIBDIR%%/reportlab/demos/colors
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/demos
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab
+%%PORTDOCS%%%%DOCSDIR%%/RML_UserGuide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/RML_UserGuide_1_0.pdf
+%%PORTDOCS%%%%DOCSDIR%%/diagradoc.pdf
+%%PORTDOCS%%%%DOCSDIR%%/graphguide.pdf
+%%PORTDOCS%%%%DOCSDIR%%/graphics_reference.pdf
+%%PORTDOCS%%%%DOCSDIR%%/reference.pdf
+%%PORTDOCS%%%%DOCSDIR%%/userguide.pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%