From a9606d7ac00eb662af6ef2f561c010f389c0bec7 Mon Sep 17 00:00:00 2001
From: Derek Schrock <dereks@lifeofadishwasher.com>
Date: Sun, 12 Nov 2017 17:17:15 -0500
Subject: [PATCH] Upgrade to 8569b95a2 g20171103

- Upgrade to 8569b95a2
- Use PORTEPOCH since version numbering changed due to Porter's Handbook [1]
- tt-rss moved to Gogs from GitLab MASTER_SITES DISTNAME updated
- USES gettext-tootls for utils/update-translations.sh

[1] https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#makefile-master_sites-github-ex4
---
 www/tt-rss/Makefile  | 14 ++++++++------
 www/tt-rss/distinfo  |  6 +++---
 www/tt-rss/pkg-plist |  4 ++++
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/www/tt-rss/Makefile b/www/tt-rss/Makefile
index 0369ce717d..5a1d44cddf 100644
--- a/www/tt-rss/Makefile
+++ b/www/tt-rss/Makefile
@@ -2,25 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	tt-rss
-PORTVERSION=	2017.06.05
+PORTVERSION=	g20171103
+PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	https://tt-rss.org/fox/tt-rss/repository/archive${EXTRACT_SUFX}?ref=${GL_TAGNAME}&num;/
+MASTER_SITES=	https://git.tt-rss.org/git/tt-rss/archive/
+DISTNAME=	${GIT_TAGNAME}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Tiny Tiny RSS: web-based news feed (RSS/Atom) aggregator
 
 LICENSE=	GPLv2
 
-GL_TAGNAME=	b0113adac42383b8039eb92ccf3ee2ec0ee70346
+GIT_TAGNAME=	8569b95a2
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
+USES=		php:cli,web shebangfix gettext-tools
 USE_PHP=	ctype dom fileinfo hash json mbstring pcntl posix session xmlrpc
 REINPLACE_ARGS=	-i ""
-USES=		php:cli,web shebangfix tar:bz2
 SHEBANG_FILES=	lib/dojo-src/rebuild-dojo.sh utils/extract-i18n-js.pl
-WRKSRC=		${WRKDIR}/tt-rss-${GL_TAGNAME}-${GL_TAGNAME}
+WRKSRC=		${WRKDIR}/tt-rss
 
 USE_RC_SUBR=	ttrssd
 
@@ -65,7 +67,7 @@ PHP2FIX=	config.php-dist update.php update_daemon2.php
 SCRIPTS=	update.php update_daemon2.php
 
 pre-configure:
-	${REINPLACE_CMD} -E "1,/define.*VERSION_STATIC/s/([0-9]+\.[0-9]+)/\1 (${GL_TAGNAME})/" ${WRKSRC}/include/version.php
+	${REINPLACE_CMD} -E "1,/define.*VERSION_STATIC/s/([0-9]+\.[0-9]+)/\1 (${GIT_TAGNAME})/" ${WRKSRC}/include/version.php
 .for script in ${PHP2FIX}
 	${REINPLACE_CMD} -e 's|/usr/bin/php|${LOCALBASE}/bin/php|'	\
 		-e 's|/usr/bin/env php| ${LOCALBASE}/bin/php|'		\
diff --git a/www/tt-rss/distinfo b/www/tt-rss/distinfo
index 3a54c6fb0e..74e6d77cd7 100644
--- a/www/tt-rss/distinfo
+++ b/www/tt-rss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497166071
-SHA256 (tt-rss-2017.06.05.tar.bz2) = 285a483c4de0a9015f97fb250da7a352374b157bc8477fb0792baa47f55b2901
-SIZE (tt-rss-2017.06.05.tar.bz2) = 2196900
+TIMESTAMP = 1510519470
+SHA256 (8569b95a2.tar.gz) = bae81e379c4bfcb5dce174ab28a83192b5abdff7289ae7cf91a2cfcc334eb7e2
+SIZE (8569b95a2.tar.gz) = 3079022
diff --git a/www/tt-rss/pkg-plist b/www/tt-rss/pkg-plist
index dbc74aa4ee..4773c661ac 100644
--- a/www/tt-rss/pkg-plist
+++ b/www/tt-rss/pkg-plist
@@ -2519,6 +2519,8 @@
 %%WWWDIR%%/schema/versions/mysql/129.sql
 %%WWWDIR%%/schema/versions/mysql/13.sql
 %%WWWDIR%%/schema/versions/mysql/130.sql
+%%WWWDIR%%/schema/versions/mysql/131.sql
+%%WWWDIR%%/schema/versions/mysql/132.sql
 %%WWWDIR%%/schema/versions/mysql/14.sql
 %%WWWDIR%%/schema/versions/mysql/15.sql
 %%WWWDIR%%/schema/versions/mysql/16.sql
@@ -2647,6 +2649,8 @@
 %%WWWDIR%%/schema/versions/pgsql/129.sql
 %%WWWDIR%%/schema/versions/pgsql/13.sql
 %%WWWDIR%%/schema/versions/pgsql/130.sql
+%%WWWDIR%%/schema/versions/pgsql/131.sql
+%%WWWDIR%%/schema/versions/pgsql/132.sql
 %%WWWDIR%%/schema/versions/pgsql/14.sql
 %%WWWDIR%%/schema/versions/pgsql/15.sql
 %%WWWDIR%%/schema/versions/pgsql/16.sql
-- 
2.15.0