Update the pidgin IM suite to version 2.3.0.

version 2.3.0 (11/24/2007):
	http://developer.pidgin.im/query?status=closed&milestone=2.3.0
Some highlights from ChangeLog:

Pidgin:
* Connection errors are now reported in mini-dialogs inside the buddy
  list, rather than as buttons in the buddy list and with dialog
  boxes.  If several accounts are disabled when you sign on elsewhere,
  you can now re-enable them all with a single click.
* If you alias a buddy to an alias that is already present within
  a particular group, we now offer to merge the buddies into the
  same contact.
* A music emblem is now displayed in the buddy list for a buddy if we
  know she is listening to some soothing music.
* Added a 'Move to' menu in buddy list context menu for moving buddies
  to other groups as an alternative to dragging.
* It is now possible to mark a chat on your buddy list as "Persistent"
  so you do not leave the chat when the window or tab is closed.
* The auto-join option for chats is now listed in the "Add Chat"
  dialog along with the new persistence option.
* Closing an IM no longer immediately closes your conversation.  It
  will now remain active for a short time so that if the conversation
  resumes, the history will be retained.  A preference has been added
  to toggle this behavior.
* The "Smiley" menu has been moved to the top-level of the toolbar.
* Pidgin's display is now saved with the command line for session
  restoration.  (David Mohr)
* ICQ Birthday notifications are shown as buddy list emblems.
* Plugin actions are now available from the docklet context menu
  in addition to the Tool menu of the buddy list.
* The manual page has been heavily rewritten to bring it in line
  with current functionality.

Finch:
* It's possible to bind key-strokes to specific menuitems in the windows.
  Read the 'Menus' section in the man-page for details.
* 'transpose-chars' operation for the entry boxes. The default key-binding
  is ctrl+t.
* 'yank' operation for the entry boxes. The default binding is ctrl+y.

11 files changed, 48 insertions, 44 deletions

diff --git a/chat/finch/PLIST b/chat/finch/PLIST
index a28952bc716..0ec24f5a12c 100644
--- a/chat/finch/PLIST
+++ b/chat/finch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/11/03 15:59:17 tnn Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/12/02 04:17:54 tnn Exp $
 bin/finch
 include/finch/finch.h
 include/finch/gntaccount.h
@@ -47,13 +47,13 @@ lib/finch/gntclipboard.la
 lib/finch/gntgf.la
 lib/finch/gnthistory.la
 lib/finch/gntlastlog.la
-lib/libgnt.la
-lib/gnt/s.la
 lib/gnt/irssi.la
+lib/gnt/s.la
+lib/libgnt.la
 lib/pkgconfig/finch.pc
 lib/pkgconfig/gnt.pc
 man/man1/finch.1
-@dirrm include/finch
-@dirrm include/gnt
 @dirrm lib/gnt
 @dirrm lib/finch
+@dirrm include/gnt
+@dirrm include/finch
diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index b61430a2d7d..4dab66349f4 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/09/21 13:03:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/12/02 04:17:54 tnn Exp $
 #
 
 PKGNAME=	libpurple-${PIDGIN_VERSION}
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=	--disable-consoleui
 
 .include "options.mk"
 
-BUILD_DIRS=	m4macros libpurple po share
+BUILD_DIRS=	m4macros libpurple po share/ca-certs share/sounds
 
 ## #post-build:
 ## #	cp ${WRKSRC}/libpurple/gconf/purple.schemas ${WRKSRC}/purple.schemas
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index 86131522536..76fed11eb5d 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.7 2007/11/03 15:59:17 tnn Exp $
+# $NetBSD: Makefile.common,v 1.8 2007/12/02 04:17:54 tnn Exp $
 #
 
-PIDGIN_VERSION=	2.2.2
+PIDGIN_VERSION=	2.3.0
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index 5f24f2494be..b8e0332558b 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2007/11/03 15:59:18 tnn Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/12/02 04:17:54 tnn Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
@@ -33,6 +33,7 @@ include/libpurple/prefs.h
 include/libpurple/privacy.h
 include/libpurple/proxy.h
 include/libpurple/prpl.h
+include/libpurple/purple.h
 include/libpurple/request.h
 include/libpurple/roomlist.h
 include/libpurple/savedstatuses.h
@@ -61,8 +62,8 @@ lib/purple-2/libicq.la
 lib/purple-2/libirc.la
 lib/purple-2/libjabber.la
 lib/purple-2/libmsn.la
-lib/purple-2/libnovell.la
 lib/purple-2/libmyspace.la
+lib/purple-2/libnovell.la
 lib/purple-2/liboscar.la
 lib/purple-2/libqq.la
 lib/purple-2/libsimple.la
@@ -142,6 +143,7 @@ share/locale/te/LC_MESSAGES/pidgin.mo
 share/locale/th/LC_MESSAGES/pidgin.mo
 share/locale/tr/LC_MESSAGES/pidgin.mo
 share/locale/uk/LC_MESSAGES/pidgin.mo
+share/locale/ur/LC_MESSAGES/pidgin.mo
 share/locale/vi/LC_MESSAGES/pidgin.mo
 share/locale/xh/LC_MESSAGES/pidgin.mo
 share/locale/zh_CN/LC_MESSAGES/pidgin.mo
diff --git a/chat/libpurple/buildlink3.mk b/chat/libpurple/buildlink3.mk
index 38d92fc722c..ca4604e7930 100644
--- a/chat/libpurple/buildlink3.mk
+++ b/chat/libpurple/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2007/12/01 22:46:42 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2007/12/02 04:17:54 tnn 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.2.2
+BUILDLINK_API_DEPENDS.libpurple+=	libpurple>=2.3.0
 BUILDLINK_PKGSRCDIR.libpurple?=	../../chat/libpurple
 .endif	# LIBPURPLE_BUILDLINK3_MK
 
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index b7bd01fdce1..9e1e42b308b 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2007/11/03 15:59:18 tnn Exp $
+$NetBSD: distinfo,v 1.11 2007/12/02 04:17:54 tnn Exp $
 
-SHA1 (pidgin-2.2.2.tar.bz2) = ff955c3a2509d257c7fda1a48af6bdde439b0d8a
-RMD160 (pidgin-2.2.2.tar.bz2) = 1f067d84c1b8545ab1c4841c30fb3db2a3fac309
-Size (pidgin-2.2.2.tar.bz2) = 8901875 bytes
+SHA1 (pidgin-2.3.0.tar.bz2) = b9e20d153c4a6c56218d807662a9957ac3e35523
+RMD160 (pidgin-2.3.0.tar.bz2) = c814e4213996227b22c61c4ff187588f4652c10b
+Size (pidgin-2.3.0.tar.bz2) = 9363188 bytes
 SHA1 (patch-aa) = 3d3282be44c933d015c75b0785b4d5582c216383
 SHA1 (patch-ab) = 5f1fc87cc258de372fbdf521aeb6822f50506090
 SHA1 (patch-ae) = ff4f2d738656c6f23c423046f746b9ed2878c415
-SHA1 (patch-af) = 665d5207afdc3ec9b627ac7cc7f99e75d4382877
+SHA1 (patch-af) = 9c6b1fb953ca4d00871c6d2f73defb33cd7922c5
 SHA1 (patch-ag) = fa71295e848f1b06f318f06fab8fcc90110c20a3
diff --git a/chat/libpurple/patches/patch-af b/chat/libpurple/patches/patch-af
index 300851d47b4..f07ef4c8f13 100644
--- a/chat/libpurple/patches/patch-af
+++ b/chat/libpurple/patches/patch-af
@@ -1,10 +1,8 @@
-$NetBSD: patch-af,v 1.2 2007/09/15 14:55:02 tnn Exp $
+$NetBSD: patch-af,v 1.3 2007/12/02 04:17:54 tnn Exp $
 
-  .desktop file only in the pidgin package
-
---- Makefile.in.orig	2007-09-14 09:31:38.000000000 +0200
+--- Makefile.in.orig	2007-11-24 20:07:19.000000000 +0100
 +++ Makefile.in
-@@ -466,7 +466,7 @@ noinst_HEADERS = config.h
+@@ -370,7 +370,7 @@ noinst_HEADERS = config.h
  #	cp libpurple/plugins/perl/common/Gaim.pm $(distdir)/libpurple/plugins/perl/common
  appsdir = $(datadir)/applications
  apps_in_files = pidgin.desktop.in
@@ -12,4 +10,4 @@ $NetBSD: patch-af,v 1.2 2007/09/15 14:55:02 tnn Exp $
 +@ENABLE_GTK_TRUE@apps_DATA = $(apps_in_files:.desktop.in=.desktop)
  @ENABLE_GTK_TRUE@GTK_DIR = pidgin
  @ENABLE_GNT_TRUE@GNT_DIR = finch
- SUBDIRS = libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros po share
+ SUBDIRS = libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros po share/ca-certs share/sounds
diff --git a/chat/pidgin-silc/Makefile b/chat/pidgin-silc/Makefile
index 34625282407..c5ae32d11ee 100644
--- a/chat/pidgin-silc/Makefile
+++ b/chat/pidgin-silc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:29 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/12/02 04:17:55 tnn Exp $
 #
 
 PKGNAME=		pidgin-silc-${PIDGIN_VERSION}
@@ -24,18 +24,18 @@ BUNDLE_SILC=yes
 .if defined(BUNDLE_SILC)
 
 DISTINFO_FILE=		${.CURDIR}/../../chat/pidgin-silc/distinfo
-SITES.silc-toolkit-1.1.2.tar.gz= \
+SITES.silc-toolkit-1.1.5.tar.gz= \
 			http://www.silcnet.org/download/toolkit/sources/
-DISTFILES+=		pidgin-${PIDGIN_VERSION}.tar.bz2 silc-toolkit-1.1.2.tar.gz
+DISTFILES+=		pidgin-${PIDGIN_VERSION}.tar.bz2 silc-toolkit-1.1.5.tar.gz
 CFLAGS+=		-fPIC
 pre-configure:
 	# Build libsilc statically and install it into the buildlink dir
-	cd ${WRKDIR}/silc-toolkit-1.1.2 && ${SETENV} ${CONFIGURE_ENV} \
+	cd ${WRKDIR}/silc-toolkit-1.1.5 && ${SETENV} ${CONFIGURE_ENV} \
 	./configure --disable-asm --enable-static --disable-shared \
 	--without-libtoolfix --prefix=${BUILDLINK_DIR} && \
 	${SETENV} ${MAKE_ENV} gmake && \
 	${SETENV} ${MAKE_ENV} gmake install && \
-	cp ${WRKDIR}/silc-toolkit-1.1.2/lib/.libs/*.a \
+	cp ${WRKDIR}/silc-toolkit-1.1.5/lib/.libs/*.a \
 	${WRKSRC}/libpurple/protocols/silc
 
 SUBST_CLASSES+=		linkage
diff --git a/chat/pidgin-silc/distinfo b/chat/pidgin-silc/distinfo
index cedd586f19c..ecc7865697c 100644
--- a/chat/pidgin-silc/distinfo
+++ b/chat/pidgin-silc/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.6 2007/11/03 15:59:18 tnn Exp $
+$NetBSD: distinfo,v 1.7 2007/12/02 04:17:55 tnn Exp $
 
-SHA1 (pidgin-2.2.2.tar.bz2) = ff955c3a2509d257c7fda1a48af6bdde439b0d8a
-RMD160 (pidgin-2.2.2.tar.bz2) = 1f067d84c1b8545ab1c4841c30fb3db2a3fac309
-Size (pidgin-2.2.2.tar.bz2) = 8901875 bytes
-SHA1 (silc-toolkit-1.1.2.tar.gz) = 7a68acc2e819d6f4f02bf28d02daf191d41693e4
-RMD160 (silc-toolkit-1.1.2.tar.gz) = e03045ae82679f9062e4e94e8fb131f1a9043a48
-Size (silc-toolkit-1.1.2.tar.gz) = 2678868 bytes
+SHA1 (pidgin-2.3.0.tar.bz2) = b9e20d153c4a6c56218d807662a9957ac3e35523
+RMD160 (pidgin-2.3.0.tar.bz2) = c814e4213996227b22c61c4ff187588f4652c10b
+Size (pidgin-2.3.0.tar.bz2) = 9363188 bytes
+SHA1 (silc-toolkit-1.1.5.tar.gz) = 25a7124554ddd9bf93dc7c59b25ae8fc75320074
+RMD160 (silc-toolkit-1.1.5.tar.gz) = 6bc3e4c1121e15d6795f32fb405fa23e3b2b71d6
+Size (silc-toolkit-1.1.5.tar.gz) = 3231165 bytes
 SHA1 (patch-aa) = 3d3282be44c933d015c75b0785b4d5582c216383
 SHA1 (patch-ab) = 5f1fc87cc258de372fbdf521aeb6822f50506090
 SHA1 (patch-ae) = ff4f2d738656c6f23c423046f746b9ed2878c415
-SHA1 (patch-af) = 665d5207afdc3ec9b627ac7cc7f99e75d4382877
+SHA1 (patch-af) = 9c6b1fb953ca4d00871c6d2f73defb33cd7922c5
 SHA1 (patch-ag) = fa71295e848f1b06f318f06fab8fcc90110c20a3
diff --git a/chat/pidgin/PLIST b/chat/pidgin/PLIST
index d4204b4df71..9a7c85c4e0f 100644
--- a/chat/pidgin/PLIST
+++ b/chat/pidgin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/09/15 14:55:02 tnn Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/12/02 04:17:54 tnn Exp $
 bin/pidgin
 include/pidgin/eggtrayicon.h
 include/pidgin/gtkaccount.h
@@ -45,6 +45,7 @@ include/pidgin/gtkstatusbox.h
 include/pidgin/gtkthemes.h
 include/pidgin/gtkutils.h
 include/pidgin/gtkwhiteboard.h
+include/pidgin/minidialog.h
 include/pidgin/pidgin.h
 include/pidgin/pidgincombobox.h
 include/pidgin/pidginstock.h
@@ -69,7 +70,6 @@ share/icons/hicolor/22x22/apps/pidgin.png
 share/icons/hicolor/24x24/apps/pidgin.png
 share/icons/hicolor/32x32/apps/pidgin.png
 share/icons/hicolor/48x48/apps/pidgin.png
-share/icons/hicolor/scalable/apps/pidgin.svg
 share/pixmaps/pidgin/animations/16/connect0.png
 share/pixmaps/pidgin/animations/16/connect1.png
 share/pixmaps/pidgin/animations/16/connect2.png
@@ -106,6 +106,7 @@ share/pixmaps/pidgin/dialogs/64/mail.png
 share/pixmaps/pidgin/dialogs/64/question.png
 share/pixmaps/pidgin/dialogs/64/warning.png
 share/pixmaps/pidgin/emblems/16/aol-client.png
+share/pixmaps/pidgin/emblems/16/birthday.png
 share/pixmaps/pidgin/emblems/16/blocked.png
 share/pixmaps/pidgin/emblems/16/bot.png
 share/pixmaps/pidgin/emblems/16/external.png
@@ -117,6 +118,7 @@ share/pixmaps/pidgin/emblems/16/half-operator.png
 share/pixmaps/pidgin/emblems/16/hiptop.png
 share/pixmaps/pidgin/emblems/16/male.png
 share/pixmaps/pidgin/emblems/16/mobile.png
+share/pixmaps/pidgin/emblems/16/music.png
 share/pixmaps/pidgin/emblems/16/not-authorized.png
 share/pixmaps/pidgin/emblems/16/operator.png
 share/pixmaps/pidgin/emblems/16/qq-member.png
@@ -370,6 +372,8 @@ share/pixmaps/pidgin/status/11/busy.png
 share/pixmaps/pidgin/status/11/chat.png
 share/pixmaps/pidgin/status/11/extended-away.png
 share/pixmaps/pidgin/status/11/invisible.png
+share/pixmaps/pidgin/status/11/log-in.png
+share/pixmaps/pidgin/status/11/log-out.png
 share/pixmaps/pidgin/status/11/offline.png
 share/pixmaps/pidgin/status/11/person.png
 share/pixmaps/pidgin/status/11/rtl/extended-away.png
@@ -409,9 +413,9 @@ share/pixmaps/pidgin/status/32/log-in.png
 share/pixmaps/pidgin/status/32/log-out.png
 share/pixmaps/pidgin/status/32/offline.png
 share/pixmaps/pidgin/status/32/person.png
+share/pixmaps/pidgin/status/32/rtl/extended-away.png
 share/pixmaps/pidgin/status/32/rtl/log-in.png
 share/pixmaps/pidgin/status/32/rtl/log-out.png
-share/pixmaps/pidgin/status/32/rtl/extended-away.png
 share/pixmaps/pidgin/status/48/available.png
 share/pixmaps/pidgin/status/48/away.png
 share/pixmaps/pidgin/status/48/busy.png
@@ -428,9 +432,9 @@ share/pixmaps/pidgin/toolbar/16/emote-select.png
 share/pixmaps/pidgin/toolbar/16/font-face.png
 share/pixmaps/pidgin/toolbar/16/font-size-down.png
 share/pixmaps/pidgin/toolbar/16/font-size-up.png
-share/pixmaps/pidgin/toolbar/16/insert.png
 share/pixmaps/pidgin/toolbar/16/insert-image.png
 share/pixmaps/pidgin/toolbar/16/insert-link.png
+share/pixmaps/pidgin/toolbar/16/insert.png
 share/pixmaps/pidgin/toolbar/16/message-new.png
 share/pixmaps/pidgin/toolbar/16/plugins.png
 share/pixmaps/pidgin/toolbar/16/send-file.png
@@ -572,6 +576,7 @@ share/pixmaps/purple/buddy_icons/qq/qq_98.png
 share/pixmaps/purple/buddy_icons/qq/qq_99.png
 @dirrm share/pixmaps/purple/buddy_icons/qq
 @dirrm share/pixmaps/purple/buddy_icons
+@dirrm share/pixmaps/purple
 @dirrm share/pixmaps/pidgin/tray/48
 @dirrm share/pixmaps/pidgin/tray/32
 @dirrm share/pixmaps/pidgin/tray/22
@@ -607,6 +612,5 @@ share/pixmaps/purple/buddy_icons/qq/qq_99.png
 @dirrm share/pixmaps/pidgin/animations/16
 @dirrm share/pixmaps/pidgin/animations
 @dirrm share/pixmaps/pidgin
-@dirrm share/pixmaps/purple
 @dirrm lib/pidgin
 @dirrm include/pidgin
diff --git a/chat/pidgin/buildlink3.mk b/chat/pidgin/buildlink3.mk
index 32df1f83af6..2a557f8876c 100644
--- a/chat/pidgin/buildlink3.mk
+++ b/chat/pidgin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2007/11/03 15:59:18 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2007/12/02 04:17:55 tnn Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PIDGIN_BUILDLINK3_MK:=	${PIDGIN_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	pidgin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pidgin
 
 .if ${PIDGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.pidgin+=	pidgin>=2.2.2
+BUILDLINK_API_DEPENDS.pidgin+=	pidgin>=2.3.0
 BUILDLINK_PKGSRCDIR.pidgin?=	../../chat/pidgin
 .endif	# PIDGIN_BUILDLINK3_MK