Use nss instead of gnutls for SSL connections. This fixes several problems

under NetBSD 1.6 (gaim hanging during MSN connection).  Bump revision to 1.

No objections in tech-pkg@ and got positive comments from tv@ and maintainer.

Closes PR pkg/28690 by chemical-al at suomi24.fi.

4 files changed, 28 insertions, 24 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 69e3ca48c31..b94a99e45df 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2005/02/27 08:52:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.81 2005/03/18 18:56:04 jmmv Exp $
 
 DISTNAME=	gaim-1.1.4
+PKGREVISION=	1
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/}
 EXTRACT_SUFX=	.tar.bz2
@@ -24,13 +25,17 @@ GNU_CONFIGURE=		yes
 SHLIBTOOL_OVERRIDE=	libtool
 
 CONFIGURE_ARGS+=	--disable-binreloc
-CONFIGURE_ARGS+=	--with-silc-includes=${BUILDLINK_PREFIX.silc-toolkit}/include/silc
-CONFIGURE_ARGS+=	--with-silc-libs=${BUILDLINK_PREFIX.silc-toolkit}/lib/silc
+CONFIGURE_ARGS+=	--disable-gnutls
 CONFIGURE_ARGS+=	--disable-nas
 CONFIGURE_ARGS+=	--disable-perl
-CONFIGURE_ARGS+=	--disable-nss
 CONFIGURE_ARGS+=	--disable-tcl
 CONFIGURE_ARGS+=	--disable-gevolution
+CONFIGURE_ARGS+=	--with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr
+CONFIGURE_ARGS+=	--with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib/nspr
+CONFIGURE_ARGS+=	--with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss
+CONFIGURE_ARGS+=	--with-nss-libs=${BUILDLINK_PREFIX.nss}/lib/nss
+CONFIGURE_ARGS+=	--with-silc-includes=${BUILDLINK_PREFIX.silc-toolkit}/include/silc
+CONFIGURE_ARGS+=	--with-silc-libs=${BUILDLINK_PREFIX.silc-toolkit}/lib/silc
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -43,9 +48,9 @@ CONFIGURE_ARGS+=	--disable-screensaver
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/nss/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../devel/silc-toolkit/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index 3a1cfbeffa2..2ac2bef47af 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.60 2005/02/27 08:52:07 jmmv Exp $
+$NetBSD: distinfo,v 1.61 2005/03/18 18:56:04 jmmv Exp $
 
 SHA1 (gaim-1.1.4.tar.bz2) = ef4061f2f7413b18c4ea59da10b9f0837df20054
 RMD160 (gaim-1.1.4.tar.bz2) = eb254b2d63108cd65c5237bea922900a4ba72fbf
 Size (gaim-1.1.4.tar.bz2) = 5195580 bytes
 SHA1 (patch-aa) = 555c394dbb4cd9ef4fea621d30ce72baae309067
-SHA1 (patch-ac) = 9cb0f91f58a556f44de84819e9c15083f012abbc
-SHA1 (patch-ad) = e3c71479caeeebe287bcd063e5b8e470832a0c08
+SHA1 (patch-ad) = 21ffc478343793ce065c75a24ed0cf58b0677359
diff --git a/chat/gaim/patches/patch-ac b/chat/gaim/patches/patch-ac
deleted file mode 100644
index 41f067158f7..00000000000
--- a/chat/gaim/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2004/11/16 19:49:42 ben Exp $
-
---- configure.ac.orig	Thu Nov 11 13:51:08 2004
-+++ configure.ac
-@@ -125,7 +125,7 @@ else
- 	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"
- 	AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
- fi
- AC_SUBST(SILC_LIBS)
diff --git a/chat/gaim/patches/patch-ad b/chat/gaim/patches/patch-ad
index e7579e21127..fc53e258813 100644
--- a/chat/gaim/patches/patch-ad
+++ b/chat/gaim/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2004/12/03 12:43:24 adam Exp $
+$NetBSD: patch-ad,v 1.7 2005/03/18 18:56:04 jmmv Exp $
 
---- configure.orig	2004-12-03 04:24:48.000000000 +0000
+--- configure.orig	2005-02-25 03:44:01.000000000 +0100
 +++ configure
-@@ -27839,7 +27839,7 @@ fi
+@@ -28205,7 +28205,7 @@ fi
  	if test "$ac_silc_libs" != "no"; then
  		SILC_LIBS="-L$ac_silc_libs"
  	fi
@@ -11,3 +11,16 @@ $NetBSD: patch-ad,v 1.6 2004/12/03 12:43:24 adam 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
+@@ -33268,10 +33268,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="$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"
+ 			fi
+ 
+ 			echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5