Use another approach for gcc33 taken from sourceforge.

4 files changed, 65 insertions, 22 deletions

diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 67b573a..cbb8217 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	OpenSP
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openjade
diff --git a/textproc/opensp/files/patch-Attribute.h b/textproc/opensp/files/patch-Attribute.h
new file mode 100644
index 0000000..013a3ff
--- /dev/null
+++ b/textproc/opensp/files/patch-Attribute.h
@@ -0,0 +1,64 @@
+--- include/Attribute.h.orig	Fri Mar 10 03:30:56 2000
++++ include/Attribute.h	Tue Aug  5 11:49:19 2003
+@@ -25,12 +25,32 @@
+ class Entity;
+ class Notation;
+ class DeclaredValue;
+-class AttributeValue;
+ class TokenizedAttributeValue;
+ 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() { }
+@@ -378,27 +398,6 @@
+   AttributeSemantics *copy() const;
+ 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 {
diff --git a/textproc/opensp/files/patch-Ptr.cxx b/textproc/opensp/files/patch-Ptr.cxx
deleted file mode 100644
index 400534a..0000000
--- a/textproc/opensp/files/patch-Ptr.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/Ptr.cxx.orig	Fri Jul 18 14:11:13 2003
-+++ include/Ptr.cxx	Fri Jul 18 14:11:32 2003
-@@ -19,7 +19,7 @@
- Ptr<T>::~Ptr()
- {
-   if (ptr_) {
--    if (ptr_->unref())
-+    if (((Resource*)ptr_)->unref())
-       delete ptr_;
-     ptr_ = 0;
-   }
diff --git a/textproc/opensp/files/patch-Ptr.h b/textproc/opensp/files/patch-Ptr.h
deleted file mode 100644
index 9bef362..0000000
--- a/textproc/opensp/files/patch-Ptr.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/Ptr.h.orig	Fri Jul 18 14:11:08 2003
-+++ include/Ptr.h	Fri Jul 18 14:11:22 2003
-@@ -5,6 +5,7 @@
- #define Ptr_INCLUDED 1
- 
- #include "Boolean.h"
-+#include "Resource.h"
- 
- // T must have Resource as a public base class
- // T may be an incomplete type