From 70f2766f425e3f15a1c402a9c846272df216b2d7 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Fri, 4 Nov 2005 17:16:34 +0000
Subject: Don't depend on -lpthread as name of the thread library, check in
 configure using PTHREAD_LIBS / PTHREAD_LDFLAGS and use them to link
 libgpgme_thread as well.

---
 security/gpgme/distinfo         |  5 +++--
 security/gpgme/patches/patch-ac | 21 ++++++++++++++++++---
 security/gpgme/patches/patch-aj | 13 +++++++++++++
 3 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 security/gpgme/patches/patch-aj

diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index 26f2179062d..ed9cd5c0c5f 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.19 2005/08/12 19:36:53 drochner Exp $
+$NetBSD: distinfo,v 1.20 2005/11/04 17:16:34 joerg Exp $
 
 SHA1 (gpgme-1.0.3.tar.gz) = 632436ff5c66405d9704983411aa031f29006dce
 RMD160 (gpgme-1.0.3.tar.gz) = cc8dc465c733eea8d7f0297127f9f97dd0876a53
 Size (gpgme-1.0.3.tar.gz) = 837866 bytes
 SHA1 (patch-aa) = 27f98c23d89a0a030398e1e5cfefff84b23d2658
 SHA1 (patch-ab) = c47b732622deaa2eb3269d7ae753ab553c4fa54e
-SHA1 (patch-ac) = c702392423c1ed48cca43f8e35a2c510a8d68460
+SHA1 (patch-ac) = 1f27efa0a5c109c7a8b4f4e346487a5d2f8b26f2
 SHA1 (patch-ae) = 88d215ad657730349ffa19462799b64238a30426
 SHA1 (patch-af) = 9945bd0ed5f999509b8a8684233286b2183009e8
 SHA1 (patch-ag) = b499aba9894e24470b7ebb60643a3db5d36b7fd5
 SHA1 (patch-ah) = 852e362f143c754149e0600a7b7f3a47a569f41e
 SHA1 (patch-ai) = 5b7958ef6ed51936e948451e03dd835c1b90414c
+SHA1 (patch-aj) = 372136250ffea3e0db9d86859544b5d22a9782e6
diff --git a/security/gpgme/patches/patch-ac b/security/gpgme/patches/patch-ac
index 5d6116fa8b6..bd8688f5c59 100644
--- a/security/gpgme/patches/patch-ac
+++ b/security/gpgme/patches/patch-ac
@@ -1,8 +1,23 @@
-$NetBSD: patch-ac,v 1.3 2004/11/04 20:41:21 shannonjr Exp $
+$NetBSD: patch-ac,v 1.4 2005/11/04 17:16:34 joerg Exp $
 
 --- configure.orig	2004-10-22 12:52:27.000000000 -0600
 +++ configure
-@@ -19827,7 +19827,7 @@ fi
+@@ -19726,12 +19726,12 @@ _ACEOF
+ 	  CFLAGS="$CFLAGS $PTH_CFLAGS"
+ 	fi
+ 	echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -19839,7 +19839,7 @@ fi
  
  # Checks for header files.
  
@@ -11,7 +26,7 @@ $NetBSD: patch-ac,v 1.3 2004/11/04 20:41:21 shannonjr Exp $
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -21876,7 +21876,7 @@ esac
+@@ -22011,7 +22011,7 @@ esac
  fi
  GPGSM=$ac_cv_path_GPGSM
  
diff --git a/security/gpgme/patches/patch-aj b/security/gpgme/patches/patch-aj
new file mode 100644
index 00000000000..3cc25546676
--- /dev/null
+++ b/security/gpgme/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2005/11/04 17:16:34 joerg Exp $
+
+--- gpgme/Makefile.in.orig	2005-11-02 14:59:53.000000000 +0000
++++ gpgme/Makefile.in
+@@ -350,7 +350,7 @@ libgpgme_pthread_la_DEPENDENCIES = libgp
+ 	@LTLIBOBJS@ $(srcdir)/libgpgme.vers
+ 
+ libgpgme_pthread_la_LIBADD = libgpgme-real.la $(assuan_libobjs) @LTLIBOBJS@ \
+-	-lpthread @GPG_ERROR_LIBS@
++	$(PTHREAD_LDFLAGS) $(PTHREAD_LIBS) @GPG_ERROR_LIBS@
+ 
+ libgpgme_pth_la_CPPFLAGS = $(AM_CPPFLAGS) @PTH_CPPFLAGS@
+ libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ \
-- 
cgit v1.2.3