Sync with FreeBSD ports.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9348 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 18 insertions, 11 deletions

diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index c4eb9e3b6..a962cc7fa 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net-im/libpurple/Makefile,v 1.21 2007/06/17 04:37:19 marcus Exp $
+#   $MCom: ports/net-im/libpurple/Makefile,v 1.22 2007/07/01 16:18:38 mezz Exp $
 #
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.0.2
-PORTREVISION?=	3
+PORTVERSION=	2.1.0
+PORTREVISION?=	1
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pidgin
@@ -182,7 +182,7 @@ USE_PERL5=		yes
 CONFIGURE_ARGS+=	--with-perl-lib=site
 PLIST_SUB+=		PERL:=""
 .if !defined(PIDGIN_SLAVE)
-MAN3PREFIX=		${TARGETDIR}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3+=			Purple.3
 .endif
 .else
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index 17a50aa73..00fd531b0 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,3 +1,3 @@
-MD5 (pidgin-2.0.2.tar.bz2) = 613a357b2b1e030433fdfa680483d00f
-SHA256 (pidgin-2.0.2.tar.bz2) = e2d8d48b00d42cf935e3a7c8ed2d83d559be65cf3eca7cc88a8d0b7e4ba15a41
-SIZE (pidgin-2.0.2.tar.bz2) = 7838262
+MD5 (pidgin-2.1.0.tar.bz2) = 83f44bf9c076595967f7374c50250176
+SHA256 (pidgin-2.1.0.tar.bz2) = 79be69cccca6cb25d6c1ba0360864da8a0c043f5ded55babcd99dc5b8e15a5f8
+SIZE (pidgin-2.1.0.tar.bz2) = 7772942
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index c07f87d97..58b1e8440 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -128,10 +128,10 @@ lib/purple-2/statenotify.so
 %%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/Purple.pm
 %%DBUS%%lib/libpurple-client.la
 %%DBUS%%lib/libpurple-client.so
-%%DBUS%%lib/libpurple-client.so.0
+%%DBUS%%lib/libpurple-client.so.1
 lib/libpurple.la
 lib/libpurple.so
-lib/libpurple.so.0
+lib/libpurple.so.1
 libdata/pkgconfig/purple.pc
 share/aclocal/purple.m4
 share/applications/pidgin.desktop
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index 1a9998c6b..747617a9b 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net-im/pidgin/Makefile,v 1.13 2007/05/28 18:56:33 marcus Exp $
+#   $MCom: ports/net-im/pidgin/Makefile,v 1.14 2007/06/17 04:37:20 marcus Exp $
 #
 
 PORTNAME=	pidgin
@@ -13,7 +13,7 @@ MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Pidgin multi-protocol messaging client (GTK+ UI)
 
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
-    		purple.0:${PORTSDIR}/net-im/libpurple
+    		purple.1:${PORTSDIR}/net-im/libpurple
 
 MASTERDIR=	${.CURDIR}/../libpurple
 BUILD_WRKSRC=	${WRKSRC}/pidgin
diff --git a/net-im/pidgin/pkg-plist b/net-im/pidgin/pkg-plist
index 66c2e775d..c4ded6b67 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -39,6 +39,8 @@ include/pidgin/gtkscrollbook.h
 include/pidgin/gtksession.h
 include/pidgin/gtksound.h
 include/pidgin/gtksourceiter.h
+include/pidgin/gtksourceundomanager.h
+include/pidgin/gtksourceview-marshal.h
 include/pidgin/gtkstatusbox.h
 include/pidgin/gtkthemes.h
 include/pidgin/gtkutils.h
@@ -141,6 +143,7 @@ share/pixmaps/pidgin/emotes/default/alien.png
 share/pixmaps/pidgin/emotes/default/angel.png
 share/pixmaps/pidgin/emotes/default/angry.png
 share/pixmaps/pidgin/emotes/default/arrogant.png
+share/gnome/pixmaps/pidgin/emotes/default/at-wits-end.png
 share/pixmaps/pidgin/emotes/default/bad.png
 share/pixmaps/pidgin/emotes/default/bashful.png
 share/pixmaps/pidgin/emotes/default/beat-up.png
@@ -191,6 +194,7 @@ share/pixmaps/pidgin/emotes/default/eat.png
 share/pixmaps/pidgin/emotes/default/embarrassed.png
 share/pixmaps/pidgin/emotes/default/excruciating.png
 share/pixmaps/pidgin/emotes/default/eyeroll.png
+share/gnome/pixmaps/pidgin/emotes/default/female-fighter.png
 share/pixmaps/pidgin/emotes/default/film.png
 share/pixmaps/pidgin/emotes/default/fingers-crossed.png
 share/pixmaps/pidgin/emotes/default/flag.png
@@ -239,6 +243,7 @@ share/pixmaps/pidgin/emotes/default/msn_online.png
 share/pixmaps/pidgin/emotes/default/musical-note.png
 share/pixmaps/pidgin/emotes/default/nailbiting.png
 share/pixmaps/pidgin/emotes/default/neutral.png
+share/gnome/pixmaps/pidgin/emotes/default/on-the-phone.png
 share/pixmaps/pidgin/emotes/default/party.png
 share/pixmaps/pidgin/emotes/default/peace.png
 share/pixmaps/pidgin/emotes/default/phone.png
@@ -292,6 +297,7 @@ share/pixmaps/pidgin/emotes/default/terror.png
 share/pixmaps/pidgin/emotes/default/theme
 share/pixmaps/pidgin/emotes/default/thinking.png
 share/pixmaps/pidgin/emotes/default/thunder.png
+share/gnome/pixmaps/pidgin/emotes/default/time-out.png
 share/pixmaps/pidgin/emotes/default/tongue.png
 share/pixmaps/pidgin/emotes/default/tremble.png
 share/pixmaps/pidgin/emotes/default/turtle.png
@@ -405,6 +411,7 @@ share/pixmaps/pidgin/toolbar/16/font-size-down.png
 share/pixmaps/pidgin/toolbar/16/font-size-up.png
 share/pixmaps/pidgin/toolbar/16/insert-image.png
 share/pixmaps/pidgin/toolbar/16/insert-link.png
+share/gnome/pixmaps/pidgin/toolbar/16/insert.png
 share/pixmaps/pidgin/toolbar/16/message-new.png
 share/pixmaps/pidgin/toolbar/16/plugins.png
 share/pixmaps/pidgin/toolbar/16/send-file.png