From eeaf8227c33bfd445b0e1f8238aa0391ecf35c28 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Mon, 10 Oct 2005 17:07:36 +0000
Subject: Just use -pthread on DragonFly for thread linkage.

---
 lang/perl5/distinfo         |  4 ++--
 lang/perl5/patches/patch-cj | 30 ++++++++++++++----------------
 2 files changed, 16 insertions(+), 18 deletions(-)

(limited to 'lang')

diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index e9020f443ba..004463b0011 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2005/08/12 19:59:03 jlam Exp $
+$NetBSD: distinfo,v 1.28 2005/10/10 17:07:36 joerg Exp $
 
 SHA1 (perl-5.8.7.tar.bz2) = c9477c6fe76b200033694bdc555a0276523d4228
 RMD160 (perl-5.8.7.tar.bz2) = 110c286d73fd89e25da8ea394e763f209a76d283
@@ -15,7 +15,7 @@ SHA1 (patch-cb) = 1a67bf37338de9b8e24e90ddad90205ec4fbb6c8
 SHA1 (patch-ce) = 6b1efab32c6bc28e0faf7522322e6d805eb21730
 SHA1 (patch-ch) = 028439dde97f1d5a94fbd571a59fd0ab2c5b3b07
 SHA1 (patch-ci) = 908a8bb35c088b994bde49707ab1536b4ab3d7a4
-SHA1 (patch-cj) = 680b7161d7530825376b9d5c108fc01f15768e5e
+SHA1 (patch-cj) = a65788f167975dbd8fea3e269c1c1bf4cfdd4195
 SHA1 (patch-ck) = 28207b8186c9ad194a1edc696159915bc16d1097
 SHA1 (patch-cl) = 8553c83e721f5ae43a5f6e0e4d2b70510b69e77c
 SHA1 (patch-zc) = eb81edd1144ec46285898afc641c03a3aad54977
diff --git a/lang/perl5/patches/patch-cj b/lang/perl5/patches/patch-cj
index a0b01800261..0021d19184f 100644
--- a/lang/perl5/patches/patch-cj
+++ b/lang/perl5/patches/patch-cj
@@ -1,8 +1,8 @@
-$NetBSD: patch-cj,v 1.1 2005/06/24 06:43:47 jlam Exp $
+$NetBSD: patch-cj,v 1.2 2005/10/10 17:07:36 joerg Exp $
 
 --- /dev/null	2005-01-17 19:31:20.000000000 -0500
 +++ hints/dragonfly.sh	2005-01-17 19:39:56.000000000 -0500
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,116 @@
 +# hints/dragonfly.sh
 +#
 +# This file is mostly copied from hints/freebsd.sh with the OS version
@@ -77,20 +77,7 @@ $NetBSD: patch-cj,v 1.1 2005/06/24 06:43:47 jlam Exp $
 +        lc_r=`/sbin/ldconfig -r|grep ':-lc_r'|awk '{print $NF}'|sed -n '$p'`
 +        case "$osvers" in
 +       *)
-+             if [ ! -r "$lc_r" ]; then
-+             cat <<EOM >&4
-+POSIX threads should be supported by FreeBSD $osvers --
-+but your system is missing the shared libc_r.
-+(/sbin/ldconfig -r doesn't find any).
-+
-+Consider using the latest STABLE release.
-+EOM
-+                exit 1
-+             fi
-+             case "$osvers" in
-+             *)        ldflags="-pthread $ldflags"
-+                       ;;
-+             esac
++             ldflags="-pthread $ldflags"
 +             # Both in 4.x and 5.x gethostbyaddr_r exists but
 +             # it is "Temporary function, not threadsafe"...
 +             # Presumably earlier it didn't even exist.
@@ -121,3 +108,14 @@ $NetBSD: patch-cj,v 1.1 2005/06/24 06:43:47 jlam Exp $
 +case "$usemallocwrap" in
 +'') usemallocwrap='define' ;;
 +esac
++
++cat > UU/pkgsrc.cbu <<'EOCBU'
++# This script UU/pkgsrc.cbu will get 'called-back' by Configure to set
++# linker options after all other call-back scripts have been invoked.
++ldflags=" -Wl,-R/usr/pkg/lib  -pthread $ldflags"
++lddlflags=" -Wl,-R/usr/pkg/lib  -pthread $lddlflags"
++EOCBU
++
++# Set pkgsrc defaults for library and header search paths.
++locincpth="/usr/pkg/include"
++loclibpth="/usr/pkg/lib"
-- 
cgit v1.2.3