update to 1.18

Main changes since ReportLab 1.16:
- Pythonpoint improvements contributed by Turgut Uyar & Tim Roberts.
- Para.py fix from doug@pennatus.com.
- Pdfgen image fixes.
- Spiderchart from Andy Robinson.
- Better distutils support with Dirk Datzert's assistance.
- Improvements for Asian fonts in paragraphs.
- Added _rl_accel._Ascii85Decode.
- Graphics and other bug fixes.
- Bug & leak fixes.
- improvements to pyRXP which can now be used in 16bit mode.
- Tables now can have row and column spanning.
- renderPM can now do PICT images.
- More charts and improvements to existing graphics classes.

5 files changed, 43 insertions, 22 deletions

diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 983d4acf998..08420603957 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/07/21 17:16:28 martti Exp $
+# $NetBSD: Makefile,v 1.13 2003/07/26 15:00:58 drochner Exp $
 #
 
-DISTNAME=	ReportLab_1_16
-PKGNAME=	${PYPKGPREFIX}-reportlab-1.16
+DISTNAME=	ReportLab_1_18
+PKGNAME=	${PYPKGPREFIX}-reportlab-1.18
 WRKSRC=		${WRKDIR}/reportlab/lib
 CATEGORIES=	print
 MASTER_SITES=   ftp://ftp.reportlab.com/
@@ -20,5 +20,6 @@ post-install:
 	cd ${WRKDIR} && ${PAX} -rw -pp reportlab ${PREFIX}/${PYSITELIB}
 	${RM} -rf ${PREFIX}/${PYSITELIB}/reportlab/lib/build
 
+.include "../../textproc/pyxml/buildlink2.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/py-reportlab/PLIST b/print/py-reportlab/PLIST
index 5740e14207e..06bb107914f 100644
--- a/print/py-reportlab/PLIST
+++ b/print/py-reportlab/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/07 18:02:03 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/07/26 15:00:58 drochner Exp $
 ${PYSITELIB}/_rl_accel.so
 ${PYSITELIB}/pyHnj.so
+${PYSITELIB}/reportlab/MANIFEST.in
 ${PYSITELIB}/reportlab/README
 ${PYSITELIB}/reportlab/__init__.py
 ${PYSITELIB}/reportlab/changes
@@ -68,12 +69,14 @@ ${PYSITELIB}/reportlab/graphics/charts/areas.py
 ${PYSITELIB}/reportlab/graphics/charts/axes.py
 ${PYSITELIB}/reportlab/graphics/charts/barcharts.py
 ${PYSITELIB}/reportlab/graphics/charts/dotbox.py
+${PYSITELIB}/reportlab/graphics/charts/doughnut.py
 ${PYSITELIB}/reportlab/graphics/charts/legends.py
 ${PYSITELIB}/reportlab/graphics/charts/linecharts.py
 ${PYSITELIB}/reportlab/graphics/charts/lineplots.py
 ${PYSITELIB}/reportlab/graphics/charts/markers.py
 ${PYSITELIB}/reportlab/graphics/charts/piecharts.py
 ${PYSITELIB}/reportlab/graphics/charts/slidebox.py
+${PYSITELIB}/reportlab/graphics/charts/spider.py
 ${PYSITELIB}/reportlab/graphics/charts/textlabels.py
 ${PYSITELIB}/reportlab/graphics/charts/utils.py
 ${PYSITELIB}/reportlab/graphics/renderPDF.py
@@ -81,11 +84,29 @@ ${PYSITELIB}/reportlab/graphics/renderPM.py
 ${PYSITELIB}/reportlab/graphics/renderPS.py
 ${PYSITELIB}/reportlab/graphics/renderSVG.py
 ${PYSITELIB}/reportlab/graphics/renderbase.py
+${PYSITELIB}/reportlab/graphics/samples/__init__.py
+${PYSITELIB}/reportlab/graphics/samples/bubble.py
+${PYSITELIB}/reportlab/graphics/samples/clustered_bar.py
+${PYSITELIB}/reportlab/graphics/samples/clustered_column.py
+${PYSITELIB}/reportlab/graphics/samples/excelcolors.py
+${PYSITELIB}/reportlab/graphics/samples/exploded_pie.py
+${PYSITELIB}/reportlab/graphics/samples/filled_radar.py
+${PYSITELIB}/reportlab/graphics/samples/line_chart.py
+${PYSITELIB}/reportlab/graphics/samples/linechart_with_markers.py
+${PYSITELIB}/reportlab/graphics/samples/radar.py
+${PYSITELIB}/reportlab/graphics/samples/runall.py
+${PYSITELIB}/reportlab/graphics/samples/scatter.py
+${PYSITELIB}/reportlab/graphics/samples/scatter_lines.py
+${PYSITELIB}/reportlab/graphics/samples/scatter_lines_markers.py
+${PYSITELIB}/reportlab/graphics/samples/simple_pie.py
+${PYSITELIB}/reportlab/graphics/samples/stacked_bar.py
+${PYSITELIB}/reportlab/graphics/samples/stacked_column.py
 ${PYSITELIB}/reportlab/graphics/shapes.py
 ${PYSITELIB}/reportlab/graphics/testdrawings.py
 ${PYSITELIB}/reportlab/graphics/testshapes.py
 ${PYSITELIB}/reportlab/graphics/widgetbase.py
 ${PYSITELIB}/reportlab/graphics/widgets/__init__.py
+${PYSITELIB}/reportlab/graphics/widgets/eventcal.py
 ${PYSITELIB}/reportlab/graphics/widgets/flags.py
 ${PYSITELIB}/reportlab/graphics/widgets/grids.py
 ${PYSITELIB}/reportlab/graphics/widgets/markers.py
@@ -119,6 +140,7 @@ ${PYSITELIB}/reportlab/lib/pyHnjmodule.c
 ${PYSITELIB}/reportlab/lib/randomtext.py
 ${PYSITELIB}/reportlab/lib/rparsexml.py
 ${PYSITELIB}/reportlab/lib/sequencer.py
+${PYSITELIB}/reportlab/lib/set_ops.py
 ${PYSITELIB}/reportlab/lib/setup.py
 ${PYSITELIB}/reportlab/lib/setup.py.orig
 ${PYSITELIB}/reportlab/lib/sgmlop.c
@@ -161,7 +183,6 @@ ${PYSITELIB}/reportlab/platypus/tables.py
 ${PYSITELIB}/reportlab/platypus/xpreformatted.py
 ${PYSITELIB}/reportlab/rl_config.py
 ${PYSITELIB}/reportlab/setup.py
-${PYSITELIB}/reportlab/setup_reportlab.py
 ${PYSITELIB}/reportlab/test/00readme.txt
 ${PYSITELIB}/reportlab/test/__init__.py
 ${PYSITELIB}/reportlab/test/pythonpowered.gif
@@ -176,6 +197,7 @@ ${PYSITELIB}/reportlab/test/test_graphics_speed.py
 ${PYSITELIB}/reportlab/test/test_hello.py
 ${PYSITELIB}/reportlab/test/test_lib_colors.py
 ${PYSITELIB}/reportlab/test/test_lib_sequencer.py
+${PYSITELIB}/reportlab/test/test_lib_utils.py
 ${PYSITELIB}/reportlab/test/test_lib_validators.py
 ${PYSITELIB}/reportlab/test/test_multibyte_chs.py
 ${PYSITELIB}/reportlab/test/test_multibyte_cht.py
@@ -189,10 +211,12 @@ ${PYSITELIB}/reportlab/test/test_pdfbase_pdfutils.py
 ${PYSITELIB}/reportlab/test/test_pdfbase_ttfonts.py
 ${PYSITELIB}/reportlab/test/test_pdfgen_callback.py
 ${PYSITELIB}/reportlab/test/test_pdfgen_general.py
+${PYSITELIB}/reportlab/test/test_pdfgen_links.py
 ${PYSITELIB}/reportlab/test/test_pdfgen_pagemodes.py
 ${PYSITELIB}/reportlab/test/test_pdfgen_pycanvas.py
 ${PYSITELIB}/reportlab/test/test_platypus_breaking.py
 ${PYSITELIB}/reportlab/test/test_platypus_general.py
+${PYSITELIB}/reportlab/test/test_platypus_indents.py
 ${PYSITELIB}/reportlab/test/test_platypus_paragraphs.py
 ${PYSITELIB}/reportlab/test/test_platypus_tables.py
 ${PYSITELIB}/reportlab/test/test_platypus_toc.py
@@ -200,6 +224,7 @@ ${PYSITELIB}/reportlab/test/test_platypus_xref.py
 ${PYSITELIB}/reportlab/test/test_pyfiles.py
 ${PYSITELIB}/reportlab/test/test_renderSVG.py
 ${PYSITELIB}/reportlab/test/test_source_chars.py
+${PYSITELIB}/reportlab/test/test_table_layout.py
 ${PYSITELIB}/reportlab/test/test_tools_pythonpoint.py
 ${PYSITELIB}/reportlab/test/test_widgetbase_tpc.py
 ${PYSITELIB}/reportlab/test/test_widgets_grids.py
@@ -233,6 +258,7 @@ ${PYSITELIB}/reportlab/tools/pythonpoint/customshapes.py
 ${PYSITELIB}/reportlab/tools/pythonpoint/demos/LeERC___.AFM
 ${PYSITELIB}/reportlab/tools/pythonpoint/demos/LeERC___.PFB
 ${PYSITELIB}/reportlab/tools/pythonpoint/demos/examples.py
+${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
@@ -248,6 +274,7 @@ ${PYSITELIB}/reportlab/tools/pythonpoint/pythonpoint.py
 ${PYSITELIB}/reportlab/tools/pythonpoint/stdparser.py
 ${PYSITELIB}/reportlab/tools/pythonpoint/styles/__init__.py
 ${PYSITELIB}/reportlab/tools/pythonpoint/styles/horrible.py
+${PYSITELIB}/reportlab/tools/pythonpoint/styles/htu.py
 ${PYSITELIB}/reportlab/tools/pythonpoint/styles/modern.py
 ${PYSITELIB}/reportlab/tools/pythonpoint/styles/projection.py
 ${PYSITELIB}/reportlab/tools/pythonpoint/styles/standard.py
@@ -264,6 +291,7 @@ ${PYSITELIB}/sgmlop.so
 @dirrm ${PYSITELIB}/reportlab/pdfbase
 @dirrm ${PYSITELIB}/reportlab/lib
 @dirrm ${PYSITELIB}/reportlab/graphics/widgets
+@dirrm ${PYSITELIB}/reportlab/graphics/samples
 @dirrm ${PYSITELIB}/reportlab/graphics/charts
 @dirrm ${PYSITELIB}/reportlab/graphics
 @dirrm ${PYSITELIB}/reportlab/fonts
diff --git a/print/py-reportlab/PLIST.pre b/print/py-reportlab/PLIST.pre
deleted file mode 100644
index 318a8c819cc..00000000000
--- a/print/py-reportlab/PLIST.pre
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST.pre,v 1.1 2001/10/31 23:32:07 zuntum Exp $
diff --git a/print/py-reportlab/distinfo b/print/py-reportlab/distinfo
index 57164a093a3..91fa380798b 100644
--- a/print/py-reportlab/distinfo
+++ b/print/py-reportlab/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/12/07 18:02:03 drochner Exp $
+$NetBSD: distinfo,v 1.6 2003/07/26 15:01:00 drochner Exp $
 
-SHA1 (ReportLab_1_16.tgz) = f3391a0db4a477b1a0fa868da84b0837d2373f44
-Size (ReportLab_1_16.tgz) = 2151941 bytes
-SHA1 (patch-aa) = 9d493c51bcfd7cdc1e9ed8ed23cb038e3a3cab6d
+SHA1 (ReportLab_1_18.tgz) = 8ece586279c2f52d94f8d9886435d997691ac08e
+Size (ReportLab_1_18.tgz) = 2191658 bytes
+SHA1 (patch-aa) = 0eeef56f0214440b5e7582f7d604900301554b63
diff --git a/print/py-reportlab/patches/patch-aa b/print/py-reportlab/patches/patch-aa
index 2148a6ba6da..68a382e2e06 100644
--- a/print/py-reportlab/patches/patch-aa
+++ b/print/py-reportlab/patches/patch-aa
@@ -1,21 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2002/10/23 18:05:24 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2003/07/26 15:01:02 drochner Exp $
 
---- setup.py.orig	Mon Oct  7 18:58:07 2002
-+++ setup.py	Mon Oct  7 18:59:19 2002
+--- setup.py.orig	2003-07-01 20:58:37.000000000 +0200
++++ setup.py	2003-07-26 16:31:46.000000000 +0200
 @@ -7,7 +7,8 @@
      import os, sys
      from distutils.core import setup, Extension
  
--    if sys.platform in ['win32', 'sunos5', 'freebsd4', 'aix4', 'mac', 'darwin']:
-+#    if sys.platform in ['win32', 'sunos5', 'freebsd4', 'aix4', 'mac', 'darwin']:
+-    if sys.platform in ['linux2', 'win32', 'sunos5', 'freebsd4', 'aix4', 'mac', 'darwin']:
++#    if sys.platform in ['linux2', 'win32', 'sunos5', 'freebsd4', 'aix4', 'mac', 'darwin']:
 +    if 1:
          LIBS=[]
      else:
          raise ValueError, "Don't know about platform:"+sys.platform
-@@ -54,4 +55,4 @@
-                 if os.path.isfile(dstf):
-                     os.remove(dstf)
-                 os.rename(os.path.join(src,f),dstf)
--        MovePYDs('sgmlop.pyd','_rl_accel.pyd','pyHnj.pyd')
-\ No newline at end of file
-+        MovePYDs('sgmlop.pyd','_rl_accel.pyd','pyHnj.pyd')