5 files changed, 61 insertions, 43 deletions

diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index ad7252a75d9d..48e823054897 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	reportlab
-PORTVERSION=	1.17
+PORTVERSION=	1.18
 CATEGORIES=	print python
-MASTER_SITES=	ftp://ftp.reportlab.com/
+MASTER_SITES=	http://216.92.220.143/ftp/ \
+		ftp://ftp.reportlab.com/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	ReportLab_${PORTVERSION:S/./_/}
 EXTRACT_SUFX=	.tgz
@@ -24,21 +25,15 @@ WRKSRC=		${WRKDIR}/reportlab
 MAKE_ENV=	PACKAGE_PATH="${REPORTLABDIR}"
 
 REPORTLABDIR=	${PYTHONPREFIX_SITELIBDIR}/reportlab
-DOCDIR=		${PREFIX}/share/doc/reportlab
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/rl_config.py
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/rl_config.py
 
 post-install:
-#	${MKDIR} ${REPORTLABDIR}/fonts
-#.for fontfile in LeERC___.AFM LeERC___.PFB
-#	(cd ${WRKSRC}/fonts; \
-#		${INSTALL_DATA} ${fontfile} ${REPORTLABDIR}/fonts)
-#.endfor
-
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${DOCDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${DOCSDIR}
 .endif
 
 	@${CAT} ${PKGMESSAGE}
diff --git a/print/py-reportlab/distinfo b/print/py-reportlab/distinfo
index c6d56adc79fa..6c1620d2d891 100644
--- a/print/py-reportlab/distinfo
+++ b/print/py-reportlab/distinfo
@@ -1 +1 @@
-MD5 (ReportLab_1_17.tgz) = 853b3acaa998cfec39a372a94a00925d
+MD5 (ReportLab_1_18.tgz) = 742dcc46702cb547264803303ffae2aa
diff --git a/print/py-reportlab/files/patch-rl_config.py b/print/py-reportlab/files/patch-rl_config.py
index e453beba6f93..28584aa959d4 100644
--- a/print/py-reportlab/files/patch-rl_config.py
+++ b/print/py-reportlab/files/patch-rl_config.py
@@ -1,42 +1,47 @@
---- rl_config.py.orig	Thu Jul 25 04:56:34 2002
-+++ rl_config.py	Sat Aug 17 18:56:07 2002
-@@ -18,29 +18,21 @@
- emptyTableAction=           'error'                 # one of 'error', 'indicate', 'ignore'
+--- 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)
  
  # places to look for T1Font information
--T1SearchPath =  ('c:/Program Files/Adobe/Acrobat 5.0/Resource/Font', #Win32, Acrobat 5
+-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
 -                 '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
--                 '%(REPORTLAB_DIR)s/fonts' #special
--                 )
-+T1SearchPath =  ('/usr/local/lib/Acrobat5/Resource/Font',
-+		 '/usr/local/lib/Acrobat4/Resource/Font',
-+		 '%(REPORTLAB_DIR)s/fonts' #special
-+		)
+-                 '/usr/local/Acrobat6/Resource/Font', #Linux, Acrobat 5?
+-                 '/usr/local/Acrobat5/Resource/Font', #Linux, Acrobat 5?
+-                 '/usr/local/Acrobat4/Resource/Font', #Linux, Acrobat 4
++T1SearchPath =  ('/usr/local/Acrobat6/Resource/Font',
++                 '/usr/local/Acrobat5/Resource/Font',
++                 '/usr/local/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
--                )
 +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',
+-CMapSearchPath = ('/usr/lib/Acrobat6/Resource/CMap',
+-                  '/usr/lib/Acrobat5/Resource/CMap',
+-                  '/usr/lib/Acrobat4/Resource/CMap',
+-                  '/usr/local/Acrobat6/Resource/CMap',
++CMapSearchPath = ('/usr/local/Acrobat6/Resource/CMap',
+                   '/usr/local/Acrobat5/Resource/CMap',
+                   '/usr/local/Acrobat4/Resource/CMap',
 -                  'C:\\Program Files\\Adobe\\Acrobat\\Resource\\CMap',
+-                  'C:\\Program Files\\Adobe\\Acrobat 6.0\\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/files/patch-setup.py b/print/py-reportlab/files/patch-setup.py
index 3bfbad3ea340..7c2dd69aa69d 100644
--- a/print/py-reportlab/files/patch-setup.py
+++ b/print/py-reportlab/files/patch-setup.py
@@ -1,11 +1,11 @@
---- setup.py.orig	Mon Dec 23 08:03:38 2002
-+++ setup.py	Mon Mar  3 16:00:37 2003
+--- setup.py.orig	Tue Apr 15 16:52:36 2003
++++ setup.py	Sun Sep 28 02:10:42 2003
 @@ -18,7 +18,7 @@
  
  pjoin = os.path.join
  
 -package_path = pjoin(package_home(distutils.__dict__), 'reportlab')
 +package_path = os.environ['PACKAGE_PATH']
- print package_path
  
  
+ # why oh why don't most setup scripts have a script handler?
diff --git a/print/py-reportlab/pkg-plist b/print/py-reportlab/pkg-plist
index 62ccd26d0d11..f3a87bb4338f 100644
--- a/print/py-reportlab/pkg-plist
+++ b/print/py-reportlab/pkg-plist
@@ -1,7 +1,6 @@
 %%PYTHON_SITELIBDIR%%/_rl_accel.so
 @unexec rm -f %D/%%PYTHON_SITELIBDIR%%/reportlab/fonts/*.fastmap
 %%PYTHON_SITELIBDIR%%/pyHnj.so
-%%PYTHON_SITELIBDIR%%/sgmlop.so
 %%PYTHON_SITELIBDIR%%/reportlab/README
 %%PYTHON_SITELIBDIR%%/reportlab/__init__.py
 %%PYTHON_SITELIBDIR%%/reportlab/__init__.pyc
@@ -130,6 +129,9 @@
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/dotbox.py
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/dotbox.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/dotbox.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/doughnut.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/doughnut.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/doughnut.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/legends.py
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/legends.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/charts/legends.pyo
@@ -187,6 +189,9 @@
 %%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/eventcal.py
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/eventcal.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/eventcal.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/flags.py
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/flags.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/graphics/widgets/flags.pyo
@@ -248,6 +253,9 @@
 %%PYTHON_SITELIBDIR%%/reportlab/lib/sequencer.py
 %%PYTHON_SITELIBDIR%%/reportlab/lib/sequencer.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/lib/sequencer.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/lib/set_ops.py
+%%PYTHON_SITELIBDIR%%/reportlab/lib/set_ops.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/lib/set_ops.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/lib/setup.py
 %%PYTHON_SITELIBDIR%%/reportlab/lib/setup.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/lib/setup.pyo
@@ -439,6 +447,9 @@
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfgen_general.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfgen_general.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfgen_general.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfgen_links.py
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfgen_links.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfgen_links.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfgen_pagemodes.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfgen_pagemodes.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_pdfgen_pagemodes.pyo
@@ -451,6 +462,9 @@
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_general.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_general.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_general.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_indents.py
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_indents.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_indents.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_paragraphs.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_paragraphs.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_platypus_paragraphs.pyo
@@ -472,6 +486,9 @@
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_source_chars.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_source_chars.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_source_chars.pyo
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_table_layout.py
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_table_layout.pyc
+%%PYTHON_SITELIBDIR%%/reportlab/test/test_table_layout.pyo
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_tools_pythonpoint.py
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_tools_pythonpoint.pyc
 %%PYTHON_SITELIBDIR%%/reportlab/test/test_tools_pythonpoint.pyo
@@ -590,12 +607,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
-%%PORTDOCS%%share/doc/reportlab/graphguide.pdf
-%%PORTDOCS%%share/doc/reportlab/graphics_reference.pdf
-%%PORTDOCS%%share/doc/reportlab/reference.pdf
-%%PORTDOCS%%share/doc/reportlab/userguide.pdf
-%%PORTDOCS%%@dirrm share/doc/reportlab
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/styles
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint/demos
 @dirrm %%PYTHON_SITELIBDIR%%/reportlab/tools/pythonpoint
@@ -625,3 +638,8 @@
 @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%%