Update to 1.17

3 files changed, 13 insertions, 49 deletions

diff --git a/print/py-reportlab/files/patch-lib::setup.py b/print/py-reportlab/files/patch-lib::setup.py
deleted file mode 100644
index f68ac44d1b25..000000000000
--- a/print/py-reportlab/files/patch-lib::setup.py
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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
- 
--    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 e27844ed257e..e453beba6f93 100644
--- a/print/py-reportlab/files/patch-rl_config.py
+++ b/print/py-reportlab/files/patch-rl_config.py
@@ -1,5 +1,5 @@
---- reportlab/rl_config.py.orig	Thu Jul 25 04:56:34 2002
-+++ reportlab/rl_config.py	Sat Aug 17 18:56:07 2002
+--- 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'
  
diff --git a/print/py-reportlab/files/patch-setup.py b/print/py-reportlab/files/patch-setup.py
new file mode 100644
index 000000000000..3bfbad3ea340
--- /dev/null
+++ b/print/py-reportlab/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	Mon Dec 23 08:03:38 2002
++++ setup.py	Mon Mar  3 16:00:37 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
+ 
+