Update to version 1.5.

Based on patch from Juan RP via PR pkg/20220.

Changes:
========
- The architecture engine supports #MAPTOKEN.
- The multibyte version of OpenSP now uses 32bit chars and supports
  the full UTF-16 range 0x0000-0x10ffff.

5 files changed, 37 insertions, 35 deletions

diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 66c141d66cb..4897506f9cf 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2002/10/09 10:27:29 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2003/02/15 00:26:19 salo Exp $
 #
 
-DISTNAME=	OpenSP-1.4
-PKGNAME=	opensp-1.4
+DISTNAME=	OpenSP-1.5
+PKGNAME=	opensp-1.5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openjade/}
 
 MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	http://openjade.sourceforge.net/doc-1.4/index.htm
+HOMEPAGE=	http://openjade.sourceforge.net/doc/index.htm
 COMMENT=	SGML parser, successor to "sp"
 
 CONFLICTS+=     sp-[0-9]*
diff --git a/textproc/opensp/PLIST b/textproc/opensp/PLIST
index b0a68be8911..a86b3f252ea 100644
--- a/textproc/opensp/PLIST
+++ b/textproc/opensp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/02 18:10:50 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/15 00:26:19 salo Exp $
 bin/onsgmls
 bin/osgmlnorm
 bin/ospam
@@ -41,6 +41,7 @@ include/OpenSP/EventsWanted.h
 include/OpenSP/ExtendEntityManager.h
 include/OpenSP/ExternalId.h
 include/OpenSP/Fixed2CodingSystem.h
+include/OpenSP/Fixed4CodingSystem.h
 include/OpenSP/GenericEventHandler.h
 include/OpenSP/Hash.h
 include/OpenSP/HashTable.cxx
@@ -73,6 +74,7 @@ include/OpenSP/MessageArg.h
 include/OpenSP/MessageBuilder.h
 include/OpenSP/MessageEventHandler.h
 include/OpenSP/MessageFormatter.h
+include/OpenSP/MessageModule.h
 include/OpenSP/MessageReporter.h
 include/OpenSP/MessageTable.h
 include/OpenSP/Mode.h
@@ -118,13 +120,13 @@ include/OpenSP/StringC.h
 include/OpenSP/StringOf.cxx
 include/OpenSP/StringOf.h
 include/OpenSP/StringResource.h
-include/OpenSP/SubstTable.cxx
 include/OpenSP/SubstTable.h
 include/OpenSP/Syntax.h
 include/OpenSP/Text.h
 include/OpenSP/TranslateCodingSystem.h
 include/OpenSP/TypeId.h
 include/OpenSP/URLStorage.h
+include/OpenSP/UTF16CodingSystem.h
 include/OpenSP/UTF8CodingSystem.h
 include/OpenSP/UnicodeCodingSystem.h
 include/OpenSP/UnivCharsetDesc.h
@@ -143,8 +145,13 @@ include/OpenSP/xnew.h
 lib/libosp.a
 lib/libosp.la
 lib/libosp.so
-lib/libosp.so.1
-lib/libosp.so.1.0
+lib/libosp.so.3
+lib/libosp.so.3.0
+man/man1/onsgmls.1
+man/man1/osgmlnorm.1
+man/man1/ospam.1
+man/man1/ospent.1
+man/man1/osx.1
 share/OpenSP/HTML32.dcl
 share/OpenSP/HTML32.dtd
 share/OpenSP/HTML32.soc
@@ -158,6 +165,9 @@ share/OpenSP/HTMLspec.ent
 share/OpenSP/HTMLsym.ent
 share/OpenSP/ISOlat1.ent
 share/OpenSP/ISOlat1.sgm
+share/OpenSP/catalog
+share/OpenSP/demo.sgm
+share/OpenSP/gensyntax.pl
 share/OpenSP/html-1.dtd
 share/OpenSP/html-1s.dtd
 share/OpenSP/html-s.dtd
@@ -166,13 +176,18 @@ share/OpenSP/html.dtd
 share/OpenSP/html.soc
 share/OpenSP/japan.dcl
 share/OpenSP/opensp-implied.dcl
+share/OpenSP/unicode.sd
+share/OpenSP/unicode.syn
 share/OpenSP/xml.dcl
 share/OpenSP/xml.soc
+share/doc/OpenSP/ABOUT-NLS
 share/doc/OpenSP/AUTHORS
 share/doc/OpenSP/COPYING
 share/doc/OpenSP/ChangeLog
 share/doc/OpenSP/NEWS
+share/doc/OpenSP/README
 share/doc/OpenSP/archform.htm
+share/doc/OpenSP/autoconf.htm
 share/doc/OpenSP/build.htm
 share/doc/OpenSP/catalog.htm
 share/doc/OpenSP/charset.htm
@@ -182,6 +197,9 @@ share/doc/OpenSP/ideas.htm
 share/doc/OpenSP/index.htm
 share/doc/OpenSP/new.htm
 share/doc/OpenSP/nsgmls.htm
+share/doc/OpenSP/releasenotes.html
+share/doc/OpenSP/releasenotes.pdf
+share/doc/OpenSP/releasenotes.ps
 share/doc/OpenSP/sgmldecl.htm
 share/doc/OpenSP/sgmlnorm.htm
 share/doc/OpenSP/sgmlsout.htm
@@ -193,8 +211,6 @@ share/doc/OpenSP/sysdecl.htm
 share/doc/OpenSP/sysid.htm
 share/doc/OpenSP/xml.htm
 share/doc/OpenSP/xmlwarn.htm
-share/locale/de/LC_MESSAGES/sp.mo
-share/locale/sv/LC_MESSAGES/sp.mo
 @dirrm share/doc/OpenSP
 @dirrm share/OpenSP
 @dirrm include/OpenSP
diff --git a/textproc/opensp/distinfo b/textproc/opensp/distinfo
index 3217d16e1e2..fcc496bb39a 100644
--- a/textproc/opensp/distinfo
+++ b/textproc/opensp/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/05/09 13:04:06 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/02/15 00:26:19 salo Exp $
 
-SHA1 (OpenSP-1.4.tar.gz) = 872ba9996769ca027a06edca21cc702753305044
-Size (OpenSP-1.4.tar.gz) = 919377 bytes
-SHA1 (patch-aa) = f7fa1dd5f74fcd8e8e9f6fb184e739db7957f5d2
-SHA1 (patch-ab) = a20e4f7c761e44de90f0e74145ab64fdb51dc3ee
+SHA1 (OpenSP-1.5.tar.gz) = f971bcef7157941396ab385d40357de72534454e
+Size (OpenSP-1.5.tar.gz) = 1288057 bytes
+SHA1 (patch-aa) = 5160bcd6f9150385ad927d33a2c567f78ca623cb
diff --git a/textproc/opensp/patches/patch-aa b/textproc/opensp/patches/patch-aa
index 4fc2d701f70..aacaa027318 100644
--- a/textproc/opensp/patches/patch-aa
+++ b/textproc/opensp/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/05/23 17:20:45 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2003/02/15 00:26:20 salo Exp $
 
---- doc/Makefile.in.orig	Mon May 22 12:39:51 2000
-+++ doc/Makefile.in	Mon May 22 12:39:58 2000
-@@ -99,7 +99,7 @@
- VERSION = @VERSION@
- l = @l@
+--- 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@
  
 -docdir = $(prefix)/doc
 +docdir = $(prefix)/share/doc
  pkgdocdir = $(docdir)/@PACKAGE@
  
- pkgdoc_DATA = archform.htm build.htm catalog.htm charset.htm 	features.htm generic.htm ideas.htm index.htm new.htm nsgmls.htm 	sgmldecl.htm sgmlnorm.htm sgmlsout.htm spam.htm spcat.htm 	spent.htm sx.htm sysdecl.htm sysid.htm xml.htm xmlwarn.htm
+ MAINTAINERCLEANFILES = Makefile.in
diff --git a/textproc/opensp/patches/patch-ab b/textproc/opensp/patches/patch-ab
deleted file mode 100644
index 34d5ce1ea4b..00000000000
--- a/textproc/opensp/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/05/23 17:20:45 hubertf Exp $
-
---- Makefile.in.orig	Mon May 22 13:35:55 2000
-+++ Makefile.in	Mon May 22 13:36:03 2000
-@@ -106,7 +106,7 @@
- 
- pkginclude_HEADERS = config.h
- 
--docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc
- pkgdocdir = $(docdir)/@PACKAGE@
- 
- pkgdoc_DATA = NEWS COPYING AUTHORS ChangeLog