3 files changed, 36 insertions, 24 deletions

diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index 1ff271d4f148..738c0246ddf5 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -6,24 +6,17 @@
 #
 
 PORTNAME=	recoll
-PORTVERSION=	1.17.3
-PORTREVISION=	1
+PORTVERSION=	1.18.1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.lesbonscomptes.com/recoll/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A personal full text search package, based on Xapian
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	Personal full text search package, based on Xapian
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	xapian:${PORTSDIR}/databases/xapian-core
 
-OPTIONS_DEFINE=	QT4 ASPELL PYTHON X11MON
-OPTIONS_DEFAULT=QT4 ASPELL PYTHON X11MON
-ASPELL_DESC=	Enable ASpell support
-X11MON_DESC=	Enable X11 session monitoring support
-
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -32,9 +25,14 @@ MAKE_JOBS_SAFE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		recollindex.1
+MAN1=		recollindex.1 recollq.1
 MAN5=		recoll.conf.5
 
+OPTIONS_DEFINE=	QT4 ASPELL PYTHON X11MON
+OPTIONS_DEFAULT=QT4 ASPELL PYTHON X11MON
+ASPELL_DESC=	Enable ASpell support
+X11MON_DESC=	Enable X11 session monitoring support
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQT4}
@@ -47,10 +45,11 @@ MAN1+=		recoll.1
 .else
 CONFIGURE_ARGS+=--disable-qtgui
 PLIST_SUB+=	QT="@comment "
+MAN1+=		recollq.1
 .endif
 
 .if ${PORT_OPTIONS:MASPELL}
-LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
 .else
 CONFIGURE_ARGS+=--without-aspell
 .endif
@@ -74,18 +73,21 @@ CONFIGURE_ARGS+=--disable-x11mon
 .endif
 
 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|= -g -O2|=|' ${WRKSRC}/mk/localdefs.in
-	@${REINPLACE_CMD} -e \
-		's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/mk/${OPSYS}
+	@${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} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
+	@cd ${WRKSRC}/qtgui && ${SETENV} ${CONFIGURE_ENV} \
+	${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
 .endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/recoll/distinfo b/deskutils/recoll/distinfo
index 5b474f19a5db..c9a56bb6ea87 100644
--- a/deskutils/recoll/distinfo
+++ b/deskutils/recoll/distinfo
@@ -1,2 +1,2 @@
-SHA256 (recoll-1.17.3.tar.gz) = 7778f80546e6b10ca45bfb7f8bb0876ccf3987dd4e98c5003ff923bd8b5acb1c
-SIZE (recoll-1.17.3.tar.gz) = 1757278
+SHA256 (recoll-1.18.1.tar.gz) = 8ea01dc64002b594b7ca08cf40c5581963bd98617d8ab5554164a8af4a9fd933
+SIZE (recoll-1.18.1.tar.gz) = 2026276
diff --git a/deskutils/recoll/pkg-plist b/deskutils/recoll/pkg-plist
index 19866989cf09..4d29b85bd4ca 100644
--- a/deskutils/recoll/pkg-plist
+++ b/deskutils/recoll/pkg-plist
@@ -1,6 +1,7 @@
 %%QT%%bin/recoll
+bin/recollq
 bin/recollindex
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll.so
+%%PYTHON_SITELIBDIR%%/recoll.so
 %%QT%%share/applications/recoll-searchgui.desktop
 %%QT%%share/icons/hicolor/48x48/apps/recoll.png
 %%QT%%share/pixmaps/recoll.png
@@ -23,6 +24,7 @@ bin/recollindex
 %%DATADIR%%/filters/rcldjvu
 %%DATADIR%%/filters/rcldoc
 %%DATADIR%%/filters/rcldvi
+%%DATADIR%%/filters/rclepub
 %%DATADIR%%/filters/rclexecm.py
 %%DATADIR%%/filters/rclfb2
 %%DATADIR%%/filters/rclgaim
@@ -51,16 +53,21 @@ bin/recollindex
 %%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
@@ -82,6 +89,7 @@ bin/recollindex
 %%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
@@ -103,3 +111,5 @@ bin/recollindex
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrmtry share/applications
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%