4 files changed, 31 insertions, 9 deletions

diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index b0988196dea2..c470c0c6d2b2 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.2
 PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -49,8 +49,8 @@ MAN1=		pidgin.1 finch.1
 PRPL_MODULES=	gg,irc,jabber,msn,novell,oscar,qq,simple,yahoo,zephyr
 
 OPTIONS=	SILC "Secure Internet Live Conferencing support" off \
-		GNUTLS "GNUTLS encryption support" off \
-		NSS "Mozilla NSS encryption support" on \
+		GNUTLS "GNUTLS encryption support" on \
+		NSS "Mozilla NSS encryption support" off \
 		SASL "Cyrus SASL support (for jabberd)" off \
 		DBUS "Enable DBUS bindings" on \
 		PERL "Perl scripting" off \
@@ -101,14 +101,14 @@ CONFIGURE_ARGS+=--disable-cap
 PLIST_SUB+=	CAP="@comment not installed: "
 .endif
 
-.if defined(WITH_GNUTLS)
+.if !defined(WITHOUT_GNUTLS)
 LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--enable-gnutls=yes
 .else
 CONFIGURE_ARGS+=	--enable-gnutls=no
 .endif
 
-.if !defined(WITHOUT_NSS)
+.if defined(WITH_NSS)
 LIB_DEPENDS+=		nss3:${PORTSDIR}/security/nss
 CONFIGURE_ARGS+=	--enable-nss=yes \
 			--with-nspr-includes=${LOCALBASE}/include/nspr \
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index 7d35e61b13da..17a50aa7380a 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,3 +1,3 @@
-MD5 (pidgin-2.0.1.tar.bz2) = 51062e232c1ba5429d8be43623983fdf
-SHA256 (pidgin-2.0.1.tar.bz2) = 80f9908a604600950de8894e8107ba8f449543034e0220382d0c9f7361d151fc
-SIZE (pidgin-2.0.1.tar.bz2) = 7682458
+MD5 (pidgin-2.0.2.tar.bz2) = 613a357b2b1e030433fdfa680483d00f
+SHA256 (pidgin-2.0.2.tar.bz2) = e2d8d48b00d42cf935e3a7c8ed2d83d559be65cf3eca7cc88a8d0b7e4ba15a41
+SIZE (pidgin-2.0.2.tar.bz2) = 7838262
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index 971ecdc47e54..56d90ee92304 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	pidgin
-PORTREVISION=	1
+PORTREVISION=	0
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Pidgin multi-protocol messaging client (GTK+ UI)
diff --git a/net-im/pidgin/pkg-plist b/net-im/pidgin/pkg-plist
index 996a17072e2d..08968757e12b 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -56,6 +56,8 @@ lib/pidgin/gestures.la
 lib/pidgin/gestures.so
 %%EVO%%lib/pidgin/gevolution.la
 %%EVO%%lib/pidgin/gevolution.so
+lib/pidgin/gtkbuddynote.la
+lib/pidgin/gtkbuddynote.so
 lib/pidgin/history.la
 lib/pidgin/history.so
 lib/pidgin/iconaway.la
@@ -414,6 +416,7 @@ share/gnome/pixmaps/pidgin/tray/16/tray-connecting.png
 share/gnome/pixmaps/pidgin/tray/16/tray-extended-away.png
 share/gnome/pixmaps/pidgin/tray/16/tray-invisible.png
 share/gnome/pixmaps/pidgin/tray/16/tray-message.png
+share/gnome/pixmaps/pidgin/tray/16/tray-new-im.png
 share/gnome/pixmaps/pidgin/tray/16/tray-offline.png
 share/gnome/pixmaps/pidgin/tray/16/tray-online.png
 share/gnome/pixmaps/pidgin/tray/22/tray-away.png
@@ -422,8 +425,25 @@ share/gnome/pixmaps/pidgin/tray/22/tray-connecting.png
 share/gnome/pixmaps/pidgin/tray/22/tray-extended-away.png
 share/gnome/pixmaps/pidgin/tray/22/tray-invisible.png
 share/gnome/pixmaps/pidgin/tray/22/tray-message.png
+share/gnome/pixmaps/pidgin/tray/22/tray-new-im.png
 share/gnome/pixmaps/pidgin/tray/22/tray-offline.png
 share/gnome/pixmaps/pidgin/tray/22/tray-online.png
+share/gnome/pixmaps/pidgin/tray/32/tray-away.png
+share/gnome/pixmaps/pidgin/tray/32/tray-busy.png
+share/gnome/pixmaps/pidgin/tray/32/tray-connecting.png
+share/gnome/pixmaps/pidgin/tray/32/tray-extended-away.png
+share/gnome/pixmaps/pidgin/tray/32/tray-invisible.png
+share/gnome/pixmaps/pidgin/tray/32/tray-new-im.png
+share/gnome/pixmaps/pidgin/tray/32/tray-offline.png
+share/gnome/pixmaps/pidgin/tray/32/tray-online.png
+share/gnome/pixmaps/pidgin/tray/48/tray-away.png
+share/gnome/pixmaps/pidgin/tray/48/tray-busy.png
+share/gnome/pixmaps/pidgin/tray/48/tray-connecting.png
+share/gnome/pixmaps/pidgin/tray/48/tray-extended-away.png
+share/gnome/pixmaps/pidgin/tray/48/tray-invisible.png
+share/gnome/pixmaps/pidgin/tray/48/tray-new-im.png
+share/gnome/pixmaps/pidgin/tray/48/tray-offline.png
+share/gnome/pixmaps/pidgin/tray/48/tray-online.png
 share/gnome/pixmaps/purple/buddy_icons/qq/qq_1.png
 share/gnome/pixmaps/purple/buddy_icons/qq/qq_10.png
 share/gnome/pixmaps/purple/buddy_icons/qq/qq_100.png
@@ -538,6 +558,8 @@ share/icons/hicolor/scalable/apps/pidgin.svg
 @dirrm share/gnome/pixmaps/purple/buddy_icons/qq
 @dirrm share/gnome/pixmaps/purple/buddy_icons
 @dirrm share/gnome/pixmaps/purple
+@dirrm share/gnome/pixmaps/pidgin/tray/48
+@dirrm share/gnome/pixmaps/pidgin/tray/32
 @dirrm share/gnome/pixmaps/pidgin/tray/22
 @dirrm share/gnome/pixmaps/pidgin/tray/16
 @dirrm share/gnome/pixmaps/pidgin/tray