deskutils/recoll: update the port to version 1.33.1

Assume maintainership for the time being.

3 files changed, 24 insertions, 25 deletions

diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index e6bd2a260b27..c8c3af995946 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	recoll
-PORTVERSION=	1.31.4
-PORTREVISION=	8
+PORTVERSION=	1.33.1
 CATEGORIES=	deskutils
 MASTER_SITES=	https://www.lesbonscomptes.com/recoll/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Personal full text search package, based on Xapian
 WWW=		https://www.lesbonscomptes.com/recoll/
 
@@ -28,11 +27,7 @@ PYDISTUTILS_PKGNAME=	Recoll
 PYDISTUTILS_PKGVERSION=	1.0
 USE_QT=		core gui printsupport widgets xml buildtools:build qmake:build
 
-SHEBANG_FILES=	desktop/hotrecoll.py filters/*.py filters/rcl7z \
-		filters/rclaudio filters/rclchm filters/rcldia filters/rclepub \
-		filters/rclepub1 filters/rclics filters/rclimg filters/rclinfo \
-		filters/rclkar filters/rclrar filters/rcltar filters/rclwar \
-		filters/rclzip
+SHEBANG_FILES=	desktop/hotrecoll.py filters/*.py filters/rclimg
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-recollq \
@@ -78,6 +73,8 @@ post-patch:
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/local/lib|${LOCALBASE}/lib|' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|override const|const override|' \
+		${WRKSRC}/index/rclmonrcv.cpp
 
 pre-build-QT5-on:
 	@cd ${WRKSRC}/qtgui && \
diff --git a/deskutils/recoll/distinfo b/deskutils/recoll/distinfo
index f49367a12ede..69f7fa8a9eab 100644
--- a/deskutils/recoll/distinfo
+++ b/deskutils/recoll/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1638053561
-SHA256 (recoll-1.31.4.tar.gz) = 6825f0ef2e4135e79c0a7cbbd1ab48be46d1caf9617f5b919ebffa85a1310156
-SIZE (recoll-1.31.4.tar.gz) = 3696726
+TIMESTAMP = 1664694486
+SHA256 (recoll-1.33.1.tar.gz) = 025dec0b9745e1ddacd86ee5478f9c52b2da2e5c307f831aaa5b2c7f9d7e8db9
+SIZE (recoll-1.33.1.tar.gz) = 3660154
diff --git a/deskutils/recoll/pkg-plist b/deskutils/recoll/pkg-plist
index 52b52cbff6e2..cf584e5cf429 100644
--- a/deskutils/recoll/pkg-plist
+++ b/deskutils/recoll/pkg-plist
@@ -31,6 +31,7 @@ bin/xadump
 %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/top_level.txt
 lib/recoll/librecoll-%%VERSION%%.so
 lib/recoll/librecoll.so
+man/man1/rclgrep.1.gz
 %%QT5%%man/man1/recoll.1.gz
 man/man1/recollindex.1.gz
 man/man1/recollq.1.gz
@@ -48,6 +49,8 @@ man/man5/recoll.conf.5.gz
 %%DATADIR%%/examples/mimemap
 %%DATADIR%%/examples/mimeview
 %%DATADIR%%/examples/rclmon.sh
+%%DATADIR%%/examples/recoll-common.css
+%%DATADIR%%/examples/recoll-common.qss
 %%DATADIR%%/examples/recoll-dark.css
 %%DATADIR%%/examples/recoll-dark.qss
 %%DATADIR%%/examples/recoll.conf
@@ -69,32 +72,32 @@ man/man5/recoll.conf.5.gz
 %%DATADIR%%/filters/openxml-word-body.xsl
 %%DATADIR%%/filters/openxml-xls-body.xsl
 %%DATADIR%%/filters/ppt-dump.py
-%%DATADIR%%/filters/rcl7z
+%%DATADIR%%/filters/rcl7z.py
 %%DATADIR%%/filters/rclaptosidman
-%%DATADIR%%/filters/rclaudio
+%%DATADIR%%/filters/rclaudio.py
 %%DATADIR%%/filters/rclbasehandler.py
 %%DATADIR%%/filters/rclbibtex.sh
 %%DATADIR%%/filters/rclcheckneedretry.sh
-%%DATADIR%%/filters/rclchm
+%%DATADIR%%/filters/rclchm.py
 %%DATADIR%%/filters/rclconfig.py
-%%DATADIR%%/filters/rcldia
+%%DATADIR%%/filters/rcldia.py
 %%DATADIR%%/filters/rcldjvu.py
 %%DATADIR%%/filters/rcldoc.py
 %%DATADIR%%/filters/rcldvi
-%%DATADIR%%/filters/rclepub
-%%DATADIR%%/filters/rclepub1
+%%DATADIR%%/filters/rclepub.py
+%%DATADIR%%/filters/rclepub1.py
 %%DATADIR%%/filters/rclexec1.py
 %%DATADIR%%/filters/rclexecm.py
 %%DATADIR%%/filters/rclfb2.py
 %%DATADIR%%/filters/rclgaim
 %%DATADIR%%/filters/rclgenxslt.py
 %%DATADIR%%/filters/rclhwp.py
-%%DATADIR%%/filters/rclics
+%%DATADIR%%/filters/rclics.py
 %%DATADIR%%/filters/rclimg
 %%DATADIR%%/filters/rclimg.py
-%%DATADIR%%/filters/rclinfo
+%%DATADIR%%/filters/rclinfo.py
 %%DATADIR%%/filters/rclipynb.py
-%%DATADIR%%/filters/rclkar
+%%DATADIR%%/filters/rclkar.py
 %%DATADIR%%/filters/rclkwd
 %%DATADIR%%/filters/rcllatinclass.py
 %%DATADIR%%/filters/rcllatinstops.zip
@@ -113,21 +116,21 @@ man/man5/recoll.conf.5.gz
 %%DATADIR%%/filters/rclpst.py
 %%DATADIR%%/filters/rclpurple
 %%DATADIR%%/filters/rclpython.py
-%%DATADIR%%/filters/rclrar
+%%DATADIR%%/filters/rclrar.py
 %%DATADIR%%/filters/rclrtf.py
 %%DATADIR%%/filters/rclscribus
 %%DATADIR%%/filters/rclshowinfo
-%%DATADIR%%/filters/rcltar
+%%DATADIR%%/filters/rcltar.py
 %%DATADIR%%/filters/rcltex
 %%DATADIR%%/filters/rcltext.py
 %%DATADIR%%/filters/rcluncomp
 %%DATADIR%%/filters/rcluncomp.py
-%%DATADIR%%/filters/rclwar
+%%DATADIR%%/filters/rclwar.py
 %%DATADIR%%/filters/rclxls.py
 %%DATADIR%%/filters/rclxml.py
 %%DATADIR%%/filters/rclxmp.py
 %%DATADIR%%/filters/rclxslt.py
-%%DATADIR%%/filters/rclzip
+%%DATADIR%%/filters/rclzip.py
 %%DATADIR%%/filters/recoll-we-move-files.py
 %%DATADIR%%/filters/recollepub.zip
 %%DATADIR%%/filters/svg.xsl
@@ -173,7 +176,6 @@ man/man5/recoll.conf.5.gz
 %%QT5%%%%DATADIR%%/translations/recoll_lt.qm
 %%QT5%%%%DATADIR%%/translations/recoll_nl.qm
 %%QT5%%%%DATADIR%%/translations/recoll_pl.qm
-%%QT5%%%%DATADIR%%/translations/recoll_ru.qm
 %%QT5%%%%DATADIR%%/translations/recoll_sv.qm
 %%QT5%%%%DATADIR%%/translations/recoll_tr.qm
 %%QT5%%%%DATADIR%%/translations/recoll_uk.qm