Update to 0.9.9:

0.9.9  20141019  Bugfix in HTML4 target. Updated toolchain.
                 Support for GraphicsMagick. Updated manual page psiconv(1).

0.9.8  20051115  Small bug fixes

6 files changed, 59 insertions, 69 deletions

diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index e839049389a..4881e2b4664 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2014/10/07 16:47:20 adam Exp $
+# $NetBSD: Makefile,v 1.41 2015/08/06 11:13:32 wiz Exp $
 
-DISTNAME=	psiconv-0.9.7
-PKGREVISION=	3
+DISTNAME=	psiconv-0.9.9
 CATEGORIES=	converters
-MASTER_SITES=	http://software.frodo.looijaard.name/psiconv/files/
+MASTER_SITES=	http://www.frodo.looijaard.name/system/files/software/psiconv/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://software.frodo.looijaard.name/psiconv/
diff --git a/converters/psiconv/PLIST b/converters/psiconv/PLIST
index 841b4b73090..923f2aa52ca 100644
--- a/converters/psiconv/PLIST
+++ b/converters/psiconv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:39:10 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2015/08/06 11:13:32 wiz Exp $
 bin/psiconv
 bin/psiconv-config
 include/psiconv/buffer.h
@@ -16,5 +16,56 @@ include/psiconv/unicode.h
 lib/libpsiconv.la
 man/man1/psiconv-config.1
 man/man1/psiconv.1
+man/man5/psiconv.conf.5
 share/examples/psiconv/psiconv.conf
 share/examples/psiconv/psiconv.conf.eg
+share/psiconv/psion/ASCII_Codes.psi
+share/psiconv/psion/Application_ID_Section.psi
+share/psiconv/psion/Basic_Elements.psi
+share/psiconv/psion/Basic_Structures.psi
+share/psiconv/psion/Clip_Art_File.psi
+share/psiconv/psion/Embedded_Object_Section.psi
+share/psiconv/psion/File_Structure.psi
+share/psiconv/psion/Fonts.psi
+share/psiconv/psion/Header_Section.psi
+share/psiconv/psion/Identifiers.psi
+share/psiconv/psion/Index.psi
+share/psiconv/psion/Introduction.psi
+share/psiconv/psion/Layout_Codes.psi
+share/psiconv/psion/MBM_File.psi
+share/psiconv/psion/Page_Layout_Section.psi
+share/psiconv/psion/Paint_Data_Section.psi
+share/psiconv/psion/Password_Section.psi
+share/psiconv/psion/Record_File.psi
+share/psiconv/psion/Record_Section.psi
+share/psiconv/psion/Section_Table_Offset_Section.psi
+share/psiconv/psion/Section_Table_Section.psi
+share/psiconv/psion/Sheet_Basic_Structures.psi
+share/psiconv/psion/Sheet_Cell_List.psi
+share/psiconv/psion/Sheet_File.psi
+share/psiconv/psion/Sheet_Formula_List.psi
+share/psiconv/psion/Sheet_Graph_Description.psi
+share/psiconv/psion/Sheet_Graph_List_Section.psi
+share/psiconv/psion/Sheet_Graph_Region.psi
+share/psiconv/psion/Sheet_Graph_Section.psi
+share/psiconv/psion/Sheet_Grid_Section.psi
+share/psiconv/psion/Sheet_Info_Section.psi
+share/psiconv/psion/Sheet_Line_Section.psi
+share/psiconv/psion/Sheet_Name_Section.psi
+share/psiconv/psion/Sheet_Status_Section.psi
+share/psiconv/psion/Sheet_Variable_List.psi
+share/psiconv/psion/Sheet_Workbook_Section.psi
+share/psiconv/psion/Sheet_Worksheet.psi
+share/psiconv/psion/Sheet_Worksheet_List.psi
+share/psiconv/psion/Sketch_File.psi
+share/psiconv/psion/Sketch_Section.psi
+share/psiconv/psion/Substitutions.psi
+share/psiconv/psion/TextEd_File.psi
+share/psiconv/psion/TextEd_Section.psi
+share/psiconv/psion/Text_Layout_Section.psi
+share/psiconv/psion/Text_Section.psi
+share/psiconv/psion/Userdic_File.psi
+share/psiconv/psion/Word_File.psi
+share/psiconv/psion/Word_Status_Section.psi
+share/psiconv/psion/Word_Styles_Section.psi
+share/psiconv/psion/World_Data_File.psi
diff --git a/converters/psiconv/distinfo b/converters/psiconv/distinfo
index 86f7fd9c49b..1021a5bd64a 100644
--- a/converters/psiconv/distinfo
+++ b/converters/psiconv/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.11 2005/12/30 17:24:16 joerg Exp $
+$NetBSD: distinfo,v 1.12 2015/08/06 11:13:32 wiz Exp $
 
-SHA1 (psiconv-0.9.7.tar.gz) = 226f95280ac40ca6642d4283b0d75492f1b8cb70
-RMD160 (psiconv-0.9.7.tar.gz) = aed8ad1308f1f51a5dec02d0b98288f314c6d623
-Size (psiconv-0.9.7.tar.gz) = 497802 bytes
-SHA1 (patch-aa) = be7330996b18ce78cf8983e4f18bd6313289c864
-SHA1 (patch-ab) = ec70d619ee26c859b2215547899241c65e96e3ec
-SHA1 (patch-ac) = bc9e16854b8a05b19fafcd57bef83e7e73b33ed4
+SHA1 (psiconv-0.9.9.tar.gz) = e5065bc34c83eaf00d8325d30fd4730afe270442
+RMD160 (psiconv-0.9.9.tar.gz) = 8da701123273775db6e6f8fcacfc34e4077b9455
+Size (psiconv-0.9.9.tar.gz) = 554882 bytes
diff --git a/converters/psiconv/patches/patch-aa b/converters/psiconv/patches/patch-aa
deleted file mode 100644
index e8f2700ced2..00000000000
--- a/converters/psiconv/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2005/04/20 13:10:06 adam Exp $
-
---- Makefile.in.orig	2005-02-25 20:40:17.000000000 +0000
-+++ Makefile.in
-@@ -182,7 +182,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = compat lib program formats docs etc
-+SUBDIRS = compat lib program docs etc
- EXTRA_DIST = autogen.sh 
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/converters/psiconv/patches/patch-ab b/converters/psiconv/patches/patch-ab
deleted file mode 100644
index 373431e9c1a..00000000000
--- a/converters/psiconv/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/12/30 17:24:25 joerg Exp $
-
---- program/psiconv/gen_xhtml.c.orig	2005-12-30 16:37:52.000000000 +0000
-+++ program/psiconv/gen_xhtml.c
-@@ -719,7 +719,7 @@ int gen_xhtml(const psiconv_config confi
- }
-                                                                                 
- 
--static struct fileformat_s ffs[] =
-+static struct fileformat_s my_ffs[] =
-   {
-     {
-       "XHTML",
-@@ -739,6 +739,6 @@ static struct fileformat_s ffs[] =
- void init_xhtml(void)
- {
-   int i;
--  for (i = 0; ffs[i].name; i++)
--    psiconv_list_add(fileformat_list,ffs+i);
-+  for (i = 0; my_ffs[i].name; i++)
-+    psiconv_list_add(fileformat_list,my_ffs+i);
- }
diff --git a/converters/psiconv/patches/patch-ac b/converters/psiconv/patches/patch-ac
deleted file mode 100644
index 4700c2dbf28..00000000000
--- a/converters/psiconv/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/12/30 17:24:25 joerg Exp $
-
---- program/psiconv/gen_html4.c.orig	2005-12-30 17:00:29.000000000 +0000
-+++ program/psiconv/gen_html4.c
-@@ -317,7 +317,7 @@ int gen_html4(const psiconv_config confi
- }
-                                                                                 
- 
--static struct fileformat_s ffs[] =
-+static struct fileformat_s my_ffs[] =
-   {
-     {
-       "HTML4",
-@@ -337,6 +337,6 @@ static struct fileformat_s ffs[] =
- void init_html4(void)
- {
-   int i;
--  for (i = 0; ffs[i].name; i++)
--    psiconv_list_add(fileformat_list,ffs+i);
-+  for (i = 0; my_ffs[i].name; i++)
-+    psiconv_list_add(fileformat_list,my_ffs+i);
- }