summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>2000-10-09 15:55:26 +0000
committertv <tv@pkgsrc.org>2000-10-09 15:55:26 +0000
commit19a0aec347afbb724e5b40630477bf9528b4aa80 (patch)
treed927a982c34080818028d64231489b1fed684614 /textproc
parent53df6acd41f3ce68c1999976c664e7d79f34c382 (diff)
downloadpkgsrc-19a0aec347afbb724e5b40630477bf9528b4aa80.tar.gz
Okay, do this the Hard Way. Activate the size_t instantiation block if
one of __alpha__ or __sparc64__ are defined. I'll look into a better fix later.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/sp/files/patch-sum4
-rw-r--r--textproc/sp/patches/patch-ab13
-rw-r--r--textproc/sp/patches/patch-ac12
-rw-r--r--textproc/sp/patches/patch-ad26
4 files changed, 11 insertions, 44 deletions
diff --git a/textproc/sp/files/patch-sum b/textproc/sp/files/patch-sum
index e2386b11f0c..1b6ac04167a 100644
--- a/textproc/sp/files/patch-sum
+++ b/textproc/sp/files/patch-sum
@@ -1,3 +1,5 @@
-$NetBSD: patch-sum,v 1.3 1999/12/16 22:03:13 mjl Exp $
+$NetBSD: patch-sum,v 1.4 2000/10/09 15:55:26 tv Exp $
MD5 (patch-aa) = a048795909d27f4fba5dff7784f62a9e
+MD5 (patch-ac) = d0b5cbd821bf4176d5ac3f443eb55854
+MD5 (patch-ad) = 744987af4349938bce6c7523d3a827ed
diff --git a/textproc/sp/patches/patch-ab b/textproc/sp/patches/patch-ab
deleted file mode 100644
index ae6eb905a51..00000000000
--- a/textproc/sp/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2000/10/07 02:03:24 tv Exp $
-
---- include/SearchResultMessageArg.h.orig Fri Oct 6 21:34:14 2000
-+++ include/SearchResultMessageArg.h Fri Oct 6 21:34:40 2000
-@@ -29,7 +29,7 @@
- int errnum(size_t) const;
- private:
- Vector<StringC> filename_;
-- Vector<unsigned int> errno_;
-+ Vector<size_t> errno_;
- };
-
- inline
diff --git a/textproc/sp/patches/patch-ac b/textproc/sp/patches/patch-ac
index 8024a8e0db0..45913fbfeff 100644
--- a/textproc/sp/patches/patch-ac
+++ b/textproc/sp/patches/patch-ac
@@ -1,15 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2000/10/07 02:03:24 tv Exp $
+$NetBSD: patch-ac,v 1.2 2000/10/09 15:55:27 tv Exp $
--- lib/parser_inst.m4.orig Fri Oct 6 21:36:27 2000
+++ lib/parser_inst.m4 Fri Oct 6 21:36:32 2000
-@@ -164,10 +164,7 @@
+@@ -164,7 +164,7 @@
__instantiate(Vector<ContentModelAmbiguity>)
__instantiate(Vector<Transition>)
__instantiate(Vector<LeafContentToken*>)
-#if 0
++#if defined(__alpha__) || defined(__sparc64__)
__instantiate(Vector<size_t>)
--#endif
--__instantiate(Vector<unsigned int>)
-
- __instantiate(NamedTable<Id>)
- __instantiate(NamedTableIter<Id>)
+ #endif
+ __instantiate(Vector<unsigned int>)
diff --git a/textproc/sp/patches/patch-ad b/textproc/sp/patches/patch-ad
index 0257b299940..28e7672a70e 100644
--- a/textproc/sp/patches/patch-ad
+++ b/textproc/sp/patches/patch-ad
@@ -1,33 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2000/10/07 02:03:25 tv Exp $
+$NetBSD: patch-ad,v 1.2 2000/10/09 15:55:27 tv Exp $
--- lib/parser_inst.cxx.orig Fri Oct 6 21:35:11 2000
+++ lib/parser_inst.cxx Fri Oct 6 21:35:46 2000
-@@ -1324,7 +1324,6 @@
+@@ -1324,7 +1324,7 @@
#endif
#endif
#endif
-#if 0
++#if defined(__alpha__) || defined(__sparc64__)
#ifdef __DECCXX
#pragma define_template Vector<size_t>
#else
-@@ -1335,20 +1334,6 @@
- template class Vector<size_t>;
- #else
- typedef Vector<size_t> Dummy_96;
--#endif
--#endif
--#endif
--#endif
--#ifdef __DECCXX
--#pragma define_template Vector<unsigned int>
--#else
--#ifdef __xlC__
--#pragma define(Vector<unsigned int>)
--#else
--#ifdef SP_ANSI_CLASS_INST
--template class Vector<unsigned int>;
--#else
--typedef Vector<unsigned int> Dummy_97;
- #endif
- #endif
- #endif