Update to 2.7:

2.7:

This release, 2.7, will be the last major one to support Python
2.5, 2.6, and 2.7.  It contains a small number of fixes and additions
since our last release in September 2012.  You may think of it as
a 'long term stable' branch - if key bugs emerge we will issue
2.7.1, 2.7.2 releases and so on.

Charts / graphics

    Added SimpleTimeSeriesPlot
    added _computeMaxSpace
    added in lineStyle (for bars)
    improved SVG rendering
    Pie Chart now has an 'innerRadiusFraction' to allow doughnut-like
    appearance for 2d charts  (it has no effect with 3d charts).
    The separate 'doughnut' chart lacks many pie chart features
    and should only be used if you wanted multiple nested doughnuts.
    Bug fixes:
	piecharts.py: fix Pie3d __init__ to call its superclass
	linecharts.py: fix swatch creation
	fixed y axis in the simple time series plot

PDF

    Fixes to testshapes & pdfform resetting
    colors.py
    various minor fixes

Platypus

    Defined a small bullet rather than a big circle as the default
    for unordered lists
    fixed attribute spelling bug
    fixed CJK + endDots


#################################################################################
#################### RELEASE 2.6  27/09/2012                    #################
#################################################################################

This is a minor release focusing mainly on improved documentation.  There are a
number of minor enhancements, and a larger number of previous-undocumented
enhancements which we have documented better.


###General changes
   * Manuals have been reformatted with more pleasing code snippets and tables of
     contents, and reviewed and expanded

###Flowing documents (Platypus):
   * Added support for HTML-style list objects
   * Added flexible mechanism for drawing bullets
   * Allowed XPreformatted objects to use Asian line wrapping
   * Added an 'autoNextPageTemplate' attribute to PageTemplates.  For example you
     can now set up a 'chapter first page template' which will always be followed
     by a 'continuation template' on the next page break, saving the programmer from
     having to issue control flow commands in the story.
   * added a TopPadder flowable, which will 'wrap' another Flowable and move it
     to the bottom of the current page.
   * More helpful error messages when large tables cannot be rendered
   * Documentation for images within text (test_032_images)
   * Trailing dots for use on contents pages



###Charts and graphics:
   * Support for UPCA bar codes
   * We now have a semi-intelligent system for labelling pie charts with
     callout lines.  Thanks to James Martin-Collar, a maths student at Warwick
     University, who did this as his summer internship.
   * Axes - added startOffset and endOffset properties; allowed for axis
     background annotations.
   * Bar charts - allow more control of z Index (i.e. drawing order of axes and
     lines)
   * Pie charts - fixed bugs in 3d appearance
   * SVG output back end has seen some bugs fixed and now outputs resizeable SVG

4 files changed, 55 insertions, 54 deletions

diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 2de6e7a93c1..24e61d24e58 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2013/12/06 11:56:36 obache Exp $
+# $NetBSD: Makefile,v 1.49 2014/01/19 09:59:47 wiz Exp $
 
-DISTNAME=	reportlab-2.5
+DISTNAME=	reportlab-2.7
 DISTFILES=	${DEFAULT_DISTFILES} pfbfer.zip
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	5
 CATEGORIES=	print python
 MASTER_SITES=	http://www.reportlab.com/ftp/
 SITES.pfbfer.zip=	http://www.reportlab.com/ftp/fonts/
@@ -18,10 +17,54 @@ DEPENDS+=	{${PYPKGPREFIX}-imaging-[0-9]*,${PYPKGPREFIX}-Pillow-[0-9]*}:../../gra
 
 EXTRACT_DIR.pfbfer.zip=	${WRKSRC}/src/reportlab/fonts
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.7
+
+REPLACE_PYTHON+=	demos/tests/testdemos.py
+REPLACE_PYTHON+=	docs/genAll.py
+REPLACE_PYTHON+=	docs/reference/genreference.py
+REPLACE_PYTHON+=	docs/userguide/genuserguide.py
+REPLACE_PYTHON+=	src/reportlab/graphics/barcode/test.py
+REPLACE_PYTHON+=	src/reportlab/graphics/testdrawings.py
+REPLACE_PYTHON+=	src/reportlab/graphics/testshapes.py
+REPLACE_PYTHON+=	src/reportlab/graphics/widgets/table.py
+REPLACE_PYTHON+=	src/reportlab/lib/__init__.py
+REPLACE_PYTHON+=	src/reportlab/lib/corp.py
+REPLACE_PYTHON+=	src/reportlab/lib/fonts.py
+REPLACE_PYTHON+=	src/reportlab/lib/formatters.py
+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_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
+REPLACE_PYTHON+=	tests/test_source_chars.py
+REPLACE_PYTHON+=	tests/test_utils.py
+REPLACE_PYTHON+=	tools/docco/docpy.py
+REPLACE_PYTHON+=	tools/docco/graphdocpy.py
+REPLACE_PYTHON+=	tools/docco/rl_doc_utils.py
+REPLACE_PYTHON+=	tools/pythonpoint/pythonpoint.py
+
 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 "../../mk/bsd.pkg.mk"
diff --git a/print/py-reportlab/PLIST b/print/py-reportlab/PLIST
index 5a838cd222b..9515c10c8c2 100644
--- a/print/py-reportlab/PLIST
+++ b/print/py-reportlab/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2012/04/08 20:21:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2014/01/19 09:59:47 wiz Exp $
 ${PYSITELIB}/_renderPM.so
 ${PYSITELIB}/_rl_accel.so
 ${PYSITELIB}/pyHnj.so
@@ -13,14 +13,10 @@ ${PYSITELIB}/reportlab/fonts/DarkGarden-readme.txt
 ${PYSITELIB}/reportlab/fonts/DarkGarden.sfd
 ${PYSITELIB}/reportlab/fonts/DarkGardenMK.afm
 ${PYSITELIB}/reportlab/fonts/DarkGardenMK.pfb
-${PYSITELIB}/reportlab/fonts/Sy______.pfb
 ${PYSITELIB}/reportlab/fonts/Vera.ttf
 ${PYSITELIB}/reportlab/fonts/VeraBI.ttf
 ${PYSITELIB}/reportlab/fonts/VeraBd.ttf
 ${PYSITELIB}/reportlab/fonts/VeraIt.ttf
-${PYSITELIB}/reportlab/fonts/Zd______.pfb
-${PYSITELIB}/reportlab/fonts/Zx______.pfb
-${PYSITELIB}/reportlab/fonts/Zy______.pfb
 ${PYSITELIB}/reportlab/fonts/_a______.pfb
 ${PYSITELIB}/reportlab/fonts/_ab_____.pfb
 ${PYSITELIB}/reportlab/fonts/_abi____.pfb
@@ -34,6 +30,10 @@ ${PYSITELIB}/reportlab/fonts/cob_____.pfb
 ${PYSITELIB}/reportlab/fonts/cobo____.pfb
 ${PYSITELIB}/reportlab/fonts/com_____.pfb
 ${PYSITELIB}/reportlab/fonts/coo_____.pfb
+${PYSITELIB}/reportlab/fonts/sy______.pfb
+${PYSITELIB}/reportlab/fonts/zd______.pfb
+${PYSITELIB}/reportlab/fonts/zx______.pfb
+${PYSITELIB}/reportlab/fonts/zy______.pfb
 ${PYSITELIB}/reportlab/graphics/__init__.py
 ${PYSITELIB}/reportlab/graphics/__init__.pyc
 ${PYSITELIB}/reportlab/graphics/__init__.pyo
diff --git a/print/py-reportlab/distinfo b/print/py-reportlab/distinfo
index 8e288ed67c2..031358ee6a2 100644
--- a/print/py-reportlab/distinfo
+++ b/print/py-reportlab/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.16 2014/01/08 09:15:58 obache Exp $
+$NetBSD: distinfo,v 1.17 2014/01/19 09:59:47 wiz Exp $
 
 SHA1 (pfbfer.zip) = 38753493035ee5b96746051df63ce4884763622d
 RMD160 (pfbfer.zip) = 70097e97f2fccc7f4df6b276b21a0fa765a57f55
 Size (pfbfer.zip) = 676909 bytes
-SHA1 (reportlab-2.5.tar.gz) = 49bd7c2c0b42569323fe4726cac696d4249cd1a5
-RMD160 (reportlab-2.5.tar.gz) = adc6db9f724c18988acbc85595acc95b8511f40b
-Size (reportlab-2.5.tar.gz) = 1917306 bytes
-SHA1 (patch-src_rl__addons_renderPM___renderPM.c) = 97672612c2da8c54f7fe7a5fddd52d520f41e45e
+SHA1 (reportlab-2.7.tar.gz) = be1014c6407c62323ed8d13b00cde0bd20d52099
+RMD160 (reportlab-2.7.tar.gz) = 0ff90be737e925bc156c36dabb25b183834cf537
+Size (reportlab-2.7.tar.gz) = 1951460 bytes
diff --git a/print/py-reportlab/patches/patch-src_rl__addons_renderPM___renderPM.c b/print/py-reportlab/patches/patch-src_rl__addons_renderPM___renderPM.c
deleted file mode 100644
index d4d79a86acd..00000000000
--- a/print/py-reportlab/patches/patch-src_rl__addons_renderPM___renderPM.c
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-src_rl__addons_renderPM___renderPM.c,v 1.1 2014/01/08 09:15:58 obache Exp $
-
-* change label ERR to RL_ERROR_EXIT fixes breakage in solaris
-  https://bitbucket.org/rptlab/reportlab/commits/88247310430c31f3e12fc3bc2a1f53be0cca30b7
-
---- src/rl_addons/renderPM/_renderPM.c.orig	2010-05-28 12:52:12.000000000 +0000
-+++ src/rl_addons/renderPM/_renderPM.c
-@@ -13,7 +13,7 @@
- #endif
- 
- 
--#define VERSION "1.07"
-+#define VERSION "1.08"
- #define MODULE "_renderPM"
- static PyObject *moduleError;
- static PyObject *_version;
-@@ -77,8 +77,8 @@ static	PyObject* parse_utf8(PyObject* se
- 		first = c[i++];
- 		if(first<0x80) PyList_Append(r, PyInt_FromLong(first));
- 		else if(first<0xc0){
--E0:			msg = "Imvalid UTF-8 String";
--			goto ERR;
-+E0:			msg = "Invalid UTF-8 String";
-+			goto RL_ERROR_EXIT;
- 			}
- 		else if(first<0xE0){
- 			second = c[i++];
-@@ -93,11 +93,11 @@ E0:			msg = "Imvalid UTF-8 String";
- 			}
- 		else{
- 			msg = "UTF-8 characters outside 16-bit range not supported";
--			goto ERR;
-+			goto RL_ERROR_EXIT;
- 			}
- 		}
- 	return r;
--ERR:
-+RL_ERROR_EXIT:
-     Py_DECREF(r);
- 	PyErr_SetString(PyExc_ValueError,msg);
-     Py_INCREF(Py_None);