From 3bfbbd01e862212264a35e1e68f9e38e1ccf06c8 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Mon, 3 Jul 2006 14:15:29 +0000
Subject: When trying to link against FOX, use pthread libs explicitly.

---
 sysutils/xfe/Makefile         |  3 ++-
 sysutils/xfe/distinfo         |  3 ++-
 sysutils/xfe/patches/patch-ab | 31 +++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 sysutils/xfe/patches/patch-ab

(limited to 'sysutils')

diff --git a/sysutils/xfe/Makefile b/sysutils/xfe/Makefile
index 98acc426deb..60c89f1d8e8 100644
--- a/sysutils/xfe/Makefile
+++ b/sysutils/xfe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/05/22 19:14:12 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2006/07/03 14:15:29 joerg Exp $
 
 DISTNAME=	xfe-0.84
 PKGREVISION=	2
@@ -26,5 +26,6 @@ post-install:
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/fox/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfe/distinfo b/sysutils/xfe/distinfo
index 5f3ff551919..91da54c8f8b 100644
--- a/sysutils/xfe/distinfo
+++ b/sysutils/xfe/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/07/25 10:55:44 adam Exp $
+$NetBSD: distinfo,v 1.4 2006/07/03 14:15:29 joerg Exp $
 
 SHA1 (xfe-0.84.tar.gz) = 7e6eaefea56d098d471ada395d937d37add056ae
 RMD160 (xfe-0.84.tar.gz) = 02206d04595f61ab1b815594cef904cf52d0cd40
 Size (xfe-0.84.tar.gz) = 847390 bytes
 SHA1 (patch-aa) = 094df6cbc885332c6364d8cd8a0a8fe6d6fdf281
+SHA1 (patch-ab) = 41b27f54e3b1487ecb5d893d2cf5ff210bb3976f
diff --git a/sysutils/xfe/patches/patch-ab b/sysutils/xfe/patches/patch-ab
new file mode 100644
index 00000000000..105ac7aa885
--- /dev/null
+++ b/sysutils/xfe/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.1 2006/07/03 14:15:29 joerg Exp $
+
+--- configure.orig	2005-06-24 08:38:30.000000000 +0000
++++ configure
+@@ -10965,7 +10965,7 @@ if test "${ac_cv_lib_FOX_1_4_fxfindfox+s
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lFOX-1.4  $LIBS"
++LIBS="-lFOX-1.4 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -11027,7 +11027,7 @@ if test $ac_cv_lib_FOX_1_4_fxfindfox = y
+ #define HAVE_LIBFOX_1_4 1
+ _ACEOF
+ 
+-  LIBS="-lFOX-1.4 $LIBS"
++  LIBS="-lFOX-1.4 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ 
+ else
+   { { echo "$as_me:$LINENO: error: \"libFOX-1.4 not found\"" >&5
+@@ -13950,6 +13950,8 @@ do
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    # Avoid regenerating for rechecks on pkgsrc
++    exit 0
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
-- 
cgit v1.2.3