deskutils/recoll: update the port and improve option handling

- Update Recoll to the latest version 1.31.2
- Unbreak the build with X11MON option (add missing -lfam)
- Unbreak stripping when CHM option is disabled

PR:	259679

5 files changed, 40 insertions, 35 deletions

diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index 0f3ffd1e9042..50a1cf4c2911 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -1,8 +1,7 @@
 # Created by: J.F. Dockes <jean-francois.dockes@wanadoo.fr>
 
 PORTNAME=	recoll
-PORTVERSION=	1.27.3
-PORTREVISION=	17
+PORTVERSION=	1.31.2
 CATEGORIES=	deskutils
 MASTER_SITES=	https://www.lesbonscomptes.com/recoll/
 
@@ -29,7 +28,7 @@ USE_PYTHON=	py3kplist
 SHEBANG_FILES=	filters/*.py filters/rcl7z filters/rclaudio \
 		filters/rclchm filters/rcldia filters/rclepub \
 		filters/rclepub1 filters/rclics filters/rclimg \
-		filters/rclinfo filters/rclkar filters/rclpython \
+		filters/rclinfo filters/rclkar \
 		filters/rclrar filters/rcltar filters/rclwar \
 		filters/rclzip desktop/hotrecoll.py
 GNU_CONFIGURE=	yes
@@ -72,7 +71,6 @@ X11MON_USES=		fam xorg
 X11MON_USE=		xorg=ice,sm,x11
 X11MON_CONFIGURE_ENABLE=	x11mon
 X11MON_CONFIGURE_WITH=	fam
-X11MON_BROKEN=		does not build: index/rclmonrcv.cpp:(.text+0x1f13): undefined reference to `FAMOpen2'
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -82,9 +80,6 @@ post-patch:
 		's|/usr/local/lib|${LOCALBASE}/lib|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
-		's|python setup.py|${PYTHON_CMD} setup.py|; s|sudo||' \
-		${WRKSRC}/python/recoll/Makefile
-	@${REINPLACE_CMD} -e \
 		's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \
 		${WRKSRC}/Makefile.in
 
@@ -94,8 +89,11 @@ pre-build-QT5-on:
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/*.so \
-		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recollchm/*.so \
-		${STAGEDIR}${PREFIX}/lib/recoll/*.so \
-		${STAGEDIR}${PREFIX}/bin/recoll
+		${STAGEDIR}${PREFIX}/lib/recoll/*.so
+# Remove systemd unit files (useless on FreeBSD)
+	@${RM} ${STAGEDIR}${DATADIR}/examples/recollindex*.service
+
+post-install-CHM-on:
+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recollchm/*.so
 
 .include <bsd.port.mk>
diff --git a/deskutils/recoll/distinfo b/deskutils/recoll/distinfo
index 3ba03e177c9f..648f9be260cb 100644
--- a/deskutils/recoll/distinfo
+++ b/deskutils/recoll/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593261648
-SHA256 (recoll-1.27.3.tar.gz) = 3f62b792f57895a20dd334eb841d6fbe851e687dab43ea89cb3fbc0ccebcddac
-SIZE (recoll-1.27.3.tar.gz) = 3172341
+TIMESTAMP = 1633945035
+SHA256 (recoll-1.31.2.tar.gz) = d3edb28fa76f2bb15e6555f82ef74e9151a2271535d3fdeb5f34012b1c2c3c54
+SIZE (recoll-1.31.2.tar.gz) = 3689921
diff --git a/deskutils/recoll/files/patch-Makefile.in b/deskutils/recoll/files/patch-Makefile.in
index 89f52f8ac242..0be98671cc8b 100644
--- a/deskutils/recoll/files/patch-Makefile.in
+++ b/deskutils/recoll/files/patch-Makefile.in
@@ -1,6 +1,15 @@
---- Makefile.in.orig	2019-05-22 12:46:15 UTC
+--- Makefile.in.orig	2021-10-11 09:30:17 UTC
 +++ Makefile.in
-@@ -2397,16 +2397,12 @@ PicStatic: $(librecoll_la_OBJECTS)
+@@ -884,7 +884,7 @@ recollindex_SOURCES = \
+     index/webqueue.cpp \
+     index/webqueue.h
+ 
+-recollindex_LDADD = librecoll.la 
++recollindex_LDADD = librecoll.la $(LIBFAM)
+ recollq_SOURCES = query/recollqmain.cpp
+ recollq_LDADD = librecoll.la
+ xadump_SOURCES = query/xadump.cpp
+@@ -2795,16 +2795,12 @@ PicStatic: $(librecoll_la_OBJECTS)
  @MAKEPYTHON_TRUE@clean-local:: recollpython-clean
  @MAKEPYTHON_TRUE@recollpython: librecoll.la
  @MAKEPYTHON_TRUE@	(cd python/recoll; set -x; \
@@ -19,7 +28,7 @@
  @MAKEPYTHON_TRUE@         )
  @MAKEPYTHON_TRUE@recollpython-clean:
  @MAKEPYTHON_TRUE@	rm -f python/recoll/*.pyc
-@@ -2422,16 +2418,12 @@ PicStatic: $(librecoll_la_OBJECTS)
+@@ -2820,16 +2816,12 @@ PicStatic: $(librecoll_la_OBJECTS)
  @MAKEPYTHONCHM_TRUE@clean-local:: rclpychm-clean
  @MAKEPYTHONCHM_TRUE@rclpychm:
  @MAKEPYTHONCHM_TRUE@	(cd python/pychm; set -x; \
diff --git a/deskutils/recoll/files/patch-utils_fileudi.cpp b/deskutils/recoll/files/patch-utils_fileudi.cpp
deleted file mode 100644
index 2dca3d529210..000000000000
--- a/deskutils/recoll/files/patch-utils_fileudi.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils/fileudi.cpp.orig	2014-07-07 16:10:11 UTC
-+++ utils/fileudi.cpp
-@@ -18,6 +18,7 @@
- 
- #include <stdio.h>
- #include <cstdlib>
-+#include <sys/types.h>
- 
- #include "fileudi.h"
- #include "md5.h"
diff --git a/deskutils/recoll/pkg-plist b/deskutils/recoll/pkg-plist
index 7abdf8bd9399..52b52cbff6e2 100644
--- a/deskutils/recoll/pkg-plist
+++ b/deskutils/recoll/pkg-plist
@@ -2,18 +2,21 @@
 bin/recollindex
 bin/recollq
 bin/xadump
-%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%/top_level.txt
+%%PYTHON_SITELIBDIR%%/Recoll-%%VERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/Recoll-%%VERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/Recoll-%%VERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/Recoll-%%VERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%PYTHON_SITELIBDIR%%/recoll/_recoll%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/recoll/__init__.py
 %%PYTHON_SITELIBDIR%%/recoll/__init__.pyc
+%%PYTHON_SITELIBDIR%%/recoll/__pycache__/rclextract.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/recoll/__pycache__/recoll.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recoll/conftree.py
 %%PYTHON_SITELIBDIR%%/recoll/conftree.pyc
 %%PYTHON_SITELIBDIR%%/recoll/rclconfig.py
 %%PYTHON_SITELIBDIR%%/recoll/rclconfig.pyc
-%%PYTHON_SITELIBDIR%%/recoll/rclextract%%PYTHON_EXT_SUFFIX%%.so
-%%PYTHON_SITELIBDIR%%/recoll/recoll%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/recoll/rclextract.py
+%%PYTHON_SITELIBDIR%%/recoll/recoll.py
 %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__init__.py
 %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__pycache__/chm.cpython-%%PYTHON_SUFFIX%%.pyc
@@ -40,11 +43,13 @@ man/man5/recoll.conf.5.gz
 %%DATADIR%%/doc/docbook-xsl.css
 %%DATADIR%%/doc/usermanual.html
 %%DATADIR%%/examples/fields
-%%DATADIR%%/examples/fragbuts.xml
+%%DATADIR%%/examples/fragment-buttons.xml
 %%DATADIR%%/examples/mimeconf
 %%DATADIR%%/examples/mimemap
 %%DATADIR%%/examples/mimeview
 %%DATADIR%%/examples/rclmon.sh
+%%DATADIR%%/examples/recoll-dark.css
+%%DATADIR%%/examples/recoll-dark.qss
 %%DATADIR%%/examples/recoll.conf
 %%DATADIR%%/examples/recoll.qss
 %%DATADIR%%/examples/recollindex.desktop
@@ -88,6 +93,7 @@ man/man5/recoll.conf.5.gz
 %%DATADIR%%/filters/rclimg
 %%DATADIR%%/filters/rclimg.py
 %%DATADIR%%/filters/rclinfo
+%%DATADIR%%/filters/rclipynb.py
 %%DATADIR%%/filters/rclkar
 %%DATADIR%%/filters/rclkwd
 %%DATADIR%%/filters/rcllatinclass.py
@@ -100,12 +106,13 @@ man/man5/recoll.conf.5.gz
 %%DATADIR%%/filters/rclocrcache.py
 %%DATADIR%%/filters/rclocrtesseract.py
 %%DATADIR%%/filters/rclopxml.py
+%%DATADIR%%/filters/rclorgmode.py
 %%DATADIR%%/filters/rclpdf.py
 %%DATADIR%%/filters/rclppt.py
 %%DATADIR%%/filters/rclps
 %%DATADIR%%/filters/rclpst.py
 %%DATADIR%%/filters/rclpurple
-%%DATADIR%%/filters/rclpython
+%%DATADIR%%/filters/rclpython.py
 %%DATADIR%%/filters/rclrar
 %%DATADIR%%/filters/rclrtf.py
 %%DATADIR%%/filters/rclscribus
@@ -161,12 +168,13 @@ man/man5/recoll.conf.5.gz
 %%QT5%%%%DATADIR%%/translations/recoll_fr.qm
 %%QT5%%%%DATADIR%%/translations/recoll_hu.qm
 %%QT5%%%%DATADIR%%/translations/recoll_it.qm
+%%QT5%%%%DATADIR%%/translations/recoll_ja.qm
 %%QT5%%%%DATADIR%%/translations/recoll_ko.qm
-%%QT5%%%%DATADIR%%/translations/recoll_kr.qm
 %%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
 %%QT5%%%%DATADIR%%/translations/recoll_xx.qm