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!

3 files changed, 24 insertions, 17 deletions

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