Fix build under Mac OS X:

- Properly instantiate required templates.
- Properly detect some functions (such as strtoul).
- Do not use unavailable Mach threads.

7 files changed, 173 insertions, 10 deletions

diff --git a/textproc/jade/distinfo b/textproc/jade/distinfo
index d8999c810ca..047816f8ca2 100644
--- a/textproc/jade/distinfo
+++ b/textproc/jade/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 14:48:43 agc Exp $
+$NetBSD: distinfo,v 1.13 2006/01/20 11:36:18 jmmv Exp $
 
 SHA1 (jade-1.2.1.tar.gz) = 4326e73b7f0b865515e1bb90c622a8b2aa6ecd06
 RMD160 (jade-1.2.1.tar.gz) = 615ebcc1b17a284d60a7976f13649a0ea78aa58d
@@ -6,7 +6,7 @@ Size (jade-1.2.1.tar.gz) = 1092062 bytes
 SHA1 (jade_1.2.1-18.diff.gz) = b3d00e797239d061ef6063b44e9d3e14055da940
 RMD160 (jade_1.2.1-18.diff.gz) = c2e9dc256b0c95a6c5e43142537e40b92ebe1df3
 Size (jade_1.2.1-18.diff.gz) = 121329 bytes
-SHA1 (patch-aa) = 11457de7520b6f1f473fb9b81aa9593d0987846b
+SHA1 (patch-aa) = b24b6fba1e52428d0d93d0235d92f2397113fa78
 SHA1 (patch-ab) = 1742175ec89ea8e796b4e874a488225850cf78e1
 SHA1 (patch-ac) = c96ca44b40bbcc9c588dfe40045f4d386e32998d
 SHA1 (patch-ad) = 1afe17aeabda9f7f5c8531b09fb0af6085a8526f
@@ -22,4 +22,8 @@ SHA1 (patch-am) = 6851ea44e1abdcaa887df3cf965593f5bb896e9b
 SHA1 (patch-an) = 514a3bf20ba6c2e1e6474c85e770e9e3b836df2d
 SHA1 (patch-ao) = 16bc7c55cdc8c3d5dc5959807dd100d36985429c
 SHA1 (patch-ap) = 156ac9a4947d7b74727b4d787e8abf0897e0a0bb
-SHA1 (patch-aq) = fb6b6a441748831e70a5c9f84ccb2cdad912d06b
+SHA1 (patch-aq) = fbc9fc7dbc5c38d91d7968e29a4d832c6ffccc7f
+SHA1 (patch-ar) = 3c7676797519b35c654513885c5ca799e55a6baf
+SHA1 (patch-as) = 8dc4d8867ea38b09f0cfadde840d8695ca1e110c
+SHA1 (patch-at) = 6b4aaee9de24eb5f648a10362fa57f92439cd00f
+SHA1 (patch-au) = f1cf55a99836b2bcbc31d4b1e12b31a1b5a28682
diff --git a/textproc/jade/patches/patch-aa b/textproc/jade/patches/patch-aa
index 443d7302e15..c9180283dc6 100644
--- a/textproc/jade/patches/patch-aa
+++ b/textproc/jade/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/06/25 03:47:39 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2006/01/20 11:36:18 jmmv Exp $
 
---- configure.orig	Tue Oct 13 06:05:00 1998
-+++ configure	Sat Jun 26 01:52:18 1999
-@@ -615,9 +615,9 @@
+--- configure.orig	2006-01-19 21:35:56.000000000 +0100
++++ configure
+@@ -620,9 +620,9 @@ ac_configure=$ac_aux_dir/configure # Thi
  TOP=`pwd`
  
  
@@ -15,3 +15,56 @@ $NetBSD: patch-aa,v 1.2 2001/06/25 03:47:39 jlam Exp $
  
  LTVERSION=`cat VERSION | cut -d'.' -f1,2 | sed 's/\./:/g'`
  
+@@ -1684,6 +1684,13 @@ EOF
+ 
+ fi
+ 
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
+ echo $ac_n "checking for memmove""... $ac_c" 1>&6
+ echo "configure:1689: checking for memmove" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then
+@@ -1988,6 +1995,13 @@ fi
+ 
+ 
+ 
++ac_ext=C
++# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cxx_cross
++
+ echo $ac_n "checking for ANSI template instantiation""... $ac_c" 1>&6
+ echo "configure:1993: checking for ANSI template instantiation" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_template_ansi'+set}'`\" = set"; then
+@@ -2030,6 +2044,13 @@ EOF
+ 
+ fi
+ 
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
+ # Check whether --enable-http or --disable-http was given.
+ if test "${enable_http+set}" = set; then
+   enableval="$enable_http"
+@@ -2609,6 +2630,10 @@ for ac_option
+ do
+   case "\$ac_option" in
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    # Avoid regenerating for rechecks on pkgsrc
++    exit 0
++    # Avoid regenerating for rechecks on pkgsrc
++    exit 0
+     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
diff --git a/textproc/jade/patches/patch-aq b/textproc/jade/patches/patch-aq
index e9751ec2f0d..cb1f4b8c6a0 100644
--- a/textproc/jade/patches/patch-aq
+++ b/textproc/jade/patches/patch-aq
@@ -1,7 +1,7 @@
-$NetBSD: patch-aq,v 1.1 2003/09/21 20:03:54 tron Exp $
+$NetBSD: patch-aq,v 1.2 2006/01/20 11:36:18 jmmv Exp $
 
---- include/config.h.orig	Fri Jun 14 12:58:51 2002
-+++ include/config.h	Fri Jun 14 13:01:00 2002
+--- include/config.h.orig	2006-01-20 00:09:04.000000000 +0100
++++ include/config.h
 @@ -31,6 +31,10 @@
  #define SP_ANSI_LIB
  #define SP_NO_STD_NAMESPACE
@@ -13,3 +13,22 @@ $NetBSD: patch-aq,v 1.1 2003/09/21 20:03:54 tron Exp $
  #endif
  
  #endif /* __GNUG__ */
+@@ -40,7 +44,7 @@
+ #define SP_STAT_BLKSIZE
+ #endif
+ 
+-#if (defined __MACH__) && (! defined __GNU__)
++#if (defined __MACH__) && (! defined __GNU__) && (!defined __Darwin__) && (! defined __APPLE__)
+ #define SP_MUTEX_MACH
+ #endif
+ 
+@@ -297,4 +301,9 @@
+ #define SP_NAMESPACE_SCOPE
+ #endif
+ 
++#if defined(__APPLE__) || defined(__Darwin__)
++#define SP_DEFINE_TEMPLATES
++#define SP_MANUAL_INST
++#endif
++
+ #endif /* not config_INCLUDED */
diff --git a/textproc/jade/patches/patch-ar b/textproc/jade/patches/patch-ar
new file mode 100644
index 00000000000..4066e8e101b
--- /dev/null
+++ b/textproc/jade/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2006/01/20 11:36:18 jmmv Exp $
+
+--- spgrove/threads.h.orig	2006-01-20 10:44:28.000000000 +0100
++++ spgrove/threads.h
+@@ -141,7 +141,7 @@ private:
+ 
+ #endif /* _MSC_VER && _MT */
+ 
+-#if (defined __MACH__) || (defined __GNU__)
++#if ((defined __MACH__) && (! defined __Darwin__) && (! defined __APPLE__)) || (defined __GNU__)
+ 
+ // For Mach, using C Threads. May or may not work as-is on your Mach-based OS.
+ // Written by Raf Schietekat <RfSchtkt@maze.ruca.ua.ac.be> on 1996-11-10.
diff --git a/textproc/jade/patches/patch-as b/textproc/jade/patches/patch-as
new file mode 100644
index 00000000000..633112c9c94
--- /dev/null
+++ b/textproc/jade/patches/patch-as
@@ -0,0 +1,23 @@
+$NetBSD: patch-as,v 1.1 2006/01/20 11:36:18 jmmv Exp $
+
+--- nsgmls/nsgmls_inst.cxx.orig	1998-10-01 07:22:18.000000000 +0200
++++ nsgmls/nsgmls_inst.cxx
+@@ -96,14 +96,18 @@ typedef IQueue<LinkRulePi> Dummy_4;
+ #endif
+ #ifdef __DECCXX
+ #pragma define_template Vector<Vector<size_t> >
++#pragma define_template Vector<size_t>
+ #else
+ #ifdef __xlC__
+ #pragma define(Vector<Vector<size_t> >)
++#pragma define(Vector<size_t>)
+ #else
+ #ifdef SP_ANSI_CLASS_INST
+ template class Vector<Vector<size_t> >;
++template class Vector<size_t>;
+ #else
+ typedef Vector<Vector<size_t> > Dummy_5;
++typedef Vector<size_t> Dummy_5;
+ #endif
+ #endif
+ #endif
diff --git a/textproc/jade/patches/patch-at b/textproc/jade/patches/patch-at
new file mode 100644
index 00000000000..30b43cdd1c7
--- /dev/null
+++ b/textproc/jade/patches/patch-at
@@ -0,0 +1,26 @@
+$NetBSD: patch-at,v 1.1 2006/01/20 11:36:18 jmmv Exp $
+
+--- jade/HtmlFOTBuilder_inst.cxx.orig	1998-10-07 12:06:36.000000000 +0200
++++ jade/HtmlFOTBuilder_inst.cxx
+@@ -106,14 +106,18 @@ typedef Vector<Vector<HtmlFOTBuilder::Ad
+ #endif
+ #ifdef __DECCXX
+ #pragma define_template Vector<Vector<size_t> >
++#pragma define_template Vector<size_t>
+ #else
+ #ifdef __xlC__
+-#pragma define(Vector<Vector<size_t> >)
++#pragma define(Vector<size_t>)
++#pragma define(Vector<size_t>)
+ #else
+ #ifdef SP_ANSI_CLASS_INST
+-template class Vector<Vector<size_t> >;
++template class Vector<size_t>;
++template class Vector<size_t>;
+ #else
+-typedef Vector<Vector<size_t> > Dummy_6;
++typedef Vector<size_t> Dummy_6;
++typedef Vector<size_t> Dummy_6;
+ #endif
+ #endif
+ #endif
diff --git a/textproc/jade/patches/patch-au b/textproc/jade/patches/patch-au
new file mode 100644
index 00000000000..5bb1ebd96fa
--- /dev/null
+++ b/textproc/jade/patches/patch-au
@@ -0,0 +1,25 @@
+$NetBSD: patch-au,v 1.1 2006/01/20 11:36:18 jmmv Exp $
+
+--- jade/RtfFOTBuilder_inst.cxx.orig	1998-10-07 12:06:36.000000000 +0200
++++ jade/RtfFOTBuilder_inst.cxx
+@@ -218,6 +218,20 @@ typedef Vector<Vector<char> > Dummy_14;
+ #endif
+ #endif
+ #endif
++#ifdef __DECCXX
++#pragma define_template Vector<size_t>
++#else
++#ifdef __xlC__
++#pragma define(Vector<size_t>)
++#else
++#ifdef SP_ANSI_CLASS_INST
++template class Vector<size_t>;
++#else
++typedef Vector<size_t> Dummy_15;
++#endif
++#endif
++#endif
++
+ 
+ #ifdef DSSSL_NAMESPACE
+ }