5 files changed, 41 insertions, 29 deletions

diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index 48e823054897..1fc019e75158 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	reportlab
-PORTVERSION=	1.18
+PORTVERSION=	1.19
 CATEGORIES=	print python
 MASTER_SITES=	http://216.92.220.143/ftp/ \
 		ftp://ftp.reportlab.com/
@@ -21,7 +21,7 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
 USE_REINPLACE=	yes
-WRKSRC=		${WRKDIR}/reportlab
+WRKSRC=		${WRKDIR}/reportlab-${PORTVERSION:S/./_/}/reportlab
 MAKE_ENV=	PACKAGE_PATH="${REPORTLABDIR}"
 
 REPORTLABDIR=	${PYTHONPREFIX_SITELIBDIR}/reportlab
@@ -31,11 +31,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/rl_config.py
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${DOCSDIR}
-.endif
-
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/print/py-reportlab/distinfo b/print/py-reportlab/distinfo
index 6c1620d2d891..6b101e49ff7b 100644
--- a/print/py-reportlab/distinfo
+++ b/print/py-reportlab/distinfo
@@ -1 +1 @@
-MD5 (ReportLab_1_18.tgz) = 742dcc46702cb547264803303ffae2aa
+MD5 (ReportLab_1_19.tgz) = 02eeec6481f71918bf469a78edc4437c
diff --git a/print/py-reportlab/files/patch-rl_config.py b/print/py-reportlab/files/patch-rl_config.py
index 28584aa959d4..138cddbb49e8 100644
--- a/print/py-reportlab/files/patch-rl_config.py
+++ b/print/py-reportlab/files/patch-rl_config.py
@@ -1,23 +1,23 @@
---- rl_config.py.orig	Tue Jul  8 01:39:48 2003
-+++ rl_config.py	Sun Sep 28 02:09:14 2003
-@@ -20,38 +20,22 @@
-                                                     #(for regression testing)
+--- rl_config.py.orig	Wed Jan 21 17:33:01 2004
++++ rl_config.py	Mon Jan 26 11:57:15 2004
+@@ -19,37 +19,22 @@
+ eps_preview_transparent=    None                    #set to white etc
  
  # places to look for T1Font information
--T1SearchPath =  ('c:/Program Files/Adobe/Acrobat 6.0/Resource/Font', #Win32, Acrobat 5
--                 'c:/Program Files/Adobe/Acrobat 5.0/Resource/Font', #Win32, Acrobat 5
+-T1SearchPath =  ('c:/Program Files/Adobe/Acrobat 6.0/Resource/Font', #Win32, Acrobat 6
+-                '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/Acrobat6/Resource/Font', #Linux, Acrobat 5?
 -                 '/usr/lib/Acrobat5/Resource/Font', #Linux, Acrobat 5?
 -                 '/usr/lib/Acrobat4/Resource/Font', #Linux, Acrobat 4
 -                 '/usr/local/Acrobat6/Resource/Font', #Linux, Acrobat 5?
 -                 '/usr/local/Acrobat5/Resource/Font', #Linux, Acrobat 5?
 -                 '/usr/local/Acrobat4/Resource/Font', #Linux, Acrobat 4
+-                 '%(REPORTLAB_DIR)s/fonts' #special
 +T1SearchPath =  ('/usr/local/Acrobat6/Resource/Font',
 +                 '/usr/local/Acrobat5/Resource/Font',
 +                 '/usr/local/Acrobat4/Resource/Font',
-                  '%(REPORTLAB_DIR)s/fonts' #special
++                  '%(REPORTLAB_DIR)s/fonts' #special
                   )
  
  # places to look for TT Font information
@@ -25,8 +25,9 @@
 -                '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
diff --git a/print/py-reportlab/files/patch-setup.py b/print/py-reportlab/files/patch-setup.py
index 7c2dd69aa69d..71dacd71889d 100644
--- a/print/py-reportlab/files/patch-setup.py
+++ b/print/py-reportlab/files/patch-setup.py
@@ -1,11 +1,11 @@
---- setup.py.orig	Tue Apr 15 16:52:36 2003
-+++ setup.py	Sun Sep 28 02:10:42 2003
-@@ -18,7 +18,7 @@
+--- setup.py.orig	Thu Jan 22 01:45:46 2004
++++ setup.py	Mon Jan 26 11:59:58 2004
+@@ -17,7 +17,7 @@
+     return r
  
  pjoin = os.path.join
- 
 -package_path = pjoin(package_home(distutils.__dict__), 'reportlab')
 +package_path = os.environ['PACKAGE_PATH']
  
- 
- # why oh why don't most setup scripts have a script handler?
+ def get_version():
+     #determine Version
diff --git a/print/py-reportlab/pkg-plist b/print/py-reportlab/pkg-plist
index f3a87bb4338f..7541e1d6c78a 100644
--- a/print/py-reportlab/pkg-plist
+++ b/print/py-reportlab/pkg-plist
@@ -159,6 +159,9 @@
 %%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/charts/utils3d.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/utils3d.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/utils3d.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/renderPDF.py
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/renderPDF.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/renderPDF.pyo
@@ -393,12 +396,21 @@
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_graphics_images.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_graphics_images.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_graphics_images.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_graphics_layout.py
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_graphics_layout.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_graphics_layout.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_graphics_speed.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_graphics_speed.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_graphics_speed.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_hello.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_hello.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_hello.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_images.py
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_images.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_images.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_invariant.py
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_invariant.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_invariant.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_lib_colors.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_lib_colors.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_lib_colors.pyo
@@ -438,6 +450,9 @@
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfbase_pdfutils.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfbase_pdfutils.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfbase_pdfutils.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfbase_postscript.py
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfbase_postscript.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfbase_postscript.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfbase_ttfonts.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfbase_ttfonts.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfbase_ttfonts.pyo
@@ -483,6 +498,9 @@
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_renderSVG.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_renderSVG.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_renderSVG.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_rl_accel.py
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_rl_accel.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_rl_accel.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_source_chars.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_source_chars.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_source_chars.pyo
@@ -581,6 +599,9 @@
 %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/demos/pplogo.gif
 %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/demos/python.gif
 %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/demos/pythonpoint.xml
+%%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/demos/slidebox.py
+%%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/demos/slidebox.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/demos/slidebox.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/demos/spectrum.png
 %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/demos/vertpython.gif
 %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/pythonpoint.dtd
@@ -607,8 +628,8 @@
 %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/styles/projection.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/styles/standard.py
 %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/styles/standard.pyc
-%%PYTHON_SITELIBDIR%%/sgmlop.so
 %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/styles/standard.pyo
+%%PYTHON_SITELIBDIR%%/sgmlop.so
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/styles
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/demos
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint
@@ -638,8 +659,3 @@
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/demos/colors
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/demos
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab
-%%PORTDOCS%%%%DOCSDIR%%/graphguide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/graphics_reference.pdf
-%%PORTDOCS%%%%DOCSDIR%%/reference.pdf
-%%PORTDOCS%%%%DOCSDIR%%/userguide.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%