4 files changed, 57 insertions, 20 deletions

diff --git a/net-im/telegram-purple/Makefile b/net-im/telegram-purple/Makefile
index d93c268ca273..94c356eda13b 100644
--- a/net-im/telegram-purple/Makefile
+++ b/net-im/telegram-purple/Makefile
@@ -2,28 +2,43 @@
 # $FreeBSD$
 
 PORTNAME=	telegram-purple
-PORTVERSION=	05222015
+PORTVERSION=	1.2.6
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net-im
-MASTER_SITES=	http://www.pcbsd.org/~kris/software/ \
-		ftp://ftp.pcbsd.org/pub/software/
 
-MAINTAINER=	kmoore@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libpurple plugin for Telegram messenger
 
-LICENSE=	GPLv3
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	pidgin:net-im/pidgin
 RUN_DEPENDS=	pidgin:net-im/pidgin
 
-USES=		execinfo gmake pkgconfig tar:xz
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+
+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
 
 BROKEN_sparc64=	cannot compile: assertion fails
 
+.include <bsd.port.pre.mk>
+
 pre-configure:
-	@${REINPLACE_CMD} -e 's|/etc/telegram-purple/server.pub|${PREFIX}/etc/telegram-purple/server.pub|g' \
+	@${REINPLACE_CMD} -e 's|/etc/telegram-purple/server.tglpub|${PREFIX}/etc/telegram-purple/server.tglpub|g' \
 		 ${WRKSRC}/telegram-purple.c
 
-.include <bsd.port.mk>
+post-extract:
+	@${MV} ${WRKSRC_tgl}/* ${WRKSRC}/tgl
+	@${MV} ${WRKSRC_tlparser}/* ${WRKSRC}/tgl/tl-parser
+
+.include <bsd.port.post.mk>
diff --git a/net-im/telegram-purple/distinfo b/net-im/telegram-purple/distinfo
index b45587f86390..3f4c5de1937d 100644
--- a/net-im/telegram-purple/distinfo
+++ b/net-im/telegram-purple/distinfo
@@ -1,2 +1,7 @@
-SHA256 (telegram-purple-05222015.tar.xz) = 8d3fa2d52e8ad10e7a2bf78d2241e8205fa3771e78d9e069b658d7fd96ac96a9
-SIZE (telegram-purple-05222015.tar.xz) = 293400
+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
diff --git a/net-im/telegram-purple/files/patch-Makefile.in b/net-im/telegram-purple/files/patch-Makefile.in
index 3994fb1eb447..45dd6e030abc 100644
--- a/net-im/telegram-purple/files/patch-Makefile.in
+++ b/net-im/telegram-purple/files/patch-Makefile.in
@@ -1,13 +1,22 @@
---- Makefile.in.orig	2015-05-22 17:14:41 UTC
+--- Makefile.in.orig	2016-03-11 14:06:35 UTC
 +++ Makefile.in
-@@ -65,8 +65,8 @@ strip: $(PRPL_LIBNAME)
- install: $(PRPL_LIBNAME)
+@@ -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)
  	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.pub $(DESTDIR)/etc/telegram-purple/server.pub
-+	mkdir -m $(DIR_PERM) -p $(DESTDIR)$(PREFIX)/etc/telegram-purple
-+	install -m $(FILE_PERM) tg-server.pub $(DESTDIR)$(PREFIX)/etc/telegram-purple/server.pub
- 	mkdir -m $(DIR_PERM) -p $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/16
- 	install -m $(FILE_PERM) imgs/telegram16.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/16/telegram.png
- 	mkdir -m $(DIR_PERM) -p $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22
+-	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)
diff --git a/net-im/telegram-purple/pkg-plist b/net-im/telegram-purple/pkg-plist
index 4cfdded36610..717484b2cf9b 100644
--- a/net-im/telegram-purple/pkg-plist
+++ b/net-im/telegram-purple/pkg-plist
@@ -1,5 +1,13 @@
-%%ETCDIR%%/server.pub
+%%ETCDIR%%/server.tglpub
 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/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
+%%NLS%%share/locale/sq/LC_MESSAGES/telegram-purple.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/telegram-purple.mo
 share/pixmaps/pidgin/protocols/16/telegram.png
 share/pixmaps/pidgin/protocols/22/telegram.png
 share/pixmaps/pidgin/protocols/48/telegram.png