From 88e27a87431aad055bbf11a725f7449e8f3cf194 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Mon, 13 Mar 2006 20:33:24 +0000
Subject: Fix NSPR detection at least for DragonFly, making it actually work.
 Addresses complains of Tom Hummel via IRC. Bump revision.

---
 chat/gaim/Makefile         |  4 ++--
 chat/gaim/distinfo         |  4 ++--
 chat/gaim/patches/patch-ad | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'chat')

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 34448db44bb..fcf4168462c 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.104 2006/02/05 23:08:23 joerg Exp $
+# $NetBSD: Makefile,v 1.105 2006/03/13 20:33:24 joerg Exp $
 
 DISTNAME=	gaim-1.5.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index f686afb8f50..b22bdf8843c 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.71 2005/12/15 23:31:04 joerg Exp $
+$NetBSD: distinfo,v 1.72 2006/03/13 20:33:24 joerg 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-ab) = c66e19e0cbc77a703e3137294f145dc5f1223b5a
-SHA1 (patch-ad) = 20196058071ab85de2537c91bab8ff4aece752f3
+SHA1 (patch-ad) = de4490e37978c2190efbd34b11a4e9718922f298
diff --git a/chat/gaim/patches/patch-ad b/chat/gaim/patches/patch-ad
index ec5fa4b7f81..68d53e76089 100644
--- a/chat/gaim/patches/patch-ad
+++ b/chat/gaim/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2005/08/25 21:30:48 reed Exp $
+$NetBSD: patch-ad,v 1.9 2006/03/13 20:33:24 joerg Exp $
 
---- configure.orig	2005-08-25 10:19:21.000000000 -0700
-+++ configure	2005-08-25 10:23:27.000000000 -0700
-@@ -29137,7 +29137,7 @@
+--- configure.orig	2005-08-12 02:21:55.000000000 +0000
++++ configure
+@@ -29137,7 +29137,7 @@ fi
  	if test "$ac_silc_libs" != "no"; then
  		SILC_LIBS="-L$ac_silc_libs"
  	fi
@@ -11,16 +11,16 @@ $NetBSD: patch-ad,v 1.8 2005/08/25 21:30:48 reed Exp $
  	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
-@@ -34275,10 +34275,10 @@
+@@ -34275,10 +34275,10 @@ echo "$as_me: error: Static linkage requ
  
  					enable_nss="no"
  				else
 -					nsprlibs="-ldl $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"
++					nsprlibs="${DLLIB} $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB $PTHREAD_LDFLAGS"
  				fi
  			else
 -				nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
-+				nsprlibs="${DLLIB} -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
++				nsprlibs="${DLLIB} -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB $PTHREAD_LDFLAGS"
  			fi
  
  			echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5
-- 
cgit v1.2.3