Index: head/textproc/jade/files/patch-lib_instmac.m4 =================================================================== --- head/textproc/jade/files/patch-lib_instmac.m4 (revision 458646) +++ head/textproc/jade/files/patch-lib_instmac.m4 (nonexistent) @@ -1,11 +0,0 @@ ---- lib/instmac.m4.orig 1998-10-01 05:13:24 UTC -+++ lib/instmac.m4 -@@ -75,7 +75,7 @@ __undefine(`translit')__dnl - __undefine(`undefine')__dnl - __undefine(`undivert')__dnl - __undefine(`unix')__dnl --__dnl __changequote(,)__dnl disable quoting -+__dnl __changequote(,)__dnl - - #ifdef SP_NAMESPACE - } Property changes on: head/textproc/jade/files/patch-lib_instmac.m4 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-jade_TransformFOTBuilder.cxx =================================================================== --- head/textproc/jade/files/patch-jade_TransformFOTBuilder.cxx (revision 458646) +++ head/textproc/jade/files/patch-jade_TransformFOTBuilder.cxx (nonexistent) @@ -1,54 +0,0 @@ ---- jade/TransformFOTBuilder.cxx.orig 1998-10-01 05:14:52 UTC -+++ jade/TransformFOTBuilder.cxx -@@ -41,6 +41,7 @@ class TransformFOTBuilder : public SerialFOTBuilder { - }; - class EntityRefFlowObj : public TransformExtensionFlowObj { - public: -+ EntityRefFlowObj() {} - void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { - fotb.entityRef(name_); - } -@@ -56,6 +57,7 @@ class TransformFOTBuilder : public SerialFOTBuilder { - }; - class ProcessingInstructionFlowObj : public TransformExtensionFlowObj { - public: -+ ProcessingInstructionFlowObj() {} - void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { - fotb.processingInstruction(data_); - } -@@ -98,6 +100,8 @@ class TransformFOTBuilder : public SerialFOTBuilder { - } - } - ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); } -+ public: -+ EmptyElementFlowObj() {} - private: - ElementNIC nic_; - }; -@@ -133,6 +137,8 @@ class TransformFOTBuilder : public SerialFOTBuilder { - } - } - ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); } -+ public: -+ ElementFlowObj() {} - private: - ElementNIC nic_; - }; -@@ -150,6 +156,8 @@ class TransformFOTBuilder : public SerialFOTBuilder { - value.convertString(systemId_); - } - ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); } -+ public: -+ EntityFlowObj() {}; - private: - StringC systemId_; - }; -@@ -174,6 +182,8 @@ class TransformFOTBuilder : public SerialFOTBuilder { - } - } - ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); } -+ public: -+ DocumentTypeFlowObj() {} - private: - DocumentTypeNIC nic_; - }; Property changes on: head/textproc/jade/files/patch-jade_TransformFOTBuilder.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-include_Ptr.cxx =================================================================== --- head/textproc/jade/files/patch-include_Ptr.cxx (revision 458646) +++ head/textproc/jade/files/patch-include_Ptr.cxx (nonexistent) @@ -1,11 +0,0 @@ ---- include/Ptr.cxx.orig 1998-10-07 05:15:50 UTC -+++ include/Ptr.cxx -@@ -19,7 +19,7 @@ template - Ptr::~Ptr() - { - if (ptr_) { -- if (ptr_->unref()) -+ if (((Resource*)ptr_)->unref()) - delete ptr_; - ptr_ = 0; - } Property changes on: head/textproc/jade/files/patch-include_Ptr.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-lib_assert.cxx =================================================================== --- head/textproc/jade/files/patch-lib_assert.cxx (revision 458646) +++ head/textproc/jade/files/patch-lib_assert.cxx (nonexistent) @@ -1,11 +0,0 @@ ---- lib/assert.cxx.orig 1998-10-07 05:15:50 UTC -+++ lib/assert.cxx -@@ -6,7 +6,7 @@ - #include "macros.h" - - #ifdef __GNUG__ --void exit (int __status) __THROW __attribute__ ((__noreturn__)); -+//void exit (int) __attribute__ ((__noreturn__)); - #endif - - #ifdef SP_NAMESPACE Property changes on: head/textproc/jade/files/patch-lib_assert.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-lib_CharsetRegistry.cxx =================================================================== --- head/textproc/jade/files/patch-lib_CharsetRegistry.cxx (revision 458646) +++ head/textproc/jade/files/patch-lib_CharsetRegistry.cxx (nonexistent) @@ -1,20 +0,0 @@ ---- lib/CharsetRegistry.cxx.orig 1998-10-07 05:15:52 UTC -+++ lib/CharsetRegistry.cxx -@@ -164,6 +164,9 @@ static const unsigned short iso8859_8[] = { - static const unsigned short iso8859_9[] = { - #include "iso8859-9.h" - }; -+static const unsigned short koi8_r[] = { -+#include "koi8-r.h" -+}; - static const unsigned short iso646_jis_G0[] = { - #include "iso646-jis.h" - }; -@@ -203,6 +206,7 @@ static const struct { - { CharsetRegistry::ISO8859_7, iso8859_7 }, - { CharsetRegistry::ISO8859_8, iso8859_8 }, - { CharsetRegistry::ISO8859_9, iso8859_9 }, -+ { CharsetRegistry::KOI8_R, koi8_r }, - { CharsetRegistry::ISO646_JIS_G0, iso646_jis_G0 }, - { CharsetRegistry::JIS0201, jis0201 }, - #ifdef SP_MULTI_BYTE Property changes on: head/textproc/jade/files/patch-lib_CharsetRegistry.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-include_config.h =================================================================== --- head/textproc/jade/files/patch-include_config.h (revision 458646) +++ head/textproc/jade/files/patch-include_config.h (nonexistent) @@ -1,13 +0,0 @@ ---- include/config.h.orig 1998-10-09 05:08:54 UTC -+++ include/config.h -@@ -30,6 +30,10 @@ - #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8) - #define SP_ANSI_LIB - #undef SP_NEW_H_MISSING -+#if __GNUC__ > 2 -+#define SP_HAVE_TYPENAME -+#undef SP_NO_STD_NAMESPACE -+#endif - #endif - #if (__GNUC__ == 2 && __GNUC_MINOR__ >= 8) - #define SP_NO_STD_NAMESPACE Property changes on: head/textproc/jade/files/patch-include_config.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-include_koi8-r.h =================================================================== --- head/textproc/jade/files/patch-include_koi8-r.h (revision 458646) +++ head/textproc/jade/files/patch-include_koi8-r.h (nonexistent) @@ -1,18 +0,0 @@ ---- /dev/null 1970-01-01 00:00:00 UTC -+++ include/koi8-r.h -@@ -0,0 +1,15 @@ -+/* KOI8-R (GR only) */ -+96, 0x0020, -+0x2550, 0x2551, 0x2552, 0x0451, 0x2553, 0x2554, 0x2555, 0x2556, -+0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x255c, 0x255d, 0x255e, -+0x255f, 0x2560, 0x2561, 0x0401, 0x2562, 0x2563, 0x2564, 0x2565, -+0x2566, 0x2567, 0x2568, 0x2569, 0x256a, 0x256b, 0x256c, 0x00a9, -+0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, -+0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, -+0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, -+0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, -+0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, -+0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, -+0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, -+0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a, -+0 Property changes on: head/textproc/jade/files/patch-include_koi8-r.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-jade_TeXFOTBuilder.cxx =================================================================== --- head/textproc/jade/files/patch-jade_TeXFOTBuilder.cxx (revision 458646) +++ head/textproc/jade/files/patch-jade_TeXFOTBuilder.cxx (nonexistent) @@ -1,20 +0,0 @@ ---- jade/TeXFOTBuilder.cxx.orig 1998-10-07 05:16:34 UTC -+++ jade/TeXFOTBuilder.cxx -@@ -83,6 +83,8 @@ class TeXFOTBuilder : public SerialFOTBuilder { (publi - value.convertString(nic_.placement); - } - ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); } -+ public: -+ PageFloatFlowObj() {} - private: - PageFloatNIC nic_; - StringC name_; -@@ -96,6 +98,8 @@ class TeXFOTBuilder : public SerialFOTBuilder { (publi - fotb.endPageFootnote(); - } - ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); } -+ public: -+ PageFootnoteFlowObj() {} - private: - }; - ////////////////////////////////////////////////////////////////////// Property changes on: head/textproc/jade/files/patch-jade_TeXFOTBuilder.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-include_Ptr.h =================================================================== --- head/textproc/jade/files/patch-include_Ptr.h (revision 458646) +++ head/textproc/jade/files/patch-include_Ptr.h (nonexistent) @@ -1,21 +0,0 @@ ---- include/Ptr.h.orig 1998-10-07 05:15:50 UTC -+++ include/Ptr.h -@@ -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 -@@ -69,8 +70,8 @@ class ConstPtr : private Ptr { (public) - const T *operator->() const { return Ptr::pointer(); } - const T &operator*() const { return *Ptr::pointer(); } - void swap(ConstPtr &p) { Ptr::swap(p); } -- Ptr::isNull; -- Ptr::clear; -+ using Ptr::isNull; -+ using Ptr::clear; - Boolean operator==(const Ptr &p) const { return Ptr::operator==(p); } - Boolean operator!=(const Ptr &p) const { return Ptr::operator!=(p); } - Boolean operator==(const ConstPtr &p) const { Property changes on: head/textproc/jade/files/patch-include_Ptr.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-lib_CodingSystemKit.cxx =================================================================== --- head/textproc/jade/files/patch-lib_CodingSystemKit.cxx (revision 458646) +++ head/textproc/jade/files/patch-lib_CodingSystemKit.cxx (nonexistent) @@ -1,62 +0,0 @@ ---- lib/CodingSystemKit.cxx.orig 1998-10-01 05:13:22 UTC -+++ lib/CodingSystemKit.cxx -@@ -74,7 +74,8 @@ class CodingSystemKitImpl : public CodingSystemKit { ( - iso8859_6, - iso8859_7, - iso8859_8, -- iso8859_9 -+ iso8859_9, -+ koi8_r - }; - struct Entry { - const char *name; -@@ -111,6 +112,7 @@ class CodingSystemKitImpl : public CodingSystemKit { ( - TranslateCodingSystem iso8859_7CodingSystem_; - TranslateCodingSystem iso8859_8CodingSystem_; - TranslateCodingSystem iso8859_9CodingSystem_; -+ TranslateCodingSystem koi8_rCodingSystem_; - #ifdef WIN32 - Win32CodingSystem ansiCodingSystem_; - Win32CodingSystem oemCodingSystem_; -@@ -246,6 +248,15 @@ static const TranslateCodingSystem::Desc iso8859_9Desc - { CharsetRegistry::UNREGISTERED, 0x0 } - }; - -+static const TranslateCodingSystem::Desc koi8_rDesc[] = { -+ { CharsetRegistry::ISO646_C0, 0x0 }, -+ { CharsetRegistry::ISO646_ASCII_G0, 0x0 }, -+ // FIXME: only GR part of KOI8-R is handled (i.e. 160..255) -+ // since koi8-r does not follow ISO control/graphic model -+ { CharsetRegistry::KOI8_R, 0x80 }, -+ { CharsetRegistry::UNREGISTERED, 0x0 } -+}; -+ - #endif /* SP_MULTI_BYTE */ - - const CodingSystemKitImpl::Entry CodingSystemKitImpl::bctfTable_[] = { -@@ -292,6 +303,8 @@ const CodingSystemKitImpl::Entry CodingSystemKitImpl:: - { "ISO-8859-8", iso8859_8 }, - { "IS8859-9", iso8859_9 }, - { "ISO-8859-9", iso8859_9 }, -+ { "KOI8-R", koi8_r }, // RFC 1489 -+ { "KOI8", koi8_r }, - { "EUC-JP", eucjp }, - { "EUC-CN", euccn }, - { "GB2312", euccn }, -@@ -324,6 +337,7 @@ CodingSystemKitImpl::CodingSystemKitImpl(const Transla - iso8859_7CodingSystem_(&identityCodingSystem_, iso8859_7Desc, &systemCharset_, 0x100, unicodeReplaceChar), - iso8859_8CodingSystem_(&identityCodingSystem_, iso8859_8Desc, &systemCharset_, 0x100, unicodeReplaceChar), - iso8859_9CodingSystem_(&identityCodingSystem_, iso8859_9Desc, &systemCharset_, 0x100, unicodeReplaceChar), -+ koi8_rCodingSystem_(&identityCodingSystem_, koi8_rDesc, &systemCharset_, 0x100, unicodeReplaceChar), - eucjpCodingSystem_(&eucBctf_, jis2Desc, &systemCharset_, 0x8000, unicodeReplaceChar), - euccnCodingSystem_(&eucBctf_, gbDesc, &systemCharset_, 0x8000, unicodeReplaceChar), - euckrCodingSystem_(&eucBctf_, kscDesc, &systemCharset_, 0x8000, unicodeReplaceChar), -@@ -472,6 +486,8 @@ CodingSystemKitImpl::makeCodingSystem(CodingSystemId i - return &iso8859_8CodingSystem_; - case iso8859_9: - return &iso8859_9CodingSystem_; -+ case koi8_r: -+ return &koi8_rCodingSystem_; - case xml: - return &xmlCodingSystem_; - #ifdef WIN32 Property changes on: head/textproc/jade/files/patch-lib_CodingSystemKit.cxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-include_CharsetRegistry.h =================================================================== --- head/textproc/jade/files/patch-include_CharsetRegistry.h (revision 458646) +++ head/textproc/jade/files/patch-include_CharsetRegistry.h (nonexistent) @@ -1,10 +0,0 @@ ---- include/CharsetRegistry.h.orig 1998-10-07 05:15:50 UTC -+++ include/CharsetRegistry.h -@@ -45,6 +45,7 @@ class SP_API CharsetRegistry { (public) - GB2312 = 58, - ISO10646_UCS2 = 176, - ISO10646_UCS4 = 177, -+ KOI8_R = 65534, // not registered - BIG5 = 65535 // not registered - }; - static ISORegistrationNumber getRegistrationNumber(const StringC &desig, Property changes on: head/textproc/jade/files/patch-include_CharsetRegistry.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-pubtext_koi8r.dcl =================================================================== --- head/textproc/jade/files/patch-pubtext_koi8r.dcl (revision 458646) +++ head/textproc/jade/files/patch-pubtext_koi8r.dcl (nonexistent) @@ -1,239 +0,0 @@ ---- /dev/null 1970-01-01 00:00:00 UTC -+++ pubtext/koi8r.dcl -@@ -0,0 +1,236 @@ -+ Property changes on: head/textproc/jade/files/patch-pubtext_koi8r.dcl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-Ptr.h =================================================================== --- head/textproc/jade/files/patch-Ptr.h (nonexistent) +++ head/textproc/jade/files/patch-Ptr.h (revision 458647) @@ -0,0 +1,21 @@ +--- include/Ptr.h.orig Wed Oct 7 14:15:50 1998 ++++ include/Ptr.h Tue Jul 22 09:19:49 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 +@@ -69,8 +70,8 @@ class ConstPtr : private Ptr { (public) + const T *operator->() const { return Ptr::pointer(); } + const T &operator*() const { return *Ptr::pointer(); } + void swap(ConstPtr &p) { Ptr::swap(p); } +- Ptr::isNull; +- Ptr::clear; ++ using Ptr::isNull; ++ using Ptr::clear; + Boolean operator==(const Ptr &p) const { return Ptr::operator==(p); } + Boolean operator!=(const Ptr &p) const { return Ptr::operator!=(p); } + Boolean operator==(const ConstPtr &p) const { Property changes on: head/textproc/jade/files/patch-Ptr.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-lib_Parser.h =================================================================== --- head/textproc/jade/files/patch-lib_Parser.h (revision 458646) +++ head/textproc/jade/files/patch-lib_Parser.h (revision 458647) @@ -1,27 +1,27 @@ ---- lib/Parser.h.orig 1998-10-01 05:13:28 UTC +--- lib/Parser.h~ 1998-10-01 05:13:28 UTC +++ lib/Parser.h @@ -62,15 +62,15 @@ class Parser : private ParserState { (public) Parser(const SgmlParser::Params &); Event *nextEvent(); void parseAll(EventHandler &, const volatile sig_atomic_t *cancelPtr); - ParserState::sdPointer; - ParserState::instanceSyntaxPointer; - ParserState::prologSyntaxPointer; - ParserState::activateLinkType; - ParserState::allLinkTypesActivated; - ParserState::entityManager; - ParserState::entityCatalog; - ParserState::baseDtd; - ParserState::options; + using ParserState::sdPointer; + using ParserState::instanceSyntaxPointer; + using ParserState::prologSyntaxPointer; + using ParserState::activateLinkType; + using ParserState::allLinkTypesActivated; + using ParserState::entityManager; + using ParserState::entityCatalog; + using ParserState::baseDtd; + using ParserState::options; private: Parser(const Parser &); // undefined void operator=(const Parser &); // undefined Index: head/textproc/jade/files/patch-TeXFOTBuilder.cxx =================================================================== --- head/textproc/jade/files/patch-TeXFOTBuilder.cxx (nonexistent) +++ head/textproc/jade/files/patch-TeXFOTBuilder.cxx (revision 458647) @@ -0,0 +1,20 @@ +--- jade/TeXFOTBuilder.cxx.orig 2011-09-24 14:17:02.000000000 +0000 ++++ jade/TeXFOTBuilder.cxx 2011-09-24 14:19:42.000000000 +0000 +@@ -83,6 +83,8 @@ + value.convertString(nic_.placement); + } + ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); } ++ public: ++ PageFloatFlowObj() {} + private: + PageFloatNIC nic_; + StringC name_; +@@ -96,6 +98,8 @@ + fotb.endPageFootnote(); + } + ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); } ++ public: ++ PageFootnoteFlowObj() {} + private: + }; + ////////////////////////////////////////////////////////////////////// Property changes on: head/textproc/jade/files/patch-TeXFOTBuilder.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-TransformFOTBuilder.cxx =================================================================== --- head/textproc/jade/files/patch-TransformFOTBuilder.cxx (nonexistent) +++ head/textproc/jade/files/patch-TransformFOTBuilder.cxx (revision 458647) @@ -0,0 +1,54 @@ +--- jade/TransformFOTBuilder.cxx.orig 2011-09-24 14:20:28.000000000 +0000 ++++ jade/TransformFOTBuilder.cxx 2011-09-24 14:22:32.000000000 +0000 +@@ -41,6 +41,7 @@ + }; + class EntityRefFlowObj : public TransformExtensionFlowObj { + public: ++ EntityRefFlowObj() {} + void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { + fotb.entityRef(name_); + } +@@ -56,6 +57,7 @@ + }; + class ProcessingInstructionFlowObj : public TransformExtensionFlowObj { + public: ++ ProcessingInstructionFlowObj() {} + void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { + fotb.processingInstruction(data_); + } +@@ -98,6 +100,8 @@ + } + } + ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); } ++ public: ++ EmptyElementFlowObj() {} + private: + ElementNIC nic_; + }; +@@ -133,6 +137,8 @@ + } + } + ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); } ++ public: ++ ElementFlowObj() {} + private: + ElementNIC nic_; + }; +@@ -150,6 +156,8 @@ + value.convertString(systemId_); + } + ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); } ++ public: ++ EntityFlowObj() {}; + private: + StringC systemId_; + }; +@@ -174,6 +182,8 @@ + } + } + ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); } ++ public: ++ DocumentTypeFlowObj() {} + private: + DocumentTypeNIC nic_; + }; Property changes on: head/textproc/jade/files/patch-TransformFOTBuilder.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-lib__instmac.m4 =================================================================== --- head/textproc/jade/files/patch-lib__instmac.m4 (nonexistent) +++ head/textproc/jade/files/patch-lib__instmac.m4 (revision 458647) @@ -0,0 +1,19 @@ +*** lib/instmac.m4.orig Sun Jul 6 20:20:04 1997 +--- lib/instmac.m4 Sun Jul 6 20:20:54 1997 +*************** +*** 75,81 **** + __undefine(`undefine')__dnl + __undefine(`undivert')__dnl + __undefine(`unix')__dnl +! __dnl __changequote(,)__dnl disable quoting + + #ifdef SP_NAMESPACE + } +--- 75,81 ---- + __undefine(`undefine')__dnl + __undefine(`undivert')__dnl + __undefine(`unix')__dnl +! __dnl __changequote(,)__dnl + + #ifdef SP_NAMESPACE + } Property changes on: head/textproc/jade/files/patch-lib__instmac.m4 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-CharsetRegistry.cxx =================================================================== --- head/textproc/jade/files/patch-CharsetRegistry.cxx (nonexistent) +++ head/textproc/jade/files/patch-CharsetRegistry.cxx (revision 458647) @@ -0,0 +1,20 @@ +--- lib/CharsetRegistry.cxx.orig Sat Jul 31 17:03:07 2004 ++++ lib/CharsetRegistry.cxx Sat Jul 31 17:05:46 2004 +@@ -164,6 +164,9 @@ + static const unsigned short iso8859_9[] = { + #include "iso8859-9.h" + }; ++static const unsigned short koi8_r[] = { ++#include "koi8-r.h" ++}; + static const unsigned short iso646_jis_G0[] = { + #include "iso646-jis.h" + }; +@@ -203,6 +206,7 @@ + { CharsetRegistry::ISO8859_7, iso8859_7 }, + { CharsetRegistry::ISO8859_8, iso8859_8 }, + { CharsetRegistry::ISO8859_9, iso8859_9 }, ++ { CharsetRegistry::KOI8_R, koi8_r }, + { CharsetRegistry::ISO646_JIS_G0, iso646_jis_G0 }, + { CharsetRegistry::JIS0201, jis0201 }, + #ifdef SP_MULTI_BYTE Property changes on: head/textproc/jade/files/patch-CharsetRegistry.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-CharsetRegistry.h =================================================================== --- head/textproc/jade/files/patch-CharsetRegistry.h (nonexistent) +++ head/textproc/jade/files/patch-CharsetRegistry.h (revision 458647) @@ -0,0 +1,10 @@ +--- include/CharsetRegistry.h.orig Sat Jul 31 17:02:57 2004 ++++ include/CharsetRegistry.h Sat Jul 31 17:05:32 2004 +@@ -45,6 +45,7 @@ + GB2312 = 58, + ISO10646_UCS2 = 176, + ISO10646_UCS4 = 177, ++ KOI8_R = 65534, // not registered + BIG5 = 65535 // not registered + }; + static ISORegistrationNumber getRegistrationNumber(const StringC &desig, Property changes on: head/textproc/jade/files/patch-CharsetRegistry.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-CodingSystemKit.cxx =================================================================== --- head/textproc/jade/files/patch-CodingSystemKit.cxx (nonexistent) +++ head/textproc/jade/files/patch-CodingSystemKit.cxx (revision 458647) @@ -0,0 +1,62 @@ +--- lib/CodingSystemKit.cxx.orig Sat Jul 31 17:03:29 2004 ++++ lib/CodingSystemKit.cxx Sat Jul 31 17:08:59 2004 +@@ -74,7 +74,8 @@ + iso8859_6, + iso8859_7, + iso8859_8, +- iso8859_9 ++ iso8859_9, ++ koi8_r + }; + struct Entry { + const char *name; +@@ -111,6 +112,7 @@ + TranslateCodingSystem iso8859_7CodingSystem_; + TranslateCodingSystem iso8859_8CodingSystem_; + TranslateCodingSystem iso8859_9CodingSystem_; ++ TranslateCodingSystem koi8_rCodingSystem_; + #ifdef WIN32 + Win32CodingSystem ansiCodingSystem_; + Win32CodingSystem oemCodingSystem_; +@@ -246,6 +248,15 @@ + { CharsetRegistry::UNREGISTERED, 0x0 } + }; + ++static const TranslateCodingSystem::Desc koi8_rDesc[] = { ++ { CharsetRegistry::ISO646_C0, 0x0 }, ++ { CharsetRegistry::ISO646_ASCII_G0, 0x0 }, ++ // FIXME: only GR part of KOI8-R is handled (i.e. 160..255) ++ // since koi8-r does not follow ISO control/graphic model ++ { CharsetRegistry::KOI8_R, 0x80 }, ++ { CharsetRegistry::UNREGISTERED, 0x0 } ++}; ++ + #endif /* SP_MULTI_BYTE */ + + const CodingSystemKitImpl::Entry CodingSystemKitImpl::bctfTable_[] = { +@@ -292,6 +303,8 @@ + { "ISO-8859-8", iso8859_8 }, + { "IS8859-9", iso8859_9 }, + { "ISO-8859-9", iso8859_9 }, ++ { "KOI8-R", koi8_r }, // RFC 1489 ++ { "KOI8", koi8_r }, + { "EUC-JP", eucjp }, + { "EUC-CN", euccn }, + { "GB2312", euccn }, +@@ -324,6 +337,7 @@ + iso8859_7CodingSystem_(&identityCodingSystem_, iso8859_7Desc, &systemCharset_, 0x100, unicodeReplaceChar), + iso8859_8CodingSystem_(&identityCodingSystem_, iso8859_8Desc, &systemCharset_, 0x100, unicodeReplaceChar), + iso8859_9CodingSystem_(&identityCodingSystem_, iso8859_9Desc, &systemCharset_, 0x100, unicodeReplaceChar), ++ koi8_rCodingSystem_(&identityCodingSystem_, koi8_rDesc, &systemCharset_, 0x100, unicodeReplaceChar), + eucjpCodingSystem_(&eucBctf_, jis2Desc, &systemCharset_, 0x8000, unicodeReplaceChar), + euccnCodingSystem_(&eucBctf_, gbDesc, &systemCharset_, 0x8000, unicodeReplaceChar), + euckrCodingSystem_(&eucBctf_, kscDesc, &systemCharset_, 0x8000, unicodeReplaceChar), +@@ -472,6 +486,8 @@ + return &iso8859_8CodingSystem_; + case iso8859_9: + return &iso8859_9CodingSystem_; ++ case koi8_r: ++ return &koi8_rCodingSystem_; + case xml: + return &xmlCodingSystem_; + #ifdef WIN32 Property changes on: head/textproc/jade/files/patch-CodingSystemKit.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-Makefile.in =================================================================== --- head/textproc/jade/files/patch-Makefile.in (revision 458646) +++ head/textproc/jade/files/patch-Makefile.in (revision 458647) @@ -1,10 +1,6 @@ ---- Makefile.in.orig 1998-10-13 02:11:06 UTC -+++ Makefile.in -@@ -14,6 +14,7 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - srcdir=@srcdir@ +--- Makefile.in.orig 1998-10-12 21:11:06.000000000 -0500 ++++ Makefile.in 2011-02-15 16:18:41.000000000 -0600 +@@ -16,2 +16,3 @@ bindir=@bindir@ +libdir=@libdir@ - # needed by libtool - top_builddir=$(TOP) Index: head/textproc/jade/files/patch-Ptr.cxx =================================================================== --- head/textproc/jade/files/patch-Ptr.cxx (nonexistent) +++ head/textproc/jade/files/patch-Ptr.cxx (revision 458647) @@ -0,0 +1,11 @@ +--- include/Ptr.cxx.orig Tue Jul 22 09:20:15 2003 ++++ include/Ptr.cxx Tue Jul 22 09:20:42 2003 +@@ -19,7 +19,7 @@ + Ptr::~Ptr() + { + if (ptr_) { +- if (ptr_->unref()) ++ if (((Resource*)ptr_)->unref()) + delete ptr_; + ptr_ = 0; + } Property changes on: head/textproc/jade/files/patch-Ptr.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-assert.cxx =================================================================== --- head/textproc/jade/files/patch-assert.cxx (nonexistent) +++ head/textproc/jade/files/patch-assert.cxx (revision 458647) @@ -0,0 +1,11 @@ +--- lib/assert.cxx.orig Wed Apr 25 12:42:54 2001 ++++ lib/assert.cxx Wed Apr 25 12:43:26 2001 +@@ -6,7 +6,7 @@ + #include "macros.h" + + #ifdef __GNUG__ +-void exit (int __status) __THROW __attribute__ ((__noreturn__)); ++//void exit (int) __attribute__ ((__noreturn__)); + #endif + + #ifdef SP_NAMESPACE Property changes on: head/textproc/jade/files/patch-assert.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-config.h =================================================================== --- head/textproc/jade/files/patch-config.h (nonexistent) +++ head/textproc/jade/files/patch-config.h (revision 458647) @@ -0,0 +1,13 @@ +--- include/config.h.orig Fri Jun 14 12:58:51 2002 ++++ include/config.h Fri Jun 14 13:01:00 2002 +@@ -31,6 +31,10 @@ + #define SP_ANSI_LIB + #define SP_NO_STD_NAMESPACE + #undef SP_NEW_H_MISSING ++#if __GNUC__ > 2 ++#define SP_HAVE_TYPENAME ++#undef SP_NO_STD_NAMESPACE ++#endif + #endif + + #endif /* __GNUG__ */ Property changes on: head/textproc/jade/files/patch-config.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-koi8-r.h =================================================================== --- head/textproc/jade/files/patch-koi8-r.h (nonexistent) +++ head/textproc/jade/files/patch-koi8-r.h (revision 458647) @@ -0,0 +1,18 @@ +--- /dev/null Sat Jul 31 17:25:08 2004 ++++ include/koi8-r.h Sat Jul 31 17:04:24 2004 +@@ -0,0 +1,15 @@ ++/* KOI8-R (GR only) */ ++96, 0x0020, ++0x2550, 0x2551, 0x2552, 0x0451, 0x2553, 0x2554, 0x2555, 0x2556, ++0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x255c, 0x255d, 0x255e, ++0x255f, 0x2560, 0x2561, 0x0401, 0x2562, 0x2563, 0x2564, 0x2565, ++0x2566, 0x2567, 0x2568, 0x2569, 0x256a, 0x256b, 0x256c, 0x00a9, ++0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, ++0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, ++0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, ++0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, ++0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, ++0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, ++0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, ++0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a, ++0 Property changes on: head/textproc/jade/files/patch-koi8-r.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/jade/files/patch-koi8r.dcl =================================================================== --- head/textproc/jade/files/patch-koi8r.dcl (nonexistent) +++ head/textproc/jade/files/patch-koi8r.dcl (revision 458647) @@ -0,0 +1,239 @@ +--- /dev/null Sat Jul 31 17:25:08 2004 ++++ pubtext/koi8r.dcl Sat Jul 31 17:04:35 2004 +@@ -0,0 +1,236 @@ ++ Property changes on: head/textproc/jade/files/patch-koi8r.dcl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property