7 files changed, 58 insertions, 34 deletions

diff --git a/net-im/telegram-purple/Makefile b/net-im/telegram-purple/Makefile
index e675a3b4c772..db7de45dbef0 100644
--- a/net-im/telegram-purple/Makefile
+++ b/net-im/telegram-purple/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	telegram-purple
-PORTVERSION=	1.2.6
-PORTREVISION=	2
+PORTVERSION=	1.3.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-im
 
@@ -25,12 +24,11 @@ USES=		execinfo gettext gmake pkgconfig tar:xz
 USE_GNOME=	glib20 libxml2
 USE_GCC=	yes
 GNU_CONFIGURE=	yes
-LIBS+=		-lexecinfo -lm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	majn:DEFAULT,tgl vysheng:tlparser
 GH_PROJECT=	tgl:tgl tl-parser:tlparser
-GH_TAGNAME?=	bec66c2:tgl 1659d87:tlparser
+GH_TAGNAME?=	624cf5a:tgl 36bf190:tlparser
 
 BROKEN_sparc64=	cannot compile: assertion fails
 
diff --git a/net-im/telegram-purple/distinfo b/net-im/telegram-purple/distinfo
index 3f4c5de1937d..e1fb3d0a8585 100644
--- a/net-im/telegram-purple/distinfo
+++ b/net-im/telegram-purple/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1469087090
-SHA256 (majn-telegram-purple-v1.2.6_GH0.tar.gz) = 9ad59002764a98169a8fc85199a7788856df209d0869b1711049d25f94d70fe8
-SIZE (majn-telegram-purple-v1.2.6_GH0.tar.gz) = 168295
-SHA256 (majn-tgl-bec66c2_GH0.tar.gz) = 8ea1e1c96580c29ad3c3f3af8b79107d5de24bbd154c873925b5e93a4c47d8db
-SIZE (majn-tgl-bec66c2_GH0.tar.gz) = 240102
-SHA256 (vysheng-tl-parser-1659d87_GH0.tar.gz) = 6b9538b0c3be3bb25e4f4750ecbea42ce7be58b005a3eeb372b9d15fbaa92e0b
-SIZE (vysheng-tl-parser-1659d87_GH0.tar.gz) = 78615
+TIMESTAMP = 1470894472
+SHA256 (majn-telegram-purple-v1.3.0_GH0.tar.gz) = 27ec26a0b1d387860a385ad35fe9fb059d6c3ec10ff6c1c018127471d97419e5
+SIZE (majn-telegram-purple-v1.3.0_GH0.tar.gz) = 190298
+SHA256 (majn-tgl-624cf5a_GH0.tar.gz) = 4b15fb4140d3c4b0c2caf954636b0579e1ddde4dfe84705688f9aae996feb149
+SIZE (majn-tgl-624cf5a_GH0.tar.gz) = 242452
+SHA256 (vysheng-tl-parser-36bf190_GH0.tar.gz) = 9c4222cfc39f1f58061678c2a22dac5d2391e2594d4ec00e5ab9a7c12e606789
+SIZE (vysheng-tl-parser-36bf190_GH0.tar.gz) = 66898
diff --git a/net-im/telegram-purple/files/patch-Makefile.in b/net-im/telegram-purple/files/patch-Makefile.in
index 45dd6e030abc..c9d610848fda 100644
--- a/net-im/telegram-purple/files/patch-Makefile.in
+++ b/net-im/telegram-purple/files/patch-Makefile.in
@@ -1,22 +1,13 @@
---- Makefile.in.orig	2016-03-11 14:06:35 UTC
+--- Makefile.in.orig	2016-08-08 08:53:04 UTC
 +++ Makefile.in
-@@ -80,7 +80,7 @@ tgl/Makefile: tgl/Makefile.in
- 	cd tgl && ./configure -q ${CRYPTO_FLAG} --disable-extf CFLAGS="@CFLAGS@" LDFLAGS="@LDFLAGS@"
- 
- tgl/libs/libtgl.a: tgl/Makefile
--	+make -C tgl
-+	+gmake -C tgl
- 
- po/%.mo: po/%.po
- 	${MSGFMT_PATH} -cf -o $@ $<
-@@ -103,8 +103,8 @@ strip: $(PRPL_LIBNAME)
- install: $(PRPL_LIBNAME) $(LOCALE_MOS)
+@@ -118,8 +118,8 @@ ${PRPL_LIBNAME}: ${PLUGIN_OBJECTS} tgl/l
+ noicon_install: $(PRPL_LIBNAME) $(LOCALE_MOS)
  	mkdir -m $(DIR_PERM) -p $(DESTDIR)$(PLUGIN_DIR_PURPLE)
  	install -m $(FILE_PERM) $(PRPL_LIBNAME) $(DESTDIR)$(PLUGIN_DIR_PURPLE)/$(PRPL_NAME)
 -	mkdir -m $(DIR_PERM) -p $(DESTDIR)/etc/telegram-purple
 -	install -m $(FILE_PERM) tg-server.tglpub $(DESTDIR)/etc/telegram-purple/server.tglpub
 +	mkdir -m $(DIR_PERM) -p $(DESTDIR)/$(PREFIX)/etc/telegram-purple
 +	install -m $(FILE_PERM) tg-server.tglpub $(DESTDIR)/$(PREFIX)/etc/telegram-purple/server.tglpub
- 	mkdir -m $(DIR_PERM) -p $(DESTDIR)$(datarootdir)/appdata
- 	install -m $(FILE_PERM) telegram-purple.metainfo.xml $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml
- ifeq ($(COPY_ICONS),no)
+ # Assume that the user does not use AppStream if she doesn't want icons
+ 	@for lang in $(LOCALES); do \
+ 		mkdir -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
diff --git a/net-im/telegram-purple/files/patch-commit.h.gen b/net-im/telegram-purple/files/patch-commit.h.gen
new file mode 100644
index 000000000000..d6d06aec2d70
--- /dev/null
+++ b/net-im/telegram-purple/files/patch-commit.h.gen
@@ -0,0 +1,23 @@
+--- commit.h.gen.orig	2016-08-08 08:53:04 UTC
++++ commit.h.gen
+@@ -20,19 +20,7 @@
+ 
+ set -e
+ 
+-if ! (command -v git && git status) >/dev/null 2>&1
+-then
+-  if test -r commit.h
+-  then
+-    echo "No git available. Assuming everything is up-to-date."
+-    exit 0
+-  else
+-    echo >&2 "No git available. Can't reconstruct commit.h"
+-    exit 1
+-  fi
+-fi
+-
+-GIT_COMMIT=`git rev-parse HEAD | cut -c1-10`
++GIT_COMMIT="0340e4f14b"
+ 
+ if grep -scq "${GIT_COMMIT}" commit.h
+ then
diff --git a/net-im/telegram-purple/files/patch-tgl_Makefile.tl-parser b/net-im/telegram-purple/files/patch-tgl_Makefile.tl-parser
deleted file mode 100644
index 64045730c830..000000000000
--- a/net-im/telegram-purple/files/patch-tgl_Makefile.tl-parser
+++ /dev/null
@@ -1,8 +0,0 @@
---- tgl/Makefile.tl-parser.orig	2016-02-27 14:10:53 UTC
-+++ tgl/Makefile.tl-parser
-@@ -1,4 +1,4 @@
--TL_PARSER_OBJECTS=${OBJ}/tl-parser.o ${OBJ}/tlc.o
-+TL_PARSER_OBJECTS=${OBJ}/tl-parser.o ${OBJ}/tlc.o ${OBJ}/crc32.o
- 
- ${TL_PARSER_OBJECTS}: ${OBJ}/%.o: ${srcdir}/tl-parser/%.c | create_dirs
- 	${CC} ${INCLUDE} ${COMPILE_FLAGS} -iquote ${srcdir}/tl-parser -c -MP -MD -MF ${DEP}/$*.d -MQ ${OBJ}/$*.o -o $@ $<
diff --git a/net-im/telegram-purple/files/patch-tgl_tl-parser_portable__endian.h b/net-im/telegram-purple/files/patch-tgl_tl-parser_portable__endian.h
new file mode 100644
index 000000000000..f276a5e929ef
--- /dev/null
+++ b/net-im/telegram-purple/files/patch-tgl_tl-parser_portable__endian.h
@@ -0,0 +1,18 @@
+--- tgl/tl-parser/portable_endian.h.orig	2016-08-11 06:34:54 UTC
++++ tgl/tl-parser/portable_endian.h
+@@ -53,15 +53,6 @@
+ 
+ #	include <sys/endian.h>
+ 
+-#	define be16toh(x) betoh16(x)
+-#	define le16toh(x) letoh16(x)
+-
+-#	define be32toh(x) betoh32(x)
+-#	define le32toh(x) letoh32(x)
+-
+-#	define be64toh(x) betoh64(x)
+-#	define le64toh(x) letoh64(x)
+-
+ #elif defined(__WINDOWS__)
+ 
+ #	include <winsock2.h>
diff --git a/net-im/telegram-purple/pkg-plist b/net-im/telegram-purple/pkg-plist
index 717484b2cf9b..43a99491c031 100644
--- a/net-im/telegram-purple/pkg-plist
+++ b/net-im/telegram-purple/pkg-plist
@@ -3,6 +3,8 @@ lib/purple-2/telegram-purple.so
 share/appdata/telegram-purple.metainfo.xml
 %%NLS%%share/locale/de_DE/LC_MESSAGES/telegram-purple.mo
 %%NLS%%share/locale/es_AR/LC_MESSAGES/telegram-purple.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/telegram-purple.mo
+%%NLS%%share/locale/it_IT/LC_MESSAGES/telegram-purple.mo
 %%NLS%%share/locale/pl_PL/LC_MESSAGES/telegram-purple.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/telegram-purple.mo
 %%NLS%%share/locale/ru_RU/LC_MESSAGES/telegram-purple.mo