Index: head/deskutils/recoll/Makefile =================================================================== --- head/deskutils/recoll/Makefile (revision 460611) +++ head/deskutils/recoll/Makefile (revision 460612) @@ -1,96 +1,97 @@ # Created by: J.F. Dockes # $FreeBSD$ PORTNAME= recoll PORTVERSION= 1.23.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= http://www.lesbonscomptes.com/recoll/ MAINTAINER= ports@FreeBSD.org COMMENT= Personal full text search package, based on Xapian LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libxapian.so:databases/xapian-core RUN_DEPENDS= unrar:archivers/unrar \ antiword:textproc/antiword \ catdoc:textproc/catdoc \ wpd2html:textproc/libwpd010 \ unrtf:textproc/unrtf USES= bison gmake iconv libtool localbase python shebangfix SHEBANG_FILES= filters/*.py desktop/hotrecoll.py \ filters/rcl7z filters/rclaudio filters/rclchm \ filters/rcldia filters/rclepub filters/rclepub1 \ filters/rclics filters/rclinfo filters/rclkar \ filters/rclpython filters/rclrar filters/rcltar \ filters/rclwar filters/rclzip +USE_PYTHON= py3kplist USE_GNOME= libxslt:run GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-pic MAKE_ENV= PYTHON_CMD=${PYTHON_CMD} PYDISTUTILS_PKGNAME= Recoll PYDISTUTILS_PKGVERSION= 1.0 PLIST_SUB= VERSION="${PORTVERSION}" \ PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}" OPTIONS_DEFINE= ASPELL CHM DJVU KONQUEROR LATEX IMAGE PDF PS \ SOUND QT4 X11MON OPTIONS_DEFAULT= ASPELL IMAGE PDF PS SOUND QT4 OPTIONS_SUB= yes ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell ASPELL_CONFIGURE_WITH= aspell CHM_DESC= CHM via CHMLIB CHM_RUN_DEPENDS= pychm>0:textproc/pychm DJVU_RUN_DEPENDS= djvutxt:graphics/djvulibre IMAGE_DESC= Store personal tags or textual descriptions in images IMAGE_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool KONQUEROR_DESC= Konqueror webarchive format with Python KONQUEROR_RUN_DEPENDS= kwebkitpart>0:www/kwebkitpart LATEX_USE= tex=dvipsk:run,latex:run PDF_RUN_DEPENDS= pdftotext:graphics/poppler-utils PS_RUN_DEPENDS= pstotext:print/pstotext QT4_USE= qt4=moc_build,qmake_build,rcc_build,uic_build \ qt4=iconengines_run,imageformats_run \ qt4=corelib,gui,xml,webkit QT4_CONFIGURE_ENABLE= qtgui QT4_CONFIGURE_ENV= QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \ QTDIR="${PREFIX}" QT4_VARS= QT_NONSTANDARD=yes SOUND_RUN_DEPENDS= mutagen-pony:audio/py-mutagen \ pykaraoke:audio/py-karaoke X11MON_DESC= X11 session monitoring support X11MON_USES= fam 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 \ '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 pre-build-QT4-on: @(cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} ${QMAKE} \ ${QMAKE_ARGS} recoll.pro) post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/*.so \ ${STAGEDIR}${PREFIX}/lib/recoll/*.so .include Index: head/deskutils/recoll/files/patch-Makefile.in =================================================================== --- head/deskutils/recoll/files/patch-Makefile.in (revision 460611) +++ head/deskutils/recoll/files/patch-Makefile.in (revision 460612) @@ -1,11 +1,11 @@ --- Makefile.in.orig 2017-11-06 17:57:14 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 \ -+@MAKEPYTHON_TRUE@ ${PYTHON_CMD} setup.py install --no-compile \ ++@MAKEPYTHON_TRUE@ ${PYTHON_CMD} setup.py install \ @MAKEPYTHON_TRUE@ --prefix=${prefix} --root=$${DESTDIR:-/} $${OPTSFORPYTHON}) @MAKEPYTHON_TRUE@clean-local: recollpython-clean @MAKEPYTHON_TRUE@recollpython-clean: Index: head/deskutils/recoll/pkg-plist =================================================================== --- head/deskutils/recoll/pkg-plist (revision 460611) +++ head/deskutils/recoll/pkg-plist (revision 460612) @@ -1,129 +1,131 @@ %%QT4%%bin/recoll bin/recollindex %%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%% %%PYTHON_SITELIBDIR%%/recoll/__init__.py +%%PYTHON_SITELIBDIR%%/recoll/__init__.pyc %%PYTHON_SITELIBDIR%%/recoll/rclconfig.py +%%PYTHON_SITELIBDIR%%/recoll/rclconfig.pyc %%PYTHON_SITELIBDIR%%/recoll/rclextract.so %%PYTHON_SITELIBDIR%%/recoll/recoll.so lib/recoll/librecoll-%%VERSION%%.so lib/recoll/librecoll.so %%QT4%%man/man1/recoll.1.gz man/man1/recollindex.1.gz man/man1/recollq.1.gz man/man5/recoll.conf.5.gz %%QT4%%share/appdata/recoll.appdata.xml %%QT4%%share/applications/recoll-searchgui.desktop %%QT4%%share/icons/hicolor/48x48/apps/recoll.png %%QT4%%share/pixmaps/recoll.png %%DATADIR%%/doc/docbook-xsl.css %%DATADIR%%/doc/usermanual.html %%DATADIR%%/examples/fields %%DATADIR%%/examples/fragbuts.xml %%DATADIR%%/examples/mimeconf %%DATADIR%%/examples/mimemap %%DATADIR%%/examples/mimeview %%DATADIR%%/examples/rclmon.sh %%DATADIR%%/examples/recoll.conf %%DATADIR%%/examples/recoll.qss %%DATADIR%%/examples/recollindex.desktop %%DATADIR%%/filters/hotrecoll.py %%DATADIR%%/filters/msodump.zip %%DATADIR%%/filters/ppt-dump.py %%DATADIR%%/filters/rcl7z %%DATADIR%%/filters/rclabw %%DATADIR%%/filters/rclaptosidman %%DATADIR%%/filters/rclaudio %%DATADIR%%/filters/rclcheckneedretry.sh %%DATADIR%%/filters/rclchm %%DATADIR%%/filters/rclconfig.py %%DATADIR%%/filters/rcldia %%DATADIR%%/filters/rcldjvu.py %%DATADIR%%/filters/rcldoc.py %%DATADIR%%/filters/rcldvi %%DATADIR%%/filters/rclepub %%DATADIR%%/filters/rclepub1 %%DATADIR%%/filters/rclexec1.py %%DATADIR%%/filters/rclexecm.py %%DATADIR%%/filters/rclfb2 %%DATADIR%%/filters/rclgaim %%DATADIR%%/filters/rclgnm %%DATADIR%%/filters/rclics %%DATADIR%%/filters/rclimg %%DATADIR%%/filters/rclimg.py %%DATADIR%%/filters/rclinfo %%DATADIR%%/filters/rclkar %%DATADIR%%/filters/rclkwd %%DATADIR%%/filters/rcllatinclass.py %%DATADIR%%/filters/rcllatinstops.zip %%DATADIR%%/filters/rcllyx %%DATADIR%%/filters/rclman %%DATADIR%%/filters/rclokulnote %%DATADIR%%/filters/rclopxml.py %%DATADIR%%/filters/rclpdf.py %%DATADIR%%/filters/rclppt.py %%DATADIR%%/filters/rclps %%DATADIR%%/filters/rclpurple %%DATADIR%%/filters/rclpython %%DATADIR%%/filters/rclrar %%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 %%DATADIR%%/filters/rcltar %%DATADIR%%/filters/rcltex %%DATADIR%%/filters/rcltext.py %%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 %%DATADIR%%/filters/rclxslt.py %%DATADIR%%/filters/rclzip %%DATADIR%%/filters/xls-dump.py %%DATADIR%%/filters/xlsxmltocsv.py %%QT4%%%%DATADIR%%/images/aptosid-book.png %%QT4%%%%DATADIR%%/images/aptosid-manual.png %%QT4%%%%DATADIR%%/images/archive.png %%QT4%%%%DATADIR%%/images/book.png %%QT4%%%%DATADIR%%/images/bookchap.png %%QT4%%%%DATADIR%%/images/document.png %%QT4%%%%DATADIR%%/images/drawing.png %%QT4%%%%DATADIR%%/images/emblem-symbolic-link.png %%QT4%%%%DATADIR%%/images/folder.png %%QT4%%%%DATADIR%%/images/html.png %%QT4%%%%DATADIR%%/images/image.png %%QT4%%%%DATADIR%%/images/message.png %%QT4%%%%DATADIR%%/images/mozilla_doc.png %%QT4%%%%DATADIR%%/images/pdf.png %%QT4%%%%DATADIR%%/images/pidgin.png %%QT4%%%%DATADIR%%/images/postscript.png %%QT4%%%%DATADIR%%/images/presentation.png %%QT4%%%%DATADIR%%/images/sidux-book.png %%QT4%%%%DATADIR%%/images/soffice.png %%QT4%%%%DATADIR%%/images/source.png %%QT4%%%%DATADIR%%/images/sownd.png %%QT4%%%%DATADIR%%/images/spreadsheet.png %%QT4%%%%DATADIR%%/images/text-x-python.png %%QT4%%%%DATADIR%%/images/txt.png %%QT4%%%%DATADIR%%/images/video.png %%QT4%%%%DATADIR%%/images/wordprocessing.png %%QT4%%%%DATADIR%%/translations/recoll_cs.qm %%QT4%%%%DATADIR%%/translations/recoll_da.qm %%QT4%%%%DATADIR%%/translations/recoll_de.qm %%QT4%%%%DATADIR%%/translations/recoll_el.qm %%QT4%%%%DATADIR%%/translations/recoll_es.qm %%QT4%%%%DATADIR%%/translations/recoll_fr.qm %%QT4%%%%DATADIR%%/translations/recoll_it.qm %%QT4%%%%DATADIR%%/translations/recoll_lt.qm %%QT4%%%%DATADIR%%/translations/recoll_pl.qm %%QT4%%%%DATADIR%%/translations/recoll_ru.qm %%QT4%%%%DATADIR%%/translations/recoll_tr.qm %%QT4%%%%DATADIR%%/translations/recoll_uk.qm %%QT4%%%%DATADIR%%/translations/recoll_xx.qm %%QT4%%%%DATADIR%%/translations/recoll_zh.qm %%QT4%%%%DATADIR%%/translations/recoll_zh_CN.qm