Update opensp to 1.5.1.

Changes:

Enable run time selection of message format with SP_MESSAGE_FORMAT
environment variable. Value is one of XML, NONE, TRADITIONAL.

When validating/parseing a document using http, OpenSP will now follow
any redirects headers/requests from the server.

The environment variable SP_HTTP_USER_AGENT can be used to specify a
UserAgent: header.

The environment variable SP_HTTP_ACCEPT can be used to specify Accept:
headers.

A number of enhancements have been made to the osx tool: security
fixes in the handling of output files; addition of the "preserve case
option".

A testing framework together with some initial tests have been
added. Currently there are 22 tests. 6 of which fail.

Support for Mac OS/X, Darwin has been improved. Build infrastructure
and localisation fixes and enhancements. Improved compiler support.

6 files changed, 26 insertions, 82 deletions

diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index bcecd9901d5..60e27c16440 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/02/22 21:59:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/05/19 05:42:38 minskim Exp $
 #
 
-DISTNAME=	OpenSP-1.5
-PKGNAME=	opensp-1.5
-PKGREVISION=	1
+DISTNAME=	OpenSP-1.5.1
+PKGNAME=	${DISTNAME:S/OpenSP/opensp/}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openjade/}
 
diff --git a/textproc/opensp/PLIST b/textproc/opensp/PLIST
index a86b3f252ea..ec552aaefc8 100644
--- a/textproc/opensp/PLIST
+++ b/textproc/opensp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/02/15 00:26:19 salo Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/05/19 05:42:38 minskim Exp $
 bin/onsgmls
 bin/osgmlnorm
 bin/ospam
@@ -145,11 +145,12 @@ include/OpenSP/xnew.h
 lib/libosp.a
 lib/libosp.la
 lib/libosp.so
-lib/libosp.so.3
-lib/libosp.so.3.0
+lib/libosp.so.4
+lib/libosp.so.4.0
 man/man1/onsgmls.1
 man/man1/osgmlnorm.1
 man/man1/ospam.1
+man/man1/ospcat.1
 man/man1/ospent.1
 man/man1/osx.1
 share/OpenSP/HTML32.dcl
@@ -182,6 +183,7 @@ share/OpenSP/xml.dcl
 share/OpenSP/xml.soc
 share/doc/OpenSP/ABOUT-NLS
 share/doc/OpenSP/AUTHORS
+share/doc/OpenSP/BUGS
 share/doc/OpenSP/COPYING
 share/doc/OpenSP/ChangeLog
 share/doc/OpenSP/NEWS
@@ -211,6 +213,10 @@ share/doc/OpenSP/sysdecl.htm
 share/doc/OpenSP/sysid.htm
 share/doc/OpenSP/xml.htm
 share/doc/OpenSP/xmlwarn.htm
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/sp4.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/sp4.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/sp4.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sp4.mo
 @dirrm share/doc/OpenSP
 @dirrm share/OpenSP
 @dirrm include/OpenSP
diff --git a/textproc/opensp/buildlink3.mk b/textproc/opensp/buildlink3.mk
index 9de2ac4d76d..ccd6a49ea2f 100644
--- a/textproc/opensp/buildlink3.mk
+++ b/textproc/opensp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/05/19 05:42:38 minskim Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSP_BUILDLINK3_MK:=	${OPENSP_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopensp}
 BUILDLINK_PACKAGES+=	opensp
 
 .if !empty(OPENSP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.opensp+=	opensp>=1.5nb1
+BUILDLINK_DEPENDS.opensp+=	opensp>=1.5.1
 BUILDLINK_PKGSRCDIR.opensp?=	../../textproc/opensp
 .endif	# OPENSP_BUILDLINK3_MK
 
diff --git a/textproc/opensp/distinfo b/textproc/opensp/distinfo
index 120954c138f..36f4088271a 100644
--- a/textproc/opensp/distinfo
+++ b/textproc/opensp/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/09/23 08:10:14 wiz Exp $
+$NetBSD: distinfo,v 1.5 2004/05/19 05:42:38 minskim Exp $
 
-SHA1 (OpenSP-1.5.tar.gz) = f971bcef7157941396ab385d40357de72534454e
-Size (OpenSP-1.5.tar.gz) = 1288057 bytes
-SHA1 (patch-aa) = 5160bcd6f9150385ad927d33a2c567f78ca623cb
-SHA1 (patch-ab) = 500bdc361da4a913fd3e62b255919442f2856305
+SHA1 (OpenSP-1.5.1.tar.gz) = 93bd4f99972c9a50e07c68e3161ed3c25f9a3b22
+Size (OpenSP-1.5.1.tar.gz) = 1418784 bytes
+SHA1 (patch-aa) = 15a4c6051a95b70a5c978f831185382b4bd386f8
diff --git a/textproc/opensp/patches/patch-aa b/textproc/opensp/patches/patch-aa
index aacaa027318..6c5a8824c2d 100644
--- a/textproc/opensp/patches/patch-aa
+++ b/textproc/opensp/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2003/02/15 00:26:20 salo Exp $
+$NetBSD: patch-aa,v 1.3 2004/05/19 05:42:38 minskim Exp $
 
---- doc/Makefile.in.orig	Sat Feb 15 00:36:47 2003
-+++ doc/Makefile.in	Sat Feb 15 00:53:04 2003
-@@ -105,7 +105,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
+--- doc/Makefile.in.orig	2003-10-11 04:05:56.000000000 -0500
++++ doc/Makefile.in
+@@ -117,7 +117,7 @@ install_sh = @install_sh@
  
--docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc
+ docdir = $(datadir)/doc
  pkgdocdir = $(docdir)/@PACKAGE@
+-pkgdochtmldir = $(pkgdocdir)/doc
++pkgdochtmldir = $(docdir)/@PACKAGE@
  
  MAINTAINERCLEANFILES = Makefile.in
+ 
diff --git a/textproc/opensp/patches/patch-ab b/textproc/opensp/patches/patch-ab
deleted file mode 100644
index b2cc6013c32..00000000000
--- a/textproc/opensp/patches/patch-ab
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/09/23 08:10:14 wiz Exp $
-
---- include/Attribute.h.orig	2000-03-09 19:30:56.000000000 +0100
-+++ include/Attribute.h
-@@ -31,6 +31,27 @@ class AttributeSemantics;
- class AttributeContext;
- class Syntax;
- 
-+class SP_API AttributeValue : public Resource {
-+public:
-+  enum Type {
-+    implied,
-+    cdata,
-+    tokenized
-+    };
-+  AttributeValue();
-+  virtual ~AttributeValue();
-+  virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
-+					    AttributeContext &,
-+					    const StringC &,
-+					    unsigned &,
-+					    unsigned &) const;
-+  virtual Type info(const Text *&, const StringC *&) const = 0;
-+  virtual const Text *text() const;
-+  virtual Boolean recoverUnquoted(const StringC &, const Location &,
-+				  AttributeContext &, const StringC &);
-+  static Boolean handleAsUnterminated(const Text &, AttributeContext &);
-+};
-+
- class SP_API AttributeDefinitionDesc {
- public:
-   AttributeDefinitionDesc() { }
-@@ -380,27 +401,6 @@ private:
-   ConstPtr<Notation> notation_;
- };
- 
--class SP_API AttributeValue : public Resource {
--public:
--  enum Type {
--    implied,
--    cdata,
--    tokenized
--    };
--  AttributeValue();
--  virtual ~AttributeValue();
--  virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
--					    AttributeContext &,
--					    const StringC &,
--					    unsigned &,
--					    unsigned &) const;
--  virtual Type info(const Text *&, const StringC *&) const = 0;
--  virtual const Text *text() const;
--  virtual Boolean recoverUnquoted(const StringC &, const Location &,
--				  AttributeContext &, const StringC &);
--  static Boolean handleAsUnterminated(const Text &, AttributeContext &);
--};
--
- class SP_API ImpliedAttributeValue : public AttributeValue {
- public:
-   ImpliedAttributeValue();