Update to 1.12

PR:		36222
Submitted by:	maintainer

4 files changed, 101 insertions, 16 deletions

diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 028d28c779a8..f042308ba774 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	reportlab
-PORTVERSION=	1.11
+PORTVERSION=	1.12
 CATEGORIES=	print python
 MASTER_SITES=	ftp://ftp.reportlab.com/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,6 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	perky@fallin.lv
 
 BUILD_DEPENDS=	${PYDISTUTILS}
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_imaging.so:${PORTSDIR}/graphics/py-imaging
 
 USE_PYTHON=	yes
 WRKSRC=		${WRKDIR}/reportlab
@@ -23,28 +24,26 @@ CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 ALL_TARGET=	sharedmods
 MAKE_FLAGS=	OPT="${CFLAGS}"
 
-REPORTLABDIR=	${PYTHON_SITELIBDIR}/reportlab
+REPORTLABDIR=	${PREFIX}/lib/${PYTHON_VERSION}/site-packages/reportlab
 DOCDIR=		${PREFIX}/share/doc/reportlab
 EXAMPLEDIR=	${PREFIX}/share/examples/reportlab
 
 post-patch:
 	${MV} ${WRKSRC}/lib/setup.py ${WRKDIR}
-	${PERL} -pi -e "s/freebsd4/freebsd4','freebsd5/g" ${WRKDIR}/setup.py
 
 do-build:
 	@(cd ${WRKDIR}; \
 		${PYTHON_CMD} setup.py build)
 
 do-install:
-	@${MKDIR} ${REPORTLABDIR}
-.for dir in . lib extensions graphics pdfbase pdfgen platypus
-	@${MKDIR} ${REPORTLABDIR}/${dir}
-	${INSTALL_DATA} ${WRKSRC}/${dir}/*.py ${REPORTLABDIR}/${dir}
-.endfor
 	@(cd ${WRKDIR}; \
-		${PYTHON_CMD} setup.py install)
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${REPORTLABDIR}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${REPORTLABDIR}
+		${PYTHON_CMD} setup.py install -c -O1 --prefix="${PREFIX}")
+
+	${MKDIR} ${REPORTLABDIR}/fonts
+.for fontfile in LeERC___.AFM LeERC___.PFB
+	(cd ${WRKDIR}/reportlab/fonts; \
+		${INSTALL_DATA} ${fontfile} ${REPORTLABDIR}/fonts)
+.endfor
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLEDIR}
diff --git a/print/py-reportlab/distinfo b/print/py-reportlab/distinfo
index cfeda960cd6f..ceecef4edde2 100644
--- a/print/py-reportlab/distinfo
+++ b/print/py-reportlab/distinfo
@@ -1 +1 @@
-MD5 (ReportLab_1_11.tgz) = 4f76901de9a5d8f09052df4fc7c1eebd
+MD5 (ReportLab_1_12.tgz) = 8f7d3c800e5f2f338fc4f81dff7e41bd
diff --git a/print/py-reportlab/files/patch-lib::setup.py b/print/py-reportlab/files/patch-lib::setup.py
index c7a3ddb4b57b..cc6590019919 100644
--- a/print/py-reportlab/files/patch-lib::setup.py
+++ b/print/py-reportlab/files/patch-lib::setup.py
@@ -1,13 +1,26 @@
---- lib/setup.py.orig	Fri Jan  4 08:08:55 2002
-+++ lib/setup.py	Fri Jan  4 08:11:04 2002
-@@ -18,23 +18,23 @@
+--- lib/setup.py.orig	Mon Jul 23 20:38:19 2001
++++ lib/setup.py	Sat Mar 23 09:14:04 2002
+@@ -7,7 +7,7 @@
+ 	import os, sys
+ 	from distutils.core import setup, Extension
+ 
+-	if sys.platform in ['win32', 'sunos5', 'freebsd4', 'aix4', 'mac']:
++	if sys.platform in ['win32', 'sunos5', 'freebsd4', 'freebsd5', 'aix4', 'mac']:
+ 		LIBS=[]
+ 	else:
+ 		raise ValueError, "Don't know about platform:"+sys.platform
+@@ -18,23 +18,27 @@
  			author = "Robin Becker",
  			author_email = "robin@reportlab.com",
  			url = "http://www.reportlab.com",
 -			packages = [],
 -			ext_modules =	[Extension(	'_rl_accel',
 -										['_rl_accel.c'],
-+			packages = ['reportlab'],
++			packages = ['reportlab',
++				'reportlab.lib', 'reportlab.extensions', 'reportlab.graphics',
++				'reportlab.pdfbase', 'reportlab.pdfgen', 'reportlab.platypus',
++				'reportlab.tools', 'reportlab.tools.docco',
++				'reportlab.tools.py2pdf', 'reportlab.tools.pythonpoint'],
 +			ext_modules =	[Extension(	'reportlab.lib._rl_accel',
 +										['reportlab/lib/_rl_accel.c'],
  										include_dirs=[],
diff --git a/print/py-reportlab/pkg-plist b/print/py-reportlab/pkg-plist
index 16d7b7bd9d82..c53a58c27cca 100644
--- a/print/py-reportlab/pkg-plist
+++ b/print/py-reportlab/pkg-plist
@@ -4,6 +4,8 @@ lib/%%PYTHON_VERSION%%/site-packages/reportlab/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/reportlab/extensions/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/reportlab/extensions/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/reportlab/extensions/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/fonts/LeERC___.AFM
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/fonts/LeERC___.PFB
 lib/%%PYTHON_VERSION%%/site-packages/reportlab/graphics/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/reportlab/graphics/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/reportlab/graphics/__init__.pyo
@@ -172,6 +174,69 @@ lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus/xpreformatted.pyo
 lib/%%PYTHON_VERSION%%/site-packages/reportlab/rl_config.py
 lib/%%PYTHON_VERSION%%/site-packages/reportlab/rl_config.pyc
 lib/%%PYTHON_VERSION%%/site-packages/reportlab/rl_config.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/codegrab.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/codegrab.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/codegrab.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/docpy.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/docpy.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/docpy.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/examples.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/examples.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/examples.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/graphdocpy.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/graphdocpy.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/graphdocpy.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/inspect.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/inspect.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/inspect.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/rl_doc_utils.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/rl_doc_utils.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/rl_doc_utils.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/rltemplate.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/rltemplate.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/rltemplate.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/stylesheet.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/stylesheet.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/stylesheet.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/t_parse.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/t_parse.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/t_parse.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/yaml.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/yaml.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/yaml.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/yaml2pdf.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/yaml2pdf.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco/yaml2pdf.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/py2pdf/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/py2pdf/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/py2pdf/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/py2pdf/demo.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/py2pdf/demo.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/py2pdf/demo.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/py2pdf/idle_print.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/py2pdf/idle_print.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/py2pdf/idle_print.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/py2pdf/py2pdf.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/py2pdf/py2pdf.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/py2pdf/py2pdf.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/pythonpoint/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/pythonpoint/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/pythonpoint/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/pythonpoint/customshapes.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/pythonpoint/customshapes.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/pythonpoint/customshapes.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/pythonpoint/pythonpoint.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/pythonpoint/pythonpoint.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/pythonpoint/pythonpoint.pyo
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/pythonpoint/stdparser.py
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/pythonpoint/stdparser.pyc
+lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/pythonpoint/stdparser.pyo
 %%PORTDOCS%%share/doc/reportlab/graphguide.pdf
 %%PORTDOCS%%share/doc/reportlab/graphics_reference.pdf
 %%PORTDOCS%%share/doc/reportlab/reference.pdf
@@ -184,20 +249,28 @@ lib/%%PYTHON_VERSION%%/site-packages/reportlab/rl_config.pyo
 %%PORTDOCS%%share/examples/reportlab/odyssey/fodyssey.py
 %%PORTDOCS%%share/examples/reportlab/odyssey/odyssey.py
 %%PORTDOCS%%share/examples/reportlab/odyssey/odyssey.txt
+%%PORTDOCS%%share/examples/reportlab/rlzope/readme.txt
+%%PORTDOCS%%share/examples/reportlab/rlzope/rlzope.py
 %%PORTDOCS%%share/examples/reportlab/stdfonts/00readme.txt
 %%PORTDOCS%%share/examples/reportlab/stdfonts/stdfonts.py
 %%PORTDOCS%%share/examples/reportlab/tests/testdemos.py
 %%PORTDOCS%%@dirrm share/examples/reportlab/tests
 %%PORTDOCS%%@dirrm share/examples/reportlab/stdfonts
+%%PORTDOCS%%@dirrm share/examples/reportlab/rlzope
 %%PORTDOCS%%@dirrm share/examples/reportlab/odyssey
 %%PORTDOCS%%@dirrm share/examples/reportlab/gadflypaper
 %%PORTDOCS%%@dirrm share/examples/reportlab/colors
 %%PORTDOCS%%@dirrm share/examples/reportlab
 %%PORTDOCS%%@dirrm share/doc/reportlab
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/pythonpoint
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/py2pdf
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools/docco
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab/tools
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab/platypus
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfgen
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab/pdfbase
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab/lib
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab/graphics
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab/fonts
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab/extensions
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/reportlab