3 files changed, 39 insertions, 8 deletions

diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile
index 04b4f8d53174..5222fa4841f8 100644
--- a/net-im/gajim-devel/Makefile
+++ b/net-im/gajim-devel/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	gajim
-PORTVERSION=	20080309
-PORTREVISION=	4
+PORTVERSION=	20080713
 CATEGORIES=	net-im
 MASTER_SITES=	http://ports.internal.vlink.ru/distfiles/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-2008-03-09
+DISTNAME=	${PORTNAME}-2008-07-13
 
 MAINTAINER=	dsh@wizard.volgograd.ru
 COMMENT=	Gajim is a Jabber client based on a plugin system
@@ -19,11 +18,11 @@ COMMENT=	Gajim is a Jabber client based on a plugin system
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/SSL.so:${PORTSDIR}/security/py-openssl
 
-USE_XORG=	x11 xext xscrnsaver
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pygtk2
 USE_PYTHON=	2.4+
+USE_XORG=	x11 xext xscrnsaver
 
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I ${LOCALBASE}/include" \
 		LDFLAGS="-L ${LOCALBASE}/lib" PYTHON=${PYTHON_CMD}
@@ -36,7 +35,7 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.11.4.2-svn
+WRKSRC=		${WRKDIR}/${PORTNAME}-0.11.4.4-svn
 
 MAN1=		gajim.1
 
diff --git a/net-im/gajim-devel/distinfo b/net-im/gajim-devel/distinfo
index 408cefcfb7ab..35541108fb2d 100644
--- a/net-im/gajim-devel/distinfo
+++ b/net-im/gajim-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gajim-2008-03-09.tar.gz) = d14c51c015b78ea7e800242aaa613a36
-SHA256 (gajim-2008-03-09.tar.gz) = 025cee72efa4e4010aff9db6b2393bc77eab94dd0bf117a4d5a5d47f850670b7
-SIZE (gajim-2008-03-09.tar.gz) = 4455761
+MD5 (gajim-2008-07-13.tar.gz) = 8415300046b2ab6181d83c62eb5c3c2a
+SHA256 (gajim-2008-07-13.tar.gz) = cabf8f21d10a44bb20249b6a4259c62b27e69253847a69928c4fa76f0d8c43a4
+SIZE (gajim-2008-07-13.tar.gz) = 4549383
diff --git a/net-im/gajim-devel/pkg-plist b/net-im/gajim-devel/pkg-plist
index bc293f6b3ac1..d115c16dcf6d 100644
--- a/net-im/gajim-devel/pkg-plist
+++ b/net-im/gajim-devel/pkg-plist
@@ -73,6 +73,7 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/emoticons/animated/party.gif
 %%DATADIR%%/data/emoticons/animated/phone.png
 %%DATADIR%%/data/emoticons/animated/photo.png
+%%DATADIR%%/data/emoticons/animated/puke.gif
 %%DATADIR%%/data/emoticons/animated/pussy.png
 %%DATADIR%%/data/emoticons/animated/rainbow.png
 %%DATADIR%%/data/emoticons/animated/sleepy.gif
@@ -115,6 +116,7 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/emoticons/static-big/oh.png
 %%DATADIR%%/data/emoticons/static-big/phone.png
 %%DATADIR%%/data/emoticons/static-big/photo.png
+%%DATADIR%%/data/emoticons/static-big/puke.png
 %%DATADIR%%/data/emoticons/static-big/pussy.png
 %%DATADIR%%/data/emoticons/static-big/rainbow.png
 %%DATADIR%%/data/emoticons/static-big/smile.png
@@ -155,6 +157,7 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/emoticons/static/oh.png
 %%DATADIR%%/data/emoticons/static/phone.png
 %%DATADIR%%/data/emoticons/static/photo.png
+%%DATADIR%%/data/emoticons/static/puke.png
 %%DATADIR%%/data/emoticons/static/pussy.png
 %%DATADIR%%/data/emoticons/static/rainbow.png
 %%DATADIR%%/data/emoticons/static/smile.png
@@ -187,6 +190,7 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/glade/data_form_window.glade
 %%DATADIR%%/data/glade/dubbleinput_dialog.glade
 %%DATADIR%%/data/glade/edit_groups_dialog.glade
+%%DATADIR%%/data/glade/esession_info_window.glade
 %%DATADIR%%/data/glade/features_window.glade
 %%DATADIR%%/data/glade/filetransfers.glade
 %%DATADIR%%/data/glade/gajim_themes_window.glade
@@ -196,6 +200,7 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/glade/history_manager.glade
 %%DATADIR%%/data/glade/history_window.glade
 %%DATADIR%%/data/glade/input_dialog.glade
+%%DATADIR%%/data/glade/input_text_dialog.glade
 %%DATADIR%%/data/glade/invitation_received_dialog.glade
 %%DATADIR%%/data/glade/join_groupchat_window.glade
 %%DATADIR%%/data/glade/manage_accounts_window.glade
@@ -572,6 +577,22 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/transports/irc/32x32/offline.png
 %%DATADIR%%/data/iconsets/transports/irc/32x32/online.png
 %%DATADIR%%/data/iconsets/transports/irc/32x32/xa.png
+%%DATADIR%%/data/iconsets/transports/mrim/16x16/away.png
+%%DATADIR%%/data/iconsets/transports/mrim/16x16/chat.png
+%%DATADIR%%/data/iconsets/transports/mrim/16x16/dnd.png
+%%DATADIR%%/data/iconsets/transports/mrim/16x16/not_in_roster.png
+%%DATADIR%%/data/iconsets/transports/mrim/16x16/offline.png
+%%DATADIR%%/data/iconsets/transports/mrim/16x16/online.png
+%%DATADIR%%/data/iconsets/transports/mrim/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/mrim/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/mrim/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/mrim/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/mrim/32x32/not_in_roster.png
+%%DATADIR%%/data/iconsets/transports/mrim/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/mrim/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/mrim/32x32/xa.png
+%%DATADIR%%/data/iconsets/transports/mrim/48x48/offline.png
+%%DATADIR%%/data/iconsets/transports/mrim/48x48/online.png
 %%DATADIR%%/data/iconsets/transports/msn/16x16/away.png
 %%DATADIR%%/data/iconsets/transports/msn/16x16/chat.png
 %%DATADIR%%/data/iconsets/transports/msn/16x16/dnd.png
@@ -658,6 +679,7 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/pixmaps/agents/jabber.png
 %%DATADIR%%/data/pixmaps/agents/jud.png
 %%DATADIR%%/data/pixmaps/agents/mail.png
+%%DATADIR%%/data/pixmaps/agents/mrim.png
 %%DATADIR%%/data/pixmaps/agents/msn.png
 %%DATADIR%%/data/pixmaps/agents/pubsub.png
 %%DATADIR%%/data/pixmaps/agents/rss.png
@@ -682,6 +704,8 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/pixmaps/kbd_input.png
 %%DATADIR%%/data/pixmaps/muc_separator.png
 %%DATADIR%%/data/pixmaps/person.png
+%%DATADIR%%/data/pixmaps/security-high.png
+%%DATADIR%%/data/pixmaps/security-low.png
 %%DATADIR%%/data/sounds/bounce.wav
 %%DATADIR%%/data/sounds/connected.wav
 %%DATADIR%%/data/sounds/disconnected.wav
@@ -993,6 +1017,9 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/src/secrets.py
 %%DATADIR%%/src/secrets.pyc
 %%DATADIR%%/src/secrets.pyo
+%%DATADIR%%/src/session.py
+%%DATADIR%%/src/session.pyc
+%%DATADIR%%/src/session.pyo
 %%DATADIR%%/src/statusicon.py
 %%DATADIR%%/src/statusicon.pyc
 %%DATADIR%%/src/statusicon.pyo
@@ -1011,6 +1038,7 @@ share/pixmaps/gajim_about.png
 %%DOCSDIR%%/README
 %%DOCSDIR%%/README.html
 %%DOCSDIR%%/THANKS
+%%DOCSDIR%%/THANKS.artists
 @dirrm lib/gajim
 @dirrmtry share/applications
 %%NLS%%@dirrmtry share/locale/be@latin/LC_MESSAGES
@@ -1085,6 +1113,10 @@ share/pixmaps/gajim_about.png
 @dirrm %%DATADIR%%/data/iconsets/transports/irc/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/irc/32x32
 @dirrm %%DATADIR%%/data/iconsets/transports/irc
+@dirrm %%DATADIR%%/data/iconsets/transports/mrim/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/mrim/32x32
+@dirrm %%DATADIR%%/data/iconsets/transports/mrim/48x48
+@dirrm %%DATADIR%%/data/iconsets/transports/mrim
 @dirrm %%DATADIR%%/data/iconsets/transports/msn/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/msn/32x32
 @dirrm %%DATADIR%%/data/iconsets/transports/msn/48x48