From 41eaa3989d68eb6bb6fc7403707a8832093907b5 Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Sun, 16 Nov 2003 14:01:20 +0000
Subject: Fix from Dan Winship for opensp and openjade -

	opensp was building against unproven-pthreads, but openjade
	was getting pth, so the link would fail.  Copy the related
	glue from opensp/Makefile to opensp/buildlink2.mk

fixes build problems in latest bulk builds.
---
 textproc/openjade/distinfo         |  3 +-
 textproc/openjade/patches/patch-aa | 70 ++++++++++++++++++++++++++++++++++++++
 textproc/opensp/buildlink2.mk      |  9 ++++-
 3 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 textproc/openjade/patches/patch-aa

(limited to 'textproc')

diff --git a/textproc/openjade/distinfo b/textproc/openjade/distinfo
index 6371875e097..d40e6c18669 100644
--- a/textproc/openjade/distinfo
+++ b/textproc/openjade/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.5 2003/09/23 08:35:52 wiz Exp $
+$NetBSD: distinfo,v 1.6 2003/11/16 14:01:20 agc Exp $
 
 SHA1 (openjade-1.3.2.tar.gz) = 54e1999f41450fbd62c5d466002d79d3efca2321
 Size (openjade-1.3.2.tar.gz) = 894834 bytes
+SHA1 (patch-aa) = 4914f08b6598d25af7b7f99a58e1e6490d292609
diff --git a/textproc/openjade/patches/patch-aa b/textproc/openjade/patches/patch-aa
new file mode 100644
index 00000000000..938b033a579
--- /dev/null
+++ b/textproc/openjade/patches/patch-aa
@@ -0,0 +1,70 @@
+$NetBSD: patch-aa,v 1.3 2003/11/16 14:01:20 agc Exp $
+
+--- configure.orig	Sun Nov  9 21:44:24 2003
++++ configure	Sun Nov  9 21:45:58 2003
+@@ -4899,16 +4899,16 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for towupper" >&5
+-echo $ECHO_N "checking for towupper... $ECHO_C" >&6
+-if test "${ac_cv_func_towupper+set}" = set; then
++echo "$as_me:$LINENO: checking for wcsxfrm" >&5
++echo $ECHO_N "checking for wcsxfrm... $ECHO_C" >&6
++if test "${ac_cv_func_wcsxfrm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char towupper (); below.  */
++    which can conflict with char wcsxfrm (); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -4916,7 +4916,7 @@
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char towupper ();
++char wcsxfrm ();
+ char (*f) ();
+ 
+ #ifdef F77_DUMMY_MAIN
+@@ -4931,10 +4931,10 @@
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_towupper) || defined (__stub___towupper)
++#if defined (__stub_wcsxfrm) || defined (__stub___towupper)
+ choke me
+ #else
+-f = towupper;
++f = wcsxfrm;
+ #endif
+ 
+   ;
+@@ -4953,17 +4953,17 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_func_towupper=yes
++  ac_cv_func_wcsxfrm=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-ac_cv_func_towupper=no
++ac_cv_func_wcsxfrm=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_towupper" >&5
+-echo "${ECHO_T}$ac_cv_func_towupper" >&6
+-if test $ac_cv_func_towupper = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_func_wcsxfrm" >&5
++echo "${ECHO_T}$ac_cv_func_wcsxfrm" >&6
++if test $ac_cv_func_wcsxfrm = yes; then
+   cat >>confdefs.h <<\_ACEOF
+ #define SP_HAVE_WCHAR 1
+ _ACEOF
diff --git a/textproc/opensp/buildlink2.mk b/textproc/opensp/buildlink2.mk
index d281e20a89b..1fbe7ab15fb 100644
--- a/textproc/opensp/buildlink2.mk
+++ b/textproc/opensp/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/09/23 06:59:24 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/11/16 14:01:20 agc Exp $
 #
 # This Makefile fragment is included by packages that use opensp.
 #
@@ -16,7 +16,14 @@ BUILDLINK_FILES.opensp+=	include/OpenSP/*.cxx
 BUILDLINK_FILES.opensp+=	include/OpenSP/*.h
 BUILDLINK_FILES.opensp+=	lib/libosp.*
 
+PTHREAD_OPTS+=          native
+
 .include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
+.  include "../../devel/unproven-pthreads/buildlink2.mk"
+.endif
 
 BUILDLINK_TARGETS+=	opensp-buildlink
 
-- 
cgit v1.2.3