5 files changed, 135 insertions, 75 deletions

diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index e6beefbbf1d7..2ce704b1d656 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	reportlab
-PORTVERSION=	1.14
-PORTREVISION=	1
+PORTVERSION=	1.15
 CATEGORIES=	print python
 MASTER_SITES=	ftp://ftp.reportlab.com/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -30,7 +29,7 @@ EXAMPLEDIR=	${PREFIX}/share/examples/reportlab
 
 post-patch:
 	${MV} ${WRKSRC}/reportlab/lib/setup.py ${WRKDIR}
-	${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/reportlab/rl_config.py
+	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/reportlab/rl_config.py
 
 post-install:
 	${MKDIR} ${REPORTLABDIR}/fonts
diff --git a/print/py-reportlab/distinfo b/print/py-reportlab/distinfo
index e25cdc13fe20..07ebd65d67f2 100644
--- a/print/py-reportlab/distinfo
+++ b/print/py-reportlab/distinfo
@@ -1 +1 @@
-MD5 (ReportLab_1_14.tgz) = 15a53dcad45bbbdf125c8ff64e535f36
+MD5 (ReportLab_1_15.tgz) = 4ed18fd5fa89a9140e274ea0542aa2cd
diff --git a/print/py-reportlab/files/patch-lib::setup.py b/print/py-reportlab/files/patch-lib::setup.py
index dbf479735b8f..f68ac44d1b25 100644
--- a/print/py-reportlab/files/patch-lib::setup.py
+++ b/print/py-reportlab/files/patch-lib::setup.py
@@ -1,46 +1,47 @@
---- reportlab/lib/setup.py.orig	Sun May 26 18:30:32 2002
-+++ reportlab/lib/setup.py	Fri May 31 07:38:09 2002
+--- reportlab/lib/setup.py.orig	Thu Jul 25 04:56:37 2002
++++ reportlab/lib/setup.py	Sat Aug 17 18:51:20 2002
 @@ -7,7 +7,7 @@
- 	import os, sys
- 	from distutils.core import setup, Extension
+     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', 'freebsd5', 'aix4', 'mac', 'darwin']:
- 		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',
-+				'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=[],
- 										define_macros=[],
- 										library_dirs=[],
- 										libraries=LIBS,	# libraries to link against
- 										),
--							Extension(	'sgmlop',
--										['sgmlop.c'],
-+							Extension(	'reportlab.lib.sgmlop',
-+										['reportlab/lib/sgmlop.c'],
- 										include_dirs=[],
- 										define_macros=[],
- 										library_dirs=[],
- 										libraries=LIBS,	# libraries to link against
- 										),
--							Extension(	'pyHnj',
--										['pyHnjmodule.c','hyphen.c', 'hnjalloc.c'],
-+							Extension(	'reportlab.lib.pyHnj',
-+										['reportlab/lib/pyHnjmodule.c','reportlab/lib/hyphen.c', 'reportlab/lib/hnjalloc.c'],
- 										include_dirs=[],
- 										define_macros=[],
- 										library_dirs=[],
+-    if sys.platform in ['win32', 'sunos5', 'freebsd4', 'aix4', 'mac', 'darwin']:
++    if sys.platform in ['win32', 'sunos5', 'freebsd4', 'freebsd5', 'aix4', 'mac', 'darwin']:
+         LIBS=[]
+     else:
+         raise ValueError, "Don't know about platform:"+sys.platform
+@@ -18,23 +18,28 @@
+             author = "Robin Becker",
+             author_email = "robin@reportlab.com",
+             url = "http://www.reportlab.com",
+-            packages = [],
+-            ext_modules =   [Extension( '_rl_accel',
+-                                        ['_rl_accel.c'],
++            packages = ['reportlab',
++                'reportlab.lib', 'reportlab.extensions', 'reportlab.graphics',
++                'reportlab.graphics.charts', 'reportlab.graphics.widgets',
++                '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=[],
+                                         define_macros=[],
+                                         library_dirs=[],
+                                         libraries=LIBS, # libraries to link against
+                                         ),
+-                            Extension(  'sgmlop',
+-                                        ['sgmlop.c'],
++                            Extension(  'reportlab.lib.sgmlop',
++                                        ['reportlab/lib/sgmlop.c'],
+                                         include_dirs=[],
+                                         define_macros=[],
+                                         library_dirs=[],
+                                         libraries=LIBS, # libraries to link against
+                                         ),
+-                            Extension(  'pyHnj',
+-                                        ['pyHnjmodule.c','hyphen.c', 'hnjalloc.c'],
++                            Extension(  'reportlab.lib.pyHnj',
++                                        ['reportlab/lib/pyHnjmodule.c','reportlab/lib/hyphen.c', 'reportlab/lib/hnjalloc.c'],
+                                         include_dirs=[],
+                                         define_macros=[],
+                                         library_dirs=[],
diff --git a/print/py-reportlab/files/patch-rl_config.py b/print/py-reportlab/files/patch-rl_config.py
index 4d25b11e6680..e27844ed257e 100644
--- a/print/py-reportlab/files/patch-rl_config.py
+++ b/print/py-reportlab/files/patch-rl_config.py
@@ -1,38 +1,42 @@
---- reportlab/rl_config.py.orig	Mon Jul 29 15:53:02 2002
-+++ reportlab/rl_config.py	Mon Jul 29 15:56:21 2002
-@@ -18,28 +18,20 @@
- emptyTableAction=			'error'					# one of 'error', 'indicate', 'ignore'
+--- reportlab/rl_config.py.orig	Thu Jul 25 04:56:34 2002
++++ reportlab/rl_config.py	Sat Aug 17 18:56:07 2002
+@@ -18,29 +18,21 @@
+ emptyTableAction=           'error'                 # one of 'error', 'indicate', 'ignore'
  
  # places to look for T1Font information
--T1SearchPath =	('c:/Program Files/Adobe/Acrobat 5.0/Resource/Font', #Win32, Acrobat 5
--				 'c:/Program Files/Adobe/Acrobat 4.0/Resource/Font', #Win32, Acrobat 4
--				 '%(disk)s/Applications/Python %(sys_version)s/reportlab/fonts', #Mac?
--				 '/usr/lib/Acrobat5/Resource/Font', #Linux, Acrobat 5?
--				 '/usr/lib/Acrobat4/Resource/Font', #Linux, Acrobat 4
--				 '%(REPORTLAB_DIR)s/fonts' #special
-+T1SearchPath =	('/usr/local/lib/Acrobat5/Resource/Font',
-+				'/usr/local/lib/Acrobat4/Resource/Font',
-+				'%(REPORTLAB_DIR)s/fonts' #special
- 				 )
+-T1SearchPath =  ('c:/Program Files/Adobe/Acrobat 5.0/Resource/Font', #Win32, Acrobat 5
+-                 'c:/Program Files/Adobe/Acrobat 4.0/Resource/Font', #Win32, Acrobat 4
+-                 '%(disk)s/Applications/Python %(sys_version)s/reportlab/fonts', #Mac?
+-                 '/usr/lib/Acrobat5/Resource/Font', #Linux, Acrobat 5?
+-                 '/usr/lib/Acrobat4/Resource/Font', #Linux, Acrobat 4
+-                 '%(REPORTLAB_DIR)s/fonts' #special
+-                 )
++T1SearchPath =  ('/usr/local/lib/Acrobat5/Resource/Font',
++		 '/usr/local/lib/Acrobat4/Resource/Font',
++		 '%(REPORTLAB_DIR)s/fonts' #special
++		)
  
  # places to look for TT Font information
 -TTFSearchPath = (
--				'c:/winnt/fonts',
--				'c:/windows/fonts',
--				'/usr/lib/X11/fonts/TrueType/',
--			 	'%(REPORTLAB_DIR)s/fonts' #special
+-                'c:/winnt/fonts',
+-                'c:/windows/fonts',
+-                '/usr/lib/X11/fonts/TrueType/',
+-                '%(REPORTLAB_DIR)s/fonts' #special
+-                )
 +TTFSearchPath = ('/usr/X11R6/lib/X11/fonts/TrueType/',
-+				'%(REPORTLAB_DIR)s/fonts' #special
- 				)
++		 '%(REPORTLAB_DIR)s/fonts' #special
++		)
  
  # places to look for CMap files - should ideally merge with above
  CMapSearchPath = ('/usr/local/Acrobat5/Resource/CMap',
--				  '/usr/local/Acrobat4/Resource/CMap',
--				  'C:\\Program Files\\Adobe\\Acrobat\\Resource\\CMap',
--				  'C:\\Program Files\\Adobe\\Acrobat 5.0\\Resource\\CMap',
--				  'C:\\Program Files\\Adobe\\Acrobat 4.0\\Resource\\CMap'
-+				'/usr/local/Acrobat4/Resource/CMap',
-+				'/usr/local/share/ghostscript/Resource/CMap'
- 				  )
+-                  '/usr/local/Acrobat4/Resource/CMap',
+-                  'C:\\Program Files\\Adobe\\Acrobat\\Resource\\CMap',
+-                  'C:\\Program Files\\Adobe\\Acrobat 5.0\\Resource\\CMap',
+-                  'C:\\Program Files\\Adobe\\Acrobat 4.0\\Resource\\CMap'
+-                  )
++		  '/usr/local/Acrobat4/Resource/CMap',
++		  '/usr/local/share/ghostscript/Resource/CMap'
++		 )
  
  #### Normally don't need to edit below here ####
+ import os, sys, string
diff --git a/print/py-reportlab/pkg-plist b/print/py-reportlab/pkg-plist
index da6d15ddf4c1..9155b8dbc673 100644
--- a/print/py-reportlab/pkg-plist
+++ b/print/py-reportlab/pkg-plist
@@ -10,6 +10,39 @@
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/__init__.py
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/__init__.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/__init__.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/__init__.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/__init__.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/__init__.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/areas.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/areas.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/areas.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/axes.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/axes.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/axes.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/barcharts.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/barcharts.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/barcharts.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/legends.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/legends.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/legends.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/linecharts.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/linecharts.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/linecharts.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/lineplots.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/lineplots.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/lineplots.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/markers.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/markers.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/markers.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/piecharts.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/piecharts.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/piecharts.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/textlabels.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/textlabels.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/textlabels.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/utils.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/utils.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/utils.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/renderPDF.py
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/renderPDF.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/renderPDF.pyo
@@ -37,6 +70,21 @@
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/widgetbase.py
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/widgetbase.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/widgetbase.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/__init__.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/__init__.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/__init__.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/flags.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/flags.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/flags.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/grids.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/grids.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/grids.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/markers.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/markers.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/markers.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/signsandsymbols.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/signsandsymbols.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/signsandsymbols.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/lib/PyFontify.py
 %%PYTHON_SITELIBDIR%%/reportlab/lib/PyFontify.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/lib/PyFontify.pyo
@@ -121,9 +169,15 @@
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/pdfdoc.py
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/pdfdoc.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/pdfdoc.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/pdfform.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/pdfform.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/pdfform.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/pdfmetrics.py
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/pdfmetrics.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/pdfmetrics.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/pdfpattern.py
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/pdfpattern.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/pdfbase/pdfpattern.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/pdfutils.py
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/pdfutils.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/pdfbase/pdfutils.pyo
@@ -277,6 +331,8 @@
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/pdfgen
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/pdfbase
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/lib
+@dirrm %%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets
+@dirrm %%PYTHON_SITELIBDIR%%/reportlab/graphics/charts
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/graphics
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/fonts
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/extensions