4 files changed, 107 insertions, 147 deletions

diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index b912b6f82e92..f8a7201da9f5 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	psiconv
-PORTVERSION=	0.9.7
+PORTVERSION=	0.9.8
 CATEGORIES=	converters devel
 MASTER_SITES=	http://software.frodo.looijaard.name/psiconv/files/
 
diff --git a/converters/psiconv/distinfo b/converters/psiconv/distinfo
index 8f8dd6f46b2e..bb1e7ef4504b 100644
--- a/converters/psiconv/distinfo
+++ b/converters/psiconv/distinfo
@@ -1,3 +1,3 @@
-MD5 (psiconv-0.9.7.tar.gz) = 1a14f0e5a047d136348b6c0e19051289
-SHA256 (psiconv-0.9.7.tar.gz) = 653be2ddcef3e108a0cd063e8257c88eb3833e786921554533c403293ad281ba
-SIZE (psiconv-0.9.7.tar.gz) = 497802
+MD5 (psiconv-0.9.8.tar.gz) = 8d7548e3c6b9cd408544736133728acd
+SHA256 (psiconv-0.9.8.tar.gz) = 1eee15b29ddcbfd2d15e0a0d26f59e28bac281c870b77418fa369dceed796806
+SIZE (psiconv-0.9.8.tar.gz) = 524949
diff --git a/converters/psiconv/files/patch-ffs b/converters/psiconv/files/patch-ffs
deleted file mode 100644
index 9246ae448d55..000000000000
--- a/converters/psiconv/files/patch-ffs
+++ /dev/null
@@ -1,40 +0,0 @@
---- program/psiconv/gen_xhtml.c.orig	Wed Feb  4 12:26:54 2004
-+++ program/psiconv/gen_xhtml.c	Mon Feb 14 11:41:57 2005
-@@ -719,7 +719,7 @@
- }
-                                                                                 
- 
--static struct fileformat_s ffs[] =
-+static struct fileformat_s my_ffs[] =
-   {
-     {
-       "XHTML",
-@@ -739,6 +739,6 @@
- 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);
- }
---- program/psiconv/gen_html4.c.orig	Wed Feb  4 13:17:38 2004
-+++ program/psiconv/gen_html4.c	Mon Feb 14 11:41:40 2005
-@@ -317,7 +317,7 @@
- }
-                                                                                 
- 
--static struct fileformat_s ffs[] =
-+static struct fileformat_s my_ffs[] =
-   {
-     {
-       "HTML4",
-@@ -337,6 +337,6 @@
- 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);
- }
diff --git a/converters/psiconv/pkg-plist b/converters/psiconv/pkg-plist
index 4a2f4328cc9b..d25bcd580fb8 100644
--- a/converters/psiconv/pkg-plist
+++ b/converters/psiconv/pkg-plist
@@ -17,108 +17,108 @@ include/psiconv/unicode.h
 lib/libpsiconv.a
 lib/libpsiconv.so
 lib/libpsiconv.so.10
-share/psiconv/psion/Application_ID_Section.psi
-share/psiconv/psion/ASCII_Codes.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
-share/psiconv/xhtml/Application_ID_Section.html
-share/psiconv/xhtml/ASCII_Codes.html
-share/psiconv/xhtml/Basic_Elements.html
-share/psiconv/xhtml/Basic_Structures.html
-share/psiconv/xhtml/Clip_Art_File.html
-share/psiconv/xhtml/Embedded_Object_Section.html
-share/psiconv/xhtml/File_Structure.html
-share/psiconv/xhtml/Fonts.html
-share/psiconv/xhtml/Header_Section.html
-share/psiconv/xhtml/Identifiers.html
-share/psiconv/xhtml/Index.html
-share/psiconv/xhtml/Introduction.html
-share/psiconv/xhtml/Layout_Codes.html
-share/psiconv/xhtml/MBM_File.html
-share/psiconv/xhtml/Page_Layout_Section.html
-share/psiconv/xhtml/Paint_Data_Section.html
-share/psiconv/xhtml/Password_Section.html
-share/psiconv/xhtml/Record_File.html
-share/psiconv/xhtml/Record_Section.html
-share/psiconv/xhtml/Section_Table_Offset_Section.html
-share/psiconv/xhtml/Section_Table_Section.html
-share/psiconv/xhtml/Sheet_Basic_Structures.html
-share/psiconv/xhtml/Sheet_Cell_List.html
-share/psiconv/xhtml/Sheet_File.html
-share/psiconv/xhtml/Sheet_Formula_List.html
-share/psiconv/xhtml/Sheet_Graph_Description.html
-share/psiconv/xhtml/Sheet_Graph_List_Section.html
-share/psiconv/xhtml/Sheet_Graph_Region.html
-share/psiconv/xhtml/Sheet_Graph_Section.html
-share/psiconv/xhtml/Sheet_Grid_Section.html
-share/psiconv/xhtml/Sheet_Info_Section.html
-share/psiconv/xhtml/Sheet_Line_Section.html
-share/psiconv/xhtml/Sheet_Name_Section.html
-share/psiconv/xhtml/Sheet_Status_Section.html
-share/psiconv/xhtml/Sheet_Variable_List.html
-share/psiconv/xhtml/Sheet_Workbook_Section.html
-share/psiconv/xhtml/Sheet_Worksheet.html
-share/psiconv/xhtml/Sheet_Worksheet_List.html
-share/psiconv/xhtml/Sketch_File.html
-share/psiconv/xhtml/Sketch_Section.html
-share/psiconv/xhtml/Substitutions.html
-share/psiconv/xhtml/TextEd_File.html
-share/psiconv/xhtml/TextEd_Section.html
-share/psiconv/xhtml/Text_Layout_Section.html
-share/psiconv/xhtml/Text_Section.html
-share/psiconv/xhtml/Userdic_File.html
-share/psiconv/xhtml/Word_File.html
-share/psiconv/xhtml/Word_Status_Section.html
-share/psiconv/xhtml/Word_Styles_Section.html
-share/psiconv/xhtml/World_Data_File.html
-@dirrm share/psiconv/xhtml
-@dirrm share/psiconv/psion
-@dirrm share/psiconv
+%%DATADIR%%/psion/ASCII_Codes.psi
+%%DATADIR%%/psion/Application_ID_Section.psi
+%%DATADIR%%/psion/Basic_Elements.psi
+%%DATADIR%%/psion/Basic_Structures.psi
+%%DATADIR%%/psion/Clip_Art_File.psi
+%%DATADIR%%/psion/Embedded_Object_Section.psi
+%%DATADIR%%/psion/File_Structure.psi
+%%DATADIR%%/psion/Fonts.psi
+%%DATADIR%%/psion/Header_Section.psi
+%%DATADIR%%/psion/Identifiers.psi
+%%DATADIR%%/psion/Index.psi
+%%DATADIR%%/psion/Introduction.psi
+%%DATADIR%%/psion/Layout_Codes.psi
+%%DATADIR%%/psion/MBM_File.psi
+%%DATADIR%%/psion/Page_Layout_Section.psi
+%%DATADIR%%/psion/Paint_Data_Section.psi
+%%DATADIR%%/psion/Password_Section.psi
+%%DATADIR%%/psion/Record_File.psi
+%%DATADIR%%/psion/Record_Section.psi
+%%DATADIR%%/psion/Section_Table_Offset_Section.psi
+%%DATADIR%%/psion/Section_Table_Section.psi
+%%DATADIR%%/psion/Sheet_Basic_Structures.psi
+%%DATADIR%%/psion/Sheet_Cell_List.psi
+%%DATADIR%%/psion/Sheet_File.psi
+%%DATADIR%%/psion/Sheet_Formula_List.psi
+%%DATADIR%%/psion/Sheet_Graph_Description.psi
+%%DATADIR%%/psion/Sheet_Graph_List_Section.psi
+%%DATADIR%%/psion/Sheet_Graph_Region.psi
+%%DATADIR%%/psion/Sheet_Graph_Section.psi
+%%DATADIR%%/psion/Sheet_Grid_Section.psi
+%%DATADIR%%/psion/Sheet_Info_Section.psi
+%%DATADIR%%/psion/Sheet_Line_Section.psi
+%%DATADIR%%/psion/Sheet_Name_Section.psi
+%%DATADIR%%/psion/Sheet_Status_Section.psi
+%%DATADIR%%/psion/Sheet_Variable_List.psi
+%%DATADIR%%/psion/Sheet_Workbook_Section.psi
+%%DATADIR%%/psion/Sheet_Worksheet.psi
+%%DATADIR%%/psion/Sheet_Worksheet_List.psi
+%%DATADIR%%/psion/Sketch_File.psi
+%%DATADIR%%/psion/Sketch_Section.psi
+%%DATADIR%%/psion/Substitutions.psi
+%%DATADIR%%/psion/TextEd_File.psi
+%%DATADIR%%/psion/TextEd_Section.psi
+%%DATADIR%%/psion/Text_Layout_Section.psi
+%%DATADIR%%/psion/Text_Section.psi
+%%DATADIR%%/psion/Userdic_File.psi
+%%DATADIR%%/psion/Word_File.psi
+%%DATADIR%%/psion/Word_Status_Section.psi
+%%DATADIR%%/psion/Word_Styles_Section.psi
+%%DATADIR%%/psion/World_Data_File.psi
+%%DATADIR%%/xhtml/ASCII_Codes.html
+%%DATADIR%%/xhtml/Application_ID_Section.html
+%%DATADIR%%/xhtml/Basic_Elements.html
+%%DATADIR%%/xhtml/Basic_Structures.html
+%%DATADIR%%/xhtml/Clip_Art_File.html
+%%DATADIR%%/xhtml/Embedded_Object_Section.html
+%%DATADIR%%/xhtml/File_Structure.html
+%%DATADIR%%/xhtml/Fonts.html
+%%DATADIR%%/xhtml/Header_Section.html
+%%DATADIR%%/xhtml/Identifiers.html
+%%DATADIR%%/xhtml/Index.html
+%%DATADIR%%/xhtml/Introduction.html
+%%DATADIR%%/xhtml/Layout_Codes.html
+%%DATADIR%%/xhtml/MBM_File.html
+%%DATADIR%%/xhtml/Page_Layout_Section.html
+%%DATADIR%%/xhtml/Paint_Data_Section.html
+%%DATADIR%%/xhtml/Password_Section.html
+%%DATADIR%%/xhtml/Record_File.html
+%%DATADIR%%/xhtml/Record_Section.html
+%%DATADIR%%/xhtml/Section_Table_Offset_Section.html
+%%DATADIR%%/xhtml/Section_Table_Section.html
+%%DATADIR%%/xhtml/Sheet_Basic_Structures.html
+%%DATADIR%%/xhtml/Sheet_Cell_List.html
+%%DATADIR%%/xhtml/Sheet_File.html
+%%DATADIR%%/xhtml/Sheet_Formula_List.html
+%%DATADIR%%/xhtml/Sheet_Graph_Description.html
+%%DATADIR%%/xhtml/Sheet_Graph_List_Section.html
+%%DATADIR%%/xhtml/Sheet_Graph_Region.html
+%%DATADIR%%/xhtml/Sheet_Graph_Section.html
+%%DATADIR%%/xhtml/Sheet_Grid_Section.html
+%%DATADIR%%/xhtml/Sheet_Info_Section.html
+%%DATADIR%%/xhtml/Sheet_Line_Section.html
+%%DATADIR%%/xhtml/Sheet_Name_Section.html
+%%DATADIR%%/xhtml/Sheet_Status_Section.html
+%%DATADIR%%/xhtml/Sheet_Variable_List.html
+%%DATADIR%%/xhtml/Sheet_Workbook_Section.html
+%%DATADIR%%/xhtml/Sheet_Worksheet.html
+%%DATADIR%%/xhtml/Sheet_Worksheet_List.html
+%%DATADIR%%/xhtml/Sketch_File.html
+%%DATADIR%%/xhtml/Sketch_Section.html
+%%DATADIR%%/xhtml/Substitutions.html
+%%DATADIR%%/xhtml/TextEd_File.html
+%%DATADIR%%/xhtml/TextEd_Section.html
+%%DATADIR%%/xhtml/Text_Layout_Section.html
+%%DATADIR%%/xhtml/Text_Section.html
+%%DATADIR%%/xhtml/Userdic_File.html
+%%DATADIR%%/xhtml/Word_File.html
+%%DATADIR%%/xhtml/Word_Status_Section.html
+%%DATADIR%%/xhtml/Word_Styles_Section.html
+%%DATADIR%%/xhtml/World_Data_File.html
+@dirrm %%DATADIR%%/xhtml
+@dirrm %%DATADIR%%/psion
+@dirrm %%DATADIR%%
 @dirrm include/psiconv
 @dirrm etc/psiconv