Update to ReportLab 2.2. This is a major update with API breakage.

Major changes include full Unicode supoprt, better support for Asian
languages, support for JPEG CMYK images, links in Platypus, better
wrapping, barcode support, better support for legends of graphics and
many more.

Addtional changes in pkgsrc include the merge of py-reportlab-renderPM
package and use of external libart.

5 files changed, 142 insertions, 370 deletions

diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 062c75f2dd0..29173e7269e 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2008/06/12 02:14:44 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2009/01/28 14:42:28 joerg Exp $
 #
 
-DISTNAME=	ReportLab_1_21_2
-PKGNAME=	${PYPKGPREFIX}-reportlab-1.21.2
+DISTNAME=	ReportLab_2_2
+PKGNAME=	${PYPKGPREFIX}-reportlab-2.2
 CATEGORIES=	print python
 MASTER_SITES=	ftp://ftp.reportlab.com/
 EXTRACT_SUFX=	.tgz
@@ -13,12 +13,12 @@ COMMENT=	Powerful PDF-generating toolkit for Python
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_ACCEPTED=	25 24 23 21
-
-WRKSRC=		${WRKDIR}/reportlab_1_21_2/reportlab
 PYBINMODULE=	yes
 PYDISTUTILSPKG=	yes
 
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
+.include "../../graphics/py-imaging/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../textproc/py-xml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/py-reportlab/PLIST b/print/py-reportlab/PLIST
index dfb36ac82b9..42ec784fe85 100644
--- a/print/py-reportlab/PLIST
+++ b/print/py-reportlab/PLIST
@@ -1,68 +1,65 @@
-@comment $NetBSD: PLIST,v 1.6 2007/11/05 20:57:51 drochner Exp $
-${PYSITELIB}/reportlab/README
+@comment $NetBSD: PLIST,v 1.7 2009/01/28 14:42:28 joerg Exp $
+${PYSITELIB}/_renderPM.so
+${PYSITELIB}/_rl_accel.so
+${PYSITELIB}/pyHnj.so
 ${PYSITELIB}/reportlab/__init__.py
 ${PYSITELIB}/reportlab/__init__.pyc
 ${PYSITELIB}/reportlab/__init__.pyo
-${PYSITELIB}/reportlab/changes
-${PYSITELIB}/reportlab/demos/colors/colortest.py
-${PYSITELIB}/reportlab/demos/gadflypaper/00readme.txt
-${PYSITELIB}/reportlab/demos/gadflypaper/gfe.py
-${PYSITELIB}/reportlab/demos/odyssey/00readme.txt
-${PYSITELIB}/reportlab/demos/odyssey/dodyssey.py
-${PYSITELIB}/reportlab/demos/odyssey/fodyssey.py
-${PYSITELIB}/reportlab/demos/odyssey/odyssey.py
-${PYSITELIB}/reportlab/demos/odyssey/odyssey.txt
-${PYSITELIB}/reportlab/demos/rlzope/readme.txt
-${PYSITELIB}/reportlab/demos/rlzope/rlzope.py
-${PYSITELIB}/reportlab/demos/stdfonts/00readme.txt
-${PYSITELIB}/reportlab/demos/stdfonts/stdfonts.py
-${PYSITELIB}/reportlab/demos/tests/testdemos.py
-${PYSITELIB}/reportlab/docs/00readme.txt
-${PYSITELIB}/reportlab/docs/genAll.py
-${PYSITELIB}/reportlab/docs/graphguide/ch1_intro.py
-${PYSITELIB}/reportlab/docs/graphguide/ch2_concepts.py
-${PYSITELIB}/reportlab/docs/graphguide/ch3_shapes.py
-${PYSITELIB}/reportlab/docs/graphguide/ch4_widgets.py
-${PYSITELIB}/reportlab/docs/graphguide/ch5_charts.py
-${PYSITELIB}/reportlab/docs/graphguide/gengraphguide.py
-${PYSITELIB}/reportlab/docs/images/Edit_Prefs.gif
-${PYSITELIB}/reportlab/docs/images/Python_21.gif
-${PYSITELIB}/reportlab/docs/images/Python_21_HINT.gif
-${PYSITELIB}/reportlab/docs/images/fileExchange.gif
-${PYSITELIB}/reportlab/docs/images/jpn.gif
-${PYSITELIB}/reportlab/docs/images/jpnchars.jpg
-${PYSITELIB}/reportlab/docs/images/lj8100.jpg
-${PYSITELIB}/reportlab/docs/images/replogo.a85
-${PYSITELIB}/reportlab/docs/images/replogo.gif
-${PYSITELIB}/reportlab/docs/reference/build.bat
-${PYSITELIB}/reportlab/docs/reference/genreference.py
-${PYSITELIB}/reportlab/docs/reference/reference.yml
-${PYSITELIB}/reportlab/docs/userguide/app_demos.py
-${PYSITELIB}/reportlab/docs/userguide/ch1_intro.py
-${PYSITELIB}/reportlab/docs/userguide/ch2_graphics.py
-${PYSITELIB}/reportlab/docs/userguide/ch2a_fonts.py
-${PYSITELIB}/reportlab/docs/userguide/ch3_pdffeatures.py
-${PYSITELIB}/reportlab/docs/userguide/ch4_platypus_concepts.py
-${PYSITELIB}/reportlab/docs/userguide/ch5_paragraphs.py
-${PYSITELIB}/reportlab/docs/userguide/ch6_tables.py
-${PYSITELIB}/reportlab/docs/userguide/ch7_custom.py
-${PYSITELIB}/reportlab/docs/userguide/ch9_future.py
-${PYSITELIB}/reportlab/docs/userguide/genuserguide.py
-${PYSITELIB}/reportlab/docs/userguide/testfile.txt
 ${PYSITELIB}/reportlab/extensions/README
 ${PYSITELIB}/reportlab/extensions/__init__.py
 ${PYSITELIB}/reportlab/extensions/__init__.pyc
 ${PYSITELIB}/reportlab/extensions/__init__.pyo
 ${PYSITELIB}/reportlab/fonts/00readme.txt
-${PYSITELIB}/reportlab/fonts/LeERC___.AFM
-${PYSITELIB}/reportlab/fonts/LeERC___.PFB
-${PYSITELIB}/reportlab/fonts/luxiserif.ttf
-${PYSITELIB}/reportlab/fonts/luxiserif_license.txt
-${PYSITELIB}/reportlab/fonts/rina.ttf
-${PYSITELIB}/reportlab/fonts/rina_license.txt
+${PYSITELIB}/reportlab/fonts/DarkGarden-copying-gpl.txt
+${PYSITELIB}/reportlab/fonts/DarkGarden-copying.txt
+${PYSITELIB}/reportlab/fonts/DarkGarden-readme.txt
+${PYSITELIB}/reportlab/fonts/DarkGarden.sfd
+${PYSITELIB}/reportlab/fonts/DarkGardenMK.afm
+${PYSITELIB}/reportlab/fonts/DarkGardenMK.pfb
+${PYSITELIB}/reportlab/fonts/Vera.ttf
+${PYSITELIB}/reportlab/fonts/VeraBI.ttf
+${PYSITELIB}/reportlab/fonts/VeraBd.ttf
+${PYSITELIB}/reportlab/fonts/VeraIt.ttf
+${PYSITELIB}/reportlab/fonts/bitstream-vera-license.txt
 ${PYSITELIB}/reportlab/graphics/__init__.py
 ${PYSITELIB}/reportlab/graphics/__init__.pyc
 ${PYSITELIB}/reportlab/graphics/__init__.pyo
+${PYSITELIB}/reportlab/graphics/barcode/__init__.py
+${PYSITELIB}/reportlab/graphics/barcode/__init__.pyc
+${PYSITELIB}/reportlab/graphics/barcode/__init__.pyo
+${PYSITELIB}/reportlab/graphics/barcode/code128.py
+${PYSITELIB}/reportlab/graphics/barcode/code128.pyc
+${PYSITELIB}/reportlab/graphics/barcode/code128.pyo
+${PYSITELIB}/reportlab/graphics/barcode/code39.py
+${PYSITELIB}/reportlab/graphics/barcode/code39.pyc
+${PYSITELIB}/reportlab/graphics/barcode/code39.pyo
+${PYSITELIB}/reportlab/graphics/barcode/code93.py
+${PYSITELIB}/reportlab/graphics/barcode/code93.pyc
+${PYSITELIB}/reportlab/graphics/barcode/code93.pyo
+${PYSITELIB}/reportlab/graphics/barcode/common.py
+${PYSITELIB}/reportlab/graphics/barcode/common.pyc
+${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/fourstate.py
+${PYSITELIB}/reportlab/graphics/barcode/fourstate.pyc
+${PYSITELIB}/reportlab/graphics/barcode/fourstate.pyo
+${PYSITELIB}/reportlab/graphics/barcode/lto.py
+${PYSITELIB}/reportlab/graphics/barcode/lto.pyc
+${PYSITELIB}/reportlab/graphics/barcode/lto.pyo
+${PYSITELIB}/reportlab/graphics/barcode/test.py
+${PYSITELIB}/reportlab/graphics/barcode/test.pyc
+${PYSITELIB}/reportlab/graphics/barcode/test.pyo
+${PYSITELIB}/reportlab/graphics/barcode/usps.py
+${PYSITELIB}/reportlab/graphics/barcode/usps.pyc
+${PYSITELIB}/reportlab/graphics/barcode/usps.pyo
+${PYSITELIB}/reportlab/graphics/barcode/usps4s.py
+${PYSITELIB}/reportlab/graphics/barcode/usps4s.pyc
+${PYSITELIB}/reportlab/graphics/barcode/usps4s.pyo
+${PYSITELIB}/reportlab/graphics/barcode/widgets.py
+${PYSITELIB}/reportlab/graphics/barcode/widgets.pyc
+${PYSITELIB}/reportlab/graphics/barcode/widgets.pyo
 ${PYSITELIB}/reportlab/graphics/charts/__init__.py
 ${PYSITELIB}/reportlab/graphics/charts/__init__.pyc
 ${PYSITELIB}/reportlab/graphics/charts/__init__.pyo
@@ -219,6 +216,9 @@ ${PYSITELIB}/reportlab/lib/abag.pyo
 ${PYSITELIB}/reportlab/lib/attrmap.py
 ${PYSITELIB}/reportlab/lib/attrmap.pyc
 ${PYSITELIB}/reportlab/lib/attrmap.pyo
+${PYSITELIB}/reportlab/lib/boxstuff.py
+${PYSITELIB}/reportlab/lib/boxstuff.pyc
+${PYSITELIB}/reportlab/lib/boxstuff.pyo
 ${PYSITELIB}/reportlab/lib/codecharts.py
 ${PYSITELIB}/reportlab/lib/codecharts.pyc
 ${PYSITELIB}/reportlab/lib/codecharts.pyo
@@ -234,12 +234,16 @@ ${PYSITELIB}/reportlab/lib/enums.pyo
 ${PYSITELIB}/reportlab/lib/extformat.py
 ${PYSITELIB}/reportlab/lib/extformat.pyc
 ${PYSITELIB}/reportlab/lib/extformat.pyo
+${PYSITELIB}/reportlab/lib/fontfinder.py
+${PYSITELIB}/reportlab/lib/fontfinder.pyc
+${PYSITELIB}/reportlab/lib/fontfinder.pyo
 ${PYSITELIB}/reportlab/lib/fonts.py
 ${PYSITELIB}/reportlab/lib/fonts.pyc
 ${PYSITELIB}/reportlab/lib/fonts.pyo
 ${PYSITELIB}/reportlab/lib/formatters.py
 ${PYSITELIB}/reportlab/lib/formatters.pyc
 ${PYSITELIB}/reportlab/lib/formatters.pyo
+${PYSITELIB}/reportlab/lib/hyphen.mashed
 ${PYSITELIB}/reportlab/lib/logger.py
 ${PYSITELIB}/reportlab/lib/logger.pyc
 ${PYSITELIB}/reportlab/lib/logger.pyo
@@ -252,6 +256,9 @@ ${PYSITELIB}/reportlab/lib/pagesizes.pyo
 ${PYSITELIB}/reportlab/lib/randomtext.py
 ${PYSITELIB}/reportlab/lib/randomtext.pyc
 ${PYSITELIB}/reportlab/lib/randomtext.pyo
+${PYSITELIB}/reportlab/lib/rltempfile.py
+${PYSITELIB}/reportlab/lib/rltempfile.pyc
+${PYSITELIB}/reportlab/lib/rltempfile.pyo
 ${PYSITELIB}/reportlab/lib/rparsexml.py
 ${PYSITELIB}/reportlab/lib/rparsexml.pyc
 ${PYSITELIB}/reportlab/lib/rparsexml.pyo
@@ -264,6 +271,9 @@ ${PYSITELIB}/reportlab/lib/set_ops.pyo
 ${PYSITELIB}/reportlab/lib/styles.py
 ${PYSITELIB}/reportlab/lib/styles.pyc
 ${PYSITELIB}/reportlab/lib/styles.pyo
+${PYSITELIB}/reportlab/lib/textsplit.py
+${PYSITELIB}/reportlab/lib/textsplit.pyc
+${PYSITELIB}/reportlab/lib/textsplit.pyo
 ${PYSITELIB}/reportlab/lib/tocindex.py
 ${PYSITELIB}/reportlab/lib/tocindex.pyc
 ${PYSITELIB}/reportlab/lib/tocindex.pyo
@@ -282,10 +292,12 @@ ${PYSITELIB}/reportlab/lib/xmllib.pyo
 ${PYSITELIB}/reportlab/lib/yaml.py
 ${PYSITELIB}/reportlab/lib/yaml.pyc
 ${PYSITELIB}/reportlab/lib/yaml.pyo
-${PYSITELIB}/reportlab/license.txt
 ${PYSITELIB}/reportlab/pdfbase/__init__.py
 ${PYSITELIB}/reportlab/pdfbase/__init__.pyc
 ${PYSITELIB}/reportlab/pdfbase/__init__.pyo
+${PYSITELIB}/reportlab/pdfbase/_can_cmap_data.py
+${PYSITELIB}/reportlab/pdfbase/_can_cmap_data.pyc
+${PYSITELIB}/reportlab/pdfbase/_can_cmap_data.pyo
 ${PYSITELIB}/reportlab/pdfbase/_cidfontdata.py
 ${PYSITELIB}/reportlab/pdfbase/_cidfontdata.pyc
 ${PYSITELIB}/reportlab/pdfbase/_cidfontdata.pyo
@@ -310,6 +322,9 @@ ${PYSITELIB}/reportlab/pdfbase/pdfpattern.pyo
 ${PYSITELIB}/reportlab/pdfbase/pdfutils.py
 ${PYSITELIB}/reportlab/pdfbase/pdfutils.pyc
 ${PYSITELIB}/reportlab/pdfbase/pdfutils.pyo
+${PYSITELIB}/reportlab/pdfbase/rl_codecs.py
+${PYSITELIB}/reportlab/pdfbase/rl_codecs.pyc
+${PYSITELIB}/reportlab/pdfbase/rl_codecs.pyo
 ${PYSITELIB}/reportlab/pdfbase/ttfonts.py
 ${PYSITELIB}/reportlab/pdfbase/ttfonts.pyc
 ${PYSITELIB}/reportlab/pdfbase/ttfonts.pyo
@@ -370,277 +385,7 @@ ${PYSITELIB}/reportlab/platypus/xpreformatted.pyo
 ${PYSITELIB}/reportlab/rl_config.py
 ${PYSITELIB}/reportlab/rl_config.pyc
 ${PYSITELIB}/reportlab/rl_config.pyo
-${PYSITELIB}/reportlab/test/__init__.py
-${PYSITELIB}/reportlab/test/__init__.pyc
-${PYSITELIB}/reportlab/test/__init__.pyo
-${PYSITELIB}/reportlab/test/doctest.py
-${PYSITELIB}/reportlab/test/doctest.pyc
-${PYSITELIB}/reportlab/test/doctest.pyo
-${PYSITELIB}/reportlab/test/linecache_copy.py
-${PYSITELIB}/reportlab/test/linecache_copy.pyc
-${PYSITELIB}/reportlab/test/linecache_copy.pyo
-${PYSITELIB}/reportlab/test/pythonpowered.gif
-${PYSITELIB}/reportlab/test/runAll.py
-${PYSITELIB}/reportlab/test/runAll.pyc
-${PYSITELIB}/reportlab/test/runAll.pyo
-${PYSITELIB}/reportlab/test/test_charts_textlabels.py
-${PYSITELIB}/reportlab/test/test_charts_textlabels.pyc
-${PYSITELIB}/reportlab/test/test_charts_textlabels.pyo
-${PYSITELIB}/reportlab/test/test_docs_build.py
-${PYSITELIB}/reportlab/test/test_docs_build.pyc
-${PYSITELIB}/reportlab/test/test_docs_build.pyo
-${PYSITELIB}/reportlab/test/test_docstrings.py
-${PYSITELIB}/reportlab/test/test_docstrings.pyc
-${PYSITELIB}/reportlab/test/test_docstrings.pyo
-${PYSITELIB}/reportlab/test/test_extra.py
-${PYSITELIB}/reportlab/test/test_extra.pyc
-${PYSITELIB}/reportlab/test/test_extra.pyo
-${PYSITELIB}/reportlab/test/test_graphics_charts.py
-${PYSITELIB}/reportlab/test/test_graphics_charts.pyc
-${PYSITELIB}/reportlab/test/test_graphics_charts.pyo
-${PYSITELIB}/reportlab/test/test_graphics_images.py
-${PYSITELIB}/reportlab/test/test_graphics_images.pyc
-${PYSITELIB}/reportlab/test/test_graphics_images.pyo
-${PYSITELIB}/reportlab/test/test_graphics_layout.py
-${PYSITELIB}/reportlab/test/test_graphics_layout.pyc
-${PYSITELIB}/reportlab/test/test_graphics_layout.pyo
-${PYSITELIB}/reportlab/test/test_graphics_speed.py
-${PYSITELIB}/reportlab/test/test_graphics_speed.pyc
-${PYSITELIB}/reportlab/test/test_graphics_speed.pyo
-${PYSITELIB}/reportlab/test/test_hello.py
-${PYSITELIB}/reportlab/test/test_hello.pyc
-${PYSITELIB}/reportlab/test/test_hello.pyo
-${PYSITELIB}/reportlab/test/test_images.py
-${PYSITELIB}/reportlab/test/test_images.pyc
-${PYSITELIB}/reportlab/test/test_images.pyo
-${PYSITELIB}/reportlab/test/test_invariant.py
-${PYSITELIB}/reportlab/test/test_invariant.pyc
-${PYSITELIB}/reportlab/test/test_invariant.pyo
-${PYSITELIB}/reportlab/test/test_lib_colors.py
-${PYSITELIB}/reportlab/test/test_lib_colors.pyc
-${PYSITELIB}/reportlab/test/test_lib_colors.pyo
-${PYSITELIB}/reportlab/test/test_lib_sequencer.py
-${PYSITELIB}/reportlab/test/test_lib_sequencer.pyc
-${PYSITELIB}/reportlab/test/test_lib_sequencer.pyo
-${PYSITELIB}/reportlab/test/test_lib_utils.py
-${PYSITELIB}/reportlab/test/test_lib_utils.pyc
-${PYSITELIB}/reportlab/test/test_lib_utils.pyo
-${PYSITELIB}/reportlab/test/test_lib_validators.py
-${PYSITELIB}/reportlab/test/test_lib_validators.pyc
-${PYSITELIB}/reportlab/test/test_lib_validators.pyo
-${PYSITELIB}/reportlab/test/test_multibyte_chs.py
-${PYSITELIB}/reportlab/test/test_multibyte_chs.pyc
-${PYSITELIB}/reportlab/test/test_multibyte_chs.pyo
-${PYSITELIB}/reportlab/test/test_multibyte_cht.py
-${PYSITELIB}/reportlab/test/test_multibyte_cht.pyc
-${PYSITELIB}/reportlab/test/test_multibyte_cht.pyo
-${PYSITELIB}/reportlab/test/test_multibyte_jpn.py
-${PYSITELIB}/reportlab/test/test_multibyte_jpn.pyc
-${PYSITELIB}/reportlab/test/test_multibyte_jpn.pyo
-${PYSITELIB}/reportlab/test/test_multibyte_kor.py
-${PYSITELIB}/reportlab/test/test_multibyte_kor.pyc
-${PYSITELIB}/reportlab/test/test_multibyte_kor.pyo
-${PYSITELIB}/reportlab/test/test_paragraphs.py
-${PYSITELIB}/reportlab/test/test_paragraphs.pyc
-${PYSITELIB}/reportlab/test/test_paragraphs.pyo
-${PYSITELIB}/reportlab/test/test_pdfbase_encodings.py
-${PYSITELIB}/reportlab/test/test_pdfbase_encodings.pyc
-${PYSITELIB}/reportlab/test/test_pdfbase_encodings.pyo
-${PYSITELIB}/reportlab/test/test_pdfbase_fontembed.py
-${PYSITELIB}/reportlab/test/test_pdfbase_fontembed.pyc
-${PYSITELIB}/reportlab/test/test_pdfbase_fontembed.pyo
-${PYSITELIB}/reportlab/test/test_pdfbase_pdfmetrics.py
-${PYSITELIB}/reportlab/test/test_pdfbase_pdfmetrics.pyc
-${PYSITELIB}/reportlab/test/test_pdfbase_pdfmetrics.pyo
-${PYSITELIB}/reportlab/test/test_pdfbase_pdfutils.py
-${PYSITELIB}/reportlab/test/test_pdfbase_pdfutils.pyc
-${PYSITELIB}/reportlab/test/test_pdfbase_pdfutils.pyo
-${PYSITELIB}/reportlab/test/test_pdfbase_postscript.py
-${PYSITELIB}/reportlab/test/test_pdfbase_postscript.pyc
-${PYSITELIB}/reportlab/test/test_pdfbase_postscript.pyo
-${PYSITELIB}/reportlab/test/test_pdfbase_ttfonts.py
-${PYSITELIB}/reportlab/test/test_pdfbase_ttfonts.pyc
-${PYSITELIB}/reportlab/test/test_pdfbase_ttfonts.pyo
-${PYSITELIB}/reportlab/test/test_pdfgen_callback.py
-${PYSITELIB}/reportlab/test/test_pdfgen_callback.pyc
-${PYSITELIB}/reportlab/test/test_pdfgen_callback.pyo
-${PYSITELIB}/reportlab/test/test_pdfgen_general.py
-${PYSITELIB}/reportlab/test/test_pdfgen_general.pyc
-${PYSITELIB}/reportlab/test/test_pdfgen_general.pyo
-${PYSITELIB}/reportlab/test/test_pdfgen_links.py
-${PYSITELIB}/reportlab/test/test_pdfgen_links.pyc
-${PYSITELIB}/reportlab/test/test_pdfgen_links.pyo
-${PYSITELIB}/reportlab/test/test_pdfgen_pagemodes.py
-${PYSITELIB}/reportlab/test/test_pdfgen_pagemodes.pyc
-${PYSITELIB}/reportlab/test/test_pdfgen_pagemodes.pyo
-${PYSITELIB}/reportlab/test/test_pdfgen_pycanvas.py
-${PYSITELIB}/reportlab/test/test_pdfgen_pycanvas.pyc
-${PYSITELIB}/reportlab/test/test_pdfgen_pycanvas.pyo
-${PYSITELIB}/reportlab/test/test_platypus_breaking.py
-${PYSITELIB}/reportlab/test/test_platypus_breaking.pyc
-${PYSITELIB}/reportlab/test/test_platypus_breaking.pyo
-${PYSITELIB}/reportlab/test/test_platypus_general.py
-${PYSITELIB}/reportlab/test/test_platypus_general.pyc
-${PYSITELIB}/reportlab/test/test_platypus_general.pyo
-${PYSITELIB}/reportlab/test/test_platypus_indents.py
-${PYSITELIB}/reportlab/test/test_platypus_indents.pyc
-${PYSITELIB}/reportlab/test/test_platypus_indents.pyo
-${PYSITELIB}/reportlab/test/test_platypus_leftright.py
-${PYSITELIB}/reportlab/test/test_platypus_leftright.pyc
-${PYSITELIB}/reportlab/test/test_platypus_leftright.pyo
-${PYSITELIB}/reportlab/test/test_platypus_paragraphs.py
-${PYSITELIB}/reportlab/test/test_platypus_paragraphs.pyc
-${PYSITELIB}/reportlab/test/test_platypus_paragraphs.pyo
-${PYSITELIB}/reportlab/test/test_platypus_pto.py
-${PYSITELIB}/reportlab/test/test_platypus_pto.pyc
-${PYSITELIB}/reportlab/test/test_platypus_pto.pyo
-${PYSITELIB}/reportlab/test/test_platypus_tables.py
-${PYSITELIB}/reportlab/test/test_platypus_tables.pyc
-${PYSITELIB}/reportlab/test/test_platypus_tables.pyo
-${PYSITELIB}/reportlab/test/test_platypus_toc.py
-${PYSITELIB}/reportlab/test/test_platypus_toc.pyc
-${PYSITELIB}/reportlab/test/test_platypus_toc.pyo
-${PYSITELIB}/reportlab/test/test_platypus_xref.py
-${PYSITELIB}/reportlab/test/test_platypus_xref.pyc
-${PYSITELIB}/reportlab/test/test_platypus_xref.pyo
-${PYSITELIB}/reportlab/test/test_pyfiles.py
-${PYSITELIB}/reportlab/test/test_pyfiles.pyc
-${PYSITELIB}/reportlab/test/test_pyfiles.pyo
-${PYSITELIB}/reportlab/test/test_renderSVG.py
-${PYSITELIB}/reportlab/test/test_renderSVG.pyc
-${PYSITELIB}/reportlab/test/test_renderSVG.pyo
-${PYSITELIB}/reportlab/test/test_rl_accel.py
-${PYSITELIB}/reportlab/test/test_rl_accel.pyc
-${PYSITELIB}/reportlab/test/test_rl_accel.pyo
-${PYSITELIB}/reportlab/test/test_source_chars.py
-${PYSITELIB}/reportlab/test/test_source_chars.pyc
-${PYSITELIB}/reportlab/test/test_source_chars.pyo
-${PYSITELIB}/reportlab/test/test_table_layout.py
-${PYSITELIB}/reportlab/test/test_table_layout.pyc
-${PYSITELIB}/reportlab/test/test_table_layout.pyo
-${PYSITELIB}/reportlab/test/test_tools_pythonpoint.py
-${PYSITELIB}/reportlab/test/test_tools_pythonpoint.pyc
-${PYSITELIB}/reportlab/test/test_tools_pythonpoint.pyo
-${PYSITELIB}/reportlab/test/test_utils.py
-${PYSITELIB}/reportlab/test/test_utils.pyc
-${PYSITELIB}/reportlab/test/test_utils.pyo
-${PYSITELIB}/reportlab/test/test_widgetbase_tpc.py
-${PYSITELIB}/reportlab/test/test_widgetbase_tpc.pyc
-${PYSITELIB}/reportlab/test/test_widgetbase_tpc.pyo
-${PYSITELIB}/reportlab/test/test_widgets_grids.py
-${PYSITELIB}/reportlab/test/test_widgets_grids.pyc
-${PYSITELIB}/reportlab/test/test_widgets_grids.pyo
-${PYSITELIB}/reportlab/test/unittest.py
-${PYSITELIB}/reportlab/test/unittest.pyc
-${PYSITELIB}/reportlab/test/unittest.pyo
-${PYSITELIB}/reportlab/test/utils.py
-${PYSITELIB}/reportlab/test/utils.pyc
-${PYSITELIB}/reportlab/test/utils.pyo
-${PYSITELIB}/reportlab/tools/README
-${PYSITELIB}/reportlab/tools/__init__.py
-${PYSITELIB}/reportlab/tools/__init__.pyc
-${PYSITELIB}/reportlab/tools/__init__.pyo
-${PYSITELIB}/reportlab/tools/docco/README
-${PYSITELIB}/reportlab/tools/docco/__init__.py
-${PYSITELIB}/reportlab/tools/docco/__init__.pyc
-${PYSITELIB}/reportlab/tools/docco/__init__.pyo
-${PYSITELIB}/reportlab/tools/docco/codegrab.py
-${PYSITELIB}/reportlab/tools/docco/codegrab.pyc
-${PYSITELIB}/reportlab/tools/docco/codegrab.pyo
-${PYSITELIB}/reportlab/tools/docco/docpy.py
-${PYSITELIB}/reportlab/tools/docco/docpy.pyc
-${PYSITELIB}/reportlab/tools/docco/docpy.pyo
-${PYSITELIB}/reportlab/tools/docco/examples.py
-${PYSITELIB}/reportlab/tools/docco/examples.pyc
-${PYSITELIB}/reportlab/tools/docco/examples.pyo
-${PYSITELIB}/reportlab/tools/docco/graphdocpy.py
-${PYSITELIB}/reportlab/tools/docco/graphdocpy.pyc
-${PYSITELIB}/reportlab/tools/docco/graphdocpy.pyo
-${PYSITELIB}/reportlab/tools/docco/rl_doc_utils.py
-${PYSITELIB}/reportlab/tools/docco/rl_doc_utils.pyc
-${PYSITELIB}/reportlab/tools/docco/rl_doc_utils.pyo
-${PYSITELIB}/reportlab/tools/docco/rltemplate.py
-${PYSITELIB}/reportlab/tools/docco/rltemplate.pyc
-${PYSITELIB}/reportlab/tools/docco/rltemplate.pyo
-${PYSITELIB}/reportlab/tools/docco/stylesheet.py
-${PYSITELIB}/reportlab/tools/docco/stylesheet.pyc
-${PYSITELIB}/reportlab/tools/docco/stylesheet.pyo
-${PYSITELIB}/reportlab/tools/docco/t_parse.py
-${PYSITELIB}/reportlab/tools/docco/t_parse.pyc
-${PYSITELIB}/reportlab/tools/docco/t_parse.pyo
-${PYSITELIB}/reportlab/tools/docco/yaml.py
-${PYSITELIB}/reportlab/tools/docco/yaml.pyc
-${PYSITELIB}/reportlab/tools/docco/yaml.pyo
-${PYSITELIB}/reportlab/tools/docco/yaml2pdf.py
-${PYSITELIB}/reportlab/tools/docco/yaml2pdf.pyc
-${PYSITELIB}/reportlab/tools/docco/yaml2pdf.pyo
-${PYSITELIB}/reportlab/tools/py2pdf/README
-${PYSITELIB}/reportlab/tools/py2pdf/__init__.py
-${PYSITELIB}/reportlab/tools/py2pdf/__init__.pyc
-${PYSITELIB}/reportlab/tools/py2pdf/__init__.pyo
-${PYSITELIB}/reportlab/tools/py2pdf/demo-config.txt
-${PYSITELIB}/reportlab/tools/py2pdf/demo.py
-${PYSITELIB}/reportlab/tools/py2pdf/demo.pyc
-${PYSITELIB}/reportlab/tools/py2pdf/demo.pyo
-${PYSITELIB}/reportlab/tools/py2pdf/idle_print.py
-${PYSITELIB}/reportlab/tools/py2pdf/idle_print.pyc
-${PYSITELIB}/reportlab/tools/py2pdf/idle_print.pyo
-${PYSITELIB}/reportlab/tools/py2pdf/py2pdf.py
-${PYSITELIB}/reportlab/tools/py2pdf/py2pdf.pyc
-${PYSITELIB}/reportlab/tools/py2pdf/py2pdf.pyo
-${PYSITELIB}/reportlab/tools/py2pdf/vertpython.jpg
-${PYSITELIB}/reportlab/tools/pythonpoint/README
-${PYSITELIB}/reportlab/tools/pythonpoint/__init__.py
-${PYSITELIB}/reportlab/tools/pythonpoint/__init__.pyc
-${PYSITELIB}/reportlab/tools/pythonpoint/__init__.pyo
-${PYSITELIB}/reportlab/tools/pythonpoint/customshapes.py
-${PYSITELIB}/reportlab/tools/pythonpoint/customshapes.pyc
-${PYSITELIB}/reportlab/tools/pythonpoint/customshapes.pyo
-${PYSITELIB}/reportlab/tools/pythonpoint/demos/LeERC___.AFM
-${PYSITELIB}/reportlab/tools/pythonpoint/demos/LeERC___.PFB
-${PYSITELIB}/reportlab/tools/pythonpoint/demos/htu.xml
-${PYSITELIB}/reportlab/tools/pythonpoint/demos/leftlogo.a85
-${PYSITELIB}/reportlab/tools/pythonpoint/demos/leftlogo.gif
-${PYSITELIB}/reportlab/tools/pythonpoint/demos/lj8100.jpg
-${PYSITELIB}/reportlab/tools/pythonpoint/demos/monterey.xml
-${PYSITELIB}/reportlab/tools/pythonpoint/demos/outline.gif
-${PYSITELIB}/reportlab/tools/pythonpoint/demos/pplogo.gif
-${PYSITELIB}/reportlab/tools/pythonpoint/demos/python.gif
-${PYSITELIB}/reportlab/tools/pythonpoint/demos/pythonpoint.xml
-${PYSITELIB}/reportlab/tools/pythonpoint/demos/spectrum.png
-${PYSITELIB}/reportlab/tools/pythonpoint/demos/vertpython.gif
-${PYSITELIB}/reportlab/tools/pythonpoint/pythonpoint.dtd
-${PYSITELIB}/reportlab/tools/pythonpoint/pythonpoint.py
-${PYSITELIB}/reportlab/tools/pythonpoint/pythonpoint.pyc
-${PYSITELIB}/reportlab/tools/pythonpoint/pythonpoint.pyo
-${PYSITELIB}/reportlab/tools/pythonpoint/stdparser.py
-${PYSITELIB}/reportlab/tools/pythonpoint/stdparser.pyc
-${PYSITELIB}/reportlab/tools/pythonpoint/stdparser.pyo
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/__init__.py
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/__init__.pyc
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/__init__.pyo
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/horrible.py
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/horrible.pyc
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/horrible.pyo
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/htu.py
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/htu.pyc
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/htu.pyo
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/modern.py
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/modern.pyc
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/modern.pyo
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/projection.py
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/projection.pyc
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/projection.pyo
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/standard.py
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/standard.pyc
-${PYSITELIB}/reportlab/tools/pythonpoint/styles/standard.pyo
-@dirrm ${PYSITELIB}/reportlab/tools/pythonpoint/styles
-@dirrm ${PYSITELIB}/reportlab/tools/pythonpoint/demos
-@dirrm ${PYSITELIB}/reportlab/tools/pythonpoint
-@dirrm ${PYSITELIB}/reportlab/tools/py2pdf
-@dirrm ${PYSITELIB}/reportlab/tools/docco
-@dirrm ${PYSITELIB}/reportlab/tools
-@dirrm ${PYSITELIB}/reportlab/test
+${PYSITELIB}/sgmlop.so
 @dirrm ${PYSITELIB}/reportlab/platypus
 @dirrm ${PYSITELIB}/reportlab/pdfgen
 @dirrm ${PYSITELIB}/reportlab/pdfbase
@@ -648,19 +393,8 @@ ${PYSITELIB}/reportlab/tools/pythonpoint/styles/standard.pyo
 @dirrm ${PYSITELIB}/reportlab/graphics/widgets
 @dirrm ${PYSITELIB}/reportlab/graphics/samples
 @dirrm ${PYSITELIB}/reportlab/graphics/charts
+@dirrm ${PYSITELIB}/reportlab/graphics/barcode
 @dirrm ${PYSITELIB}/reportlab/graphics
 @dirrm ${PYSITELIB}/reportlab/fonts
 @dirrm ${PYSITELIB}/reportlab/extensions
-@dirrm ${PYSITELIB}/reportlab/docs/userguide
-@dirrm ${PYSITELIB}/reportlab/docs/reference
-@dirrm ${PYSITELIB}/reportlab/docs/images
-@dirrm ${PYSITELIB}/reportlab/docs/graphguide
-@dirrm ${PYSITELIB}/reportlab/docs
-@dirrm ${PYSITELIB}/reportlab/demos/tests
-@dirrm ${PYSITELIB}/reportlab/demos/stdfonts
-@dirrm ${PYSITELIB}/reportlab/demos/rlzope
-@dirrm ${PYSITELIB}/reportlab/demos/odyssey
-@dirrm ${PYSITELIB}/reportlab/demos/gadflypaper
-@dirrm ${PYSITELIB}/reportlab/demos/colors
-@dirrm ${PYSITELIB}/reportlab/demos
 @dirrm ${PYSITELIB}/reportlab
diff --git a/print/py-reportlab/buildlink3.mk b/print/py-reportlab/buildlink3.mk
deleted file mode 100644
index a61b4b8b6b5..00000000000
--- a/print/py-reportlab/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:05 jlam Exp $
-
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-PYREPORTLAB_BUILDLINK3_MK:=	${PYREPORTLAB_BUILDLINK3_MK}+
-
-.include "../../lang/python/pyversion.mk"
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pyreportlab
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyreportlab}
-BUILDLINK_PACKAGES+=	pyreportlab
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyreportlab
-
-.if !empty(PYREPORTLAB_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.pyreportlab+=		${PYPKGPREFIX}-reportlab-[0-9]*
-BUILDLINK_ABI_DEPENDS.pyreportlab?=	${PYPKGPREFIX}-reportlab>=1.20nb2
-BUILDLINK_PKGSRCDIR.pyreportlab?=	../../print/py-reportlab
-.endif	# PYREPORTLAB_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/py-reportlab/distinfo b/print/py-reportlab/distinfo
index ab7272741ae..8fc8e7ae147 100644
--- a/print/py-reportlab/distinfo
+++ b/print/py-reportlab/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.10 2007/11/05 20:57:51 drochner Exp $
+$NetBSD: distinfo,v 1.11 2009/01/28 14:42:28 joerg Exp $
 
-SHA1 (ReportLab_1_21_2.tgz) = 0da8959ad05de0c26c0c40c72e437be2a86c6f61
-RMD160 (ReportLab_1_21_2.tgz) = 70e21be1b422a204c478f88baccdc18cfdd128b6
-Size (ReportLab_1_21_2.tgz) = 3464482 bytes
+SHA1 (ReportLab_2_2.tgz) = 6cd751111950a97859b901824e83bf4836b6b6a5
+RMD160 (ReportLab_2_2.tgz) = 585de3724d71a5c2251980c7125e7a2ca81f544a
+Size (ReportLab_2_2.tgz) = 1960714 bytes
+SHA1 (patch-aa) = 67d9d7f3198bff2c47cf734b40e29ce8619e170a
diff --git a/print/py-reportlab/patches/patch-aa b/print/py-reportlab/patches/patch-aa
new file mode 100644
index 00000000000..6858045685e
--- /dev/null
+++ b/print/py-reportlab/patches/patch-aa
@@ -0,0 +1,59 @@
+$NetBSD: patch-aa,v 1.7 2009/01/28 14:42:28 joerg Exp $
+
+--- setup.py.orig	2008-09-11 15:01:16.000000000 +0200
++++ setup.py
+@@ -255,21 +255,9 @@ def main():
+         infoline( '################################################')
+         infoline( '#Attempting install of _renderPM')
+         infoline( '#extensions from %r'%RENDERPM)
+-        LIBART_DIR=pjoin(RENDERPM,'libart_lgpl')
+         MACROS=[('ROBIN_DEBUG',None)]
+         MACROS=[]
+-        def libart_version():
+-            K = ('LIBART_MAJOR_VERSION','LIBART_MINOR_VERSION','LIBART_MICRO_VERSION')
+-            D = {}
+-            for l in open(pjoin(LIBART_DIR,'configure.in'),'r').readlines():
+-                l = l.strip().split('=')
+-                if len(l)>1 and l[0].strip() in K:
+-                    D[l[0].strip()] = l[1].strip()
+-                    if len(D)==3: break
+-            return (sys.platform == 'win32' and '\\"%s\\"' or '"%s"') % '.'.join(map(lambda k,D=D: D.get(k,'?'),K))
+-        LIBART_VERSION = libart_version()
+         SOURCES=[pjoin(RENDERPM,'_renderPM.c')]
+-        LIBART_SRCS=glob.glob(pjoin(LIBART_DIR, 'art_*.c'))
+         GT1_DIR=pjoin(RENDERPM,'gt1')
+         LIBS = []       #assume empty libraries list
+ 
+@@ -314,14 +302,6 @@ def main():
+             infoline('# installing without freetype no ttf, sorry!')
+ 
+         LIBRARIES+= [
+-                    ('_renderPM_libart',
+-                    {
+-                    'sources':  LIBART_SRCS,
+-                    'include_dirs': [RENDERPM,LIBART_DIR,],
+-                    'macros': [('LIBART_COMPILATION',None),]+BIGENDIAN('WORDS_BIGENDIAN')+MACROS,
+-                    #'extra_compile_args':['/Z7'],
+-                    }
+-                    ),
+                     ('_renderPM_gt1',
+                     {
+                     'sources':  pfxJoin(GT1_DIR,'gt1-dict.c','gt1-namecontext.c','gt1-parset1.c','gt1-region.c','parseAFM.c'),
+@@ -334,13 +314,13 @@ def main():
+ 
+         EXT_MODULES +=  [Extension( '_renderPM',
+                                         SOURCES,
+-                                        include_dirs=[RENDERPM,LIBART_DIR,GT1_DIR]+FT_INC_DIR,
+-                                        define_macros=FT_MACROS+[('LIBART_COMPILATION',None)]+MACROS+[('LIBART_VERSION',LIBART_VERSION)],
++                                        include_dirs=[RENDERPM,GT1_DIR]+FT_INC_DIR,
++                                        define_macros=FT_MACROS+MACROS,
+                                         library_dirs=[]+FT_LIB_DIR,
+ 
+                                         # libraries to link against
+-                                        libraries=LIBS+FT_LIB,
+-                                        #extra_objects=['gt1.lib','libart.lib',],
++                                        libraries=LIBS+FT_LIB+['art_lgpl_2'],
++                                        #extra_objects=['gt1.lib'],
+                                         #extra_compile_args=['/Z7'],
+                                         extra_link_args=[]
+                                         ),