Changes:

0.9.6  20040430  Compilation fixes for Solaris
                 Compilation fixes for ImageMagick unavailability

0.9.5  20040406  Bug fixes
                 Compilation with gcc 2.95.x should work again

0.9.4  20040316  Mostly bug fixes
                 Minimum version required for AbiWord 2.1.1 and later

0.9.3  20040226  Minimum version required for new AbiWord 2.1 plugin
                 Fixed a few minor bugs
                 Added psiconv_unicode_from_list and psiconv_unicode_strstr
                 Much better error and progress reporting in generators

0.9.2.1 20040223 Quick fix for the library number mistake in 0.9.2

0.9.2  20040223  Many bugfixes, among them some critical ones:
                 * Package now builds without psiconv.conf files installed
                 UTF8 Psion support might now actually work
                 -c argument introduced for psiconv program

0.9.1  20040209  Added the psiconv-config program.
		 Fixed the installation of @includedir@/psiconv/general.h
                 Added the forgotted psiconv_config_free function.
		 Removed some small memory leaks.

0.9.0  20040204  New major library version number breaks source compatibility:
		 * All strings and characters are now stored in UCS-2
                 * New config structure.
                   - Call psiconv_config_default and psiconv_config_read at the
                     start of your program
                   - Almost all functions have a new psiconv_config parameter
                   - All former global variables are now in this structure
                 * Several minor changes in the functions defined in
                   parse_routines.h and generate_routines.h
                 * All generate_* routines have now a lev parameter except
                   generate_file.
                 * psiconv_sketch_section data representation changes
                 * New verbosity level PSICONV_VERB_ERROR
                 Use config files /etc/psiconv.conf and ~/.psiconv.conf
                 Support automake 1.6, 1.7 and 1.8
                 Support autoconf-2.50 and up
                 Support ImageMagick 5.4.x and 5.5.x (API changed once again...)
                 Support Unicode output in psiconv program (Keita Kawabe)
                 Don't use features not present in plain sh (Keita Kawabe)
                 Clean up some automake-related stuff.
		 Format documentation is now installed too.
                 Debian build support
                 Embedded objects in Word are now properly parsed and generated
                 Sketch file generation is added (stand-alone and as object)
                 MBM and Clipart file generation is added
                 Image files other than 2-bits greyscale are parsed and
                   generated (experimental)
                 Errors and warnings sanitized
                 Rewrite of the psiconv program:
                 * Outputs in UTF8, UCS2, ASCII or Psion encodings
		 * XHTML target generates strict XHTML using CSS
                 * HTML4 target generates traditional HTML without CSS
                 * IMAGE target remains the same
                 * LATEX and RTF targets are not supported anymore

9 files changed, 33 insertions, 101 deletions

diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index d96047184de..82744ed3fe1 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2004/10/03 00:13:17 tv Exp $
-#
+# $NetBSD: Makefile,v 1.27 2004/10/08 13:19:26 adam Exp $
 
-DISTNAME=	psiconv-0.8.3
-PKGREVISION=	2
+DISTNAME=	psiconv-0.9.6
 CATEGORIES=	converters
 MASTER_SITES=	http://huizen.dds.nl/~frodol/psiconv/
 
@@ -11,18 +9,14 @@ HOMEPAGE=	http://huizen.dds.nl/~frodol/psiconv/
 COMMENT=	PSION 5 file format data conversion utilities
 
 USE_BUILDLINK3=		YES
-USE_X11=		YES
+USE_PKGINSTALL=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
-CPPFLAGS+=		-DIMAGEMAGICK
+CONFIGURE_ARGS+=	--without-imagemagick
+CONFIGURE_ARGS+=	--with-etcdir=${EGDIR}
 
-DOCDIR=		${PREFIX}/share/doc/psiconv
+EGDIR=		${PREFIX}/share/examples/psiconv
+CONF_FILES+=	${EGDIR}/psiconv.conf ${PKG_SYSCONFDIR}/psiconv.conf
+CONF_FILES+=	${EGDIR}/psiconv.conf.eg ${PKG_SYSCONFDIR}/psiconv.conf.eg
 
-post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	cd ${WRKSRC}/docs; for file in ascii html html4; do		\
-		${INSTALL_DATA} $${file} ${DOCDIR};			\
-	done
-
-.include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/psiconv/PLIST b/converters/psiconv/PLIST
index dae4842ee15..2faba648c8e 100644
--- a/converters/psiconv/PLIST
+++ b/converters/psiconv/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:21 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/10/08 13:19:26 adam Exp $
 bin/psiconv
+bin/psiconv-config
 include/psiconv/buffer.h
 include/psiconv/common.h
+include/psiconv/configuration.h
 include/psiconv/data.h
 include/psiconv/error.h
 include/psiconv/general.h
@@ -10,9 +12,11 @@ include/psiconv/generate_routines.h
 include/psiconv/list.h
 include/psiconv/parse.h
 include/psiconv/parse_routines.h
+include/psiconv/unicode.h
 lib/libpsiconv.la
-share/doc/psiconv/ascii
-share/doc/psiconv/html
-share/doc/psiconv/html4
-@dirrm share/doc/psiconv
+man/man1/psiconv-config.1
+man/man1/psiconv.1
+share/examples/psiconv/psiconv.conf
+share/examples/psiconv/psiconv.conf.eg
 @dirrm include/psiconv
+@dirrm share/examples/psiconv
diff --git a/converters/psiconv/buildlink3.mk b/converters/psiconv/buildlink3.mk
index bbf43ea96d0..006fdd71ac3 100644
--- a/converters/psiconv/buildlink3.mk
+++ b/converters/psiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:17 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/10/08 13:19:26 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PSICONV_BUILDLINK3_MK:=	${PSICONV_BUILDLINK3_MK}+
@@ -16,6 +16,4 @@ BUILDLINK_RECOMMENDED.psiconv+=	psiconv>=0.8.3nb2
 BUILDLINK_PKGSRCDIR.psiconv?=	../../converters/psiconv
 .endif	# PSICONV_BUILDLINK3_MK
 
-.include "../../graphics/ImageMagick/buildlink3.mk"
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/converters/psiconv/distinfo b/converters/psiconv/distinfo
index 98fb8d4770a..f8ef26369c8 100644
--- a/converters/psiconv/distinfo
+++ b/converters/psiconv/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.7 2004/01/26 13:15:18 grant Exp $
+$NetBSD: distinfo,v 1.8 2004/10/08 13:19:26 adam Exp $
 
-SHA1 (psiconv-0.8.3.tar.gz) = 19bab16895385904f152af5dea294fe029207b7b
-Size (psiconv-0.8.3.tar.gz) = 326460 bytes
-SHA1 (patch-aa) = efe63d69692430900b79b80e8b06066e9182d739
-SHA1 (patch-af) = 628abc563c0f548baf813954a12355bcf2f7255d
-SHA1 (patch-ag) = c840310b5417dd2caa7d120398b0910043820276
-SHA1 (patch-ah) = a35166070aa15b56f4d5e30f07411bc42556eaeb
-SHA1 (patch-ai) = 03ab0625c0c08d94d31f886829eef9248e214169
+SHA1 (psiconv-0.9.6.tar.gz) = 3bdf547ed6e8f69bea41ea4c25cbe96225099755
+Size (psiconv-0.9.6.tar.gz) = 497086 bytes
+SHA1 (patch-aa) = 7580f79866a3081f282ca1c405b9428aefd6a2ab
diff --git a/converters/psiconv/patches/patch-aa b/converters/psiconv/patches/patch-aa
index 36f27df0b2a..161df02d0f3 100644
--- a/converters/psiconv/patches/patch-aa
+++ b/converters/psiconv/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2003/09/03 12:18:29 adam Exp $
+$NetBSD: patch-aa,v 1.4 2004/10/08 13:19:26 adam Exp $
 
---- Makefile.in.orig	2003-09-03 14:03:07.000000000 +0200
+--- Makefile.in.orig	2004-04-30 12:07:58.000000000 +0000
 +++ Makefile.in
-@@ -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
+@@ -179,7 +179,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-af b/converters/psiconv/patches/patch-af
deleted file mode 100644
index 5301e56eaa0..00000000000
--- a/converters/psiconv/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.2 2003/09/03 12:18:29 adam Exp $
-
---- configure.orig	2002-01-29 21:16:47.000000000 +0100
-+++ configure
-@@ -6667,7 +6667,11 @@ else
-   cat >conftest.$ac_ext <<_ACEOF
- #line 6668 "configure"
- #include "confdefs.h"
-- #include <magick/magick.h>
-+ #include <stdio.h>
-+ #include <string.h>
-+ #include <time.h>
-+ #include <sys/types.h>
-+ #include <magick/api.h>
-                  int main(void) { ExceptionInfo exception;
-                  GetExceptionInfo(&exception);
-                  OpenModules(&exception);
diff --git a/converters/psiconv/patches/patch-ag b/converters/psiconv/patches/patch-ag
deleted file mode 100644
index 4a6a93fcaca..00000000000
--- a/converters/psiconv/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2003/09/03 12:18:29 adam Exp $
-
---- 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
- 
--#include <magick/magick.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <time.h>
-+#include <sys/types.h>
-+#include <magick/api.h>
- 
- extern const MagickInfo * GetMagickFileList(void);
- 
diff --git a/converters/psiconv/patches/patch-ah b/converters/psiconv/patches/patch-ah
deleted file mode 100644
index c069067bd14..00000000000
--- a/converters/psiconv/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/09/10 12:35:08 markd Exp $
-
---- program/psiconv/psiconv.c.orig	Sat Feb 17 07:37:37 2001
-+++ program/psiconv/psiconv.c	Mon Sep  9 23:04:44 2002
-@@ -33,7 +33,7 @@
- #endif
- 
- #ifdef IMAGEMAGICK
--#include <magick/magick.h>
-+#include <magick/api.h>
- #endif
- 
- #include "psiconv/data.h"
diff --git a/converters/psiconv/patches/patch-ai b/converters/psiconv/patches/patch-ai
deleted file mode 100644
index 349aa2fa585..00000000000
--- a/converters/psiconv/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2003/09/03 12:18:29 adam Exp $
-
---- 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"
- #include <magick/magick.h>
--#include <magick/config.h>
-+#include <magick/magick_config.h>
- 
- #endif
-