Attachment 209874 Details for Bug 242517 – update to g20191211 0a1083249

[patch] update to g20191211 0a1083249

0001-www-tt-rss-update-to-g20191211-0a1083249.patch (text/plain), 5.07 KB, created by Derek Schrock on 2019-12-11 17:45:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Derek Schrock

Created: 2019-12-11 17:45:55 UTC

Size: 5.07 KB

patch

obsolete

>From acac9f9f993262901700ff8db58c70cbd56e0094 Mon Sep 17 00:00:00 2001
>From: Derek Schrock <dereks@lifeofadishwasher.com>
>Date: Sat, 7 Dec 2019 20:55:49 -0500
>Subject: [PATCH] www/tt-rss: update to g20191211 0a1083249
>
>Update to g20191211 0a1083249
>Use version_static.txt to show freesbsd:version:commit [1]
>
>[1] https://git.tt-rss.org/fox/tt-rss/commit/5907409a84
>---
> www/tt-rss/Makefile  |  8 ++++----
> www/tt-rss/distinfo  |  6 +++---
> www/tt-rss/pkg-plist | 14 +++++---------
> 3 files changed, 12 insertions(+), 16 deletions(-)
>
>diff --git a/www/tt-rss/Makefile b/www/tt-rss/Makefile
>index 9cd6d40d12a6..72abfb59aac6 100644
>--- a/www/tt-rss/Makefile
>+++ b/www/tt-rss/Makefile
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	tt-rss
>-PORTVERSION=	g20191009
>+PORTVERSION=	g20191211
> PORTEPOCH=	1
> CATEGORIES=	www
>-MASTER_SITES=	https://git.tt-rss.org/git/tt-rss/archive/
>+MASTER_SITES=	https://git.tt-rss.org/fox/tt-rss/archive/
> DISTNAME=	${GIT_TAGNAME}
> DIST_SUBDIR=	${PORTNAME}
> 
>@@ -21,7 +21,7 @@ REINPLACE_ARGS=	-i ""
> SHEBANG_FILES=	lib/dojo-src/rebuild-dojo.sh utils/extract-i18n-js.pl
> WRKSRC=		${WRKDIR}/tt-rss
> 
>-GIT_TAGNAME=	81bf1125a
>+GIT_TAGNAME=	0a1083249
> 
> NO_BUILD=	yes
> NO_ARCH=	yes
>@@ -68,7 +68,6 @@ 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 (${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|'		\
>@@ -88,6 +87,7 @@ do-install:
> 	${MKDIR} ${STAGEDIR}${WWWDIR}/icons/	# Not used for fresh installation
> 	${TOUCH} ${STAGEDIR}${WWWDIR}/icons/.empty
> 	${INSTALL_DATA} ${WRKDIR}/httpd-tt-rss.conf ${STAGEDIR}${DATADIR}
>+	${ECHO} "${OPSYS}:${PORTVERSION}:${GIT_TAGNAME}" > "${STAGEDIR}${WWWDIR}/version_static.txt"
> 
> 	${MV} ${STAGEDIR}${WWWDIR}/config.php-dist ${STAGEDIR}${WWWDIR}/config.php.sample
> 
>diff --git a/www/tt-rss/distinfo b/www/tt-rss/distinfo
>index c473884d06d1..d3ab10cb9901 100644
>--- a/www/tt-rss/distinfo
>+++ b/www/tt-rss/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1570907864
>-SHA256 (tt-rss/81bf1125a.tar.gz) = 8c57bd825a508f08f1470c04c18a54b6347f5e3ae4aaad6168bddc044813cdbc
>-SIZE (tt-rss/81bf1125a.tar.gz) = 3346629
>+TIMESTAMP = 1576085787
>+SHA256 (tt-rss/0a1083249.tar.gz) = fa2d8eb0150be09093038762c4e8fed0c5e1cbffe8ddd54821867f4e8570172e
>+SIZE (tt-rss/0a1083249.tar.gz) = 3367193
>diff --git a/www/tt-rss/pkg-plist b/www/tt-rss/pkg-plist
>index 8ae7ba9df3e6..1cd2ae507d59 100644
>--- a/www/tt-rss/pkg-plist
>+++ b/www/tt-rss/pkg-plist
>@@ -2289,6 +2289,8 @@
> %%WWWDIR%%/locale/de_DE/LC_MESSAGES/messages.po
> %%WWWDIR%%/locale/el_GR/LC_MESSAGES/messages.mo
> %%WWWDIR%%/locale/el_GR/LC_MESSAGES/messages.po
>+%%WWWDIR%%/locale/eo/LC_MESSAGES/messages.mo
>+%%WWWDIR%%/locale/eo/LC_MESSAGES/messages.po
> %%WWWDIR%%/locale/es_ES/LC_MESSAGES/messages.mo
> %%WWWDIR%%/locale/es_ES/LC_MESSAGES/messages.po
> %%WWWDIR%%/locale/es_LA/LC_MESSAGES/messages.mo
>@@ -2560,6 +2562,7 @@
> %%WWWDIR%%/schema/versions/mysql/136.sql
> %%WWWDIR%%/schema/versions/mysql/137.sql
> %%WWWDIR%%/schema/versions/mysql/138.sql
>+%%WWWDIR%%/schema/versions/mysql/139.sql
> %%WWWDIR%%/schema/versions/pgsql/3.sql
> %%WWWDIR%%/schema/versions/pgsql/4.sql
> %%WWWDIR%%/schema/versions/pgsql/5.sql
>@@ -2696,6 +2699,7 @@
> %%WWWDIR%%/schema/versions/pgsql/136.sql
> %%WWWDIR%%/schema/versions/pgsql/137.sql
> %%WWWDIR%%/schema/versions/pgsql/138.sql
>+%%WWWDIR%%/schema/versions/pgsql/139.sql
> %%WWWDIR%%/templates/digest_template.txt
> %%WWWDIR%%/templates/digest_template_html.txt
> %%WWWDIR%%/templates/email_article_template.txt
>@@ -2704,7 +2708,6 @@
> %%WWWDIR%%/templates/otp_disabled_template.txt
> %%WWWDIR%%/templates/password_change_template.txt
> %%WWWDIR%%/templates/resetpass_link_template.txt
>-%%WWWDIR%%/tests/ApiTest.php
> %%WWWDIR%%/themes.local/.empty
> %%WWWDIR%%/themes/.empty
> %%WWWDIR%%/themes/compact.css
>@@ -2717,16 +2720,11 @@
> %%WWWDIR%%/themes/night_blue.css
> %%WWWDIR%%/themes/night_blue.css.map
> %%WWWDIR%%/themes/night_blue.less
>+%%WWWDIR%%/version_static.txt
> @mode u=rx
> %%WWWDIR%%/update.php
> %%WWWDIR%%/update_daemon2.php
> %%WWWDIR%%/utils/extract-i18n-js.pl
>-%%WWWDIR%%/utils/gitlab-ci/check-schema.sh
>-%%WWWDIR%%/utils/gitlab-ci/config-template.php
>-%%WWWDIR%%/utils/gitlab-ci/nginx-default
>-%%WWWDIR%%/utils/gitlab-ci/php-lint.sh
>-%%WWWDIR%%/utils/gitlab-ci/phpmd-ruleset.xml
>-%%WWWDIR%%/utils/gitlab-ci/phpmd.sh
> @mode
> %%WWWDIR%%/utils/localized_schema.txt
> @mode u=rx
>@@ -2753,11 +2751,9 @@
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/vendor/Psr/Log/Test
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/vendor/Psr/Log
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/vendor/OTPHP
>-@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/utils/gitlab-ci
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/utils
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/themes.local
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/themes
>-@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tests
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/templates
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/schema/versions/pgsql
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/schema/versions/mysql
>-- 
>2.24.0
>

Flags:

dereks: maintainer-approval+

Actions: View | Diff

Attachments on bug 242517: 209797 | 209874 | 210345