- Update to 1.19.9

- Add dependencies for libxslt, antiword, catdoc, libwpd, unrtf, unrar
- Add CHM, DJVU, KONQUEROR, LATEX, IMAGE, PDF, PS and SOUND Options
- Add IMAGE, PDF, PS and SOUND to default Options
- Fix staging, change REINPLACE_CMD

Approved by:	pawel / wg (mentors, implicit)

2 files changed, 37 insertions, 12 deletions

diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index 2797f204eb1b..06d4d5c8d3f6 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	recoll
-PORTVERSION=	1.19.8
+PORTVERSION=	1.19.9
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.lesbonscomptes.com/${PORTNAME}/
 
@@ -12,6 +12,13 @@ COMMENT=	Personal full text search package, based on Xapian
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	xapian-core>=0:${PORTSDIR}/databases/xapian-core
+RUN_DEPENDS:=	${BUILD_DEPENDS} \
+		xsltproc:${PORTSDIR}/textproc/libxslt \
+		antiword:${PORTSDIR}/textproc/antiword \
+		catdoc:${PORTSDIR}/textproc/catdoc \
+		wpd2html:${PORTSDIR}/textproc/libwpd \
+		unrtf:${PORTSDIR}/textproc/unrtf \
+		unrar:${PORTSDIR}/archivers/unrar
 
 USES=		gmake iconv
 GNU_CONFIGURE=	yes
@@ -20,17 +27,38 @@ CONFIGURE_ARGS=	--enable-pic
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	ASPELL PYTHON QT4  X11MON
+OPTIONS_DEFINE=	ASPELL CHM DJVU KONQUEROR LATEX IMAGE PDF PS PYTHON SOUND QT4 X11MON
+CHM_DESC=	CHM via CHMLIB
+IMAGE_DESC=	Store personal tags or textual descriptions in images
 X11MON_DESC=	X11 session monitoring support
-OPTIONS_DEFAULT=ASPELL PYTHON QT4 X11MON
+KONQUEROR_DESC=	Konqueror webarchive format with Python
+OPTIONS_DEFAULT=ASPELL IMAGE PDF PS PYTHON SOUND QT4 X11MON
 
 OPTIONS_SUB=	yes
 
 ASPELL_LIB_DEPENDS=		libaspell.so:${PORTSDIR}/textproc/aspell
 ASPELL_CONFIGURE_WITH=		aspell
 
+CHM_RUN_DEPENDS=		pychm:${PORTSDIR}/textproc/pychm
+
+DJVU_RUN_DEPENDS=		djvutxt:${PORTSDIR}/graphics/djvulibre
+
+KONQUEROR_RUN_DEPENDS=		kwebkitpart:${PORTSDIR}/www/kwebkitpart
+
+LATEX_RUN_DEPENDS=		detex:${PORTSDIR}/print/detex \
+				dvips:${PORTSDIR}/print/dvips
+
+IMAGE_RUN_DEPENDS=		exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool-devel
+
+PDF_RUN_DEPENDS=		xpdf:${PORTSDIR}/graphics/xpdf
+
+PS_RUN_DEPENDS=			pstotext:${PORTSDIR}/print/pstotext
+
 PYTHON_CONFIGURE_ENABLE=	python-module
 
+SOUND_RUN_DEPENDS=		mutagen-pony:${PORTSDIR}/audio/py-mutagen \
+				pykaraoke:${PORTSDIR}/audio/py-karaoke
+
 QT4_CONFIGURE_ENABLE=		qtgui
 
 X11MON_CONFIGURE_ENABLE=	x11mon
@@ -66,16 +94,13 @@ post-patch:
 		-e 's|= -g -O2|=|' ${WRKSRC}/mk/localdefs.in
 	@${REINPLACE_CMD} \
 		-e 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/mk/${OPSYS}
-	@${REINPLACE_CMD} -e 's|@NOCMDLINE@||g' \
+	@${REINPLACE_CMD} -e 's|@NOCMDLINE@||g ; \
+		s|@prefix@|${PREFIX}| ; \
+		s|REALPREFIX=$$PREFIX|REALPREFIX=${STAGEDIR}$$PREFIX| ; \
+		s|$${ROOTFORPYTHON}||' \
 		${WRKSRC}/recollinstall.in
 	@${REINPLACE_CMD} -e 's|python setup.py|${PYTHON_CMD} setup.py|' \
 		${WRKSRC}/python/recoll/Makefile \
 		${WRKSRC}/recollinstall.in
 
-post-configure:
-.if ${PORT_OPTIONS:MQT4}
-	@cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} \
-		${QMAKE} ${QMAKE_ARGS}
-.endif
-
 .include <bsd.port.mk>
diff --git a/deskutils/recoll/distinfo b/deskutils/recoll/distinfo
index 90b0183398c5..83e6509bc590 100644
--- a/deskutils/recoll/distinfo
+++ b/deskutils/recoll/distinfo
@@ -1,2 +1,2 @@
-SHA256 (recoll-1.19.8.tar.gz) = 90ec363a6267c9a63754f47f09a6fa84e9d47d92956d687e7cb434c8a019f5f7
-SIZE (recoll-1.19.8.tar.gz) = 2012818
+SHA256 (recoll-1.19.9.tar.gz) = 13e036b12a3a7d47b819a1235713f33545c8a42eec3630e056c999ef04d82f0d
+SIZE (recoll-1.19.9.tar.gz) = 2013067