Index: head/deskutils/recoll/Makefile =================================================================== --- head/deskutils/recoll/Makefile (revision 320215) +++ head/deskutils/recoll/Makefile (revision 320216) @@ -1,94 +1,92 @@ -# New ports collection makefile for: recoll -# Date created: 5 December 2005 -# Whom: J.F. Dockes -# +# Created by: J.F. Dockes # $FreeBSD$ -# PORTNAME= recoll -PORTVERSION= 1.18.1 -PORTREVISION= 1 +PORTVERSION= 1.18.2 CATEGORIES= deskutils -MASTER_SITES= http://www.lesbonscomptes.com/recoll/ +MASTER_SITES= http://www.lesbonscomptes.com/${PORTNAME}/ MAINTAINER= nemysis@gmx.ch COMMENT= Personal full text search package, based on Xapian LICENSE= GPLv2 -LIB_DEPENDS= xapian:${PORTSDIR}/databases/xapian-core +BUILD_DEPENDS= xapian-core>=0:${PORTSDIR}/databases/xapian-core -USES= iconv +USE_ICONV= yes USE_GMAKE= yes GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAN1= recollindex.1 MAN5= recoll.conf.5 OPTIONS_DEFINE= QT4 ASPELL PYTHON X11MON -OPTIONS_DEFAULT=QT4 ASPELL PYTHON X11MON X11MON_DESC= X11 session monitoring support +OPTIONS_DEFAULT=QT4 ASPELL PYTHON X11MON + +# Wrong versioning upstream +PORTSCOUT= skipv:1.19 .include .if ${PORT_OPTIONS:MQT4} USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats \ corelib gui xml webkit QT_NONSTANDARD= yes CONFIGURE_ENV+= QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" CONFIGURE_ARGS+=--enable-qtgui INSTALLS_ICONS= yes PLIST_SUB+= QT="" MAN1+= recollq.1 recoll.1 .else CONFIGURE_ARGS+=--disable-qtgui PLIST_SUB+= QT="@comment " .endif .if ${PORT_OPTIONS:MASPELL} LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell .else CONFIGURE_ARGS+=--without-aspell .endif .if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes INSTALLS_EGGINFO= yes PYDISTUTILS_EGGINFO= Recoll-1.0-py${PYTHON_VER}.egg-info PLIST_SUB+= PYTHON="" .else CONFIGURE_ARGS+=--disable-python-module PLIST_SUB+= PYTHON="@comment " .endif .if ${PORT_OPTIONS:MX11MON} USE_XORG+= ice sm x11 USE_FAM= yes CONFIGURE_ARGS+=--with-fam .else CONFIGURE_ARGS+=--disable-x11mon .endif post-patch: @${REINPLACE_CMD} \ -e 's|$${MAKE} -C query recollq|@NOQTMAKE@$${MAKE} -C query recollq|' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} \ -e 's|/usr/local/lib|${LOCALBASE}/lib|' ${WRKSRC}/configure @${REINPLACE_CMD} \ -e 's|= -g -O2|=|' ${WRKSRC}/mk/localdefs.in @${REINPLACE_CMD} \ -e 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/mk/${OPSYS} @${REINPLACE_CMD} -e 's|@NOCMDLINE@|@NOQTMAKE@|g' \ ${WRKSRC}/recollinstall.in post-configure: .if ${PORT_OPTIONS:MQT4} @cd ${WRKSRC}/qtgui && ${SETENV} ${CONFIGURE_ENV} \ ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} .endif .include Index: head/deskutils/recoll/distinfo =================================================================== --- head/deskutils/recoll/distinfo (revision 320215) +++ head/deskutils/recoll/distinfo (revision 320216) @@ -1,2 +1,2 @@ -SHA256 (recoll-1.18.1.tar.gz) = 8ea01dc64002b594b7ca08cf40c5581963bd98617d8ab5554164a8af4a9fd933 -SIZE (recoll-1.18.1.tar.gz) = 2026276 +SHA256 (recoll-1.18.2.tar.gz) = 4729785354bd0d465c92e7d2a6fced688d8c08f1342a9bef2f040e7b10b1f510 +SIZE (recoll-1.18.2.tar.gz) = 1969421 Index: head/deskutils/recoll/pkg-plist =================================================================== --- head/deskutils/recoll/pkg-plist (revision 320215) +++ head/deskutils/recoll/pkg-plist (revision 320216) @@ -1,113 +1,110 @@ %%QT%%bin/recoll bin/recollindex %%QT%%bin/recollq %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll.so %%QT%%share/applications/recoll-searchgui.desktop %%QT%%share/icons/hicolor/48x48/apps/recoll.png %%QT%%share/pixmaps/recoll.png %%DATADIR%%/doc/docbook.css %%DATADIR%%/doc/usermanual.html %%DATADIR%%/examples/fields %%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/rclabw %%DATADIR%%/filters/rclaptosidman %%DATADIR%%/filters/rclaudio %%DATADIR%%/filters/rclchm %%DATADIR%%/filters/rcldia %%DATADIR%%/filters/rcldjvu %%DATADIR%%/filters/rcldoc %%DATADIR%%/filters/rcldvi %%DATADIR%%/filters/rclepub %%DATADIR%%/filters/rclexecm.py %%DATADIR%%/filters/rclfb2 %%DATADIR%%/filters/rclgaim %%DATADIR%%/filters/rclgnm %%DATADIR%%/filters/rclics %%DATADIR%%/filters/rclimg %%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/rclnull %%DATADIR%%/filters/rclokulnote %%DATADIR%%/filters/rclopxml %%DATADIR%%/filters/rclpdf %%DATADIR%%/filters/rclppt %%DATADIR%%/filters/rclps %%DATADIR%%/filters/rclpurple %%DATADIR%%/filters/rclpython %%DATADIR%%/filters/rclrar %%DATADIR%%/filters/rclrtf %%DATADIR%%/filters/rclscribus %%DATADIR%%/filters/rclshowinfo %%DATADIR%%/filters/rclsiduxman %%DATADIR%%/filters/rclsoff %%DATADIR%%/filters/rclsvg %%DATADIR%%/filters/rcltar %%DATADIR%%/filters/rcltex %%DATADIR%%/filters/rcltext %%DATADIR%%/filters/rcluncomp %%DATADIR%%/filters/rclwar %%DATADIR%%/filters/rclwpd %%DATADIR%%/filters/rclxls %%DATADIR%%/filters/rclxml %%DATADIR%%/filters/rclzip %%DATADIR%%/filters/xdg-open %%DATADIR%%/images/aptosid-book.png %%DATADIR%%/images/aptosid-manual.png %%DATADIR%%/images/archive.png %%DATADIR%%/images/book.png %%DATADIR%%/images/bookchap.png %%DATADIR%%/images/document.png %%DATADIR%%/images/drawing.png %%DATADIR%%/images/folder.png %%DATADIR%%/images/html.png %%DATADIR%%/images/image.png %%DATADIR%%/images/message.png %%DATADIR%%/images/mozilla_doc.png %%DATADIR%%/images/pdf.png %%DATADIR%%/images/pidgin.png %%DATADIR%%/images/postscript.png %%DATADIR%%/images/presentation.png %%DATADIR%%/images/sidux-book.png %%DATADIR%%/images/soffice.png %%DATADIR%%/images/source.png %%DATADIR%%/images/sownd.png %%DATADIR%%/images/spreadsheet.png %%DATADIR%%/images/text-x-python.png %%DATADIR%%/images/txt.png +%%DATADIR%%/images/video.png %%DATADIR%%/images/wordprocessing.png %%DATADIR%%/translations/recoll_cs.qm %%DATADIR%%/translations/recoll_de.qm %%DATADIR%%/translations/recoll_el.qm %%DATADIR%%/translations/recoll_es.qm %%DATADIR%%/translations/recoll_fr.qm %%DATADIR%%/translations/recoll_it.qm %%DATADIR%%/translations/recoll_lt.qm %%DATADIR%%/translations/recoll_ru.qm %%DATADIR%%/translations/recoll_tr.qm %%DATADIR%%/translations/recoll_uk.qm %%DATADIR%%/translations/recoll_xx.qm %%DATADIR%%/translations/recoll_zh.qm %%DATADIR%%/translations/recoll_zh_CN.qm @dirrm %%DATADIR%%/translations @dirrm %%DATADIR%%/images @dirrm %%DATADIR%%/filters @dirrm %%DATADIR%%/examples @dirrm %%DATADIR%%/doc @dirrm %%DATADIR%% -@dirrmtry share/icons/hicolor/48x48/apps -@dirrmtry share/icons/hicolor/48x48 -@dirrmtry share/icons/hicolor -@dirrmtry share/icons -@dirrmtry share/applications +%%QT%%@dirrmtry share/applications