Update patch-ad so instead of getting rid of -ldl (which is needed

by Linux) in tests, use value of BUILDLINK_LDADD.dl.
Also use PTHREAD_LIBS instead of hard-coded -lpthread.

Include dlopen.buildlink3.mk and include pthread.buildlink3.mk.

This fixes problem on Linux and DragonFly where it was not
built with silc support.

Okayed by maintainer.

I tested this on Linux, DragonFly and NetBSD 2.0.2.

I also filed a bug report with gaim last week so they can fix the
configure.ac correctly.

3 files changed, 14 insertions, 11 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 1f428f2051f..d97fa9b2ca7 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2005/08/19 10:24:25 grant Exp $
+# $NetBSD: Makefile,v 1.98 2005/08/25 21:30:47 reed Exp $
 
 DISTNAME=	gaim-1.5.0
 CATEGORIES=	chat x11
@@ -28,6 +28,7 @@ CONFIGURE_ARGS+=	--disable-tcl
 CONFIGURE_ARGS+=	--disable-gevolution
 CONFIGURE_ARGS+=	--with-silc-includes=${BUILDLINK_PREFIX.silc-toolkit}/include/silc
 CONFIGURE_ARGS+=	--with-silc-libs=${BUILDLINK_PREFIX.silc-toolkit}/lib/silc
+CONFIGURE_ENV+=		DLLIB=${BUILDLINK_LDADD.dl}
 
 .include "options.mk"
 
@@ -47,5 +48,7 @@ CONFIGURE_ARGS+=	--disable-screensaver
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index 060c24a3cf1..6360526e1f7 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.69 2005/08/12 17:52:17 reed Exp $
+$NetBSD: distinfo,v 1.70 2005/08/25 21:30:47 reed Exp $
 
 SHA1 (gaim-1.5.0.tar.bz2) = a280d005f01be7fa89c9fa210efb86cc6a9eb9c7
 RMD160 (gaim-1.5.0.tar.bz2) = 13f74e2d2ed69a775a5884b807c365177455ae0e
 Size (gaim-1.5.0.tar.bz2) = 6123237 bytes
 SHA1 (patch-aa) = 555c394dbb4cd9ef4fea621d30ce72baae309067
-SHA1 (patch-ad) = 21ffc478343793ce065c75a24ed0cf58b0677359
+SHA1 (patch-ad) = 20196058071ab85de2537c91bab8ff4aece752f3
diff --git a/chat/gaim/patches/patch-ad b/chat/gaim/patches/patch-ad
index fc53e258813..ec5fa4b7f81 100644
--- a/chat/gaim/patches/patch-ad
+++ b/chat/gaim/patches/patch-ad
@@ -1,26 +1,26 @@
-$NetBSD: patch-ad,v 1.7 2005/03/18 18:56:04 jmmv Exp $
+$NetBSD: patch-ad,v 1.8 2005/08/25 21:30:48 reed Exp $
 
---- configure.orig	2005-02-25 03:44:01.000000000 +0100
-+++ configure
-@@ -28205,7 +28205,7 @@ fi
+--- configure.orig	2005-08-25 10:19:21.000000000 -0700
++++ configure	2005-08-25 10:23:27.000000000 -0700
+@@ -29137,7 +29137,7 @@
  	if test "$ac_silc_libs" != "no"; then
  		SILC_LIBS="-L$ac_silc_libs"
  	fi
 -	SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread -ldl"
-+	SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread"
++	SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient ${PTHREAD_LIBS} ${DLLIB}"
  	echo "$as_me:$LINENO: checking for silc_client_init in -lsilcclient" >&5
  echo $ECHO_N "checking for silc_client_init in -lsilcclient... $ECHO_C" >&6
  if test "${ac_cv_lib_silcclient_silc_client_init+set}" = set; then
-@@ -33268,10 +33268,10 @@ echo "$as_me: error: Static linkage requ
+@@ -34275,10 +34275,10 @@
  
  					enable_nss="no"
  				else
 -					nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
-+					nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
++					nsprlibs="${DLLIB} $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
  				fi
  			else
 -				nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
-+				nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
++				nsprlibs="${DLLIB} -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
  			fi
  
  			echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5