Changes 2.7.9:

  John: Just a quick release for a security fix here.  Elliott has not
  yet had a chance to work on the MSN breakage that's been present in
  the last couple releases, but we hope he can do it before 2.7.10!

Changes 2.7.8:
  Elliott: OK, so I know a few things broke with the last release, and
  it's too bad we had to rush it for that silly certificate thing that
  the MSN people can't configure properly.  I've certainly done a lot of
  small fixes this time, but it's too bad we haven't been able to get the
  transfers with the official client fixed yet.  I promise it'll be in
  the next release (barring any quick security issues).

  John: So, it's been about a month since we last released.  Again, we've
  assembled a bugfix release for your enjoyment.  While a few commonly
  reported bugs remain, particularly in MSN, we're working on it for the
  next release.  In the meantime, Merry Christmas and enjoy!

Changes 2.7.7:
  John: Well, this time around, we should finally have the certificate
  issue really and fully fixed for all of you MSN users.  Also, we have
  a few AIM-related fixes in this release, most notably the fix for the
  new "SSL Handshake Failure" message some of you got after upgrading.
  That one was an oversight on our part.  Enjoy the fixes!

12 files changed, 51 insertions, 42 deletions

diff --git a/chat/finch/Makefile b/chat/finch/Makefile
index df6c082c23b..6dc57cb7918 100644
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2011/01/13 13:37:12 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2011/02/02 13:18:47 adam Exp $
 
 PKGNAME=	finch-${PIDGIN_VERSION}
-PKGREVISION=	3
 
 COMMENT=	Multi-protocol Instant Messaging client console frontend
 
diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index 2436b252736..d556a691a45 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2011/01/13 13:53:24 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2011/02/02 13:18:48 adam Exp $
 
 PKGNAME=	libpurple-${PIDGIN_VERSION}
-PKGREVISION=	3
 COMMENT=	Multi-protocol Instant Messaging client backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index 1ff53227ff0..92ec2d3c0ee 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2010/08/30 11:18:01 adam Exp $
+# $NetBSD: Makefile.common,v 1.32 2011/02/02 13:18:48 adam Exp $
 #
 # used by chat/finch/Makefile
 # used by chat/libpurple/Makefile
@@ -6,7 +6,7 @@
 # used by chat/pidgin-sametime/Makefile
 # used by chat/pidgin-silc/Makefile
 
-PIDGIN_VERSION=	2.7.3
+PIDGIN_VERSION=	2.7.9
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
@@ -16,10 +16,10 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pidgin.im/
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config gmake
 USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		pkg-config gmake
+GNU_CONFIGURE=		yes
 
 PATCHDIR=		${.CURDIR}/../../chat/libpurple/patches
 DISTINFO_FILE?=		${.CURDIR}/../../chat/libpurple/distinfo
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index 419b67498b8..450a7bce965 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2010/08/30 11:18:01 adam Exp $
+@comment $NetBSD: PLIST,v 1.23 2011/02/02 13:18:48 adam Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
@@ -143,6 +143,8 @@ share/locale/ko/LC_MESSAGES/pidgin.mo
 share/locale/ku/LC_MESSAGES/pidgin.mo
 share/locale/lo/LC_MESSAGES/pidgin.mo
 share/locale/lt/LC_MESSAGES/pidgin.mo
+share/locale/mai/LC_MESSAGES/pidgin.mo
+share/locale/mhr/LC_MESSAGES/pidgin.mo
 share/locale/mk/LC_MESSAGES/pidgin.mo
 share/locale/mn/LC_MESSAGES/pidgin.mo
 share/locale/mr/LC_MESSAGES/pidgin.mo
@@ -184,17 +186,23 @@ share/purple/ca-certs/AOL_Member_CA.pem
 share/purple/ca-certs/America_Online_Root_Certification_Authority_1.pem
 share/purple/ca-certs/CAcert_Class3.pem
 share/purple/ca-certs/CAcert_Root.pem
+share/purple/ca-certs/Deutsche_Telekom_Root_CA_2.pem
 share/purple/ca-certs/Entrust.net_Secure_Server_CA.pem
 share/purple/ca-certs/Equifax_Secure_CA.pem
 share/purple/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem
 share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
+share/purple/ca-certs/Go_Daddy_Class_2_CA.pem
 share/purple/ca-certs/Microsoft_Internet_Authority.pem
+share/purple/ca-certs/Microsoft_Internet_Authority_2010.pem
 share/purple/ca-certs/Microsoft_Secure_Server_Authority.pem
+share/purple/ca-certs/Microsoft_Secure_Server_Authority_2010.pem
 share/purple/ca-certs/StartCom_Certification_Authority.pem
 share/purple/ca-certs/StartCom_Free_SSL_CA.pem
 share/purple/ca-certs/Thawte_Premium_Server_CA.pem
+share/purple/ca-certs/Thawte_Primary_Root_CA.pem
 share/purple/ca-certs/ValiCert_Class_2_VA.pem
 share/purple/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem
+share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem
 share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
 share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
 share/purple/ca-certs/VeriSign_International_Server_Class_3_CA.pem
diff --git a/chat/libpurple/buildlink3.mk b/chat/libpurple/buildlink3.mk
index 68b85edd029..c5539953ec6 100644
--- a/chat/libpurple/buildlink3.mk
+++ b/chat/libpurple/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.19 2011/01/13 13:36:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2011/02/02 13:18:48 adam Exp $
 
 BUILDLINK_TREE+=	libpurple
 
 .if !defined(LIBPURPLE_BUILDLINK3_MK)
 LIBPURPLE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libpurple+=	libpurple>=2.5.0
-BUILDLINK_ABI_DEPENDS.libpurple?=	libpurple>=2.7.3nb3
+BUILDLINK_API_DEPENDS.libpurple+=	libpurple>=2.7.9
+BUILDLINK_ABI_DEPENDS.libpurple+=	libpurple>=2.7.9
 BUILDLINK_PKGSRCDIR.libpurple?=	../../chat/libpurple
 
 pkgbase := libpurple
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index b1b20537e04..ff1a5a0d45a 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.26 2010/08/30 11:18:01 adam Exp $
+$NetBSD: distinfo,v 1.27 2011/02/02 13:18:48 adam Exp $
 
-SHA1 (pidgin-2.7.3.tar.bz2) = 81b9b5591ddbdf36aa656ddd90ff935ae090e940
-RMD160 (pidgin-2.7.3.tar.bz2) = 276fb19abf6505f9d56120c7412987002511fcb3
-Size (pidgin-2.7.3.tar.bz2) = 9746117 bytes
+SHA1 (pidgin-2.7.9.tar.bz2) = 9fb36d788a644528ca1132befa553a3cb4228012
+RMD160 (pidgin-2.7.9.tar.bz2) = 4e913f608fa4ad3da81c4872c7202f567dfa4b95
+Size (pidgin-2.7.9.tar.bz2) = 9965575 bytes
diff --git a/chat/libpurple/options.mk b/chat/libpurple/options.mk
index 533e397e6be..3f8b92c4f26 100644
--- a/chat/libpurple/options.mk
+++ b/chat/libpurple/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2010/08/31 18:00:52 drochner Exp $
+# $NetBSD: options.mk,v 1.18 2011/02/02 13:18:48 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.libpurple
 PKG_SUPPORTED_OPTIONS+=		avahi dbus debug farsight gnome gnutls
@@ -19,6 +19,8 @@ CONFIGURE_ARGS+=	--enable-avahi
 PLIST.gnome=		yes
 .  include "../../devel/GConf/schemas.mk"
 GCONF_SCHEMAS+=		purple.schemas
+.else
+CONFIGURE_ARGS+=	--disable-schemas-install
 .endif
 
 .if !empty(PKG_OPTIONS:Mgnutls)
@@ -26,7 +28,6 @@ PLIST.gnutls=		yes
 CONFIGURE_ARGS+=	--enable-gnutls
 CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
 CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
-
 .  include "../../security/gnutls/buildlink3.mk"
 .else
 PLIST.nss=		yes
@@ -35,7 +36,6 @@ 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
-
 .  include "../../devel/nss/buildlink3.mk"
 .endif
 
diff --git a/chat/pidgin-sametime/Makefile b/chat/pidgin-sametime/Makefile
index 234cc856bec..10a490e2bc7 100644
--- a/chat/pidgin-sametime/Makefile
+++ b/chat/pidgin-sametime/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2011/01/13 13:37:15 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2011/02/02 13:18:48 adam Exp $
 
 PKGNAME=	pidgin-sametime-${PIDGIN_VERSION}
-PKGREVISION=	3
 COMMENT=	Lotus Sametime plugin for the Pidgin instant messenger
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -14,7 +13,6 @@ CONFIGURE_ARGS+=	--enable-meanwhile
 
 BUILD_DIRS=		libpurple/protocols/sametime
 
-BUILDLINK_API_DEPENDS.libpurple+=	libpurple-${PIDGIN_VERSION}{,nb*}
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../chat/meanwhile/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/chat/pidgin-silc/Makefile b/chat/pidgin-silc/Makefile
index 3b878e28701..7bcedd71b4c 100644
--- a/chat/pidgin-silc/Makefile
+++ b/chat/pidgin-silc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2011/01/13 13:37:15 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2011/02/02 13:18:48 adam Exp $
 
 PKGNAME=	pidgin-silc-${PIDGIN_VERSION}
-PKGREVISION=	3
 COMMENT=	SILC plugin for the Pidgin instant messenger
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -12,7 +11,6 @@ USE_TOOLS+=		msgfmt perl intltool
 
 BUILD_DIRS=		libpurple/protocols/silc
 
-BUILDLINK_API_DEPENDS.libpurple+=	libpurple-${PIDGIN_VERSION}{,nb*}
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index 38f2ca6c747..ea8d2c07771 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2011/01/13 13:36:45 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.27 2011/02/02 13:18:47 adam Exp $
+
 # XXX appease pkglint
 #PKGNAME=		pidgin-${PIDGIN_VERSION}
-PKGREVISION=		3
 COMMENT=		Multi-protocol Instant Messaging client GTK frontend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -37,16 +36,11 @@ post-install:
 
 # XXX install pidgin.1 via doc/Makefile
 
-BUILDLINK_API_DEPENDS.libpurple+=	libpurple-${PIDGIN_VERSION}{,nb*}
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXScrnSaver/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/pidgin/PLIST b/chat/pidgin/PLIST
index cc41725725c..9785407105f 100644
--- a/chat/pidgin/PLIST
+++ b/chat/pidgin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2010/08/30 19:05:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2011/02/02 13:18:47 adam Exp $
 bin/pidgin
 include/pidgin/gtkaccount.h
 include/pidgin/gtkblist-theme-loader.h
@@ -52,7 +52,7 @@ include/pidgin/pidginstock.h
 include/pidgin/pidgintooltip.h
 lib/pidgin/convcolors.la
 lib/pidgin/extplacement.la
-lib/pidgin/gestures.la
+${PLIST.x11}lib/pidgin/gestures.la
 lib/pidgin/gtkbuddynote.la
 lib/pidgin/history.la
 lib/pidgin/iconaway.la
@@ -399,7 +399,6 @@ share/pixmaps/pidgin/emotes/small/coffee.png
 share/pixmaps/pidgin/emotes/small/cold.png
 share/pixmaps/pidgin/emotes/small/confused.png
 share/pixmaps/pidgin/emotes/small/console.png
-share/pixmaps/pidgin/emotes/small/cool.png
 share/pixmaps/pidgin/emotes/small/cross.png
 share/pixmaps/pidgin/emotes/small/crying.png
 share/pixmaps/pidgin/emotes/small/devil.png
@@ -411,7 +410,6 @@ share/pixmaps/pidgin/emotes/small/excited.png
 share/pixmaps/pidgin/emotes/small/excruciating.png
 share/pixmaps/pidgin/emotes/small/eyeroll.png
 share/pixmaps/pidgin/emotes/small/girl.png
-share/pixmaps/pidgin/emotes/small/grin.png
 share/pixmaps/pidgin/emotes/small/grumpy.png
 share/pixmaps/pidgin/emotes/small/happy.png
 share/pixmaps/pidgin/emotes/small/hot.png
@@ -456,6 +454,7 @@ share/pixmaps/pidgin/emotes/small/suit.png
 share/pixmaps/pidgin/emotes/small/surfing.png
 share/pixmaps/pidgin/emotes/small/theme
 share/pixmaps/pidgin/emotes/small/thinking.png
+share/pixmaps/pidgin/emotes/small/thunder.png
 share/pixmaps/pidgin/emotes/small/tongue.png
 share/pixmaps/pidgin/emotes/small/tv.png
 share/pixmaps/pidgin/emotes/small/typing.png
@@ -466,6 +465,7 @@ share/pixmaps/pidgin/emotes/small/writing.png
 share/pixmaps/pidgin/logo.png
 share/pixmaps/pidgin/protocols/16/aim.png
 share/pixmaps/pidgin/protocols/16/bonjour.png
+share/pixmaps/pidgin/protocols/16/facebook.png
 share/pixmaps/pidgin/protocols/16/gadu-gadu.png
 share/pixmaps/pidgin/protocols/16/google-talk.png
 share/pixmaps/pidgin/protocols/16/icq.png
@@ -483,6 +483,7 @@ share/pixmaps/pidgin/protocols/16/yahoo.png
 share/pixmaps/pidgin/protocols/16/zephyr.png
 share/pixmaps/pidgin/protocols/22/aim.png
 share/pixmaps/pidgin/protocols/22/bonjour.png
+share/pixmaps/pidgin/protocols/22/facebook.png
 share/pixmaps/pidgin/protocols/22/gadu-gadu.png
 share/pixmaps/pidgin/protocols/22/google-talk.png
 share/pixmaps/pidgin/protocols/22/icq.png
@@ -499,6 +500,7 @@ share/pixmaps/pidgin/protocols/22/yahoo.png
 share/pixmaps/pidgin/protocols/22/zephyr.png
 share/pixmaps/pidgin/protocols/48/aim.png
 share/pixmaps/pidgin/protocols/48/bonjour.png
+share/pixmaps/pidgin/protocols/48/facebook.png
 share/pixmaps/pidgin/protocols/48/gadu-gadu.png
 share/pixmaps/pidgin/protocols/48/icq.png
 share/pixmaps/pidgin/protocols/48/irc.png
diff --git a/chat/pidgin/options.mk b/chat/pidgin/options.mk
index e711253c6ad..a0a68e3103d 100644
--- a/chat/pidgin/options.mk
+++ b/chat/pidgin/options.mk
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.10 2010/08/30 11:18:02 adam Exp $
+# $NetBSD: options.mk,v 1.11 2011/02/02 13:18:48 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.pidgin
-PKG_SUPPORTED_OPTIONS+=		dbus debug farsight gstreamer gtkspell
-PKG_SUGGESTED_OPTIONS+=		dbus gtkspell farsight gstreamer
+PKG_SUPPORTED_OPTIONS+=		dbus debug gstreamer gtkspell farsight x11
+PKG_SUGGESTED_OPTIONS+=		dbus gstreamer gtkspell farsight x11
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		dbus vv
+PLIST_VARS+=		dbus vv x11
 
 .if !empty(PKG_OPTIONS:Mdbus)
 CONFIGURE_ARGS+=	--enable-dbus
@@ -40,5 +40,16 @@ CONFIGURE_ARGS+=	--enable-gstreamer
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+= --enable-debug
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+PLIST.x11=		yes
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXScrnSaver/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-startup-notification
+CONFIGURE_ARGS+=	--without-x
 .endif