Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Jan 2019 23:08:24 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r491209 - head/deskutils/recoll
Message-ID:  <201901252308.x0PN8Odn087108@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Fri Jan 25 23:08:24 2019
New Revision: 491209
URL: https://svnweb.freebsd.org/changeset/ports/491209

Log:
  deskutils/recoll: Update 1.23.7 -> 1.24.3
  
  * New dependency of QT5. Remove all references to QT4
  * Add gnome to USES
  * Shebang file desktop/hotrecoll.py moved to filters/hotrecoll.py
  * Portlint suggestions:
      USE_LDCONFIG=yes
      USE_GL+=gl when QT5 options is enabled
  
  Changelog:
  https://www.lesbonscomptes.com/recoll/release-1.24.html
  
  PR:		235205
  Submitted by:	jjuanino@gmail.com

Modified:
  head/deskutils/recoll/Makefile
  head/deskutils/recoll/distinfo
  head/deskutils/recoll/pkg-plist

Modified: head/deskutils/recoll/Makefile
==============================================================================
--- head/deskutils/recoll/Makefile	Fri Jan 25 22:09:19 2019	(r491208)
+++ head/deskutils/recoll/Makefile	Fri Jan 25 23:08:24 2019	(r491209)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	recoll
-DISTVERSION=	1.23.7
-PORTREVISION=	3
+DISTVERSION=	1.24.3
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.lesbonscomptes.com/recoll/
 
@@ -20,13 +19,16 @@ RUN_DEPENDS=	unrar:archivers/unrar \
 		wpd2html:textproc/libwpd010 \
 		unrtf:textproc/unrtf
 
-USES=		bison gmake iconv libtool localbase python:2.7 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
+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/rclinfo \
+		filters/rclkar filters/rclpython filters/rclrar \
+		filters/rcltar filters/rclwar filters/rclzip \
+		desktop/hotrecoll.py
 USE_PYTHON=	py3kplist
 USE_GNOME=	libxslt:run
 GNU_CONFIGURE=	yes
@@ -39,7 +41,7 @@ PLIST_SUB=		VERSION="${PORTVERSION}" \
 			PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}"
 
 OPTIONS_DEFINE=		ASPELL CHM DJVU LATEX IMAGE PDF PS \
-			SOUND QT4 X11MON
+			SOUND QT5 X11MON
 OPTIONS_DEFAULT=	ASPELL IMAGE PDF PS SOUND
 OPTIONS_SUB=		yes
 
@@ -53,12 +55,10 @@ IMAGE_RUN_DEPENDS=	exiftool:graphics/p5-Image-ExifTool
 LATEX_USE=		tex=dvipsk:run,latex:run
 PDF_RUN_DEPENDS=	pdftotext:graphics/poppler-utils
 PS_RUN_DEPENDS=		pstotext:print/pstotext
-QT4_USES=		qmake:no_env qt:4
-QT4_USE=		qt=moc_build,qmake_build,rcc_build,uic_build \
-			qt=iconengines_run,imageformats_run \
-			qt=corelib,gui,xml,webkit
-QT4_CONFIGURE_ENABLE=	qtgui
-QT4_CONFIGURE_ENV=	QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \
+USE_QT=			core gui network printsupport widgets webkit xml
+QT5_USES=		qt:5 gl
+QT5_CONFIGURE_ENABLE=	qtgui
+QT5_CONFIGURE_ENV=	QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \
 			QTDIR="${PREFIX}"
 SOUND_RUN_DEPENDS=	mutagen-pony-${PYTHON_VER}:audio/py-mutagen@${PY_FLAVOR} \
 			pykaraoke:audio/py-karaoke@${PY_FLAVOR}
@@ -70,9 +70,9 @@ X11MON_CONFIGURE_WITH=	fam
 X11MON_BROKEN=		does not build: index/rclmonrcv.cpp:(.text+0x1f13): undefined reference to `FAMOpen2'
 
 .include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MQT4}
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
+
+.if ${PORT_OPTIONS:MQT5}
+USE_GL+=gl
 .endif
 
 post-patch:
@@ -89,7 +89,7 @@ post-patch:
 		's|python setup.py|${PYTHON_CMD} setup.py|' \
 		${WRKSRC}/Makefile.in
 
-pre-build-QT4-on:
+pre-build-QT5-on:
 	@(cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} ${QMAKE} \
 		${QMAKE_ARGS} recoll.pro)
 

Modified: head/deskutils/recoll/distinfo
==============================================================================
--- head/deskutils/recoll/distinfo	Fri Jan 25 22:09:19 2019	(r491208)
+++ head/deskutils/recoll/distinfo	Fri Jan 25 23:08:24 2019	(r491209)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518401092
-SHA256 (recoll-1.23.7.tar.gz) = 56eaa8695b8ac8f30a3f451688a3ae47da64637badfffd33878977d13f92cba0
-SIZE (recoll-1.23.7.tar.gz) = 2601930
+TIMESTAMP = 1548429974
+SHA256 (recoll-1.24.3.tar.gz) = f1552961dd0cfd1a12d95fab1bf4990846df2085ddeaa5e832442bbce35acad2
+SIZE (recoll-1.24.3.tar.gz) = 2675171

Modified: head/deskutils/recoll/pkg-plist
==============================================================================
--- head/deskutils/recoll/pkg-plist	Fri Jan 25 22:09:19 2019	(r491208)
+++ head/deskutils/recoll/pkg-plist	Fri Jan 25 23:08:24 2019	(r491209)
@@ -1,4 +1,4 @@
-%%QT4%%bin/recoll
+%%QT5%%bin/recoll
 bin/recollindex
 %%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%
 %%PYTHON_SITELIBDIR%%/recoll/__init__.py
@@ -9,14 +9,14 @@ bin/recollindex
 %%PYTHON_SITELIBDIR%%/recoll/recoll.so
 lib/recoll/librecoll-%%VERSION%%.so
 lib/recoll/librecoll.so
-%%QT4%%man/man1/recoll.1.gz
+%%QT5%%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
+%%QT5%%share/appdata/recoll.appdata.xml
+%%QT5%%share/applications/recoll-searchgui.desktop
+%%QT5%%share/icons/hicolor/48x48/apps/recoll.png
+%%QT5%%share/pixmaps/recoll.png
 %%DATADIR%%/doc/docbook-xsl.css
 %%DATADIR%%/doc/usermanual.html
 %%DATADIR%%/examples/fields
@@ -35,6 +35,7 @@ man/man5/recoll.conf.5.gz
 %%DATADIR%%/filters/rclabw
 %%DATADIR%%/filters/rclaptosidman
 %%DATADIR%%/filters/rclaudio
+%%DATADIR%%/filters/rclbibtex.sh
 %%DATADIR%%/filters/rclcheckneedretry.sh
 %%DATADIR%%/filters/rclchm
 %%DATADIR%%/filters/rclconfig.py
@@ -59,6 +60,7 @@ man/man5/recoll.conf.5.gz
 %%DATADIR%%/filters/rcllatinstops.zip
 %%DATADIR%%/filters/rcllyx
 %%DATADIR%%/filters/rclman
+%%DATADIR%%/filters/rclmidi.py
 %%DATADIR%%/filters/rclokulnote
 %%DATADIR%%/filters/rclopxml.py
 %%DATADIR%%/filters/rclpdf.py
@@ -87,46 +89,47 @@ man/man5/recoll.conf.5.gz
 %%DATADIR%%/filters/rclxslt.py
 %%DATADIR%%/filters/rclzip
 %%DATADIR%%/filters/recoll-we-move-files.py
+%%DATADIR%%/filters/recollepub.zip
 %%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
+%%QT5%%%%DATADIR%%/images/aptosid-book.png
+%%QT5%%%%DATADIR%%/images/aptosid-manual.png
+%%QT5%%%%DATADIR%%/images/archive.png
+%%QT5%%%%DATADIR%%/images/book.png
+%%QT5%%%%DATADIR%%/images/bookchap.png
+%%QT5%%%%DATADIR%%/images/document.png
+%%QT5%%%%DATADIR%%/images/drawing.png
+%%QT5%%%%DATADIR%%/images/emblem-symbolic-link.png
+%%QT5%%%%DATADIR%%/images/folder.png
+%%QT5%%%%DATADIR%%/images/html.png
+%%QT5%%%%DATADIR%%/images/image.png
+%%QT5%%%%DATADIR%%/images/message.png
+%%QT5%%%%DATADIR%%/images/mozilla_doc.png
+%%QT5%%%%DATADIR%%/images/pdf.png
+%%QT5%%%%DATADIR%%/images/pidgin.png
+%%QT5%%%%DATADIR%%/images/postscript.png
+%%QT5%%%%DATADIR%%/images/presentation.png
+%%QT5%%%%DATADIR%%/images/sidux-book.png
+%%QT5%%%%DATADIR%%/images/soffice.png
+%%QT5%%%%DATADIR%%/images/source.png
+%%QT5%%%%DATADIR%%/images/sownd.png
+%%QT5%%%%DATADIR%%/images/spreadsheet.png
+%%QT5%%%%DATADIR%%/images/text-x-python.png
+%%QT5%%%%DATADIR%%/images/txt.png
+%%QT5%%%%DATADIR%%/images/video.png
+%%QT5%%%%DATADIR%%/images/wordprocessing.png
+%%QT5%%%%DATADIR%%/translations/recoll_cs.qm
+%%QT5%%%%DATADIR%%/translations/recoll_da.qm
+%%QT5%%%%DATADIR%%/translations/recoll_de.qm
+%%QT5%%%%DATADIR%%/translations/recoll_el.qm
+%%QT5%%%%DATADIR%%/translations/recoll_es.qm
+%%QT5%%%%DATADIR%%/translations/recoll_fr.qm
+%%QT5%%%%DATADIR%%/translations/recoll_it.qm
+%%QT5%%%%DATADIR%%/translations/recoll_lt.qm
+%%QT5%%%%DATADIR%%/translations/recoll_pl.qm
+%%QT5%%%%DATADIR%%/translations/recoll_ru.qm
+%%QT5%%%%DATADIR%%/translations/recoll_tr.qm
+%%QT5%%%%DATADIR%%/translations/recoll_uk.qm
+%%QT5%%%%DATADIR%%/translations/recoll_xx.qm
+%%QT5%%%%DATADIR%%/translations/recoll_zh.qm
+%%QT5%%%%DATADIR%%/translations/recoll_zh_CN.qm



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901252308.x0PN8Odn087108>