Reportlab 2.4:

- Various smaller bugfixes and improvements

4 files changed, 30 insertions, 69 deletions

diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index d659c8bf7fd..c4272c9d00d 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:24 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/14 08:51:36 joerg Exp $
 #
 
-DISTNAME=	ReportLab_2_3
-PKGNAME=	${PYPKGPREFIX}-reportlab-2.3
-PKGREVISION=	1
+DISTNAME=	ReportLab_2_4
+PKGNAME=	${PYPKGPREFIX}-reportlab-2.4
 CATEGORIES=	print python
 MASTER_SITES=	http://www.reportlab.com/ftp/
 
diff --git a/print/py-reportlab/PLIST b/print/py-reportlab/PLIST
index 454f3904d4c..fa7bdf1a6a9 100644
--- a/print/py-reportlab/PLIST
+++ b/print/py-reportlab/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/10/19 11:17:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/06/14 08:51:36 joerg Exp $
 ${PYSITELIB}/_renderPM.so
 ${PYSITELIB}/_rl_accel.so
 ${PYSITELIB}/pyHnj.so
@@ -12,11 +12,27 @@ ${PYSITELIB}/reportlab/fonts/DarkGarden-readme.txt
 ${PYSITELIB}/reportlab/fonts/DarkGarden.sfd
 ${PYSITELIB}/reportlab/fonts/DarkGardenMK.afm
 ${PYSITELIB}/reportlab/fonts/DarkGardenMK.pfb
+${PYSITELIB}/reportlab/fonts/Sy______.pfb
 ${PYSITELIB}/reportlab/fonts/Vera.ttf
 ${PYSITELIB}/reportlab/fonts/VeraBI.ttf
 ${PYSITELIB}/reportlab/fonts/VeraBd.ttf
 ${PYSITELIB}/reportlab/fonts/VeraIt.ttf
+${PYSITELIB}/reportlab/fonts/Zd______.pfb
+${PYSITELIB}/reportlab/fonts/Zx______.pfb
+${PYSITELIB}/reportlab/fonts/Zy______.pfb
+${PYSITELIB}/reportlab/fonts/_a______.pfb
+${PYSITELIB}/reportlab/fonts/_ab_____.pfb
+${PYSITELIB}/reportlab/fonts/_abi____.pfb
+${PYSITELIB}/reportlab/fonts/_ai_____.pfb
+${PYSITELIB}/reportlab/fonts/_eb_____.pfb
+${PYSITELIB}/reportlab/fonts/_ebi____.pfb
+${PYSITELIB}/reportlab/fonts/_ei_____.pfb
+${PYSITELIB}/reportlab/fonts/_er_____.pfb
 ${PYSITELIB}/reportlab/fonts/bitstream-vera-license.txt
+${PYSITELIB}/reportlab/fonts/cob_____.pfb
+${PYSITELIB}/reportlab/fonts/cobo____.pfb
+${PYSITELIB}/reportlab/fonts/com_____.pfb
+${PYSITELIB}/reportlab/fonts/coo_____.pfb
 ${PYSITELIB}/reportlab/graphics/__init__.py
 ${PYSITELIB}/reportlab/graphics/__init__.pyc
 ${PYSITELIB}/reportlab/graphics/__init__.pyo
@@ -200,6 +216,9 @@ ${PYSITELIB}/reportlab/graphics/widgets/markers.pyo
 ${PYSITELIB}/reportlab/graphics/widgets/signsandsymbols.py
 ${PYSITELIB}/reportlab/graphics/widgets/signsandsymbols.pyc
 ${PYSITELIB}/reportlab/graphics/widgets/signsandsymbols.pyo
+${PYSITELIB}/reportlab/graphics/widgets/table.py
+${PYSITELIB}/reportlab/graphics/widgets/table.pyc
+${PYSITELIB}/reportlab/graphics/widgets/table.pyo
 ${PYSITELIB}/reportlab/lib/PyFontify.py
 ${PYSITELIB}/reportlab/lib/PyFontify.pyc
 ${PYSITELIB}/reportlab/lib/PyFontify.pyo
@@ -258,6 +277,9 @@ ${PYSITELIB}/reportlab/lib/pagesizes.pyo
 ${PYSITELIB}/reportlab/lib/pdfencrypt.py
 ${PYSITELIB}/reportlab/lib/pdfencrypt.pyc
 ${PYSITELIB}/reportlab/lib/pdfencrypt.pyo
+${PYSITELIB}/reportlab/lib/pygments2xpre.py
+${PYSITELIB}/reportlab/lib/pygments2xpre.pyc
+${PYSITELIB}/reportlab/lib/pygments2xpre.pyo
 ${PYSITELIB}/reportlab/lib/randomtext.py
 ${PYSITELIB}/reportlab/lib/randomtext.pyc
 ${PYSITELIB}/reportlab/lib/randomtext.pyo
diff --git a/print/py-reportlab/distinfo b/print/py-reportlab/distinfo
index a3ec990fddf..61d7092ce76 100644
--- a/print/py-reportlab/distinfo
+++ b/print/py-reportlab/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.12 2009/10/19 11:17:16 joerg Exp $
+$NetBSD: distinfo,v 1.13 2010/06/14 08:51:36 joerg Exp $
 
-SHA1 (ReportLab_2_3.tar.gz) = cb5e27fef02eceaab79236d5a074cdfb92bff179
-RMD160 (ReportLab_2_3.tar.gz) = ebb347765d516e74b965ec89c7909ec7592e3f54
-Size (ReportLab_2_3.tar.gz) = 1857239 bytes
-SHA1 (patch-aa) = 67d9d7f3198bff2c47cf734b40e29ce8619e170a
+SHA1 (ReportLab_2_4.tar.gz) = 31ecc9ff0f55ce3c5fddaa909dd48b6e9e9a20ce
+RMD160 (ReportLab_2_4.tar.gz) = 7a7198b9934b1f993dbb49705d93cc4b78b45012
+Size (ReportLab_2_4.tar.gz) = 1884175 bytes
diff --git a/print/py-reportlab/patches/patch-aa b/print/py-reportlab/patches/patch-aa
deleted file mode 100644
index 6858045685e..00000000000
--- a/print/py-reportlab/patches/patch-aa
+++ /dev/null
@@ -1,59 +0,0 @@
-$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=[]
-                                         ),