summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2005-02-14 12:27:39 +0000
committerPav Lucistnik <pav@FreeBSD.org>2005-02-14 12:27:39 +0000
commit89cc6725ce39a2eb9593427450768d73da764fea (patch)
tree03f3b946f1221d223dffe036c0bade6f6ab7cf3f /converters
parentUpdate to 1.1.14-3. (diff)
- Update to 0.9.6
Cluebat provided by: mat (ffs patch)
Notes
Notes: svn path=/head/; revision=128772
Diffstat (limited to 'converters')
-rw-r--r--converters/psiconv/Makefile8
-rw-r--r--converters/psiconv/distinfo4
-rw-r--r--converters/psiconv/files/patch-ffs40
-rw-r--r--converters/psiconv/files/patch-formats::html_links.sh28
-rw-r--r--converters/psiconv/files/patch-formats::index_html.sh16
-rw-r--r--converters/psiconv/files/patch-ltmain.sh28
-rw-r--r--converters/psiconv/pkg-plist111
7 files changed, 157 insertions, 78 deletions
diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index 78d9b319bfea..bfe4c9a91225 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= psiconv
-PORTVERSION= 0.8.3
-PORTREVISION= 1
+PORTVERSION= 0.9.6
CATEGORIES= converters devel
MASTER_SITES= http://www.frodol.dds.nl/psiconv/
@@ -16,8 +15,11 @@ COMMENT= A conversion utility to convert Psion 5(MX) files into other formats
USE_GETOPT_LONG=yes
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
+USE_GMAKE= yes
+USE_LIBTOOL_VER=15
CONFIGURE_ARGS= --with-imagemagick=no
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+MAN1= psiconv.1 psiconv-config.1
+
.include <bsd.port.mk>
diff --git a/converters/psiconv/distinfo b/converters/psiconv/distinfo
index 9117548d0433..a24defef7c2f 100644
--- a/converters/psiconv/distinfo
+++ b/converters/psiconv/distinfo
@@ -1,2 +1,2 @@
-MD5 (psiconv-0.8.3.tar.gz) = 7fe2b6d926aa7fb3b2ef77aada4adaf9
-SIZE (psiconv-0.8.3.tar.gz) = 326460
+MD5 (psiconv-0.9.6.tar.gz) = a17bdea04d57877fbd037556b6421f46
+SIZE (psiconv-0.9.6.tar.gz) = 497086
diff --git a/converters/psiconv/files/patch-ffs b/converters/psiconv/files/patch-ffs
new file mode 100644
index 000000000000..9246ae448d55
--- /dev/null
+++ b/converters/psiconv/files/patch-ffs
@@ -0,0 +1,40 @@
+--- 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/files/patch-formats::html_links.sh b/converters/psiconv/files/patch-formats::html_links.sh
deleted file mode 100644
index 5d64b95a4b17..000000000000
--- a/converters/psiconv/files/patch-formats::html_links.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- formats/html_links.sh 2001/08/21 13:34:26 1.1
-+++ formats/html_links.sh 2001/08/21 13:37:05
-@@ -1,8 +1,8 @@
- #!/bin/sh
-
--function generate_links
-+generate_links()
- {
-- local index_file name file lineno
-+ #local index_file name file lineno
-
- index_file="$1"
-
-@@ -17,9 +17,9 @@
- eval "$command"
- }
-
--function generate_headers
-+generate_headers()
- {
-- local index_file name this_file
-+ #local index_file name this_file
-
- index_file="$1"
- this_file=`echo $2 | sed 's,.*/,,' | sed 's,\..*$,,'`
diff --git a/converters/psiconv/files/patch-formats::index_html.sh b/converters/psiconv/files/patch-formats::index_html.sh
deleted file mode 100644
index 21083a24ccec..000000000000
--- a/converters/psiconv/files/patch-formats::index_html.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- formats/index_html.sh 2001/08/21 13:34:31 1.1
-+++ formats/index_html.sh 2001/08/21 13:36:00
-@@ -1,8 +1,8 @@
- #!/bin/sh
-
--function make_targets_file
-+make_targets_file()
- {
-- local file line line_nr error targets_file files
-+ #local file line line_nr error targets_file files
-
- targets_file="$1"
- shift
diff --git a/converters/psiconv/files/patch-ltmain.sh b/converters/psiconv/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/converters/psiconv/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh 2001/08/27 09:51:26 1.1
-+++ ltmain.sh 2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/converters/psiconv/pkg-plist b/converters/psiconv/pkg-plist
index 58586384eeaf..4a2f4328cc9b 100644
--- a/converters/psiconv/pkg-plist
+++ b/converters/psiconv/pkg-plist
@@ -1,6 +1,10 @@
bin/psiconv
+bin/psiconv-config
+etc/psiconv/psiconv.conf
+etc/psiconv/psiconv.conf.eg
include/psiconv/buffer.h
include/psiconv/common.h
+include/psiconv/configuration.h
include/psiconv/data.h
include/psiconv/error.h
include/psiconv/general.h
@@ -9,7 +13,112 @@ include/psiconv/generate_routines.h
include/psiconv/list.h
include/psiconv/parse.h
include/psiconv/parse_routines.h
+include/psiconv/unicode.h
lib/libpsiconv.a
lib/libpsiconv.so
-lib/libpsiconv.so.8
+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
@dirrm include/psiconv
+@dirrm etc/psiconv