From b2acde38da26444b53d47e6e6e5a568ee69dd877 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Wed, 10 Aug 2005 09:59:13 +0000
Subject: [PATCH] adjust config.h to correspond to what gcc actually does.
 Suppresses most of the warnings.

---
 textproc/sp/Makefile                          |  3 ++-
 textproc/sp/patches/patch-include_Attribute_h | 20 +++++++++----------
 textproc/sp/patches/patch-include_config_h    | 11 +++++++---
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile
index ecbf9cee1a5..baac75ea574 100644
--- a/textproc/sp/Makefile
+++ b/textproc/sp/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2004/12/07 00:23:23 alek Exp $
+# $OpenBSD: Makefile,v 1.18 2005/08/10 09:59:13 espie Exp $
 
 COMMENT=	"OO toolkit for SGML parsing and entity management"
 
 DISTNAME=	sp-1.3.4
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	textproc
 HOMEPAGE=	http://www.jclark.com/sp/
 
diff --git a/textproc/sp/patches/patch-include_Attribute_h b/textproc/sp/patches/patch-include_Attribute_h
index 9cdd37a75db..f11d6202193 100644
--- a/textproc/sp/patches/patch-include_Attribute_h
+++ b/textproc/sp/patches/patch-include_Attribute_h
@@ -1,6 +1,6 @@
-$OpenBSD: patch-include_Attribute_h,v 1.1 2004/01/14 20:24:31 naddy Exp $
---- include/Attribute.h.orig	2004-01-14 21:09:00.000000000 +0100
-+++ include/Attribute.h	2004-01-14 21:10:44.000000000 +0100
+$OpenBSD: patch-include_Attribute_h,v 1.2 2005/08/10 09:59:13 espie Exp $
+--- include/Attribute.h.orig	Tue Dec 16 09:49:29 1997
++++ include/Attribute.h	Wed Aug 10 11:43:30 2005
 @@ -31,6 +31,27 @@ class AttributeSemantics;
  class AttributeContext;
  class Syntax;
@@ -29,10 +29,12 @@ $OpenBSD: patch-include_Attribute_h,v 1.1 2004/01/14 20:24:31 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/01/14 20:24:31 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/sp/patches/patch-include_config_h b/textproc/sp/patches/patch-include_config_h
index 95dfb2bda2e..4e76d11dda0 100644
--- a/textproc/sp/patches/patch-include_config_h
+++ b/textproc/sp/patches/patch-include_config_h
@@ -1,12 +1,17 @@
-$OpenBSD: patch-include_config_h,v 1.1 2002/10/16 00:49:04 naddy Exp $
+$OpenBSD: patch-include_config_h,v 1.2 2005/08/10 09:59:13 espie Exp $
 --- include/config.h.orig	Wed Oct 13 07:02:46 1999
-+++ include/config.h	Wed Oct 16 02:07:51 2002
-@@ -26,7 +26,7 @@
++++ include/config.h	Wed Aug 10 11:47:51 2005
+@@ -26,8 +26,12 @@
  #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
++#define SP_HAVE_PLACEMENT_OPERATOR_DELETE
  #endif
  
+ #endif /* __GNUG__ */