update to reportlab-3.3.0

Prefer py-Pillow over py-imaging (if not installed) permitting better
performance, successful test results and at the same time remove the
python-3 incompatibility.

CHANGES
=======

This is a summary of changes made to the reportlab source code for each release.
Please refer to subversion backlogs (using the release dates) for more details
or for releases which we have not provide a higher level changes list for.
E.g. to retrieve the changes made between release 3.1 and release 3.2, type::

  $ hg log -r adb3f0d

The contributors lists are in no order and apologies to those accidentally not
mentioned. If we missed you, please let us know!


RELEASE 3.3  17/02/2016
-----------------------
    * Canvas & Doctemplate now allow specification of the initial font Name, Size & Leading. Prevously you had to mess with rl_settings to accomplish this.
    * Canvas & Doctemplate now support specification of the crop/art/trim/bleed boxes.
    * Add option to auto generate missing TTF font names. Handy for CJKers with home produced fonts. Also attempt to prevent usage of multiple TTFs with same name.
    * Paragraph styles now have justifyBreaks to control justification of lines broken with <br/>.
    * Paragraph styles now have justifyLastLine=n to control justification of last lines with more than n words (0 means do not).
    * Added EAN-5 and ISBN barcode widgets (contribution by Edward Greve).
    * Bug fix of QrCodeWidget (prompted by https://bitbucket.org/fubu/).
    * Frames now have support for automatic flowables at the top of frame. story support via the class reportlab.platypus.flowables.SetTopFlowables.
    * Added support for Trapped and ModDate PDF info dictionary keys.
    * Bug fix for pie charts with no data (raised by  Michael Spector).
    * New barcodes BarcodeCode128Auto & BarcodeECC200DataMatrix (contributed by Kyle MacFarlane).
    * Improved LinePlot marker handling.
    * PyPy improvements inspired by Marius Gedminas.
    * Bug fix in reportlab.lib.utils.simpleSplit (reported by Chris Buergi <cb@enerweb.ch>).
    * Unwanted escaping in renderSVG fixed (reported by Ruby Yocum).
    * Bug fix in _rl_accel.c (remove excess state and fix refcount breakage reported by Mark De Wit <mark.dewit@iesve.com>).
    * Code128 barcode length optimization inspired by Klaas Feenstra.
    * Paragraph <sup>/<super> & <sub> tags now support rise & size attributes to allow special control over position & font size.
    * Splitting tables now remove unwanted styles in the first part of the split (reported by Lele Gaifax).
    * test changes inspired by https://bitbucket.org/stoneleaf
    * ReportLab now runs all tests under Python 2.7, 3.3, 3.4 & 3.5.


### Contributors:
    * Edward Greve
    * https://bitbucket.org/fubu/
    * Michael Spector
    * Kyle MacFarlane
    * Marius Gedminas
    * Chris Buergi
    * Ruby Yocum
    * Mark de Wit
    * Klaas Feenstra
    * Lele Gaifax
    * https://bitbucket.org/stoneleaf

RELEASE 3.2  01/06/2015
-----------------------

   * Added proportional underlining specific to font sizes, set via the `underlineProportion` attribute of ParagraphStyles.
   * TrueType fonts: added support for cmaps 10 & 13
   * DocTemplate class now supports a boolean `displayDocTitle` argument.
   * TableofContents now supports a formatter argument to allow formatting of the displayed page numbers (eg for appendices etc).
   * Table `repeatRows` can now be a tuple of row numbers to allow incomplete ranges of rows to be repeated.
   * Tables now do pass instance.`spaceBefore` & `spaceAfter` to their split children when split
   * Several strangenesses were fixed in the pdfbase.pdfform module; Multiple usage is now allowed.
   * Error message fixes
   * Various environment fixes for Google Application Environment
   * Resource fixes
   * PDFDoc can now set the `Lang` attribute
   * canvas.drawString and similar now allow the character spacing to be set
   * Index of accented stuff has been improved
   * RTL code was improved
   * fix Propertyset.clone
   * `flowables.py`: fix ImageAndFlowables so it avoids testing negative availableWidth

### Contributors:
   * Steven Jacobs
   * Philip Semanchuk
   * Marius Gedminas
   * masklinn
   * Kale Franz
   * Albertas Agejavas
   • Anders Hammarquist
   * jvanzuela @ bitbucket
   * Glen Lindermann
   * Greg Jones
   * James Bynd
   * fcoelho @ bitbucket


RELEASE 3.1  22/04/2014
-----------------------

If you are running ReportLab 3.0.x, the changes are minor.
   * support for emoji - characters outside the Unicode basic multilingual plane
   * improved pip-based installers will pull in all the needed dependencies; Pillow 2.4 appears to deal with all our issues.

### Contributors
   * Ivan Tchomgue
   * Waldemar Osuch
   * masayuku
   * alexandrel_sgi


RELEASE 3.0  14/02/2014
-----------------------

ReportLab 3.0 now supports Python 2.7, 3.3 and higher.

There has been a substantial internal rewrite to ensure consistent use of unicode strings for
  natural-language text, and of bytes for all file format internals.  The intent
  is to make as few API changes as possible so that there should be little or no
  impact on users and their applications.  Changes are too numerous but can be
  seen on Bitbucket.

### Python 3.x compatibility
  * Python 3.x compatibility.  A single line of code should run on 2.7 and 3.3
  * __init__.py restricts to 2.7 or >=3.3
  * __init__.py allow the import of on optional reportlab.local_rl_mods to allow monkey patching etc.
  * rl_config now imports rl_settings & optionally local_rl_settings
  * ReportLab C extensions now live inside reportlab; _rl_accel is no longer required; All _rl_accel imports now
	pass through reportlab.lib.rl_accel
  * xmllib is gone, alongside the paraparser stuff that caused issues in favour of HTMLParser.
  * some obsolete C extensions (sgmlop and pyHnj) are gone
  * Improved support for multi-threaded systems to the _rl_accel extension module.
  * Removed reportlab/lib/ para.py & pycanvas.py;  these would better belong in third party packages,
	which can make use of the monkeypatching feature above.


### New features
  * Add ability to output greyscale and 1-bit PIL images without conversion to RGB. (contributed by Matthew Duggan)
  * highlight annotation (contributed by Ben Echols)

### Other
  * numerous very minor fixes, visible through BitBucket.

4 files changed, 51 insertions, 32 deletions

diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 44943f262ed..a1b9f1ab136 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.54 2016/07/09 13:04:03 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2016/09/11 15:53:51 richard Exp $
 
-DISTNAME=	reportlab-2.7
+DISTNAME=	reportlab-3.3.0
 DISTFILES=	${DEFAULT_DISTFILES} pfbfer.zip
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	print python
-MASTER_SITES=	http://www.reportlab.com/ftp/
+MASTER_SITES=	${MASTER_SITE_PYPI:=r/reportlab/}
 SITES.pfbfer.zip=	http://www.reportlab.com/ftp/fonts/
 
 MAINTAINER=	joerg@NetBSD.org
@@ -13,13 +13,11 @@ COMMENT=	Powerful PDF-generating toolkit for Python
 LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-DEPENDS+=	{${PYPKGPREFIX}-imaging-[0-9]*,${PYPKGPREFIX}-Pillow-[0-9]*}:../../graphics/py-imaging
+DEPENDS+=	{${PYPKGPREFIX}-Pillow-[0-9]*,${PYPKGPREFIX}-imaging-[0-9]*}:../../graphics/py-Pillow
 
 EXTRACT_DIR.pfbfer.zip=	${WRKSRC}/src/reportlab/fonts
 EXTRACT_OPTS_ZIP+=	-L
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # not yet ported as of 2.7; py-imaging
-
 REPLACE_PYTHON+=	demos/tests/testdemos.py
 REPLACE_PYTHON+=	docs/genAll.py
 REPLACE_PYTHON+=	docs/reference/genreference.py
@@ -36,21 +34,17 @@ REPLACE_PYTHON+=	src/reportlab/lib/logger.py
 REPLACE_PYTHON+=	src/reportlab/lib/normalDate.py
 REPLACE_PYTHON+=	src/reportlab/lib/pagesizes.py
 REPLACE_PYTHON+=	src/reportlab/lib/randomtext.py
-REPLACE_PYTHON+=	src/reportlab/lib/set_ops.py
 REPLACE_PYTHON+=	src/reportlab/lib/units.py
-REPLACE_PYTHON+=	src/reportlab/pdfgen/pycanvas.py
-REPLACE_PYTHON+=	src/rl_addons/renderPM/setup.py
 REPLACE_PYTHON+=	tests/runAll.py
 REPLACE_PYTHON+=	tests/test_docstrings.py
-REPLACE_PYTHON+=	tests/test_encrypt.py
 REPLACE_PYTHON+=	tests/test_geomutils.py
 REPLACE_PYTHON+=	tests/test_hello.py
 REPLACE_PYTHON+=	tests/test_images.py
 REPLACE_PYTHON+=	tests/test_invariant.py
+REPLACE_PYTHON+=	tests/test_lib_pdfencrypt.py
 REPLACE_PYTHON+=	tests/test_pdfbase_postscript.py
 REPLACE_PYTHON+=	tests/test_pdfgen_callback.py
 REPLACE_PYTHON+=	tests/test_pdfgen_general.py
-REPLACE_PYTHON+=	tests/test_pdfgen_pycanvas.py
 REPLACE_PYTHON+=	tests/test_platypus_paraparser.py
 REPLACE_PYTHON+=	tests/test_platypus_tables.py
 REPLACE_PYTHON+=	tests/test_renderSVG.py
@@ -61,11 +55,15 @@ REPLACE_PYTHON+=	tools/docco/graphdocpy.py
 REPLACE_PYTHON+=	tools/docco/rl_doc_utils.py
 REPLACE_PYTHON+=	tools/pythonpoint/pythonpoint.py
 
+#fixup group/world writeable fonts from pfbfer.zip
+post-install:
+	${CHMOD} ${SHAREMODE} \
+		${DESTDIR}${PREFIX}/${PYSITELIB}/reportlab/fonts/*.pfb
 do-test:
 	${RUN}cd ${WRKSRC};${PYTHONBIN} setup.py tests
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/py-reportlab/PLIST b/print/py-reportlab/PLIST
index 9515c10c8c2..926bd706268 100644
--- a/print/py-reportlab/PLIST
+++ b/print/py-reportlab/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.14 2014/01/19 09:59:47 wiz Exp $
-${PYSITELIB}/_renderPM.so
-${PYSITELIB}/_rl_accel.so
-${PYSITELIB}/pyHnj.so
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.15 2016/09/11 15:53:51 richard Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/reportlab/__init__.py
 ${PYSITELIB}/reportlab/__init__.pyc
 ${PYSITELIB}/reportlab/__init__.pyo
@@ -37,6 +38,7 @@ ${PYSITELIB}/reportlab/fonts/zy______.pfb
 ${PYSITELIB}/reportlab/graphics/__init__.py
 ${PYSITELIB}/reportlab/graphics/__init__.pyc
 ${PYSITELIB}/reportlab/graphics/__init__.pyo
+${PYSITELIB}/reportlab/graphics/_renderPM.so
 ${PYSITELIB}/reportlab/graphics/barcode/__init__.py
 ${PYSITELIB}/reportlab/graphics/barcode/__init__.pyc
 ${PYSITELIB}/reportlab/graphics/barcode/__init__.pyo
@@ -55,6 +57,9 @@ ${PYSITELIB}/reportlab/graphics/barcode/common.pyo
 ${PYSITELIB}/reportlab/graphics/barcode/eanbc.py
 ${PYSITELIB}/reportlab/graphics/barcode/eanbc.pyc
 ${PYSITELIB}/reportlab/graphics/barcode/eanbc.pyo
+${PYSITELIB}/reportlab/graphics/barcode/ecc200datamatrix.py
+${PYSITELIB}/reportlab/graphics/barcode/ecc200datamatrix.pyc
+${PYSITELIB}/reportlab/graphics/barcode/ecc200datamatrix.pyo
 ${PYSITELIB}/reportlab/graphics/barcode/fourstate.py
 ${PYSITELIB}/reportlab/graphics/barcode/fourstate.pyc
 ${PYSITELIB}/reportlab/graphics/barcode/fourstate.pyo
@@ -64,6 +69,9 @@ ${PYSITELIB}/reportlab/graphics/barcode/lto.pyo
 ${PYSITELIB}/reportlab/graphics/barcode/qr.py
 ${PYSITELIB}/reportlab/graphics/barcode/qr.pyc
 ${PYSITELIB}/reportlab/graphics/barcode/qr.pyo
+${PYSITELIB}/reportlab/graphics/barcode/qrencoder.py
+${PYSITELIB}/reportlab/graphics/barcode/qrencoder.pyc
+${PYSITELIB}/reportlab/graphics/barcode/qrencoder.pyo
 ${PYSITELIB}/reportlab/graphics/barcode/test.py
 ${PYSITELIB}/reportlab/graphics/barcode/test.pyc
 ${PYSITELIB}/reportlab/graphics/barcode/test.pyo
@@ -229,6 +237,7 @@ ${PYSITELIB}/reportlab/lib/PyFontify.pyo
 ${PYSITELIB}/reportlab/lib/__init__.py
 ${PYSITELIB}/reportlab/lib/__init__.pyc
 ${PYSITELIB}/reportlab/lib/__init__.pyo
+${PYSITELIB}/reportlab/lib/_rl_accel.so
 ${PYSITELIB}/reportlab/lib/abag.py
 ${PYSITELIB}/reportlab/lib/abag.pyc
 ${PYSITELIB}/reportlab/lib/abag.pyo
@@ -281,12 +290,16 @@ ${PYSITELIB}/reportlab/lib/pagesizes.pyo
 ${PYSITELIB}/reportlab/lib/pdfencrypt.py
 ${PYSITELIB}/reportlab/lib/pdfencrypt.pyc
 ${PYSITELIB}/reportlab/lib/pdfencrypt.pyo
+${PYSITELIB}/reportlab/lib/pyHnj.so
 ${PYSITELIB}/reportlab/lib/pygments2xpre.py
 ${PYSITELIB}/reportlab/lib/pygments2xpre.pyc
 ${PYSITELIB}/reportlab/lib/pygments2xpre.pyo
 ${PYSITELIB}/reportlab/lib/randomtext.py
 ${PYSITELIB}/reportlab/lib/randomtext.pyc
 ${PYSITELIB}/reportlab/lib/randomtext.pyo
+${PYSITELIB}/reportlab/lib/rl_accel.py
+${PYSITELIB}/reportlab/lib/rl_accel.pyc
+${PYSITELIB}/reportlab/lib/rl_accel.pyo
 ${PYSITELIB}/reportlab/lib/rltempfile.py
 ${PYSITELIB}/reportlab/lib/rltempfile.pyc
 ${PYSITELIB}/reportlab/lib/rltempfile.pyo
@@ -296,9 +309,6 @@ ${PYSITELIB}/reportlab/lib/rparsexml.pyo
 ${PYSITELIB}/reportlab/lib/sequencer.py
 ${PYSITELIB}/reportlab/lib/sequencer.pyc
 ${PYSITELIB}/reportlab/lib/sequencer.pyo
-${PYSITELIB}/reportlab/lib/set_ops.py
-${PYSITELIB}/reportlab/lib/set_ops.pyc
-${PYSITELIB}/reportlab/lib/set_ops.pyo
 ${PYSITELIB}/reportlab/lib/styles.py
 ${PYSITELIB}/reportlab/lib/styles.pyc
 ${PYSITELIB}/reportlab/lib/styles.pyo
@@ -317,9 +327,6 @@ ${PYSITELIB}/reportlab/lib/utils.pyo
 ${PYSITELIB}/reportlab/lib/validators.py
 ${PYSITELIB}/reportlab/lib/validators.pyc
 ${PYSITELIB}/reportlab/lib/validators.pyo
-${PYSITELIB}/reportlab/lib/xmllib.py
-${PYSITELIB}/reportlab/lib/xmllib.pyc
-${PYSITELIB}/reportlab/lib/xmllib.pyo
 ${PYSITELIB}/reportlab/lib/yaml.py
 ${PYSITELIB}/reportlab/lib/yaml.pyc
 ${PYSITELIB}/reportlab/lib/yaml.pyo
@@ -437,9 +444,6 @@ ${PYSITELIB}/reportlab/pdfgen/pdfgeom.pyo
 ${PYSITELIB}/reportlab/pdfgen/pdfimages.py
 ${PYSITELIB}/reportlab/pdfgen/pdfimages.pyc
 ${PYSITELIB}/reportlab/pdfgen/pdfimages.pyo
-${PYSITELIB}/reportlab/pdfgen/pycanvas.py
-${PYSITELIB}/reportlab/pdfgen/pycanvas.pyc
-${PYSITELIB}/reportlab/pdfgen/pycanvas.pyo
 ${PYSITELIB}/reportlab/pdfgen/textobject.py
 ${PYSITELIB}/reportlab/pdfgen/textobject.pyc
 ${PYSITELIB}/reportlab/pdfgen/textobject.pyo
@@ -479,4 +483,6 @@ ${PYSITELIB}/reportlab/platypus/xpreformatted.pyo
 ${PYSITELIB}/reportlab/rl_config.py
 ${PYSITELIB}/reportlab/rl_config.pyc
 ${PYSITELIB}/reportlab/rl_config.pyo
-${PYSITELIB}/sgmlop.so
+${PYSITELIB}/reportlab/rl_settings.py
+${PYSITELIB}/reportlab/rl_settings.pyc
+${PYSITELIB}/reportlab/rl_settings.pyo
diff --git a/print/py-reportlab/distinfo b/print/py-reportlab/distinfo
index bf47b43ccd4..3f1d76b9387 100644
--- a/print/py-reportlab/distinfo
+++ b/print/py-reportlab/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.18 2015/11/04 01:01:39 agc Exp $
+$NetBSD: distinfo,v 1.19 2016/09/11 15:53:51 richard Exp $
 
 SHA1 (pfbfer.zip) = 38753493035ee5b96746051df63ce4884763622d
 RMD160 (pfbfer.zip) = 70097e97f2fccc7f4df6b276b21a0fa765a57f55
 SHA512 (pfbfer.zip) = f07bea3c1f77816a5ce24b6383d7de11a78deeb9e12c5d8d281de640c88e4dd8afc2f6b89a5cfaedd2814bea67ba10d3c1cc8b6c59ce997655162749a59b53ae
 Size (pfbfer.zip) = 676909 bytes
-SHA1 (reportlab-2.7.tar.gz) = be1014c6407c62323ed8d13b00cde0bd20d52099
-RMD160 (reportlab-2.7.tar.gz) = 0ff90be737e925bc156c36dabb25b183834cf537
-SHA512 (reportlab-2.7.tar.gz) = f0c994c91b18ad55f7573af4eb49d173a1b3939d6e7a490e8dc1cce19f8c0dbe31a060df504b908ed6d7642f1d88e5aa4e86b9e459f058da331186f4e0998be4
-Size (reportlab-2.7.tar.gz) = 1951460 bytes
+SHA1 (reportlab-3.3.0.tar.gz) = 04c20507ec324918d05e852ddc3c8d7b6ec51c19
+RMD160 (reportlab-3.3.0.tar.gz) = 5fa65b8abf15042671d7e850bb214acff6eeeb03
+SHA512 (reportlab-3.3.0.tar.gz) = a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
+Size (reportlab-3.3.0.tar.gz) = 1959255 bytes
+SHA1 (patch-src_rl__addons_renderPM_gt1_gt1-namecontext.c) = 315c130ce8ae734970cec3ecb4586b1b89b27754
diff --git a/print/py-reportlab/patches/patch-src_rl__addons_renderPM_gt1_gt1-namecontext.c b/print/py-reportlab/patches/patch-src_rl__addons_renderPM_gt1_gt1-namecontext.c
new file mode 100644
index 00000000000..4612bdc2d22
--- /dev/null
+++ b/print/py-reportlab/patches/patch-src_rl__addons_renderPM_gt1_gt1-namecontext.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_rl__addons_renderPM_gt1_gt1-namecontext.c,v 1.1 2016/09/11 15:53:51 richard Exp $
+memcpy() and co are found in <string.h> on POSIX systems.
+
+--- src/rl_addons/renderPM/gt1/gt1-namecontext.c.orig	2013-03-14 11:30:09.000000000 +0000
++++ src/rl_addons/renderPM/gt1/gt1-namecontext.c
+@@ -3,7 +3,7 @@
+ #include "gt1-misc.h"
+ 
+ #include "gt1-namecontext.h"
+-#if defined(_WIN32) || defined(macintosh)
++#if 1
+ #	include <string.h>
+ #endif
+