From dc9dde284dfc00014fbb1bf4d1dccf5ac41c47f5 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 6 Sep 2005 22:47:35 +0000
Subject: [PATCH] gcc 3 knows about proper typename. Same patch as sp, kills
 most of the warnings.

---
 textproc/openjade/Makefile                    |  3 ++-
 .../patches/patch-include_Attribute_h         | 20 +++++++++----------
 .../openjade/patches/patch-include_config_h   | 10 +++++++---
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 8094bc9212c..fd483a6438e 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2004/12/07 00:23:22 alek Exp $
+# $OpenBSD: Makefile,v 1.17 2005/09/06 22:47:35 espie Exp $
 
 COMMENT=	"object-oriented SGML/XML parser toolkit and DSSSL engine"
 
 DISTNAME=	openjade-1.3
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openjade/}
 
diff --git a/textproc/openjade/patches/patch-include_Attribute_h b/textproc/openjade/patches/patch-include_Attribute_h
index b5860dbf011..84dedfe8a4c 100644
--- a/textproc/openjade/patches/patch-include_Attribute_h
+++ b/textproc/openjade/patches/patch-include_Attribute_h
@@ -1,6 +1,6 @@
-$OpenBSD: patch-include_Attribute_h,v 1.1 2004/03/06 22:11:08 naddy Exp $
---- include/Attribute.h.orig	1999-05-02 17:36:36.000000000 +0200
-+++ include/Attribute.h	2004-03-06 21:59:55.000000000 +0100
+$OpenBSD: patch-include_Attribute_h,v 1.2 2005/09/06 22:47:35 espie Exp $
+--- include/Attribute.h.orig	Sun May  2 17:36:36 1999
++++ include/Attribute.h	Wed Sep  7 00:00:52 2005
 @@ -31,6 +31,27 @@ class AttributeSemantics;
  class AttributeContext;
  class Syntax;
@@ -29,10 +29,12 @@ $OpenBSD: patch-include_Attribute_h,v 1.1 2004/03/06 22:11:08 naddy Exp $
  class SP_API AttributeDefinitionDesc {
  public:
    AttributeDefinitionDesc() { }
-@@ -373,27 +394,6 @@ private:
+@@ -371,27 +392,6 @@ public:
+   AttributeSemantics *copy() const;
+ private:
    ConstPtr<Notation> notation_;
- };
- 
+-};
+-
 -class SP_API AttributeValue : public Resource {
 -public:
 -  enum Type {
@@ -52,8 +54,6 @@ $OpenBSD: patch-include_Attribute_h,v 1.1 2004/03/06 22:11:08 naddy Exp $
 -  virtual Boolean recoverUnquoted(const StringC &, const Location &,
 -				  AttributeContext &, const StringC &);
 -  static Boolean handleAsUnterminated(const Text &, AttributeContext &);
--};
--
+ };
+ 
  class SP_API ImpliedAttributeValue : public AttributeValue {
- public:
-   ImpliedAttributeValue();
diff --git a/textproc/openjade/patches/patch-include_config_h b/textproc/openjade/patches/patch-include_config_h
index 57a334782ad..ecce1a42e4c 100644
--- a/textproc/openjade/patches/patch-include_config_h
+++ b/textproc/openjade/patches/patch-include_config_h
@@ -1,12 +1,16 @@
-$OpenBSD: patch-include_config_h,v 1.1 2002/10/16 01:33:58 naddy Exp $
+$OpenBSD: patch-include_config_h,v 1.2 2005/09/06 22:47:35 espie Exp $
 --- include/config.h.orig	Fri Jul 23 17:50:17 1999
-+++ include/config.h	Wed Oct 16 02:54:16 2002
-@@ -26,7 +26,7 @@
++++ include/config.h	Wed Sep  7 00:37:32 2005
+@@ -26,8 +26,11 @@
  #endif
  #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
  #define SP_ANSI_LIB
 -#define SP_NO_STD_NAMESPACE
 +// #define SP_NO_STD_NAMESPACE
  #undef SP_NEW_H_MISSING
++#endif
++#if __GNUC__ > 2
++#define SP_HAVE_TYPENAME
  #endif
  
+ #endif /* __GNUG__ */