4 files changed, 12 insertions, 34 deletions

diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index 4806e191b3c1..1f4e3a98035b 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gajim
-PORTVERSION=	0.14
+PORTVERSION=	0.14.1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.gajim.org/downloads/0.14/
 
-MAINTAINER=	dsh@wizard.volgograd.ru
+MAINTAINER=	dsh@bamus.cz
 COMMENT=	Gajim is a Jabber client based on a plugin system
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:${PORTSDIR}/devel/py-dbus
@@ -47,21 +47,4 @@ pre-build:
 		${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/src
 		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/src
 
-post-install:
-		${MKDIR} ${DATADIR}/data/activities
-		(cd ${WRKSRC}/data/activities && \
-		${COPYTREE_SHARE} "default" ${DATADIR}/data/activities)
-
-		${MKDIR} ${DATADIR}/data/emoticons
-		(cd ${WRKSRC}/data/emoticons && \
-		${COPYTREE_SHARE} "${EMOTICONS}" ${DATADIR}/data/emoticons)
-
-		${MKDIR} ${DATADIR}/data/iconsets
-		(cd ${WRKSRC}/data/iconsets && \
-		${COPYTREE_SHARE} "${ICONSETS}" ${DATADIR}/data/iconsets)
-
-		${MKDIR} ${DATADIR}/data/moods
-		(cd ${WRKSRC}/data/moods && \
-		${COPYTREE_SHARE} "default" ${DATADIR}/data/moods)
-
 .include <bsd.port.mk>
diff --git a/net-im/gajim/distinfo b/net-im/gajim/distinfo
index 1ecf400018d3..b55324122a53 100644
--- a/net-im/gajim/distinfo
+++ b/net-im/gajim/distinfo
@@ -1,3 +1,2 @@
-MD5 (gajim-0.14.tar.bz2) = f1508ff76344851eaf3fd4c0e32f22f6
-SHA256 (gajim-0.14.tar.bz2) = 9f9471781f178421d05250adc42a2d2efdf4aa05eac2148dab50ec262b92e61b
-SIZE (gajim-0.14.tar.bz2) = 4142326
+SHA256 (gajim-0.14.1.tar.bz2) = 5c8a10e7b06f362844ff70c6f49bd92a170b9d6e4c24e878f604032e31254d3b
+SIZE (gajim-0.14.1.tar.bz2) = 4144916
diff --git a/net-im/gajim/files/patch-src-Makefile.in b/net-im/gajim/files/patch-src-Makefile.in
index 52e5a6243da2..ec0cc9b48e71 100644
--- a/net-im/gajim/files/patch-src-Makefile.in
+++ b/net-im/gajim/files/patch-src-Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in	2010-09-02 23:41:57.000000000 +0400
-+++ src/Makefile.in	2010-09-26 02:52:26.000000000 +0400
-@@ -236,12 +236,26 @@
+--- src/Makefile.in.orig	2010-10-26 17:30:57.000000000 +0200
++++ src/Makefile.in	2010-10-30 13:13:42.000000000 +0200
+@@ -239,12 +239,26 @@
  gajimsrcdir = $(gajim_srcdir)
  nobase_dist_gajimsrc_PYTHON = \
  	$(srcdir)/*.py \
@@ -28,7 +28,7 @@
  
  MAINTAINERCLEANFILES = Makefile.in
  all: all-am
-@@ -298,13 +312,13 @@
+@@ -301,13 +315,6 @@
  	      $(MKDIR_P) "$(DESTDIR)$(gajimsrcdir)/$$dir"; }; \
  	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(gajimsrcdir)/$$dir'"; \
  	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(gajimsrcdir)/$$dir" || exit $$?; }; \
@@ -39,13 +39,6 @@
 -	      PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(gajimsrcdir)" $$dlist; \
 -	    fi; \
 -	  else :; fi \
-+#	  if test -n "$$dlist"; then \
-+#	    if test -z "$(DESTDIR)"; then \
-+#	      PYTHON=$(PYTHON) $(py_compile) --basedir "$(gajimsrcdir)" $$dlist; \
-+#	    else \
-+#	      PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(gajimsrcdir)" $$dlist; \
-+#	    fi; \
-+#	  else :; fi \
  	done
  
  uninstall-nobase_dist_gajimsrcPYTHON:
diff --git a/net-im/gajim/pkg-plist b/net-im/gajim/pkg-plist
index 7ac096c24348..522cc85f87c7 100644
--- a/net-im/gajim/pkg-plist
+++ b/net-im/gajim/pkg-plist
@@ -878,6 +878,7 @@ share/applications/gajim.desktop
 %%DATADIR%%/icons/hicolor/48x48/actions/gajim-single_msg_recv.png
 %%DATADIR%%/icons/hicolor/48x48/actions/gajim-subscription_request.png
 %%DATADIR%%/icons/hicolor/48x48/actions/gajim-unsubscribed.png
+%%DATADIR%%/icons/hicolor/48x48/actions/gajim-warning.png
 %%DATADIR%%/icons/hicolor/64x64/apps/gajim.png
 %%DATADIR%%/icons/hicolor/scalable/apps/gajim.svg
 %%DATADIR%%/src/adhoc_commands.py
@@ -1291,8 +1292,11 @@ share/icons/hicolor/scalable/apps/gajim.svg
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gajim.mo
 %%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/gl
 %%NLS%%@dirrmtry share/locale/be@latin/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/be@latin
+@dirrmtry share/applications
 @dirrm %%DATADIR%%/src/common/zeroconf
 @dirrm %%DATADIR%%/src/common/xmpp
 @dirrm %%DATADIR%%/src/common/protocol
@@ -1414,4 +1418,3 @@ share/icons/hicolor/scalable/apps/gajim.svg
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
-@dirrmtry share/applications