Sync with ports tree.

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

6 files changed, 52 insertions, 16 deletions

diff --git a/net-im/libgaim/Makefile b/net-im/libgaim/Makefile
index 89c9032ca..a0f3ee9f3 100644
--- a/net-im/libgaim/Makefile
+++ b/net-im/libgaim/Makefile
@@ -2,18 +2,18 @@
 # Date created:			26 Mar 1999
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
-# $FreeBSD: ports/net-im/libgaim/Makefile,v 1.7 2006/11/28 19:22:45 marcus Exp $
+# $FreeBSD$
 #   $MCom: ports-stable/net-im/libgaim/Makefile,v 1.4 2006/10/29 18:55:28 marcus Exp $
 #
 
 PORTNAME=	gaim
-PORTVERSION=	2.0.0.b5
+PORTVERSION=	2.0.0.b6
 PORTREVISION?=	1
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX?=	lib
-DISTNAME=	${PORTNAME}-2.0.0beta5
+DISTNAME=	${PORTNAME}-2.0.0beta6
 
 MAINTAINER?=	marcus@FreeBSD.org
 COMMENT?=	Backend library for the Gaim multi-protocol messaging client
@@ -91,7 +91,7 @@ PLIST_SUB+=		EVO="@comment not installed: "
 .endif
 
 .if defined(WITH_GTKUI) && !defined(WITHOUT_GSTREAMER)
-USE_GSTREAMER+= core good
+USE_GSTREAMER+=	core good
 .else
 CONFIGURE_ARGS+=--disable-gstreamer
 .endif
@@ -174,7 +174,7 @@ LIB_DEPENDS+=		ao.3:${PORTSDIR}/audio/libao \
 CONFIGURE_ARGS+=	--disable-audio
 .endif
 
-.if defined(WITH_DBUS)
+.if !defined(WITHOUT_DBUS)
 LIB_DEPENDS+=		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 .if !defined(GAIM_SLAVE)
 RUN_DEPENDS+=		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
diff --git a/net-im/libgaim/distinfo b/net-im/libgaim/distinfo
index 78652a0a9..3c4115064 100644
--- a/net-im/libgaim/distinfo
+++ b/net-im/libgaim/distinfo
@@ -1,3 +1,3 @@
-MD5 (gaim-2.0.0beta5.tar.bz2) = 84099216123de25402fa7e904ceca437
-SHA256 (gaim-2.0.0beta5.tar.bz2) = d6fab2ff940eddbf8256b2d845332cbc25b10e1c44f1761a0a754c55849b01db
-SIZE (gaim-2.0.0beta5.tar.bz2) = 6489271
+MD5 (gaim-2.0.0beta6.tar.bz2) = 404dcec261f911bcb56f69e5ea192583
+SHA256 (gaim-2.0.0beta6.tar.bz2) = fea8d9adbb2886ea7accde1d11b6da5fb77e1847fb4054ac55bca30b5b10ce82
+SIZE (gaim-2.0.0beta6.tar.bz2) = 6667700
diff --git a/net-im/libgaim/pkg-plist b/net-im/libgaim/pkg-plist
index 5a2ab69c4..d2f88ac08 100644
--- a/net-im/libgaim/pkg-plist
+++ b/net-im/libgaim/pkg-plist
@@ -56,10 +56,20 @@ include/gaim/value.h
 include/gaim/version.h
 include/gaim/whiteboard.h
 include/gaim/xmlnode.h
+lib/gaim/autoaccept.la
+lib/gaim/autoaccept.so
+lib/gaim/autoreply.la
+lib/gaim/autoreply.so
+lib/gaim/buddynote.la
+lib/gaim/buddynote.so
 %%DBUS%%lib/gaim/dbus-example.la
 %%DBUS%%lib/gaim/dbus-example.so
 lib/gaim/idle.la
 lib/gaim/idle.so
+lib/gaim/libaim.la
+lib/gaim/libaim.so
+lib/gaim/libicq.la
+lib/gaim/libicq.so
 %%PERL:%%lib/gaim/libgaimperl.la
 %%PERL:%%lib/gaim/libgaimperl.so
 %%BONJOUR%%lib/gaim/libbonjour.la
@@ -76,6 +86,7 @@ lib/gaim/libnovell.la
 lib/gaim/libnovell.so
 lib/gaim/liboscar.la
 lib/gaim/liboscar.so
+lib/gaim/liboscar.so.0
 %%SILC%%lib/gaim/libsilcgaim.la
 %%SILC%%lib/gaim/libsilcgaim.so
 lib/gaim/libqq.la
@@ -90,6 +101,10 @@ lib/gaim/libzephyr.la
 lib/gaim/libzephyr.so
 lib/gaim/log_reader.la
 lib/gaim/log_reader.so
+lib/gaim/newline.la
+lib/gaim/newline.so
+lib/gaim/offlinemsg.la
+lib/gaim/offlinemsg.so
 lib/gaim/psychic.la
 lib/gaim/psychic.so
 lib/gaim/ssl-gnutls.la
@@ -128,6 +143,7 @@ share/locale/ca@valencia/LC_MESSAGES/gaim.mo
 share/locale/cs/LC_MESSAGES/gaim.mo
 share/locale/da/LC_MESSAGES/gaim.mo
 share/locale/de/LC_MESSAGES/gaim.mo
+share/locale/dz/LC_MESSAGES/gaim.mo
 share/locale/el/LC_MESSAGES/gaim.mo
 share/locale/en_AU/LC_MESSAGES/gaim.mo
 share/locale/en_CA/LC_MESSAGES/gaim.mo
@@ -217,6 +233,8 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
 @dirrmtry share/locale/en_AU
 @dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 89c9032ca..a0f3ee9f3 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -2,18 +2,18 @@
 # Date created:			26 Mar 1999
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
-# $FreeBSD: ports/net-im/libgaim/Makefile,v 1.7 2006/11/28 19:22:45 marcus Exp $
+# $FreeBSD$
 #   $MCom: ports-stable/net-im/libgaim/Makefile,v 1.4 2006/10/29 18:55:28 marcus Exp $
 #
 
 PORTNAME=	gaim
-PORTVERSION=	2.0.0.b5
+PORTVERSION=	2.0.0.b6
 PORTREVISION?=	1
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX?=	lib
-DISTNAME=	${PORTNAME}-2.0.0beta5
+DISTNAME=	${PORTNAME}-2.0.0beta6
 
 MAINTAINER?=	marcus@FreeBSD.org
 COMMENT?=	Backend library for the Gaim multi-protocol messaging client
@@ -91,7 +91,7 @@ PLIST_SUB+=		EVO="@comment not installed: "
 .endif
 
 .if defined(WITH_GTKUI) && !defined(WITHOUT_GSTREAMER)
-USE_GSTREAMER+= core good
+USE_GSTREAMER+=	core good
 .else
 CONFIGURE_ARGS+=--disable-gstreamer
 .endif
@@ -174,7 +174,7 @@ LIB_DEPENDS+=		ao.3:${PORTSDIR}/audio/libao \
 CONFIGURE_ARGS+=	--disable-audio
 .endif
 
-.if defined(WITH_DBUS)
+.if !defined(WITHOUT_DBUS)
 LIB_DEPENDS+=		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 .if !defined(GAIM_SLAVE)
 RUN_DEPENDS+=		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index 78652a0a9..3c4115064 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,3 +1,3 @@
-MD5 (gaim-2.0.0beta5.tar.bz2) = 84099216123de25402fa7e904ceca437
-SHA256 (gaim-2.0.0beta5.tar.bz2) = d6fab2ff940eddbf8256b2d845332cbc25b10e1c44f1761a0a754c55849b01db
-SIZE (gaim-2.0.0beta5.tar.bz2) = 6489271
+MD5 (gaim-2.0.0beta6.tar.bz2) = 404dcec261f911bcb56f69e5ea192583
+SHA256 (gaim-2.0.0beta6.tar.bz2) = fea8d9adbb2886ea7accde1d11b6da5fb77e1847fb4054ac55bca30b5b10ce82
+SIZE (gaim-2.0.0beta6.tar.bz2) = 6667700
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index 5a2ab69c4..d2f88ac08 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -56,10 +56,20 @@ include/gaim/value.h
 include/gaim/version.h
 include/gaim/whiteboard.h
 include/gaim/xmlnode.h
+lib/gaim/autoaccept.la
+lib/gaim/autoaccept.so
+lib/gaim/autoreply.la
+lib/gaim/autoreply.so
+lib/gaim/buddynote.la
+lib/gaim/buddynote.so
 %%DBUS%%lib/gaim/dbus-example.la
 %%DBUS%%lib/gaim/dbus-example.so
 lib/gaim/idle.la
 lib/gaim/idle.so
+lib/gaim/libaim.la
+lib/gaim/libaim.so
+lib/gaim/libicq.la
+lib/gaim/libicq.so
 %%PERL:%%lib/gaim/libgaimperl.la
 %%PERL:%%lib/gaim/libgaimperl.so
 %%BONJOUR%%lib/gaim/libbonjour.la
@@ -76,6 +86,7 @@ lib/gaim/libnovell.la
 lib/gaim/libnovell.so
 lib/gaim/liboscar.la
 lib/gaim/liboscar.so
+lib/gaim/liboscar.so.0
 %%SILC%%lib/gaim/libsilcgaim.la
 %%SILC%%lib/gaim/libsilcgaim.so
 lib/gaim/libqq.la
@@ -90,6 +101,10 @@ lib/gaim/libzephyr.la
 lib/gaim/libzephyr.so
 lib/gaim/log_reader.la
 lib/gaim/log_reader.so
+lib/gaim/newline.la
+lib/gaim/newline.so
+lib/gaim/offlinemsg.la
+lib/gaim/offlinemsg.so
 lib/gaim/psychic.la
 lib/gaim/psychic.so
 lib/gaim/ssl-gnutls.la
@@ -128,6 +143,7 @@ share/locale/ca@valencia/LC_MESSAGES/gaim.mo
 share/locale/cs/LC_MESSAGES/gaim.mo
 share/locale/da/LC_MESSAGES/gaim.mo
 share/locale/de/LC_MESSAGES/gaim.mo
+share/locale/dz/LC_MESSAGES/gaim.mo
 share/locale/el/LC_MESSAGES/gaim.mo
 share/locale/en_AU/LC_MESSAGES/gaim.mo
 share/locale/en_CA/LC_MESSAGES/gaim.mo
@@ -217,6 +233,8 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
 @dirrmtry share/locale/en_AU
 @dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES