From fd49777646189118510d633d1a9f60375d2e5445 Mon Sep 17 00:00:00 2001
From: Ruslan Makhmatkhanov <rm@FreeBSD.org>
Date: Tue, 4 Oct 2016 05:38:12 +0000
Subject: [PATCH] net-im/gajim: update to 0.16.6

- update to 0.16.6
- remove patches, applied upstream
---
 net-im/gajim/Makefile                              |  6 ++----
 net-im/gajim/distinfo                              |  5 +++--
 .../files/patch-data_gajim-remote.desktop.in.in    | 14 --------------
 net-im/gajim/files/patch-data_gajim.desktop.in.in  | 14 --------------
 .../gajim/files/patch-src-plugins_plugins_i18n.py  | 10 ----------
 5 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 net-im/gajim/files/patch-data_gajim-remote.desktop.in.in
 delete mode 100644 net-im/gajim/files/patch-data_gajim.desktop.in.in
 delete mode 100644 net-im/gajim/files/patch-src-plugins_plugins_i18n.py

diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index eb4f00f8608a..ffa071fcd482 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gajim
-PORTVERSION=	0.16.5
+PORTVERSION=	0.16.6
 CATEGORIES=	net-im
 MASTER_SITES=	http://gajim.org/downloads/0.16/
 
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \
 		${PYTHON_PKGNAMEPREFIX}nbxmpp>0:net-im/py-nbxmpp
 
 NO_ARCH=	yes
-USES=		cpe dos2unix gmake pathfix python:2 tar:bzip2
+USES=		cpe dos2unix gmake localbase pathfix python:2.7 tar:bzip2
 USE_GNOME=	intltool pygtk2
 USE_XORG=	x11 xext xscrnsaver
 
@@ -26,8 +26,6 @@ DOS2UNIX_FILES=	src/plugins/plugins_i18n.py
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 INSTALLS_ICONS=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=	AVAHI CRYPTO DBUS DOCS GUPNP NLS SPELL
 OPTIONS_DEFAULT=DBUS SPELL
diff --git a/net-im/gajim/distinfo b/net-im/gajim/distinfo
index eaa037c7662b..7e0f352a7805 100644
--- a/net-im/gajim/distinfo
+++ b/net-im/gajim/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gajim-0.16.5.tar.bz2) = a5c015b3b140ec5e47d3842cbe701c9948af5a0cce36314248f0793c2d66d091
-SIZE (gajim-0.16.5.tar.bz2) = 4562971
+TIMESTAMP = 1475522393
+SHA256 (gajim-0.16.6.tar.bz2) = 1357ed178ce497d28fc2d48960b999821e1370f42ffaa4669c1cb803fce778dc
+SIZE (gajim-0.16.6.tar.bz2) = 4564505
diff --git a/net-im/gajim/files/patch-data_gajim-remote.desktop.in.in b/net-im/gajim/files/patch-data_gajim-remote.desktop.in.in
deleted file mode 100644
index d45a7b72ebb5..000000000000
--- a/net-im/gajim/files/patch-data_gajim-remote.desktop.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix desktop-file-validate warnings. This is upstream commit:
-https://trac.gajim.org/changeset/eaea5e65364b167d14dc191b00f114b4f5ccb508/
-
---- data/gajim-remote.desktop.in.in.orig	2015-12-28 12:38:50 UTC
-+++ data/gajim-remote.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly;
- _Name=Gajim Remote
--_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip
-+_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip;
- Version=1.0
- Exec=gajim-remote handle_uri %u
- TryExec=gajim-remote
diff --git a/net-im/gajim/files/patch-data_gajim.desktop.in.in b/net-im/gajim/files/patch-data_gajim.desktop.in.in
deleted file mode 100644
index 117b0fff8652..000000000000
--- a/net-im/gajim/files/patch-data_gajim.desktop.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix desktop-file-validate warnings. This is upstream commit:
-https://trac.gajim.org/changeset/eaea5e65364b167d14dc191b00f114b4f5ccb508/
-
---- data/gajim.desktop.in.in.orig	2015-12-28 12:38:50 UTC
-+++ data/gajim.desktop.in.in
-@@ -3,7 +3,7 @@ Categories=Network;InstantMessaging;GTK;
- _Name=Gajim
- _GenericName=Jabber IM Client
- _Comment=A GTK+ Jabber client
--_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip
-+_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip;
- Version=1.0
- Exec=gajim
- Icon=gajim
diff --git a/net-im/gajim/files/patch-src-plugins_plugins_i18n.py b/net-im/gajim/files/patch-src-plugins_plugins_i18n.py
deleted file mode 100644
index 57e4da563bda..000000000000
--- a/net-im/gajim/files/patch-src-plugins_plugins_i18n.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/plugins/plugins_i18n.py.orig	2015-12-28 12:38:51 UTC
-+++ src/plugins/plugins_i18n.py
-@@ -29,7 +29,6 @@ plugins_locale_dir = os_path.join(gajim.
- 
- if os.name != 'nt':
-     locale.setlocale(locale.LC_ALL, '')
--    locale.bindtextdomain(APP, plugins_locale_dir)
-     gettext.bindtextdomain(APP, plugins_locale_dir)
-     gettext.textdomain(APP)
-