4 files changed, 56 insertions, 8 deletions

diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 169c89b32003..87cc743e439b 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.5.2
+PORTVERSION=	2.5.3
 PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -118,8 +118,10 @@ CONFIGURE_ARGS+=	--enable-nss=yes \
 			--with-nspr-libs=${LOCALBASE}/lib \
 			--with-nss-includes=${LOCALBASE}/include/nss/nss \
 			--with-nss-libs=${LOCALBASE}/lib/nss
+PLIST_SUB+=		NSS=""
 .else
 CONFIGURE_ARGS+=	--enable-nss=no
+PLIST_SUB+=		NSS="@comment "
 .endif
 
 .if defined(WITH_SASL)
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index 139e3f3a63e4..419d15a647f3 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,3 +1,3 @@
-MD5 (pidgin-2.5.2.tar.bz2) = 4a712f6fd3d2e25c07ccff1fc350c6ea
-SHA256 (pidgin-2.5.2.tar.bz2) = 2013410352bbbab949cbaa71b0b751a39597b3710845a34e62fcb0e1f9b669dc
-SIZE (pidgin-2.5.2.tar.bz2) = 8059006
+MD5 (pidgin-2.5.3.tar.bz2) = 4abc4ce9e1ad62bbf098f05f305147d7
+SHA256 (pidgin-2.5.3.tar.bz2) = 912c934425fc40535fc79eb9082f6f823808d8ea8ecdd370d0b8ceec4b97ad82
+SIZE (pidgin-2.5.3.tar.bz2) = 8393073
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index f16e1eb56a4d..1b7f4cb85138 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -117,8 +117,8 @@ lib/purple-2/psychic.la
 lib/purple-2/psychic.so
 lib/purple-2/ssl-gnutls.la
 lib/purple-2/ssl-gnutls.so
-lib/purple-2/ssl-nss.la
-lib/purple-2/ssl-nss.so
+%%NSS%%lib/purple-2/ssl-nss.la
+%%NSS%%lib/purple-2/ssl-nss.so
 lib/purple-2/ssl.la
 lib/purple-2/ssl.so
 lib/purple-2/statenotify.la
@@ -215,6 +215,7 @@ 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_Internet_Authority.pem
 share/purple/ca-certs/Microsoft_Secure_Server_Authority.pem
 share/purple/ca-certs/StartCom_Free_SSL_CA.pem
 share/purple/ca-certs/Verisign_Class3_Primary_CA.pem
diff --git a/net-im/pidgin/pkg-plist b/net-im/pidgin/pkg-plist
index 21974c377ae4..94b2ec2d153f 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -371,6 +371,47 @@ share/pixmaps/pidgin/emotes/default/worship.png
 share/pixmaps/pidgin/emotes/default/yawn.png
 share/pixmaps/pidgin/emotes/default/yin-yang.png
 share/pixmaps/pidgin/emotes/none/theme
+share/pixmaps/pidgin/emotes/small/angel.png
+share/pixmaps/pidgin/emotes/small/angry.png
+share/pixmaps/pidgin/emotes/small/beer.png
+share/pixmaps/pidgin/emotes/small/camera.png
+share/pixmaps/pidgin/emotes/small/cigarette.png
+share/pixmaps/pidgin/emotes/small/coffee.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
+share/pixmaps/pidgin/emotes/small/dont-know.png
+share/pixmaps/pidgin/emotes/small/grin.png
+share/pixmaps/pidgin/emotes/small/hug-left.png
+share/pixmaps/pidgin/emotes/small/hug-right.png
+share/pixmaps/pidgin/emotes/small/kiss.png
+share/pixmaps/pidgin/emotes/small/love.png
+share/pixmaps/pidgin/emotes/small/meeting.png
+share/pixmaps/pidgin/emotes/small/musical-note.png
+share/pixmaps/pidgin/emotes/small/nerdy.png
+share/pixmaps/pidgin/emotes/small/neutral.png
+share/pixmaps/pidgin/emotes/small/party.png
+share/pixmaps/pidgin/emotes/small/phone.png
+share/pixmaps/pidgin/emotes/small/plate.png
+share/pixmaps/pidgin/emotes/small/question.png
+share/pixmaps/pidgin/emotes/small/sad.png
+share/pixmaps/pidgin/emotes/small/shame.png
+share/pixmaps/pidgin/emotes/small/shock.png
+share/pixmaps/pidgin/emotes/small/sick.png
+share/pixmaps/pidgin/emotes/small/silent.png
+share/pixmaps/pidgin/emotes/small/sleepy.png
+share/pixmaps/pidgin/emotes/small/smile-big.png
+share/pixmaps/pidgin/emotes/small/smile.png
+share/pixmaps/pidgin/emotes/small/theme
+share/pixmaps/pidgin/emotes/small/thinking.png
+share/pixmaps/pidgin/emotes/small/tongue.png
+share/pixmaps/pidgin/emotes/small/tv.png
+share/pixmaps/pidgin/emotes/small/uhm-yeah.png
+share/pixmaps/pidgin/emotes/small/wink.png
+share/pixmaps/pidgin/emotes/small/yawn.png
 share/pixmaps/pidgin/logo.png
 share/pixmaps/pidgin/protocols/16/aim.png
 share/pixmaps/pidgin/protocols/16/bonjour.png
@@ -430,6 +471,8 @@ 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
+share/pixmaps/pidgin/status/11/rtl/log-in.png
+share/pixmaps/pidgin/status/11/rtl/log-out.png
 share/pixmaps/pidgin/status/16/available.png
 share/pixmaps/pidgin/status/16/away.png
 share/pixmaps/pidgin/status/16/busy.png
@@ -479,8 +522,9 @@ share/pixmaps/pidgin/status/48/log-out.png
 share/pixmaps/pidgin/status/48/offline.png
 share/pixmaps/pidgin/status/48/person.png
 share/pixmaps/pidgin/status/48/rtl/extended-away.png
-share/pixmaps/pidgin/status/48/rtl/login.png
-share/pixmaps/pidgin/status/48/rtl/logout.png
+share/pixmaps/pidgin/status/48/invisible.png
+share/pixmaps/pidgin/status/48/rtl/log-in.png
+share/pixmaps/pidgin/status/48/rtl/log-out.png
 share/pixmaps/pidgin/toolbar/16/change-bgcolor.png
 share/pixmaps/pidgin/toolbar/16/change-fgcolor.png
 share/pixmaps/pidgin/toolbar/16/emote-select.png
@@ -566,6 +610,7 @@ share/icons/hicolor/48x48/apps/pidgin.png
 @dirrm share/pixmaps/pidgin/protocols/22
 @dirrm share/pixmaps/pidgin/protocols/16
 @dirrm share/pixmaps/pidgin/protocols
+@dirrm share/pixmaps/pidgin/emotes/small
 @dirrm share/pixmaps/pidgin/emotes/none
 @dirrm share/pixmaps/pidgin/emotes/default
 @dirrm share/pixmaps/pidgin/emotes