From nobody Tue Jul 30 11:30:49 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WYChp0kwsz5RnTW; Tue, 30 Jul 2024 11:30:50 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WYChp08txz4Z7P; Tue, 30 Jul 2024 11:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722339050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B86bVFmW1Sa3pqHjufLt0D+C8NzMFPTxcj+Vx57wOEQ=; b=dJDF7KWrmI1rZchWavF04UY9HJTUn1UcJ+G8jkth/DWK1PTnZoRYrZ1/L7iWJZPTHYliOG iJ5BKqd0GISnKOJPA4toviXp2uDGGvZYb5KlYj2xoY6CsITVXtUC/EStdl3D6i6ZyoHC1F cYOdY1CTcucLkOEZXCCTwJeBSwt6dweM6HOSgx1ey725xZZHymM6x0WFmMlxIMuXZQFVXW t9FhtrefNpMLWzI9YxEnV7rcAOV1/nlVUTDzSHhWLJjo4SzTXRq9bQDS0kb9qoc6z3wq/R FjnpF8Ae2MFfulpexfufLwCXmbRDqMxcOFSgk0R4IsB53CuPMOrkqpmoWPV+rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722339050; a=rsa-sha256; cv=none; b=Fx/3YmyGYedPbfxzDVWdjas9Y0qyFTrdsUqHWt2kGCpu0KBUDfvUgnCYEjk64YmaYV1QnH 7qr9f+9RoaDakjK5zyG+LR5tKEPVPRmMaKDBDfBt4FNMU++skuza307R7Bz3UExfm5cdfC NVdOGJ9tlDGtQjrdd92dpjYTtVbqCrDQtLeMbUL70wFcKkppZdTiHMEoClkoeFoynUFcrl YMhVzd+umDcBPPjuaQgDvnzcMwDVz1Ougg7ulTYgK8pF0sx1TDYW9QHjBYKNOo2qCk/aUT rcbpvEMzqPxsRvaggLeZAtF0kDRvN1dB52w+LloxVR08Y0typ4F5eqKTSfCUZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722339050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B86bVFmW1Sa3pqHjufLt0D+C8NzMFPTxcj+Vx57wOEQ=; b=GcZKFiwJ7x0DDSDbVBU7NG76bIR6G4SxIg2Ohul4rzjY2UIyM0VK0/sCkNC22tvgE2e9F8 Oft6ZRcdQYYU9VGbJ02mlfFq0dioy1I+WKxiOQqgpxLLlnw6gaUcpKbIicUVyoHLjzaGIp eZfiLJ52proLqUjZ2GVc/h8nL2N6iYZIyYIYMAfQSYHjY5qRWXAMIX4nDbbt+uU4B6v406 SIPoEtFdbX8xFv6oPJxnYIvtV9XNN/F71H789NBsMR6YbDlpLbeq7Ybtyo7tHuBJh9ZkIP yb8XGncqFdbbm7ffChZVhCKZ37sGQBN0oGjPmC4OQRau7/ubkw8y/CjLGzk27w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WYChn6tMBzG9c; Tue, 30 Jul 2024 11:30:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46UBUnrU034398; Tue, 30 Jul 2024 11:30:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46UBUn80034395; Tue, 30 Jul 2024 11:30:49 GMT (envelope-from git) Date: Tue, 30 Jul 2024 11:30:49 GMT Message-Id: <202407301130.46UBUn80034395@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: ec0512fcd946 - main - deskutils/recoll: clean up the port's Makefile before next updates List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec0512fcd946241156f868ca9ae8c1d1c1e05868 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec0512fcd946241156f868ca9ae8c1d1c1e05868 commit ec0512fcd946241156f868ca9ae8c1d1c1e05868 Author: Alexey Dokuchaev AuthorDate: 2024-07-30 11:29:58 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-07-30 11:29:58 +0000 deskutils/recoll: clean up the port's Makefile before next updates - Project's web pages have been moved to their own host for clarity and security - Undo some of the dubious whitespace changes in commit 37991a7381a0, particularly, right-shift by one tab of the entire option helpers block because X11MON_CONFIGURE_ENABLE is too long (convert to more traditional and shorter _ON/OFF knobs to avoid this in the future) - Fix misplaced global USE_QT and make it conditional under the QT5 option as expected - Drop no longer needed GNU_CONFIGURE_MANPREFIX, add missing hyphen in the COMMENT, etc. --- deskutils/recoll/Makefile | 68 ++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile index 95e6a5ea65a1..4eac747301dc 100644 --- a/deskutils/recoll/Makefile +++ b/deskutils/recoll/Makefile @@ -2,11 +2,11 @@ PORTNAME= recoll PORTVERSION= 1.33.1 PORTREVISION= 8 CATEGORIES= deskutils -MASTER_SITES= https://www.lesbonscomptes.com/recoll/ +MASTER_SITES= ${WWW} MAINTAINER= danfe@FreeBSD.org -COMMENT= Personal full text search package, based on Xapian -WWW= https://www.lesbonscomptes.com/recoll/ +COMMENT= Personal full-text search package, based on Xapian +WWW= https://www.recoll.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING @@ -24,19 +24,15 @@ USES= bison compiler:c++11-lang gmake gnome iconv libtool localbase \ USE_GNOME= libxslt USE_LDCONFIG= yes USE_PYTHON= py3kplist -PYDISTUTILS_PKGNAME= Recoll -PYDISTUTILS_PKGVERSION= 1.0 -USE_QT= core gui printsupport widgets xml buildtools:build qmake:build - SHEBANG_FILES= desktop/hotrecoll.py filters/*.py filters/rclimg - GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-recollq \ - --enable-xadump -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share +CONFIGURE_ARGS= --enable-recollq --enable-xadump MAKE_ENV= PYTHON_CMD=${PYTHON_CMD} BINARY_ALIAS= python2=${FALSE} python3=${PYTHON_CMD} +PYDISTUTILS_PKGNAME= Recoll +PYDISTUTILS_PKGVERSION= 1.0 + PLIST_SUB= PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}" \ VERSION="${PORTVERSION}" @@ -44,31 +40,31 @@ OPTIONS_DEFINE= ASPELL CHM DJVU IMAGE LATEX PDF PS QT5 SOUND X11MON OPTIONS_DEFAULT= ASPELL CHM IMAGE PDF PS QT5 SOUND X11MON OPTIONS_SUB= yes -CHM_DESC= Python bindings for Microsoft ITSS/CHM format -IMAGE_DESC= Store personal tags or textual descriptions in images -X11MON_DESC= X11 session monitoring support -ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell -ASPELL_CONFIGURE_WITH= aspell -CHM_LIB_DEPENDS= libchm.so:misc/chmlib -CHM_CONFIGURE_OFF= --disable-python-chm -DJVU_RUN_DEPENDS= djvutxt:graphics/djvulibre -IMAGE_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool -LATEX_USES= tex -LATEX_USE= TEX=dvipsk:run,latex:run -PDF_RUN_DEPENDS= pdftotext:graphics/poppler-utils -PS_RUN_DEPENDS= pstotext:print/pstotext -QT5_USES= gl qt:5 -QT5_USE= GL=gl -QT5_CONFIGURE_ON= --disable-webkit -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} -X11MON_USES= fam xorg -X11MON_USE= XORG=ice,sm,x11 -X11MON_CONFIGURE_ENABLE= x11mon -X11MON_CONFIGURE_WITH= fam +ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell +ASPELL_CONFIGURE_OFF= --without-aspell +CHM_DESC= Python bindings for Microsoft ITSS/CHM format +CHM_LIB_DEPENDS= libchm.so:misc/chmlib +CHM_CONFIGURE_OFF= --disable-python-chm +DJVU_RUN_DEPENDS= djvutxt:graphics/djvulibre +IMAGE_DESC= Store personal tags or textual descriptions in images +IMAGE_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool +LATEX_USES= tex +LATEX_USE= TEX=dvipsk:run,latex:run +PDF_RUN_DEPENDS= pdftotext:graphics/poppler-utils +PS_RUN_DEPENDS= pstotext:print/pstotext +QT5_USES= gl qt:5 +QT5_USE= GL=gl QT=buildtools:build,qmake:build \ + QT=core,gui,printsupport,widgets,xml +QT5_CONFIGURE_ENV= QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \ + QTDIR="${PREFIX}" +QT5_CONFIGURE_ON= --disable-webkit +QT5_CONFIGURE_OFF= --disable-qtgui +SOUND_RUN_DEPENDS= mutagen-pony-${PYTHON_VER}:audio/py-mutagen@${PY_FLAVOR} +X11MON_DESC= X11 session monitoring support +X11MON_USES= fam xorg +X11MON_USE= XORG=ice,sm,x11 +X11MON_CONFIGURE_OFF= --disable-x11mon +X11MON_CONFIGURE_ON= --with-fam post-patch: @${REINPLACE_CMD} -e 's|@QMAKE@|${TRUE}|' \