From eb0902cbf4161c3856c8c1f5a09d82777176a359 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Wed, 7 Apr 2004 15:12:40 +0000
Subject: When -lpthread is used, link the db4 library against it, so that
 programs using -ldb4 alone don't complain about missing symbols.  This fixes
 the build of some programs (like evolution-data-server), as exposed in Linux.

---
 databases/db4/Makefile         |  3 ++-
 databases/db4/distinfo         |  4 ++--
 databases/db4/patches/patch-ab | 18 +++++++++++++-----
 3 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'databases/db4')

diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index ae2abab03ca..85b754fe1ca 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/03/20 05:42:35 snj Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/07 15:12:40 jmmv Exp $
 
 DISTNAME=		db-4.2.52
 PKGNAME=		${DISTNAME:S/db/db4/}
@@ -60,4 +60,5 @@ CONFIGURE_ARGS+=	--enable-java
 post-install:
 	${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/doc/db4
 
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/db4/distinfo b/databases/db4/distinfo
index b3ce1d85564..73391b84193 100644
--- a/databases/db4/distinfo
+++ b/databases/db4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2003/12/08 23:15:05 seb Exp $
+$NetBSD: distinfo,v 1.6 2004/04/07 15:12:40 jmmv Exp $
 
 SHA1 (db-4.2.52.tar.gz) = 12d21a58efd7b5fd35b56815a8fb1ac2cbab2e5c
 Size (db-4.2.52.tar.gz) = 4073147 bytes
 SHA1 (patch-aa) = 532c6616f848d3a31a034478519024e72c5fe0ce
-SHA1 (patch-ab) = 90171c714f1b8f57831d789036cf85158d5aed3b
+SHA1 (patch-ab) = 4204cd6171426de613741a9a16e8b32de37c42b2
 SHA1 (patch-ac) = b9b52d5604afd12409261294a71b3db20b899476
diff --git a/databases/db4/patches/patch-ab b/databases/db4/patches/patch-ab
index 2a0558fb063..ff6eaf4ab89 100644
--- a/databases/db4/patches/patch-ab
+++ b/databases/db4/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2003/12/07 00:51:07 epg Exp $
+$NetBSD: patch-ab,v 1.4 2004/04/07 15:12:40 jmmv Exp $
 
---- ../dist/configure.orig	Wed Dec  3 16:10:02 2003
-+++ ../dist/configure
-@@ -5390,6 +5390,7 @@ db_cv_gxx_except=no;
+--- ../dist/configure.orig	2003-12-03 22:10:02.000000000 +0100
++++ ../dist/configure	2004-04-07 17:00:04.000000000 +0200
+@@ -5390,6 +5390,7 @@
  if test "$GXX" = "yes"; then
  	GXX_VERSION=`${MAKEFILE_CXX} --version`
  	case ${GXX_VERSION} in
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.3 2003/12/07 00:51:07 epg Exp $
  	1.*|2.[01234567].*|*-1.*|*-2.[01234567].*)
  		db_cv_gxx_except=yes;;
  	esac
-@@ -20138,7 +20139,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6
+@@ -20138,7 +20139,7 @@
  INSTALLER="\$(LIBTOOL) --mode=install cp -p"
  
  MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
@@ -19,3 +19,11 @@ $NetBSD: patch-ab,v 1.3 2003/12/07 00:51:07 epg Exp $
  MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
  MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
  MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
+@@ -27047,6 +27048,7 @@
+ echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6
+ if test $ac_cv_lib_pthread_main = yes; then
+   LOAD_LIBS="$LOAD_LIBS -lpthread"
++  LIBSO_LIBS="$LIBSO_LIBS -lpthread"
+ fi
+ ac_cv_lib_pthread=ac_cv_lib_pthread_main
+ 
-- 
cgit v1.2.3