From c70172c815092b59cfede03ccad9936166f42057 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Wed, 21 Jul 1999 16:54:45 +0000
Subject: [PATCH] Quick and dirty fix for gcc-2.95.

---
 textproc/jade/files/Makefile.inc |  1 +
 textproc/jade/patches/patch-ab   | 56 ++++++++++++++++++++++++++++++++
 textproc/jade/patches/patch-ad   | 11 +++++++
 3 files changed, 68 insertions(+)
 create mode 100644 textproc/jade/patches/patch-ab
 create mode 100644 textproc/jade/patches/patch-ad

diff --git a/textproc/jade/files/Makefile.inc b/textproc/jade/files/Makefile.inc
index a83d36b0608..b789dc0b903 100644
--- a/textproc/jade/files/Makefile.inc
+++ b/textproc/jade/files/Makefile.inc
@@ -38,6 +38,7 @@ DEBUG=
 #   environment variable is unset.  SP now automatically searches for a file
 #   called "catalog" in the same directory as the document entity.
 DEFINES=-DSGML_CATALOG_FILES_DEFAULT=\"${PREFIX}/share/sgml/catalog\"
+DEFINES+=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST
 INCLUDES+=-I. -I${.CURDIR}/../include -I${.CURDIR}/../generic
 CXXFLAGS=-ansi $(DEBUG) $(WARN) $(DEFINES) $(INCLUDES)
 
diff --git a/textproc/jade/patches/patch-ab b/textproc/jade/patches/patch-ab
new file mode 100644
index 00000000000..e4958fd0a48
--- /dev/null
+++ b/textproc/jade/patches/patch-ab
@@ -0,0 +1,56 @@
+--- lib/entmgr_inst.cxx.orig	Wed Jul 21 16:21:12 1999
++++ lib/entmgr_inst.cxx	Wed Jul 21 16:22:00 1999
+@@ -436,7 +436,7 @@
+ #pragma define(Vector<String<EquivCode> >)
+ #else
+ #ifdef SP_ANSI_CLASS_INST
+-template class Vector<String<EquivCode> >;
++//template class Vector<String<EquivCode> >;
+ #else
+ typedef Vector<String<EquivCode> > Dummy_30;
+ #endif
+@@ -566,7 +566,7 @@
+ #pragma define(SharedXcharMap<unsigned char>)
+ #else
+ #ifdef SP_ANSI_CLASS_INST
+-template class SharedXcharMap<unsigned char>;
++//template class SharedXcharMap<unsigned char>;
+ #else
+ typedef SharedXcharMap<unsigned char> Dummy_40;
+ #endif
+@@ -592,7 +592,7 @@
+ #pragma define(String<EquivCode>)
+ #else
+ #ifdef SP_ANSI_CLASS_INST
+-template class String<EquivCode>;
++//template class String<EquivCode>;
+ #else
+ typedef String<EquivCode> Dummy_42;
+ #endif
+@@ -631,7 +631,7 @@
+ #pragma define(XcharMap<unsigned char>)
+ #else
+ #ifdef SP_ANSI_CLASS_INST
+-template class XcharMap<unsigned char>;
++//template class XcharMap<unsigned char>;
+ #else
+ typedef XcharMap<unsigned char> Dummy_45;
+ #endif
+@@ -670,7 +670,7 @@
+ #pragma define(Vector<PackedBoolean>)
+ #else
+ #ifdef SP_ANSI_CLASS_INST
+-template class Vector<PackedBoolean>;
++//template class Vector<PackedBoolean>;
+ #else
+ typedef Vector<PackedBoolean> Dummy_48;
+ #endif
+@@ -683,7 +683,7 @@
+ #pragma define(SubstTable<Char>)
+ #else
+ #ifdef SP_ANSI_CLASS_INST
+-template class SubstTable<Char>;
++//template class SubstTable<Char>;
+ #else
+ typedef SubstTable<Char> Dummy_49;
+ #endif
diff --git a/textproc/jade/patches/patch-ad b/textproc/jade/patches/patch-ad
new file mode 100644
index 00000000000..595263630a2
--- /dev/null
+++ b/textproc/jade/patches/patch-ad
@@ -0,0 +1,11 @@
+--- lib/parser_inst.cxx.orig	Wed Jul 21 16:26:55 1999
++++ lib/parser_inst.cxx	Wed Jul 21 16:27:09 1999
+@@ -1344,7 +1344,7 @@
+ #pragma define(Vector<unsigned int>)
+ #else
+ #ifdef SP_ANSI_CLASS_INST
+-template class Vector<unsigned int>;
++//template class Vector<unsigned int>;
+ #else
+ typedef Vector<unsigned int> Dummy_97;
+ #endif