5 files changed, 127 insertions, 134 deletions

diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index f459414567ed..cbbe7433595f 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -1,10 +1,9 @@
 # Created by: Jim Mock <jim@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/net-im/libpurple/Makefile,v 1.32 2010/05/10 04:21:19 marcus Exp $
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.10.9
-PORTREVISION?=	7
+PORTVERSION=	2.10.10
+PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
 DISTNAME=	pidgin-${PORTVERSION}
@@ -12,7 +11,7 @@ DISTNAME=	pidgin-${PORTVERSION}
 MAINTAINER?=	marcus@FreeBSD.org
 COMMENT?=	Backend library for the Pidgin multi-protocol messaging client
 
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		cpe gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME?=	gnomeprefix intlhack glib20 libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--disable-gtkui \
@@ -27,10 +26,9 @@ INSTALL_TARGET=	install-strip
 .if !defined(PIDGIN_SLAVE)
 # Pidgin slave ports that require the following functionality, must explicitly
 # set these macros themselves.
-USES+=		gettext iconv
+USES+=		gettext iconv python
 USE_LDCONFIG=	yes
 WANT_GNOME=	yes
-USE_PYTHON=	yes
 
 .if defined(PACKAGE_BUILDING)
 .undef WITHOUT_GNOME
@@ -41,6 +39,8 @@ WITH_GNOME=	yes
 
 PRPL_MODULES=
 
+CPE_VENDOR=	pidgin
+
 OPTIONS_DEFINE=	BONJOUR DBUS GNUTLS NSS SASL GSTREAMER VV IDN PERL TCLTK \
 		SAMETIME SILC GG IRC JABBER MSN MYSPACE NOVELL OSCAR QQ \
 		SIMPLE YAHOO ZEPHYR
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index 6cd95f4e55f5..cf2cbdd20453 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pidgin-2.10.9.tar.bz2) = dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319
-SIZE (pidgin-2.10.9.tar.bz2) = 10093423
+SHA256 (pidgin-2.10.10.tar.bz2) = dc6b95512eaec75aef170aabce471491fc70584932599dfead20f1f1c45c822d
+SIZE (pidgin-2.10.10.tar.bz2) = 9409485
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index b6e313499ac1..1ab126d501b8 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -153,11 +153,11 @@ lib/purple-2/statenotify.so
 %%DBUS%%lib/libpurple-client.a
 %%DBUS%%lib/libpurple-client.so
 %%DBUS%%lib/libpurple-client.so.0
-%%DBUS%%lib/libpurple-client.so.0.10.9
+%%DBUS%%lib/libpurple-client.so.0.10.10
 lib/libpurple.a
 lib/libpurple.so
 lib/libpurple.so.0
-lib/libpurple.so.0.10.9
+lib/libpurple.so.0.10.10
 libdata/pkgconfig/purple.pc
 %%CONSOLEUI%%man/man1/finch.1.gz
 %%GTKUI%%man/man1/pidgin.1.gz
@@ -197,23 +197,22 @@ share/locale/he/LC_MESSAGES/pidgin.mo
 share/locale/hi/LC_MESSAGES/pidgin.mo
 share/locale/hr/LC_MESSAGES/pidgin.mo
 share/locale/hu/LC_MESSAGES/pidgin.mo
-share/locale/hy/LC_MESSAGES/pidgin.mo
 share/locale/id/LC_MESSAGES/pidgin.mo
 share/locale/it/LC_MESSAGES/pidgin.mo
 share/locale/ja/LC_MESSAGES/pidgin.mo
 share/locale/ka/LC_MESSAGES/pidgin.mo
+share/locale/kk/LC_MESSAGES/pidgin.mo
 share/locale/ko/LC_MESSAGES/pidgin.mo
 share/locale/km/LC_MESSAGES/pidgin.mo
 share/locale/kn/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/lv/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
-share/locale/ms_MY/LC_MESSAGES/pidgin.mo
 share/locale/my_MM/LC_MESSAGES/pidgin.mo
 share/locale/nb/LC_MESSAGES/pidgin.mo
 share/locale/ne/LC_MESSAGES/pidgin.mo
@@ -240,6 +239,7 @@ share/locale/ta/LC_MESSAGES/pidgin.mo
 share/locale/te/LC_MESSAGES/pidgin.mo
 share/locale/th/LC_MESSAGES/pidgin.mo
 share/locale/tr/LC_MESSAGES/pidgin.mo
+share/locale/tt/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
@@ -269,66 +269,60 @@ 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
 share/purple/ca-certs/Verisign_Class3_Primary_CA.pem
+share/purple/ca-certs/VeriSign_Class_3_Primary_CA-G2.pem
+share/purple/ca-certs/VeriSign_Class_3_Primary_CA-G5-2.pem
+share/purple/ca-certs/VeriSign_Class_3_Primary_CA-G5.pem
 share/sounds/purple/alert.wav
 share/sounds/purple/login.wav
 share/sounds/purple/logout.wav
 share/sounds/purple/receive.wav
 share/sounds/purple/send.wav
-@dirrm share/sounds/purple
-@dirrm share/purple/ca-certs
-@dirrm share/purple
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sw/LC_MESSAGES
-@dirrmtry share/locale/sw
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/my_MM/LC_MESSAGES
-@dirrmtry share/locale/my_MM
-@dirrmtry share/locale/ms_MY/LC_MESSAGES
-@dirrmtry share/locale/ms_MY
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mhr/LC_MESSAGES
-@dirrmtry share/locale/mhr
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/lo/LC_MESSAGES
-@dirrmtry share/locale/lo
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/km/LC_MESSAGES
-@dirrmtry share/locale/km
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-%%PERL:%%@dirrm lib/purple-2/perl/auto/Purple
-%%PERL:%%@dirrm lib/purple-2/perl/auto
-%%PERL:%%@dirrm lib/purple-2/perl
-@dirrm lib/purple-2
-@dirrm include/libpurple/media
-@dirrm include/libpurple
+@dir share/sounds/purple
+@dir share/purple/ca-certs
+@dir share/purple
+@dir share/locale/zh_HK/LC_MESSAGES
+@dir share/locale/zh_HK
+@dir share/locale/xh/LC_MESSAGES
+@dir share/locale/xh
+@dir share/locale/ur/LC_MESSAGES
+@dir share/locale/ur
+@dir share/locale/te/LC_MESSAGES
+@dir share/locale/te
+@dir share/locale/sw/LC_MESSAGES
+@dir share/locale/sw
+@dir share/locale/sr@latin/LC_MESSAGES
+@dir share/locale/sr@latin
+@dir share/locale/si/LC_MESSAGES
+@dir share/locale/si
+@dir share/locale/ps/LC_MESSAGES
+@dir share/locale/ps
+@dir share/locale/oc/LC_MESSAGES
+@dir share/locale/oc
+@dir share/locale/my_MM/LC_MESSAGES
+@dir share/locale/my_MM
+@dir share/locale/mr/LC_MESSAGES
+@dir share/locale/mr
+@dir share/locale/mhr/LC_MESSAGES
+@dir share/locale/mhr
+@dir share/locale/mai/LC_MESSAGES
+@dir share/locale/mai
+@dir share/locale/ku/LC_MESSAGES
+@dir share/locale/ku
+@dir share/locale/km/LC_MESSAGES
+@dir share/locale/km
+@dir share/locale/dz/LC_MESSAGES
+@dir share/locale/dz
+@dir share/locale/ca@valencia/LC_MESSAGES
+@dir share/locale/ca@valencia
+@dir share/locale/bn_IN/LC_MESSAGES
+@dir share/locale/bn_IN
+@dir share/locale/be@latin/LC_MESSAGES
+@dir share/locale/be@latin
+%%PERL:%%@dir lib/purple-2/perl/auto/Purple
+%%PERL:%%@dir lib/purple-2/perl/auto
+%%PERL:%%@dir lib/purple-2/perl
+@dir lib/purple-2
+@dir include/libpurple/media
+@dir include/libpurple
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index 0368b3e1ae83..1fd92abefad3 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -3,7 +3,6 @@
 #   $MCom: ports/net-im/pidgin/Makefile,v 1.17 2007/09/17 19:53:06 marcus Exp $
 
 PORTNAME=	pidgin
-PORTREVISION=	4
 
 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 2c4564accfd4..8a253f66ab4a 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -662,67 +662,67 @@ share/pixmaps/pidgin/tray/hicolor/48x48/status/pidgin-tray-offline.png
 share/pixmaps/pidgin/tray/hicolor/48x48/status/pidgin-tray-pending.png
 share/pixmaps/pidgin/tray/hicolor/48x48/status/pidgin-tray-xa.png
 share/pixmaps/pidgin/tray/hicolor/index.theme
-@dirrm include/pidgin
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrm share/pixmaps/pidgin/animations/16
-@dirrm share/pixmaps/pidgin/animations
-@dirrm share/pixmaps/pidgin/buttons
-@dirrm share/pixmaps/pidgin/dialogs/16
-@dirrm share/pixmaps/pidgin/dialogs/64
-@dirrm share/pixmaps/pidgin/dialogs/scalable
-@dirrm share/pixmaps/pidgin/dialogs
-@dirrm share/pixmaps/pidgin/emblems/16
-@dirrm share/pixmaps/pidgin/emblems/scalable
-@dirrm share/pixmaps/pidgin/emblems
-@dirrm share/pixmaps/pidgin/emotes/default
-@dirrm share/pixmaps/pidgin/emotes/none
-@dirrm share/pixmaps/pidgin/emotes/small
-@dirrm share/pixmaps/pidgin/emotes
-@dirrm share/pixmaps/pidgin/protocols/16
-@dirrm share/pixmaps/pidgin/protocols/22
-@dirrm share/pixmaps/pidgin/protocols/48
-@dirrm share/pixmaps/pidgin/protocols/scalable
-@dirrm share/pixmaps/pidgin/protocols
-@dirrm share/pixmaps/pidgin/status/11/rtl
-@dirrm share/pixmaps/pidgin/status/11
-@dirrm share/pixmaps/pidgin/status/16/rtl
-@dirrm share/pixmaps/pidgin/status/16
-@dirrm share/pixmaps/pidgin/status/22/rtl
-@dirrm share/pixmaps/pidgin/status/22
-@dirrm share/pixmaps/pidgin/status/32/rtl
-@dirrm share/pixmaps/pidgin/status/32
-@dirrm share/pixmaps/pidgin/status/48/rtl
-@dirrm share/pixmaps/pidgin/status/48
-@dirrm share/pixmaps/pidgin/status
-@dirrm share/pixmaps/pidgin/toolbar/11
-@dirrm share/pixmaps/pidgin/toolbar/16
-@dirrm share/pixmaps/pidgin/toolbar/22
-@dirrm share/pixmaps/pidgin/toolbar/32
-@dirrm share/pixmaps/pidgin/toolbar/48
-@dirrm share/pixmaps/pidgin/toolbar
-@dirrm share/pixmaps/pidgin/tray/16
-@dirrm share/pixmaps/pidgin/tray/hicolor/16x16/status
-@dirrm share/pixmaps/pidgin/tray/hicolor/16x16
-@dirrm share/pixmaps/pidgin/tray/hicolor/22x22/status
-@dirrm share/pixmaps/pidgin/tray/hicolor/22x22
-@dirrm share/pixmaps/pidgin/tray/hicolor/32x32/status
-@dirrm share/pixmaps/pidgin/tray/hicolor/32x32
-@dirrm share/pixmaps/pidgin/tray/hicolor/48x48/status
-@dirrm share/pixmaps/pidgin/tray/hicolor/48x48
-@dirrm share/pixmaps/pidgin/tray/hicolor
-@dirrm share/pixmaps/pidgin/tray
-@dirrm share/pixmaps/pidgin
-@dirrm lib/pidgin
+@dir include/pidgin
+@dir share/icons/hicolor/16x16/apps
+@dir share/icons/hicolor/16x16
+@dir share/icons/hicolor/22x22/apps
+@dir share/icons/hicolor/22x22
+@dir share/icons/hicolor/48x48/apps
+@dir share/icons/hicolor/48x48
+@dir share/icons/hicolor/24x24/apps
+@dir share/icons/hicolor/24x24
+@dir share/icons/hicolor/32x32/apps
+@dir share/icons/hicolor/32x32
+@dir share/icons/hicolor/scalable/apps
+@dir share/icons/hicolor/scalable
+@dir share/icons/hicolor
+@dir share/icons
+@dir share/pixmaps/pidgin/animations/16
+@dir share/pixmaps/pidgin/animations
+@dir share/pixmaps/pidgin/buttons
+@dir share/pixmaps/pidgin/dialogs/16
+@dir share/pixmaps/pidgin/dialogs/64
+@dir share/pixmaps/pidgin/dialogs/scalable
+@dir share/pixmaps/pidgin/dialogs
+@dir share/pixmaps/pidgin/emblems/16
+@dir share/pixmaps/pidgin/emblems/scalable
+@dir share/pixmaps/pidgin/emblems
+@dir share/pixmaps/pidgin/emotes/default
+@dir share/pixmaps/pidgin/emotes/none
+@dir share/pixmaps/pidgin/emotes/small
+@dir share/pixmaps/pidgin/emotes
+@dir share/pixmaps/pidgin/protocols/16
+@dir share/pixmaps/pidgin/protocols/22
+@dir share/pixmaps/pidgin/protocols/48
+@dir share/pixmaps/pidgin/protocols/scalable
+@dir share/pixmaps/pidgin/protocols
+@dir share/pixmaps/pidgin/status/11/rtl
+@dir share/pixmaps/pidgin/status/11
+@dir share/pixmaps/pidgin/status/16/rtl
+@dir share/pixmaps/pidgin/status/16
+@dir share/pixmaps/pidgin/status/22/rtl
+@dir share/pixmaps/pidgin/status/22
+@dir share/pixmaps/pidgin/status/32/rtl
+@dir share/pixmaps/pidgin/status/32
+@dir share/pixmaps/pidgin/status/48/rtl
+@dir share/pixmaps/pidgin/status/48
+@dir share/pixmaps/pidgin/status
+@dir share/pixmaps/pidgin/toolbar/11
+@dir share/pixmaps/pidgin/toolbar/16
+@dir share/pixmaps/pidgin/toolbar/22
+@dir share/pixmaps/pidgin/toolbar/32
+@dir share/pixmaps/pidgin/toolbar/48
+@dir share/pixmaps/pidgin/toolbar
+@dir share/pixmaps/pidgin/tray/16
+@dir share/pixmaps/pidgin/tray/hicolor/16x16/status
+@dir share/pixmaps/pidgin/tray/hicolor/16x16
+@dir share/pixmaps/pidgin/tray/hicolor/22x22/status
+@dir share/pixmaps/pidgin/tray/hicolor/22x22
+@dir share/pixmaps/pidgin/tray/hicolor/32x32/status
+@dir share/pixmaps/pidgin/tray/hicolor/32x32
+@dir share/pixmaps/pidgin/tray/hicolor/48x48/status
+@dir share/pixmaps/pidgin/tray/hicolor/48x48
+@dir share/pixmaps/pidgin/tray/hicolor
+@dir share/pixmaps/pidgin/tray
+@dir share/pixmaps/pidgin
+@dir lib/pidgin