@@ -, +, @@ post-install-CHM-on target flavors --- deskutils/recoll/Makefile | 24 +++++------ deskutils/recoll/distinfo | 6 +-- deskutils/recoll/files/patch-Makefile.in | 54 ++++++++++++++++++++---- deskutils/recoll/pkg-plist | 45 +++++++++++++++++--- 4 files changed, 99 insertions(+), 30 deletions(-) --- b/deskutils/recoll/Makefile +++ b/deskutils/recoll/Makefile @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= recoll -DISTVERSION= 1.24.5 -PORTREVISION= 2 +DISTVERSION= 1.25.16 CATEGORIES= deskutils MASTER_SITES= https://www.lesbonscomptes.com/recoll/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jjuanino@gmail.com COMMENT= Personal full text search package, based on Xapian LICENSE= GPLv2+ @@ -22,14 +21,16 @@ RUN_DEPENDS= unrar:archivers/unrar \ USES= bison gmake gnome iconv libtool localbase python:2.7 shebangfix USE_LDCONFIG= yes + 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/rclrar filters/rcltar filters/rclwar \ - filters/rclzip desktop/hotrecoll.py + filters/rclzip desktop/hotrecoll.py + USE_PYTHON= py3kplist -USE_GNOME= libxslt:run +USE_GNOME= libxslt GNU_CONFIGURE= yes MAKE_ENV= PYTHON_CMD=${PYTHON_CMD} @@ -47,7 +48,9 @@ OPTIONS_SUB= yes ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell ASPELL_CONFIGURE_WITH= aspell CHM_DESC= CHM via CHMLIB +CHM_LIB_DEPENDS= libchm.so:misc/chmlib CHM_RUN_DEPENDS= pychm>0:textproc/pychm +CHM_CONFIGURE_ENABLE= python-chm DJVU_RUN_DEPENDS= djvutxt:graphics/djvulibre IMAGE_DESC= Store personal tags or textual descriptions in images IMAGE_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool @@ -70,18 +73,12 @@ X11MON_CONFIGURE_WITH= fam X11MON_BROKEN= does not build: index/rclmonrcv.cpp:(.text+0x1f13): undefined reference to `FAMOpen2' post-patch: - @${REINPLACE_CMD} -e \ - 's|@QMAKE@|${TRUE}|' \ - ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ '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.in - @${REINPLACE_CMD} -e \ - 's|python setup.py|${PYTHON_CMD} setup.py|' \ - ${WRKSRC}/Makefile.in + ${WRKSRC}/python/recoll/Makefile pre-build-QT5-on: @cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} ${QMAKE} \ @@ -91,4 +88,7 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/*.so \ ${STAGEDIR}${PREFIX}/lib/recoll/*.so +post-install-CHM-on: + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recollchm/*.so + .include --- b/deskutils/recoll/distinfo +++ b/deskutils/recoll/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1549037086 -SHA256 (recoll-1.24.5.tar.gz) = 9b25f4494023fcea729ff96dd2bb525e78df14caf4ebab3a93377a0b1f50a382 -SIZE (recoll-1.24.5.tar.gz) = 2675385 +TIMESTAMP = 1558855793 +SHA256 (recoll-1.25.16.tar.gz) = a0e19c8fc71f62eb1b7ebed271afb2f440402362f589bc663c7164c52e5c223c +SIZE (recoll-1.25.16.tar.gz) = 2843267 --- b/deskutils/recoll/files/patch-Makefile.in +++ b/deskutils/recoll/files/patch-Makefile.in @@ -1,11 +1,49 @@ ---- Makefile.in.orig 2017-11-06 17:57:14 UTC +--- Makefile.in.orig 2019-05-22 12:46:15 UTC +++ Makefile.in -@@ -2206,7 +2206,7 @@ PicStatic: $(librecoll_la_OBJECTS) - @MAKEPYTHON_TRUE@ OPTSFORPYTHON=--install-layout=deb; \ - @MAKEPYTHON_TRUE@ fi; \ - @MAKEPYTHON_TRUE@ set -x; \ --@MAKEPYTHON_TRUE@ python setup.py install \ +@@ -436,7 +436,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ +-QMAKE = @QMAKE@ ++QMAKE = true + QMAKEPATH = @QMAKEPATH@ + QMAKE_DISABLE_WEBENGINE = @QMAKE_DISABLE_WEBENGINE@ + QMAKE_DISABLE_WEBKIT = @QMAKE_DISABLE_WEBKIT@ +@@ -2397,16 +2397,12 @@ PicStatic: $(librecoll_la_OBJECTS) + @MAKEPYTHON_TRUE@clean-local:: recollpython-clean + @MAKEPYTHON_TRUE@recollpython: librecoll.la + @MAKEPYTHON_TRUE@ (cd python/recoll; set -x; \ +-@MAKEPYTHON_TRUE@ for v in 2 3;do test -n "`which python$${v}`" && \ +-@MAKEPYTHON_TRUE@ libdir=$(libdir) python$${v} setup.py build; \ +-@MAKEPYTHON_TRUE@ done \ ++@MAKEPYTHON_TRUE@ libdir=$(libdir) ${PYTHON_CMD} setup.py build; \ + @MAKEPYTHON_TRUE@ ) + @MAKEPYTHON_TRUE@recollpython-install: + @MAKEPYTHON_TRUE@ (cd python/recoll; set -x; \ +-@MAKEPYTHON_TRUE@ for v in 2 3;do test -n "`which python$${v}`" && \ +-@MAKEPYTHON_TRUE@ python$${v} setup.py install \ +@MAKEPYTHON_TRUE@ ${PYTHON_CMD} setup.py install \ - @MAKEPYTHON_TRUE@ --prefix=${prefix} --root=$${DESTDIR:-/} $${OPTSFORPYTHON}) - @MAKEPYTHON_TRUE@clean-local: recollpython-clean + @MAKEPYTHON_TRUE@ --prefix=${prefix} --root=$${DESTDIR:-/} $(OPTSFORPYTHON); \ +-@MAKEPYTHON_TRUE@ done; \ + @MAKEPYTHON_TRUE@ ) @MAKEPYTHON_TRUE@recollpython-clean: + @MAKEPYTHON_TRUE@ rm -f python/recoll/*.pyc +@@ -2422,16 +2418,12 @@ PicStatic: $(librecoll_la_OBJECTS) + @MAKEPYTHONCHM_TRUE@clean-local:: rclpychm-clean + @MAKEPYTHONCHM_TRUE@rclpychm: + @MAKEPYTHONCHM_TRUE@ (cd python/pychm; set -x; \ +-@MAKEPYTHONCHM_TRUE@ for v in 2 3;do \ +-@MAKEPYTHONCHM_TRUE@ test -n "`which python$${v}`" && python$${v} setup.py build;\ +-@MAKEPYTHONCHM_TRUE@ done \ ++@MAKEPYTHONCHM_TRUE@ ${PYTHON_CMD} setup.py build;\ + @MAKEPYTHONCHM_TRUE@ ) + @MAKEPYTHONCHM_TRUE@rclpychm-install: + @MAKEPYTHONCHM_TRUE@ (cd python/pychm; set -x; \ +-@MAKEPYTHONCHM_TRUE@ for v in 2 3;do test -n "`which python$${v}`" && \ +-@MAKEPYTHONCHM_TRUE@ python$${v} setup.py install \ ++@MAKEPYTHONCHM_TRUE@ ${PYTHON_CMD} setup.py install \ + @MAKEPYTHONCHM_TRUE@ --prefix=${prefix} --root=$${DESTDIR:-/} $(OPTSFORPYTHON); \ +-@MAKEPYTHONCHM_TRUE@ done \ + @MAKEPYTHONCHM_TRUE@ ) + @MAKEPYTHONCHM_TRUE@rclpychm-clean: + @MAKEPYTHONCHM_TRUE@ rm -rf python/pychm/build --- b/deskutils/recoll/pkg-plist +++ b/deskutils/recoll/pkg-plist @@ -1,17 +1,35 @@ %%QT5%%bin/recoll bin/recollindex -%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%% +%%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/__init__.py %%PYTHON_SITELIBDIR%%/recoll/__init__.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.so %%PYTHON_SITELIBDIR%%/recoll/recoll.so +%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/PKG-INFO +%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/SOURCES.txt +%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/dependency_links.txt +%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm-0.8.4.1+git-py%%PYTHON_VER%%.egg-info/top_level.txt +%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__init__.py +%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/__init__.pyc +%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/_chmlib.so +%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/chm.py +%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/chm.pyc +%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/chmlib.py +%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/chmlib.pyc +%%CHM%%%%PYTHON_SITELIBDIR%%/recollchm/extra.so lib/recoll/librecoll-%%VERSION%%.so lib/recoll/librecoll.so %%QT5%%man/man1/recoll.1.gz man/man1/recollindex.1.gz man/man1/recollq.1.gz +man/man1/xadump.1.gz man/man5/recoll.conf.5.gz %%QT5%%share/appdata/recoll.appdata.xml %%QT5%%share/applications/recoll-searchgui.desktop @@ -28,13 +46,25 @@ man/man5/recoll.conf.5.gz %%DATADIR%%/examples/recoll.conf %%DATADIR%%/examples/recoll.qss %%DATADIR%%/examples/recollindex.desktop +%%DATADIR%%/filters/abiword.xsl +%%DATADIR%%/filters/conftree.py +%%DATADIR%%/filters/fb2.xsl +%%DATADIR%%/filters/gnumeric.xsl %%DATADIR%%/filters/hotrecoll.py %%DATADIR%%/filters/msodump.zip +%%DATADIR%%/filters/okular-note.xsl +%%DATADIR%%/filters/opendoc-body.xsl +%%DATADIR%%/filters/opendoc-flat.xsl +%%DATADIR%%/filters/opendoc-meta.xsl +%%DATADIR%%/filters/openxml-meta.xsl +%%DATADIR%%/filters/openxml-word-body.xsl +%%DATADIR%%/filters/openxml-xls-body.xsl %%DATADIR%%/filters/ppt-dump.py %%DATADIR%%/filters/rcl7z -%%DATADIR%%/filters/rclabw +%%DATADIR%%/filters/rclabw.py %%DATADIR%%/filters/rclaptosidman %%DATADIR%%/filters/rclaudio +%%DATADIR%%/filters/rclbasehandler.py %%DATADIR%%/filters/rclbibtex.sh %%DATADIR%%/filters/rclcheckneedretry.sh %%DATADIR%%/filters/rclchm @@ -47,9 +77,10 @@ man/man5/recoll.conf.5.gz %%DATADIR%%/filters/rclepub1 %%DATADIR%%/filters/rclexec1.py %%DATADIR%%/filters/rclexecm.py -%%DATADIR%%/filters/rclfb2 +%%DATADIR%%/filters/rclfb2.py %%DATADIR%%/filters/rclgaim -%%DATADIR%%/filters/rclgnm +%%DATADIR%%/filters/rclgenxslt.py +%%DATADIR%%/filters/rclgnm.py %%DATADIR%%/filters/rclics %%DATADIR%%/filters/rclimg %%DATADIR%%/filters/rclimg.py @@ -61,7 +92,7 @@ man/man5/recoll.conf.5.gz %%DATADIR%%/filters/rcllyx %%DATADIR%%/filters/rclman %%DATADIR%%/filters/rclmidi.py -%%DATADIR%%/filters/rclokulnote +%%DATADIR%%/filters/rclokulnote.py %%DATADIR%%/filters/rclopxml.py %%DATADIR%%/filters/rclpdf.py %%DATADIR%%/filters/rclppt.py @@ -72,7 +103,6 @@ man/man5/recoll.conf.5.gz %%DATADIR%%/filters/rclrtf.py %%DATADIR%%/filters/rclscribus %%DATADIR%%/filters/rclshowinfo -%%DATADIR%%/filters/rclsiduxman %%DATADIR%%/filters/rclsoff-flat.py %%DATADIR%%/filters/rclsoff.py %%DATADIR%%/filters/rclsvg.py @@ -82,7 +112,6 @@ man/man5/recoll.conf.5.gz %%DATADIR%%/filters/rcluncomp %%DATADIR%%/filters/rcluncomp.py %%DATADIR%%/filters/rclwar -%%DATADIR%%/filters/rclwpd %%DATADIR%%/filters/rclxls.py %%DATADIR%%/filters/rclxml.py %%DATADIR%%/filters/rclxmp.py @@ -90,8 +119,10 @@ man/man5/recoll.conf.5.gz %%DATADIR%%/filters/rclzip %%DATADIR%%/filters/recoll-we-move-files.py %%DATADIR%%/filters/recollepub.zip +%%DATADIR%%/filters/svg.xsl %%DATADIR%%/filters/xls-dump.py %%DATADIR%%/filters/xlsxmltocsv.py +%%DATADIR%%/filters/xml.xsl %%QT5%%%%DATADIR%%/images/aptosid-book.png %%QT5%%%%DATADIR%%/images/aptosid-manual.png %%QT5%%%%DATADIR%%/images/archive.png --