View | Details | Raw Unified | Return to bug 223268
Collapse All | Expand All

(-)Makefile (+5 lines)
Lines 16-21 Link Here
16
MAINTAINER=	kuriyama@FreeBSD.org
16
MAINTAINER=	kuriyama@FreeBSD.org
17
COMMENT=	Object-oriented SGML/XML parser toolkit and DSSSL engine
17
COMMENT=	Object-oriented SGML/XML parser toolkit and DSSSL engine
18
18
19
LICENSE=	MITlegacy
20
LICENSE_NAME=	Old version of MIT license
21
LICENSE_FILE=	${WRKSRC}/COPYING
22
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
23
19
RUN_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr
24
RUN_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr
20
25
21
CONFLICTS=	sp-1.*
26
CONFLICTS=	sp-1.*
(-)files/patch-CharsetRegistry.cxx (-4 / +4 lines)
Lines 1-6 Link Here
1
--- lib/CharsetRegistry.cxx.orig	Sat Jul 31 17:03:07 2004
1
--- lib/CharsetRegistry.cxx.orig	1998-10-07 05:15:52 UTC
2
+++ lib/CharsetRegistry.cxx	Sat Jul 31 17:05:46 2004
2
+++ lib/CharsetRegistry.cxx
3
@@ -164,6 +164,9 @@
3
@@ -164,6 +164,9 @@ static const unsigned short iso8859_8[] 
4
 static const unsigned short iso8859_9[] = {
4
 static const unsigned short iso8859_9[] = {
5
 #include "iso8859-9.h"
5
 #include "iso8859-9.h"
6
 };
6
 };
Lines 10-16 Link Here
10
 static const unsigned short iso646_jis_G0[] = {
10
 static const unsigned short iso646_jis_G0[] = {
11
 #include "iso646-jis.h"
11
 #include "iso646-jis.h"
12
 };
12
 };
13
@@ -203,6 +206,7 @@
13
@@ -203,6 +206,7 @@ static const struct {
14
   { CharsetRegistry::ISO8859_7, iso8859_7 },
14
   { CharsetRegistry::ISO8859_7, iso8859_7 },
15
   { CharsetRegistry::ISO8859_8, iso8859_8 },
15
   { CharsetRegistry::ISO8859_8, iso8859_8 },
16
   { CharsetRegistry::ISO8859_9, iso8859_9 },
16
   { CharsetRegistry::ISO8859_9, iso8859_9 },
(-)files/patch-CharsetRegistry.h (-3 / +3 lines)
Lines 1-6 Link Here
1
--- include/CharsetRegistry.h.orig	Sat Jul 31 17:02:57 2004
1
--- include/CharsetRegistry.h.orig	1998-10-07 05:15:50 UTC
2
+++ include/CharsetRegistry.h	Sat Jul 31 17:05:32 2004
2
+++ include/CharsetRegistry.h
3
@@ -45,6 +45,7 @@
3
@@ -45,6 +45,7 @@ public:
4
     GB2312 = 58,
4
     GB2312 = 58,
5
     ISO10646_UCS2 = 176,
5
     ISO10646_UCS2 = 176,
6
     ISO10646_UCS4 = 177,
6
     ISO10646_UCS4 = 177,
(-)files/patch-CodingSystemKit.cxx (-8 / +8 lines)
Lines 1-6 Link Here
1
--- lib/CodingSystemKit.cxx.orig	Sat Jul 31 17:03:29 2004
1
--- lib/CodingSystemKit.cxx.orig	1998-10-01 05:13:22 UTC
2
+++ lib/CodingSystemKit.cxx	Sat Jul 31 17:08:59 2004
2
+++ lib/CodingSystemKit.cxx
3
@@ -74,7 +74,8 @@
3
@@ -74,7 +74,8 @@ public:
4
     iso8859_6,
4
     iso8859_6,
5
     iso8859_7,
5
     iso8859_7,
6
     iso8859_8,
6
     iso8859_8,
Lines 10-16 Link Here
10
   };
10
   };
11
   struct Entry {
11
   struct Entry {
12
     const char *name;
12
     const char *name;
13
@@ -111,6 +112,7 @@
13
@@ -111,6 +112,7 @@ private:
14
   TranslateCodingSystem iso8859_7CodingSystem_;
14
   TranslateCodingSystem iso8859_7CodingSystem_;
15
   TranslateCodingSystem iso8859_8CodingSystem_;
15
   TranslateCodingSystem iso8859_8CodingSystem_;
16
   TranslateCodingSystem iso8859_9CodingSystem_;
16
   TranslateCodingSystem iso8859_9CodingSystem_;
Lines 18-24 Link Here
18
 #ifdef WIN32
18
 #ifdef WIN32
19
   Win32CodingSystem ansiCodingSystem_;
19
   Win32CodingSystem ansiCodingSystem_;
20
   Win32CodingSystem oemCodingSystem_;
20
   Win32CodingSystem oemCodingSystem_;
21
@@ -246,6 +248,15 @@
21
@@ -246,6 +248,15 @@ static const TranslateCodingSystem::Desc
22
   { CharsetRegistry::UNREGISTERED, 0x0 }
22
   { CharsetRegistry::UNREGISTERED, 0x0 }
23
 };
23
 };
24
 
24
 
Lines 34-40 Link Here
34
 #endif /* SP_MULTI_BYTE */
34
 #endif /* SP_MULTI_BYTE */
35
 
35
 
36
 const CodingSystemKitImpl::Entry CodingSystemKitImpl::bctfTable_[] = {
36
 const CodingSystemKitImpl::Entry CodingSystemKitImpl::bctfTable_[] = {
37
@@ -292,6 +303,8 @@
37
@@ -292,6 +303,8 @@ const CodingSystemKitImpl::Entry CodingS
38
   { "ISO-8859-8", iso8859_8 },
38
   { "ISO-8859-8", iso8859_8 },
39
   { "IS8859-9", iso8859_9 },
39
   { "IS8859-9", iso8859_9 },
40
   { "ISO-8859-9", iso8859_9 },
40
   { "ISO-8859-9", iso8859_9 },
Lines 43-49 Link Here
43
   { "EUC-JP", eucjp },
43
   { "EUC-JP", eucjp },
44
   { "EUC-CN", euccn },
44
   { "EUC-CN", euccn },
45
   { "GB2312", euccn },
45
   { "GB2312", euccn },
46
@@ -324,6 +337,7 @@
46
@@ -324,6 +337,7 @@ CodingSystemKitImpl::CodingSystemKitImpl
47
   iso8859_7CodingSystem_(&identityCodingSystem_, iso8859_7Desc, &systemCharset_, 0x100, unicodeReplaceChar),
47
   iso8859_7CodingSystem_(&identityCodingSystem_, iso8859_7Desc, &systemCharset_, 0x100, unicodeReplaceChar),
48
   iso8859_8CodingSystem_(&identityCodingSystem_, iso8859_8Desc, &systemCharset_, 0x100, unicodeReplaceChar),
48
   iso8859_8CodingSystem_(&identityCodingSystem_, iso8859_8Desc, &systemCharset_, 0x100, unicodeReplaceChar),
49
   iso8859_9CodingSystem_(&identityCodingSystem_, iso8859_9Desc, &systemCharset_, 0x100, unicodeReplaceChar),
49
   iso8859_9CodingSystem_(&identityCodingSystem_, iso8859_9Desc, &systemCharset_, 0x100, unicodeReplaceChar),
Lines 51-57 Link Here
51
   eucjpCodingSystem_(&eucBctf_, jis2Desc, &systemCharset_, 0x8000, unicodeReplaceChar),
51
   eucjpCodingSystem_(&eucBctf_, jis2Desc, &systemCharset_, 0x8000, unicodeReplaceChar),
52
   euccnCodingSystem_(&eucBctf_, gbDesc, &systemCharset_, 0x8000, unicodeReplaceChar),
52
   euccnCodingSystem_(&eucBctf_, gbDesc, &systemCharset_, 0x8000, unicodeReplaceChar),
53
   euckrCodingSystem_(&eucBctf_, kscDesc, &systemCharset_, 0x8000, unicodeReplaceChar),
53
   euckrCodingSystem_(&eucBctf_, kscDesc, &systemCharset_, 0x8000, unicodeReplaceChar),
54
@@ -472,6 +486,8 @@
54
@@ -472,6 +486,8 @@ CodingSystemKitImpl::makeCodingSystem(Co
55
     return &iso8859_8CodingSystem_;
55
     return &iso8859_8CodingSystem_;
56
   case iso8859_9:
56
   case iso8859_9:
57
     return &iso8859_9CodingSystem_;
57
     return &iso8859_9CodingSystem_;
(-)files/patch-Makefile.in (-3 / +7 lines)
Lines 1-6 Link Here
1
--- Makefile.in.orig	1998-10-12 21:11:06.000000000 -0500
1
--- Makefile.in.orig	2017-10-27 05:44:52 UTC
2
+++ Makefile.in	2011-02-15 16:18:41.000000000 -0600
2
+++ Makefile.in
3
@@ -16,2 +16,3 @@
3
@@ -14,6 +14,7 @@ prefix=@prefix@
4
 exec_prefix=@exec_prefix@
5
 srcdir=@srcdir@
4
 bindir=@bindir@
6
 bindir=@bindir@
5
+libdir=@libdir@
7
+libdir=@libdir@
6
 
8
 
9
 # needed by libtool
10
 top_builddir=$(TOP)
(-)files/patch-Ptr.cxx (-3 / +3 lines)
Lines 1-6 Link Here
1
--- include/Ptr.cxx.orig	Tue Jul 22 09:20:15 2003
1
--- include/Ptr.cxx.orig	1998-10-07 05:15:50 UTC
2
+++ include/Ptr.cxx	Tue Jul 22 09:20:42 2003
2
+++ include/Ptr.cxx
3
@@ -19,7 +19,7 @@
3
@@ -19,7 +19,7 @@ template<class T>
4
 Ptr<T>::~Ptr()
4
 Ptr<T>::~Ptr()
5
 {
5
 {
6
   if (ptr_) {
6
   if (ptr_) {
(-)files/patch-Ptr.h (-2 / +2 lines)
Lines 1-5 Link Here
1
--- include/Ptr.h.orig	Wed Oct  7 14:15:50 1998
1
--- include/Ptr.h.orig	1998-10-07 05:15:50 UTC
2
+++ include/Ptr.h	Tue Jul 22 09:19:49 2003
2
+++ include/Ptr.h
3
@@ -5,6 +5,7 @@
3
@@ -5,6 +5,7 @@
4
 #define Ptr_INCLUDED 1
4
 #define Ptr_INCLUDED 1
5
 
5
 
(-)files/patch-TeXFOTBuilder.cxx (-4 / +4 lines)
Lines 1-6 Link Here
1
--- jade/TeXFOTBuilder.cxx.orig	2011-09-24 14:17:02.000000000 +0000
1
--- jade/TeXFOTBuilder.cxx.orig	2017-10-27 05:44:52 UTC
2
+++ jade/TeXFOTBuilder.cxx	2011-09-24 14:19:42.000000000 +0000
2
+++ jade/TeXFOTBuilder.cxx
3
@@ -83,6 +83,8 @@
3
@@ -83,6 +83,8 @@ public:
4
       value.convertString(nic_.placement);
4
       value.convertString(nic_.placement);
5
       }
5
       }
6
     ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); }
6
     ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); }
Lines 9-15 Link Here
9
   private:
9
   private:
10
     PageFloatNIC nic_;
10
     PageFloatNIC nic_;
11
     StringC name_;
11
     StringC name_;
12
@@ -96,6 +98,8 @@
12
@@ -96,6 +98,8 @@ public:
13
       fotb.endPageFootnote();
13
       fotb.endPageFootnote();
14
     }
14
     }
15
     ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); }
15
     ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); }
(-)files/patch-TransformFOTBuilder.cxx (-8 / +8 lines)
Lines 1-6 Link Here
1
--- jade/TransformFOTBuilder.cxx.orig	2011-09-24 14:20:28.000000000 +0000
1
--- jade/TransformFOTBuilder.cxx.orig	1998-10-01 05:14:52 UTC
2
+++ jade/TransformFOTBuilder.cxx	2011-09-24 14:22:32.000000000 +0000
2
+++ jade/TransformFOTBuilder.cxx
3
@@ -41,6 +41,7 @@
3
@@ -41,6 +41,7 @@ public:
4
   };
4
   };
5
   class EntityRefFlowObj : public TransformExtensionFlowObj {
5
   class EntityRefFlowObj : public TransformExtensionFlowObj {
6
   public:
6
   public:
Lines 8-14 Link Here
8
     void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
8
     void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
9
       fotb.entityRef(name_);
9
       fotb.entityRef(name_);
10
     }
10
     }
11
@@ -56,6 +57,7 @@
11
@@ -56,6 +57,7 @@ public:
12
   };
12
   };
13
   class ProcessingInstructionFlowObj : public TransformExtensionFlowObj {
13
   class ProcessingInstructionFlowObj : public TransformExtensionFlowObj {
14
   public:
14
   public:
Lines 16-22 Link Here
16
     void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
16
     void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
17
       fotb.processingInstruction(data_);
17
       fotb.processingInstruction(data_);
18
     }
18
     }
19
@@ -98,6 +100,8 @@
19
@@ -98,6 +100,8 @@ public:
20
       }
20
       }
21
     }
21
     }
22
     ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); }
22
     ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); }
Lines 25-31 Link Here
25
   private:
25
   private:
26
     ElementNIC nic_;
26
     ElementNIC nic_;
27
   };
27
   };
28
@@ -133,6 +137,8 @@
28
@@ -133,6 +137,8 @@ public:
29
       }
29
       }
30
     }
30
     }
31
     ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); }
31
     ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); }
Lines 34-40 Link Here
34
   private:
34
   private:
35
     ElementNIC nic_;
35
     ElementNIC nic_;
36
   };
36
   };
37
@@ -150,6 +156,8 @@
37
@@ -150,6 +156,8 @@ public:
38
       value.convertString(systemId_);
38
       value.convertString(systemId_);
39
     }
39
     }
40
     ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); }
40
     ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); }
Lines 43-49 Link Here
43
   private:
43
   private:
44
     StringC systemId_;
44
     StringC systemId_;
45
   };
45
   };
46
@@ -174,6 +182,8 @@
46
@@ -174,6 +182,8 @@ public:
47
       }
47
       }
48
     }
48
     }
49
     ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); }
49
     ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); }
(-)files/patch-assert.cxx (-2 / +2 lines)
Lines 1-5 Link Here
1
--- lib/assert.cxx.orig	Wed Apr 25 12:42:54 2001
1
--- lib/assert.cxx.orig	2017-10-27 05:44:53 UTC
2
+++ lib/assert.cxx	Wed Apr 25 12:43:26 2001
2
+++ lib/assert.cxx
3
@@ -6,7 +6,7 @@
3
@@ -6,7 +6,7 @@
4
 #include "macros.h"
4
 #include "macros.h"
5
 
5
 
(-)files/patch-config.h (-6 / +6 lines)
Lines 1-8 Link Here
1
--- include/config.h.orig	Fri Jun 14 12:58:51 2002
1
--- include/config.h.orig	2017-10-27 05:44:53 UTC
2
+++ include/config.h	Fri Jun 14 13:01:00 2002
2
+++ include/config.h
3
@@ -31,6 +31,10 @@
3
@@ -30,6 +30,10 @@
4
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
4
 #define SP_ANSI_LIB
5
 #define SP_ANSI_LIB
5
 #define SP_NO_STD_NAMESPACE
6
 #undef SP_NEW_H_MISSING
6
 #undef SP_NEW_H_MISSING
7
+#if __GNUC__ > 2
7
+#if __GNUC__ > 2
8
+#define SP_HAVE_TYPENAME
8
+#define SP_HAVE_TYPENAME
Lines 9-13 Link Here
9
+#undef SP_NO_STD_NAMESPACE
9
+#undef SP_NO_STD_NAMESPACE
10
+#endif
10
+#endif
11
 #endif
11
 #endif
12
 
12
 #if (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
13
 #endif /* __GNUG__ */
13
 #define SP_NO_STD_NAMESPACE
(-)files/patch-koi8-r.h (-2 / +2 lines)
Lines 1-5 Link Here
1
--- /dev/null	Sat Jul 31 17:25:08 2004
1
--- include/koi8-r.h.orig	2017-10-27 05:44:59 UTC
2
+++ include/koi8-r.h	Sat Jul 31 17:04:24 2004
2
+++ include/koi8-r.h
3
@@ -0,0 +1,15 @@
3
@@ -0,0 +1,15 @@
4
+/* KOI8-R (GR only) */
4
+/* KOI8-R (GR only) */
5
+96, 0x0020,
5
+96, 0x0020,
(-)files/patch-koi8r.dcl (-2 / +2 lines)
Lines 1-5 Link Here
1
--- /dev/null	Sat Jul 31 17:25:08 2004
1
--- pubtext/koi8r.dcl.orig	2017-10-27 05:44:59 UTC
2
+++ pubtext/koi8r.dcl	Sat Jul 31 17:04:35 2004
2
+++ pubtext/koi8r.dcl
3
@@ -0,0 +1,236 @@
3
@@ -0,0 +1,236 @@
4
+		     <!SGML "ISO 8879:1986 (ENR)"
4
+		     <!SGML "ISO 8879:1986 (ENR)"
5
+
5
+
(-)files/patch-lib__instmac.m4 (-19 / +11 lines)
Lines 1-19 Link Here
1
*** lib/instmac.m4.orig	Sun Jul  6 20:20:04 1997
1
--- lib/instmac.m4.orig	1998-10-01 05:13:24 UTC
2
--- lib/instmac.m4	Sun Jul  6 20:20:54 1997
2
+++ lib/instmac.m4
3
***************
3
@@ -75,7 +75,7 @@ __undefine(`translit')__dnl
4
*** 75,81 ****
4
 __undefine(`undefine')__dnl
5
  __undefine(`undefine')__dnl
5
 __undefine(`undivert')__dnl
6
  __undefine(`undivert')__dnl
6
 __undefine(`unix')__dnl
7
  __undefine(`unix')__dnl
7
-__dnl __changequote(,)__dnl disable quoting
8
! __dnl __changequote(,)__dnl disable quoting
8
+__dnl __changequote(,)__dnl
9
  
9
 
10
  #ifdef SP_NAMESPACE
10
 #ifdef SP_NAMESPACE
11
  }
11
 }
12
--- 75,81 ----
13
  __undefine(`undefine')__dnl
14
  __undefine(`undivert')__dnl
15
  __undefine(`unix')__dnl
16
! __dnl __changequote(,)__dnl
17
  
18
  #ifdef SP_NAMESPACE
19
  }

Return to bug 223268