Welcome to libpurple, finch, and pidgin version 2.5.0.

Bump PKGREVISION of non-bundled plug-ins.

Changes for 2.5.0 (08/17/2008) since 2.4.3:
	libpurple + pidgin:

 - Lots of bug fixes and improvements for the MSN protocol
   (MSNP15 support) and MSN "bunny icon" (?).
 - Miscellaneous bug fixes, a few new icons, etc.

 - The following API changes:

	libpurple:
  Added:
  * Connection flag PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY to indicate
    that the connection supports sending and receiving custom smileys.
  * PurpleSmiley and the Smiley API.
  * purple_serv_got_join_chat_failed
  * chat-join-failed signal (see conversation-signals.dox)
  * chat-invite-blocked and blocked-im-msg signals (see
    converation-signals.dox) (Thanks to Stefan Ott)
  * purple_blist_update_node_icon
  * purple_buddy_icons_node_has_custom_icon
  * purple_buddy_icons_node_find_custom_icon
  * purple_buddy_icons_node_set_custom_icon
  * purple_buddy_icons_node_set_custom_icon_from_file
  * purple_notify_user_info_prepend_section_break
  * purple_notify_user_info_prepend_section_header
  * "website" and "dev_website" items to the ui_info hash table
  * purple_cmds_get_handle, purple_cmds_init, purple_cmds_uninit
  * cmd-added and cmd-removed signals
  * purple_get_host_name
  * purple_util_fetch_url_len (temporary function overload to add max_len
    param)
  * purple_util_fetch_url_request_len
  * purple_prpl_send_attention
  * purple_prpl_got_attention
  * purple_prpl_got_attention_in_chat

  Deprecated:
  * purple_blist_update_buddy_icon
  * purple_buddy_icons_has_custom_icon
  * purple_buddy_icons_find_custom_icon
  * purple_buddy_icons_set_custom_icon
  * pidgin_set_custom_buddy_icon
  * purple_util_fetch_url_len
  * purple_util_fetch_url_request_len
  * serv_send_attention
  * serv_got_attention

  Changed:
  * xmlnode_copy now copies the prefix and namespace map for nodes.

	pidgin:
  Added:
  * gtk_imhtml_smiley_create, gtk_imhtml_smiley_reload and
    gtk_imhtml_smiley_destroy to deal with GtkIMHtmlSmiley's.
  * pidgin_pixbuf_from_imgstore to create a GdkPixbuf from a
    PurpleStoredImage.
  * pidgin_themes_smiley_themeize_custom to associate custom smileys to
    a GtkIMHtml widget.
  * GTK_IMHTML_CUSTOM_SMILEY flag for GtkIMHtml.
  * GTK+ Custom Smiley API.

5 files changed, 12 insertions, 29 deletions

diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index 21239835c5d..7cac5e61811 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.18 2008/07/11 07:39:20 tnn Exp $
+# $NetBSD: Makefile.common,v 1.19 2008/08/19 18:18:10 bjs Exp $
 #
 # used by chat/finch/Makefile
 # used by chat/libpurple/Makefile
 # used by chat/pidgin/Makefile
 
-PIDGIN_VERSION=	2.4.3
+PIDGIN_VERSION=	2.5.0
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index 114dc1395d9..d1a02a4e7d7 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2008/05/17 22:56:17 tnn Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/08/19 18:18:10 bjs Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
@@ -40,6 +40,7 @@ include/libpurple/savedstatuses.h
 include/libpurple/server.h
 include/libpurple/signals.h
 include/libpurple/sound.h
+include/libpurple/smiley.h
 include/libpurple/sslconn.h
 include/libpurple/status.h
 include/libpurple/stringref.h
@@ -151,6 +152,8 @@ share/locale/xh/LC_MESSAGES/pidgin.mo
 share/locale/zh_CN/LC_MESSAGES/pidgin.mo
 share/locale/zh_HK/LC_MESSAGES/pidgin.mo
 share/locale/zh_TW/LC_MESSAGES/pidgin.mo
+share/purple/ca-certs/CAcert_Class3.pem
+share/purple/ca-certs/CAcert_Root.pem
 share/purple/ca-certs/Equifax_Secure_CA.pem
 share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
 share/purple/ca-certs/Microsoft_Secure_Server_Authority.pem
diff --git a/chat/libpurple/buildlink3.mk b/chat/libpurple/buildlink3.mk
index 42b8a6ab3f9..d242758b49a 100644
--- a/chat/libpurple/buildlink3.mk
+++ b/chat/libpurple/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2008/05/17 22:56:17 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2008/08/19 18:18:10 bjs Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPURPLE_BUILDLINK3_MK:=	${LIBPURPLE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	libpurple
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libpurple
 
 .if ${LIBPURPLE_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libpurple+=	libpurple>=2.4.2
+BUILDLINK_API_DEPENDS.libpurple+=	libpurple>=2.5.0
 BUILDLINK_PKGSRCDIR.libpurple?=	../../chat/libpurple
 .endif	# LIBPURPLE_BUILDLINK3_MK
 
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index 3602bbc6f5f..c4fb896ade2 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.16 2008/07/11 07:39:20 tnn Exp $
+$NetBSD: distinfo,v 1.17 2008/08/19 18:18:10 bjs Exp $
 
-SHA1 (pidgin-2.4.3.tar.bz2) = c967ddda3cb4a8aecfb2566427e8cbd260f2c0de
-RMD160 (pidgin-2.4.3.tar.bz2) = c5fa8f3f9e52ffffcc829d08a8b822cd9cdf5368
-Size (pidgin-2.4.3.tar.bz2) = 9382967 bytes
+SHA1 (pidgin-2.5.0.tar.bz2) = 5e05c9e795fde0055c99eb288e63f9ad0e1973c4
+RMD160 (pidgin-2.5.0.tar.bz2) = a600c16c6b7037ba2568ea956fd730c3b9cb8479
+Size (pidgin-2.5.0.tar.bz2) = 9316876 bytes
 SHA1 (patch-aa) = a64f525462056178653e5b7548862773a1fdce32
-SHA1 (patch-ab) = 5f1fc87cc258de372fbdf521aeb6822f50506090
 SHA1 (patch-ae) = ff4f2d738656c6f23c423046f746b9ed2878c415
 SHA1 (patch-ag) = fa71295e848f1b06f318f06fab8fcc90110c20a3
diff --git a/chat/libpurple/patches/patch-ab b/chat/libpurple/patches/patch-ab
deleted file mode 100644
index bc161486d6f..00000000000
--- a/chat/libpurple/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/08/17 16:39:37 gdt Exp $
-
-  We need definitions of NGROUPS, MAXLOGNAME, MAXCOMLEN on NetBSD.
-
---- libpurple/nat-pmp.c.orig	2007-05-09 23:02:58.000000000 -0400
-+++ libpurple/nat-pmp.c
-@@ -35,6 +35,12 @@
- #include "network.h"
- 
- #ifdef HAVE_SYS_SYSCTL_H
-+/*
-+ * XXX sysctl.h is a BSD include, and all such systems will have
-+ * sys/param.h.  Upstream should probably add a configure test for
-+ * sys/param.h.
-+ */
-+#include <sys/param.h>
- #include <sys/sysctl.h>
- #endif
-