Update to 1.5.2 to fix build with gcc4 on 3.99.21. Ok agc@

Changes in OpenSP 1.5.2

* Support for version 4.0 and 4.1 of the GNU C++ compiler.
* Added doc building and config option.
* Updated local gettext.
* Added config option to turn off DTDDECL support.
* Update 'de' and 'fr' translations; add new 'tr' translation.
* Add more tests. (Karl Eichwalder)

5 files changed, 22 insertions, 36 deletions

diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 18f5b968b04..190e12284fc 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2006/04/14 18:14:34 heinz Exp $
+# $NetBSD: Makefile,v 1.34 2006/06/26 19:50:28 wiz Exp $
 #
 
-DISTNAME=	OpenSP-1.5.1
+DISTNAME=	OpenSP-1.5.2
 PKGNAME=	${DISTNAME:S/OpenSP/opensp/}
-PKGREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openjade/}
 
@@ -11,10 +10,11 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://openjade.sourceforge.net/doc/index.htm
 COMMENT=	SGML parser, successor to "sp"
 
+BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
+
 CONFLICTS+=     sp-[0-9]*
 
-BROKEN_GETTEXT_DETECTION=	yes
-USE_TOOLS+=		msgfmt perl
+USE_TOOLS+=		gmake msgfmt perl
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 PTHREAD_OPTS+=		require
diff --git a/textproc/opensp/PLIST b/textproc/opensp/PLIST
index 2da033353d6..da1c0cab997 100644
--- a/textproc/opensp/PLIST
+++ b/textproc/opensp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/17 07:07:35 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/06/26 19:50:28 wiz Exp $
 bin/onsgmls
 bin/osgmlnorm
 bin/ospam
@@ -196,8 +196,6 @@ 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
@@ -209,10 +207,11 @@ 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/sp4.mo
-share/locale/fr/LC_MESSAGES/sp4.mo
-share/locale/ja/LC_MESSAGES/sp4.mo
-share/locale/sv/LC_MESSAGES/sp4.mo
+share/locale/de/LC_MESSAGES/sp5.mo
+share/locale/fr/LC_MESSAGES/sp5.mo
+share/locale/ja/LC_MESSAGES/sp5.mo
+share/locale/sv/LC_MESSAGES/sp5.mo
+share/locale/tr/LC_MESSAGES/sp5.mo
 @dirrm share/doc/OpenSP
 @dirrm share/OpenSP
 @dirrm include/OpenSP
diff --git a/textproc/opensp/distinfo b/textproc/opensp/distinfo
index 5132e8cba86..153290ea56a 100644
--- a/textproc/opensp/distinfo
+++ b/textproc/opensp/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 14:48:44 agc Exp $
+$NetBSD: distinfo,v 1.8 2006/06/26 19:50:28 wiz Exp $
 
-SHA1 (OpenSP-1.5.1.tar.gz) = 93bd4f99972c9a50e07c68e3161ed3c25f9a3b22
-RMD160 (OpenSP-1.5.1.tar.gz) = 42731fff1e5a1529037c2398de6efe5d9c608a74
-Size (OpenSP-1.5.1.tar.gz) = 1418784 bytes
-SHA1 (patch-aa) = 15a4c6051a95b70a5c978f831185382b4bd386f8
-SHA1 (patch-ab) = 25873063e861873b86790a4420216cde8d422a15
+SHA1 (OpenSP-1.5.2.tar.gz) = b4e903e980f8a8b3887396a24e067bef126e97d5
+RMD160 (OpenSP-1.5.2.tar.gz) = 6e671a267562c5b9283e7e6504e8339cb1d86850
+Size (OpenSP-1.5.2.tar.gz) = 1521390 bytes
+SHA1 (patch-aa) = c24326e85a585378088a8c5ed0bd65a2a5022951
diff --git a/textproc/opensp/patches/patch-aa b/textproc/opensp/patches/patch-aa
index 6c5a8824c2d..eae2cef77a2 100644
--- a/textproc/opensp/patches/patch-aa
+++ b/textproc/opensp/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2004/05/19 05:42:38 minskim Exp $
+$NetBSD: patch-aa,v 1.4 2006/06/26 19:50:28 wiz Exp $
 
---- doc/Makefile.in.orig	2003-10-11 04:05:56.000000000 -0500
+--- doc/Makefile.in.orig	2005-12-23 14:15:58.000000000 +0000
 +++ doc/Makefile.in
-@@ -117,7 +117,7 @@ install_sh = @install_sh@
- 
+@@ -216,7 +216,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  docdir = $(datadir)/doc
  pkgdocdir = $(docdir)/@PACKAGE@
 -pkgdochtmldir = $(pkgdocdir)/doc
 +pkgdochtmldir = $(docdir)/@PACKAGE@
- 
  MAINTAINERCLEANFILES = Makefile.in
- 
+ pkgdochtml_DATA = archform.htm build.htm catalog.htm charset.htm \
+ 	features.htm generic.htm ideas.htm index.htm new.htm nsgmls.htm \
diff --git a/textproc/opensp/patches/patch-ab b/textproc/opensp/patches/patch-ab
deleted file mode 100644
index 3960df5c494..00000000000
--- a/textproc/opensp/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2004/06/07 19:25:58 shannonjr Exp $
-
---- include/RangeMap.cxx.orig	2000-02-25 09:55:21.000000000 -0700
-+++ include/RangeMap.cxx
-@@ -7,6 +7,7 @@
- #include "RangeMap.h"
- #include "ISet.h"
- #include "types.h"
-+#include "constant.h"
- 
- #ifdef SP_NAMESPACE
- namespace SP_NAMESPACE {