Changes 0.8.3: extends the Sheet files support, and fixes several memory leaks

8 files changed, 30 insertions, 45 deletions

diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index a42f97da39d..0509bcb6eed 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2003/07/17 21:27:28 grant Exp $
+# $NetBSD: Makefile,v 1.22 2003/09/03 12:18:28 adam Exp $
 #
 
-DISTNAME=	psiconv-0.8.2
-PKGREVISION=	4
+DISTNAME=	psiconv-0.8.3
 CATEGORIES=	converters
 MASTER_SITES=	http://huizen.dds.nl/~frodol/psiconv/
 
diff --git a/converters/psiconv/PLIST b/converters/psiconv/PLIST
index d88a17f5f68..c61e235c4e5 100644
--- a/converters/psiconv/PLIST
+++ b/converters/psiconv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/19 20:08:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/09/03 12:18:28 adam Exp $
 bin/psiconv
 include/psiconv/buffer.h
 include/psiconv/common.h
@@ -13,8 +13,8 @@ include/psiconv/parse_routines.h
 lib/libpsiconv.a
 lib/libpsiconv.la
 lib/libpsiconv.so
-lib/libpsiconv.so.7
-lib/libpsiconv.so.7.0
+lib/libpsiconv.so.8
+lib/libpsiconv.so.8.0
 share/doc/psiconv/ascii
 share/doc/psiconv/html
 share/doc/psiconv/html4
diff --git a/converters/psiconv/distinfo b/converters/psiconv/distinfo
index a12aecf2410..01773086b62 100644
--- a/converters/psiconv/distinfo
+++ b/converters/psiconv/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.5 2002/09/23 20:39:21 jlam Exp $
+$NetBSD: distinfo,v 1.6 2003/09/03 12:18:28 adam Exp $
 
-SHA1 (psiconv-0.8.2.tar.gz) = 4512aac15db4e1a129a3131a2b0b3fa149e88811
-Size (psiconv-0.8.2.tar.gz) = 304322 bytes
-SHA1 (patch-aa) = b7ef8a4916df1c13324b00a2fefff620dc99fa32
+SHA1 (psiconv-0.8.3.tar.gz) = 19bab16895385904f152af5dea294fe029207b7b
+Size (psiconv-0.8.3.tar.gz) = 326460 bytes
+SHA1 (patch-aa) = efe63d69692430900b79b80e8b06066e9182d739
 SHA1 (patch-ab) = cff4e1d6bbfadb5c47b69b07cde8896f5b423c9a
-SHA1 (patch-ad) = af772d87f3764081d717f07e4b0ac9f8a20cf47e
 SHA1 (patch-ae) = 9a79cddedca2d14e6e8aa43016b196354ba639d1
-SHA1 (patch-af) = 59e098cf8ea3a44bae13a970822bacb7d4177e30
-SHA1 (patch-ag) = 125d770e565defd6b1904e8cd2f37dee449a93e6
+SHA1 (patch-af) = 628abc563c0f548baf813954a12355bcf2f7255d
+SHA1 (patch-ag) = c840310b5417dd2caa7d120398b0910043820276
 SHA1 (patch-ah) = a35166070aa15b56f4d5e30f07411bc42556eaeb
-SHA1 (patch-ai) = 67b10faed835925865ab19911f7ad97225f4daad
+SHA1 (patch-ai) = 03ab0625c0c08d94d31f886829eef9248e214169
diff --git a/converters/psiconv/patches/patch-aa b/converters/psiconv/patches/patch-aa
index 54f519a266b..36f27df0b2a 100644
--- a/converters/psiconv/patches/patch-aa
+++ b/converters/psiconv/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2001/12/19 20:08:51 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2003/09/03 12:18:29 adam Exp $
 
---- Makefile.in.orig	Mon Jul 16 19:53:54 2001
+--- Makefile.in.orig	2003-09-03 14:03:07.000000000 +0200
 +++ Makefile.in
-@@ -80,7 +80,7 @@
- VERSION = @VERSION@
+@@ -85,7 +85,7 @@ am__quote = @am__quote@
  cflags_set = @cflags_set@
+ install_sh = @install_sh@
  
 -SUBDIRS = compat lib program formats extra docs
 +SUBDIRS = compat lib program extra docs
  EXTRA_DIST = autogen.sh
+ subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/converters/psiconv/patches/patch-ad b/converters/psiconv/patches/patch-ad
deleted file mode 100644
index 219a884ea93..00000000000
--- a/converters/psiconv/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2001/12/19 20:08:51 wiz Exp $
-
---- program/psiconv/gen_image.c.orig	Sat Jun 30 15:35:24 2001
-+++ program/psiconv/gen_image.c
-@@ -221,7 +221,7 @@
-   ff.output = psiconv_gen_image;
-   for (mi = GetMagickFileList(); mi ; mi = mi->next) {
-     if (mi->encoder) {
--      ff.name = strdup(mi->tag);
-+      ff.name = strdup(mi->name);
-       ff.description = strdup(mi->description);
-       psiconv_list_add(fileformat_list,&ff);
-     }
diff --git a/converters/psiconv/patches/patch-af b/converters/psiconv/patches/patch-af
index a48650dd410..5301e56eaa0 100644
--- a/converters/psiconv/patches/patch-af
+++ b/converters/psiconv/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.1 2002/09/10 12:35:08 markd Exp $
+$NetBSD: patch-af,v 1.2 2003/09/03 12:18:29 adam Exp $
 
---- configure.orig	Tue Jul 17 05:51:56 2001
-+++ configure	Tue Sep 10 23:03:21 2002
-@@ -6261,7 +6261,11 @@
+--- configure.orig	2002-01-29 21:16:47.000000000 +0100
++++ configure
+@@ -6667,7 +6667,11 @@ else
    cat >conftest.$ac_ext <<_ACEOF
- #line 6262 "configure"
+ #line 6668 "configure"
  #include "confdefs.h"
 - #include <magick/magick.h>
 + #include <stdio.h>
diff --git a/converters/psiconv/patches/patch-ag b/converters/psiconv/patches/patch-ag
index 414ce1eafeb..4a6a93fcaca 100644
--- a/converters/psiconv/patches/patch-ag
+++ b/converters/psiconv/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1 2002/09/10 12:35:08 markd Exp $
+$NetBSD: patch-ag,v 1.2 2003/09/03 12:18:29 adam Exp $
 
---- program/psiconv/magick-aux.h.orig	Mon Dec 11 05:44:47 2000
-+++ program/psiconv/magick-aux.h	Mon Sep  9 23:14:27 2002
+--- program/psiconv/magick-aux.h.orig	2002-01-22 22:21:21.000000000 +0100
++++ program/psiconv/magick-aux.h
 @@ -21,7 +21,11 @@
  
  #if IMAGEMAGICK
@@ -13,5 +13,5 @@ $NetBSD: patch-ag,v 1.1 2002/09/10 12:35:08 markd Exp $
 +#include <sys/types.h>
 +#include <magick/api.h>
  
- extern MagickInfo * GetMagickFileList(void);
+ extern const MagickInfo * GetMagickFileList(void);
  
diff --git a/converters/psiconv/patches/patch-ai b/converters/psiconv/patches/patch-ai
index 552c17a14e4..349aa2fa585 100644
--- a/converters/psiconv/patches/patch-ai
+++ b/converters/psiconv/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1 2002/09/10 12:35:08 markd Exp $
+$NetBSD: patch-ai,v 1.2 2003/09/03 12:18:29 adam Exp $
 
---- program/psiconv/magick-aux.c.orig	Sun Jul  1 01:36:00 2001
-+++ program/psiconv/magick-aux.c	Mon Sep  9 23:11:25 2002
+--- program/psiconv/magick-aux.c.orig	2002-01-29 18:40:50.000000000 +0100
++++ program/psiconv/magick-aux.c
 @@ -23,7 +23,7 @@
  
  #include "magick-aux.h"
@@ -9,5 +9,5 @@ $NetBSD: patch-ai,v 1.1 2002/09/10 12:35:08 markd Exp $
 -#include <magick/config.h>
 +#include <magick/magick_config.h>
  
- /* This used to be very ugly, but nowadays it is much better */
+ #endif