svn commit: r491209 - head/deskutils/recoll

[Tobias Kortkamp]

On Fri, Jan 25, 2019 at 11:08:24PM +0000, Yuri Victorovich wrote:
> 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 at 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}"

Hi Yuri,

the QT5 option is broken and doesn't build in Poudriere.  Qmake
isn't declared as a build dependency, but it's clearly required.
buildtools_build is probably missing too, but the build doesn't get
far enough:

configure: error: Bad qt/qmake version string (not 4 or 5?): ./configure: /usr/local/lib/qt5/bin/qmake: not found
===>  Script "configure" failed unexpectedly.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20190126/edbf4052/attachment.sig>