From owner-svn-ports-all@freebsd.org Sat Jan 26 16:38:15 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6CC7014C8622; Sat, 26 Jan 2019 16:38:15 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0FD558A006; Sat, 26 Jan 2019 16:38:15 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D918F22A7A; Sat, 26 Jan 2019 16:38:14 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0QGcEat051433; Sat, 26 Jan 2019 16:38:14 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0QGcECE051432; Sat, 26 Jan 2019 16:38:14 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201901261638.x0QGcECE051432@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 26 Jan 2019 16:38:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491301 - head/deskutils/recoll X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/deskutils/recoll X-SVN-Commit-Revision: 491301 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0FD558A006 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.964,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jan 2019 16:38:15 -0000 Author: yuri Date: Sat Jan 26 16:38:14 2019 New Revision: 491301 URL: https://svnweb.freebsd.org/changeset/ports/491301 Log: deskutils/recoll: Fix QT5 dependencies Also change all URLs to https and use helpers. Reported by: tobik (QT dependencies) Modified: head/deskutils/recoll/Makefile head/deskutils/recoll/pkg-descr Modified: head/deskutils/recoll/Makefile ============================================================================== --- head/deskutils/recoll/Makefile Sat Jan 26 16:32:28 2019 (r491300) +++ head/deskutils/recoll/Makefile Sat Jan 26 16:38:14 2019 (r491301) @@ -4,7 +4,7 @@ PORTNAME= recoll DISTVERSION= 1.24.3 CATEGORIES= deskutils -MASTER_SITES= http://www.lesbonscomptes.com/recoll/ +MASTER_SITES= https://www.lesbonscomptes.com/recoll/ MAINTAINER= ports@FreeBSD.org COMMENT= Personal full text search package, based on Xapian @@ -20,9 +20,7 @@ RUN_DEPENDS= unrar:archivers/unrar \ unrtf:textproc/unrtf 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 \ @@ -55,8 +53,9 @@ 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 -USE_QT= core gui network printsupport widgets webkit xml +USE_QT= core gui network printsupport widgets webkit xml buildtools_build qmake_build QT5_USES= qt:5 gl +QT5_USE= GL=gl QT5_CONFIGURE_ENABLE= qtgui QT5_CONFIGURE_ENV= QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \ QTDIR="${PREFIX}" @@ -65,16 +64,10 @@ SOUND_RUN_DEPENDS= mutagen-pony-${PYTHON_VER}:audio/py X11MON_DESC= X11 session monitoring support X11MON_USES= fam X11MON_USE= xorg=ice,sm,x11 -X11MON_CONFIGURE_ENABLE=x11mon +X11MON_CONFIGURE_ENABLE= x11mon X11MON_CONFIGURE_WITH= fam X11MON_BROKEN= does not build: index/rclmonrcv.cpp:(.text+0x1f13): undefined reference to `FAMOpen2' -.include - -.if ${PORT_OPTIONS:MQT5} -USE_GL+=gl -.endif - post-patch: @${REINPLACE_CMD} -e \ 's|@QMAKE@|${TRUE}|' \ @@ -90,8 +83,8 @@ post-patch: ${WRKSRC}/Makefile.in pre-build-QT5-on: - @(cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} ${QMAKE} \ - ${QMAKE_ARGS} recoll.pro) + @cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} ${QMAKE} \ + ${QMAKE_ARGS} recoll.pro post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/*.so \ Modified: head/deskutils/recoll/pkg-descr ============================================================================== --- head/deskutils/recoll/pkg-descr Sat Jan 26 16:32:28 2019 (r491300) +++ head/deskutils/recoll/pkg-descr Sat Jan 26 16:38:14 2019 (r491301) @@ -16,4 +16,4 @@ Features: * Extensive documentation, with a complete user manual and manual pages for each command. -WWW: http://www.lesbonscomptes.com/recoll/ +WWW: https://www.lesbonscomptes.com/recoll/