- Update to 20090829

PR:		138399
Submitted by:	Denis Shaposhnikov <dsh@wizard.volgograd.ru> (maintainer)

4 files changed, 46 insertions, 19 deletions

diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile
index 156cd15278d7..19d356577a63 100644
--- a/net-im/gajim-devel/Makefile
+++ b/net-im/gajim-devel/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	gajim
-PORTVERSION=	20090608
-PORTREVISION=	1
+PORTVERSION=	20090829
 CATEGORIES=	net-im
 MASTER_SITES=	http://wizard.volgograd.ru/distfiles/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-2009-06-08
+DISTNAME=	${PORTNAME}-2009-08-29
 
 MAINTAINER=	dsh@wizard.volgograd.ru
 COMMENT=	Gajim is a Jabber client based on a plugin system
@@ -36,9 +35,9 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.12.1.5-svn
+WRKSRC=		${WRKDIR}/${PORTNAME}-0.12.3.1-dev
 
-MAN1=		gajim.1
+MAN1=		gajim.1 gajim-remote.1
 
 ACTIVITIES=	default
 EMOTICONS=	animated static static-big
diff --git a/net-im/gajim-devel/distinfo b/net-im/gajim-devel/distinfo
index 7f49e11a038e..22628289df20 100644
--- a/net-im/gajim-devel/distinfo
+++ b/net-im/gajim-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gajim-2009-06-08.tar.gz) = 0f8ffbab772353064d86602de5a072ab
-SHA256 (gajim-2009-06-08.tar.gz) = 574b04c8bb3ae333d65334c5ba5dc406862e761f23af2b30b3193b9d649507f8
-SIZE (gajim-2009-06-08.tar.gz) = 4982291
+MD5 (gajim-2009-08-29.tar.gz) = d452a936b923c69e28f6da5c2977ec4e
+SHA256 (gajim-2009-08-29.tar.gz) = 226f947fa5bb6f0696e6076ea60733c1d07e08eb83cd1bbbfd6805784557af27
+SIZE (gajim-2009-08-29.tar.gz) = 5003227
diff --git a/net-im/gajim-devel/files/patch-src-Makefile.in b/net-im/gajim-devel/files/patch-src-Makefile.in
index 9b071947172f..78346507aae8 100644
--- a/net-im/gajim-devel/files/patch-src-Makefile.in
+++ b/net-im/gajim-devel/files/patch-src-Makefile.in
@@ -1,29 +1,29 @@
---- src/Makefile.in.orig	2008-03-09 03:05:26.000000000 +0300
-+++ src/Makefile.in	2008-03-09 23:01:28.000000000 +0300
-@@ -332,18 +332,18 @@
+--- src/Makefile.in.orig	2009-07-12 06:08:08.000000000 +0400
++++ src/Makefile.in	2009-07-12 22:20:58.000000000 +0400
+@@ -270,18 +270,18 @@
  
  @BUILD_TRAYICON_TRUE@trayicon_la_CFLAGS = $(PYGTK_CFLAGS)
  gajimsrcdir = $(pkgdatadir)/src
--gajimsrc_PYTHON = $(srcdir)/*.py 
+-gajimsrc_PYTHON = $(srcdir)/*.py
 +gajimsrc_PYTHON = $(srcdir)/*.py $(srcdir)/*.pyc $(srcdir)/*.pyo
  gajimsrc1dir = $(pkgdatadir)/src/common
  gajimsrc1_PYTHON = \
--				$(srcdir)/common/*.py 
+-				$(srcdir)/common/*.py
 +				$(srcdir)/common/*.py $(srcdir)/common/*.pyc $(srcdir)/common/*.pyo
  
  gajimsrc2dir = $(pkgdatadir)/src/common/xmpp
  gajimsrc2_PYTHON = \
--				$(srcdir)/common/xmpp/*.py 
+-				$(srcdir)/common/xmpp/*.py
 +				$(srcdir)/common/xmpp/*.py $(srcdir)/common/xmpp/*.pyc $(srcdir)/common/xmpp/*.pyo
  
  gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf
  gajimsrc3_PYTHON = \
--				$(srcdir)/common/zeroconf/*.py 
+-				$(srcdir)/common/zeroconf/*.py
 +				$(srcdir)/common/zeroconf/*.py $(srcdir)/common/zeroconf/*.pyc $(srcdir)/common/zeroconf/*.pyo
  
  DISTCLEANFILES = 
  EXTRA_DIST = $(gajimsrc_PYTHON) \
-@@ -530,14 +530,7 @@
+@@ -426,14 +426,7 @@
  	    echo " $(gajimsrcPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(gajimsrcdir)/$$f'"; \
  	    $(gajimsrcPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(gajimsrcdir)/$$f"; \
  	  else :; fi; \
@@ -39,7 +39,7 @@
  
  uninstall-gajimsrcPYTHON:
  	@$(NORMAL_UNINSTALL)
-@@ -558,14 +551,7 @@
+@@ -454,14 +447,7 @@
  	    echo " $(gajimsrc1PYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(gajimsrc1dir)/$$f'"; \
  	    $(gajimsrc1PYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(gajimsrc1dir)/$$f"; \
  	  else :; fi; \
@@ -55,7 +55,7 @@
  
  uninstall-gajimsrc1PYTHON:
  	@$(NORMAL_UNINSTALL)
-@@ -586,14 +572,7 @@
+@@ -482,14 +468,7 @@
  	    echo " $(gajimsrc2PYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(gajimsrc2dir)/$$f'"; \
  	    $(gajimsrc2PYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(gajimsrc2dir)/$$f"; \
  	  else :; fi; \
@@ -71,7 +71,7 @@
  
  uninstall-gajimsrc2PYTHON:
  	@$(NORMAL_UNINSTALL)
-@@ -614,14 +593,7 @@
+@@ -510,14 +489,7 @@
  	    echo " $(gajimsrc3PYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(gajimsrc3dir)/$$f'"; \
  	    $(gajimsrc3PYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(gajimsrc3dir)/$$f"; \
  	  else :; fi; \
diff --git a/net-im/gajim-devel/pkg-plist b/net-im/gajim-devel/pkg-plist
index 4745daefe4cd..243fd9982eed 100644
--- a/net-im/gajim-devel/pkg-plist
+++ b/net-im/gajim-devel/pkg-plist
@@ -1,5 +1,6 @@
 bin/gajim
 bin/gajim-history-manager
+bin/gajim-remote
 lib/gajim/trayicon.la
 lib/gajim/trayicon.so
 %%NLS%%share/locale/be/LC_MESSAGES/gajim.mo
@@ -34,6 +35,7 @@ lib/gajim/trayicon.so
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gajim.mo
 share/applications/gajim.desktop
 share/pixmaps/gajim.png
+share/pixmaps/gajim.svg
 share/pixmaps/gajim_about.png
 %%DATADIR%%/data/activities/default/doing_chores/buying_groceries.png
 %%DATADIR%%/data/activities/default/doing_chores/category.png
@@ -293,6 +295,7 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/glade/progress_dialog.glade
 %%DATADIR%%/data/glade/remove_account_window.glade
 %%DATADIR%%/data/glade/roster_contact_context_menu.glade
+%%DATADIR%%/data/glade/roster_item_exchange_window.glade
 %%DATADIR%%/data/glade/roster_window.glade
 %%DATADIR%%/data/glade/search_window.glade
 %%DATADIR%%/data/glade/service_discovery_window.glade
@@ -614,6 +617,22 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/transports/aim/32x32/xa.png
 %%DATADIR%%/data/iconsets/transports/aim/48x48/offline.png
 %%DATADIR%%/data/iconsets/transports/aim/48x48/online.png
+%%DATADIR%%/data/iconsets/transports/facebook/16x16/away.png
+%%DATADIR%%/data/iconsets/transports/facebook/16x16/chat.png
+%%DATADIR%%/data/iconsets/transports/facebook/16x16/dnd.png
+%%DATADIR%%/data/iconsets/transports/facebook/16x16/not_in_roster.png
+%%DATADIR%%/data/iconsets/transports/facebook/16x16/offline.png
+%%DATADIR%%/data/iconsets/transports/facebook/16x16/online.png
+%%DATADIR%%/data/iconsets/transports/facebook/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/facebook/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/facebook/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/facebook/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/facebook/32x32/not_in_roster.png
+%%DATADIR%%/data/iconsets/transports/facebook/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/facebook/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/facebook/32x32/xa.png
+%%DATADIR%%/data/iconsets/transports/facebook/48x48/offline.png
+%%DATADIR%%/data/iconsets/transports/facebook/48x48/online.png
 %%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/away.png
 %%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/chat.png
 %%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/dnd.png
@@ -842,6 +861,7 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/pixmaps/agents/conference.png
 %%DATADIR%%/data/pixmaps/agents/disc.png
 %%DATADIR%%/data/pixmaps/agents/error.png
+%%DATADIR%%/data/pixmaps/agents/facebook.png
 %%DATADIR%%/data/pixmaps/agents/gadu-gadu.png
 %%DATADIR%%/data/pixmaps/agents/http-ws.png
 %%DATADIR%%/data/pixmaps/agents/icq.png
@@ -872,6 +892,7 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/pixmaps/events/unsubscribed.png
 %%DATADIR%%/data/pixmaps/gajim.ico
 %%DATADIR%%/data/pixmaps/gajim.png
+%%DATADIR%%/data/pixmaps/gajim.svg
 %%DATADIR%%/data/pixmaps/gajim_about.png
 %%DATADIR%%/data/pixmaps/kbd_input.png
 %%DATADIR%%/data/pixmaps/muc_separator.png
@@ -977,6 +998,9 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/src/common/idle.py
 %%DATADIR%%/src/common/idle.pyc
 %%DATADIR%%/src/common/idle.pyo
+%%DATADIR%%/src/common/kwalletbinding.py
+%%DATADIR%%/src/common/kwalletbinding.pyc
+%%DATADIR%%/src/common/kwalletbinding.pyo
 %%DATADIR%%/src/common/latex.py
 %%DATADIR%%/src/common/latex.pyc
 %%DATADIR%%/src/common/latex.pyo
@@ -1301,6 +1325,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/facebook/48x48
+@dirrm %%DATADIR%%/data/iconsets/transports/facebook/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/facebook/32x32
+@dirrm %%DATADIR%%/data/iconsets/transports/facebook
 @dirrm %%DATADIR%%/data/iconsets/transports/icq/48x48
 @dirrm %%DATADIR%%/data/iconsets/transports/icq/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/icq/32x32