From 3d4504ca3d4a7643a8aa691ffc0c7ee69afc0a14 Mon Sep 17 00:00:00 2001
From: Derek Schrock <dereks@lifeofadishwasher.com>
Date: Fri, 22 Jan 2021 20:16:58 -0500
Subject: [PATCH] www/tt-rss: Update to g20210123

- Update to g20210123 6c546f37b
- portfmt and portclippy clean up
---
 www/tt-rss/Makefile  | 60 ++++++++++++++++++++++++++------------------
 www/tt-rss/distinfo  |  6 ++---
 www/tt-rss/pkg-plist |  4 +--
 3 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/www/tt-rss/Makefile b/www/tt-rss/Makefile
index 632f496f68..e1de4233ce 100644
--- a/www/tt-rss/Makefile
+++ b/www/tt-rss/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	tt-rss
-PORTVERSION=	g20201208
+PORTVERSION=	g20210123
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	https://git.tt-rss.org/fox/tt-rss/archive/
-DISTNAME=	${GIT_TAGNAME}
+DISTNAME=	${_GIT_TAGNAME}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	dereks@lifeofadishwasher.com
@@ -14,44 +14,51 @@ COMMENT=	Tiny Tiny RSS: web-based news feed (RSS/Atom) aggregator
 
 LICENSE=	GPLv2
 
-USES=		php:cli,web shebangfix gettext-tools
-USE_PHP=	ctype dom fileinfo filter iconv intl hash json mbstring pcntl posix session xmlrpc
+USES=		gettext-tools php:cli,web shebangfix
+USE_PHP=	ctype dom fileinfo filter hash iconv intl json mbstring pcntl \
+		posix session xmlrpc
+USE_RC_SUBR=	ttrssd
 
-REINPLACE_ARGS=	-i ""
-SHEBANG_FILES=	lib/dojo-src/rebuild-dojo.sh utils/extract-i18n-js.pl update_daemon2.php
-WRKSRC=		${WRKDIR}/tt-rss
+SHEBANG_FILES=	lib/dojo-src/rebuild-dojo.sh update_daemon2.php \
+		utils/extract-i18n-js.pl
 
-GIT_TAGNAME=	71c8d8d36
+_GIT_TAGNAME=	6c546f37b
+
+REINPLACE_ARGS=	-i ""
 
-NO_BUILD=	yes
 NO_ARCH=	yes
+NO_BUILD=	yes
 
-USE_RC_SUBR=	ttrssd
+WRKSRC=		${WRKDIR}/tt-rss
 
-OPTIONS_DEFINE=	CURL GD
-OPTIONS_SINGLE=	DB
-OPTIONS_SINGLE_DB=	MYSQL PGSQL
+OPTIONS_DEFINE=		CURL GD
 OPTIONS_DEFAULT=	CURL GD MYSQL
+OPTIONS_SINGLE=		DB
+OPTIONS_SINGLE_DB=	MYSQL PGSQL
 
 CURL_DESC=	Use SimplePie instead of Magpie
-CURL_USE=	PHP=curl
-
 GD_DESC=	Use OTP QR code generation
-GD_USE=		PHP=gd
 
-PGSQL_VARS=	DB=pgsql
-PGSQL_USE=	PHP=pdo_pgsql,pgsql
-PGSQL_VARS_OFF=	PGSQL="\#"
+CURL_USE=	PHP=curl
+GD_USE=		PHP=gd
 
+MYSQL_USE=	PHP=mysqli,pdo_mysql
 MYSQL_VARS=	DB=mysql
-MYSQL_USE=	PHP=pdo_mysql,mysqli
 MYSQL_VARS_OFF=	MYSQL="\#"
 
+PGSQL_USE=	PHP=pdo_pgsql,pgsql
+PGSQL_VARS=	DB=pgsql
+PGSQL_VARS_OFF=	PGSQL="\#"
+
 .include <bsd.port.options.mk>
 
 SUB_FILES=	httpd-tt-rss.conf pkg-message
-SUB_LIST=	DB=${DB} WWWOWN=${WWWOWN} MYSQL=${MYSQL} PGSQL=${PGSQL}
-PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+SUB_LIST=	DB=${DB} \
+		MYSQL=${MYSQL} \
+		PGSQL=${PGSQL} \
+		WWWOWN=${WWWOWN}
+PLIST_SUB=	WWWGRP=${WWWGRP} \
+		WWWOWN=${WWWOWN}
 
 PHP2FIX=	config.php-dist update.php
 
@@ -70,8 +77,11 @@ do-install:
 		"! -name LICENSE ! -name .empty")
 	${RM} -r ${STAGEDIR}${WWWDIR}/debian
 	${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
-	${RLN} ${STAGEDIR}${WWWDIR}/config.php.sample ${STAGEDIR}${WWWDIR}/config.php-dist
+	${ECHO} "${OPSYS}:${PORTVERSION}:${_GIT_TAGNAME}" > \
+		"${STAGEDIR}${WWWDIR}/version_static.txt"
+	${MV} ${STAGEDIR}${WWWDIR}/config.php-dist \
+		${STAGEDIR}${WWWDIR}/config.php.sample
+	${RLN} ${STAGEDIR}${WWWDIR}/config.php.sample \
+		${STAGEDIR}${WWWDIR}/config.php-dist
 
 .include <bsd.port.mk>
diff --git a/www/tt-rss/distinfo b/www/tt-rss/distinfo
index d625a546d3..d220bbd5e9 100644
--- a/www/tt-rss/distinfo
+++ b/www/tt-rss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607462928
-SHA256 (tt-rss/71c8d8d36.tar.gz) = 812cd4b4a66658ae0345e7c6491e2edd40d65f1cb7493a26a21d768707950738
-SIZE (tt-rss/71c8d8d36.tar.gz) = 3443726
+TIMESTAMP = 1611467057
+SHA256 (tt-rss/6c546f37b.tar.gz) = dc84f8aaf11a6ebf1cfd620669e49a1ed860ae46f813cb5b301cfc84a0443263
+SIZE (tt-rss/6c546f37b.tar.gz) = 3440210
diff --git a/www/tt-rss/pkg-plist b/www/tt-rss/pkg-plist
index 78f9d3d885..75730798e0 100644
--- a/www/tt-rss/pkg-plist
+++ b/www/tt-rss/pkg-plist
@@ -2402,8 +2402,7 @@
 %%WWWDIR%%/plugins/note/note.js
 %%WWWDIR%%/plugins/nsfw/init.js
 %%WWWDIR%%/plugins/nsfw/init.php
-%%WWWDIR%%/plugins/search_sphinx/init.php
-%%WWWDIR%%/plugins/search_sphinx/sphinxapi.php
+%%WWWDIR%%/plugins/scored_oldest_first/init.php
 %%WWWDIR%%/plugins/share/init.php
 %%WWWDIR%%/plugins/share/share.css
 %%WWWDIR%%/plugins/share/share.js
@@ -2771,7 +2770,6 @@
 @dir %%WWWDIR%%/plugins/toggle_sidebar
 @dir %%WWWDIR%%/plugins/shorten_expanded
 @dir %%WWWDIR%%/plugins/share
-@dir %%WWWDIR%%/plugins/search_sphinx
 @dir %%WWWDIR%%/plugins/nsfw
 @dir %%WWWDIR%%/plugins/note
 @dir %%WWWDIR%%/plugins/no_url_hashes
-- 
2.30.0