From nobody Sun May 08 14:42:25 2022 X-Original-To: dev-commits-ports-all@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 E0A041AC90F1; Sun, 8 May 2022 14:42:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kx6TY5s3nz3HkW; Sun, 8 May 2022 14:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652020945; 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=9NClHRm21lZr1nSd11UmrGQgeZLeOyEZ3HfU6HMhnGg=; b=VPibnhT+X+dNokLCOt5N306ilegT0tepeKCIujLHX+ZZ8fjJaoXzPPfJt4QBKsgbdpXCNy xcHMglNbpUWOkSKlNPt0G+T+udEXRa1w/WFzJXeLjoe9Pb5Lextmqf8C/m5ngbsah/sCmv xvQH2KemqEHzjvne+YJjNF5Tpfxwdo3N31fbi7XzIAUhjJEs/D4+SO/em+STbcntzlQiAe oaQzcQM4Gxdg571GhlYigA0T7ed0e45M6ZjXDo/eBqhvAxpL1+Yw1MKgfcAqZVTN+F73EO 2RAkr4XtHzMdo5wlV9v4vHLN232vrlaqXQ6/842dMXcfXCONDiSRmyYRiD5cvQ== 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 A98C826C0C; Sun, 8 May 2022 14:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 248EgPYI064501; Sun, 8 May 2022 14:42:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 248EgPjw064500; Sun, 8 May 2022 14:42:25 GMT (envelope-from git) Date: Sun, 8 May 2022 14:42:25 GMT Message-Id: <202205081442.248EgPjw064500@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: b693974d417d - main - www/py-urlwatch: Update to 2.25 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b693974d417d2751131991f2fb78f790da998817 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652020945; 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=9NClHRm21lZr1nSd11UmrGQgeZLeOyEZ3HfU6HMhnGg=; b=k8P+CWyGE7C/hqadNys/ZyF+Dd2ajIryOakyGWGlbbgT7NjUe8Q++8vdNctgR5V2uR7/Df fCm4EWylohCbBbm6jQZhvN8c8EjGBrpssFr67YlGfY9oyaN9hPhg7Uorbe1ncf1FK8T0nY /wNf8tCUwfPeiiOgfqKwzyYUR14NVmuSsrBf1+in4QktxvOZTcbkDthXyRoL5ZFlemkm1n phWj/7dFmBRF6hcR2qDkibRCGopNijruro/sJDIl8jKhMDdYZ2X4RNd3Sg9Rvz3c5V7wAb r64UmqSGj+KeeZUWMACE+qiWM+ZFdwjlUpCikxn4jAn1UhquSPHZXU55fn/FjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652020945; a=rsa-sha256; cv=none; b=WfYbtzDjWFKZd91fustaWW/4GT55s99UQWmYEt6kgc3hYSJTX0+T0JlJYS9fye4HZrXJ2t qbbMeL7lxF7BfHlExvIBkahp44NmSoLlX8DX173AnF1iF1a4Jf36CBp8U+iQAkZi8z7IfI pqxKrFMMgdWkGJxrtxEirgFZIq1pORvJxFqWmKi8RDvMUW+5Q97P+bZ9WiLla/8zVvvJxl 9Dq3SDjvBPOCKjwgYDLixiYCUknGFuuO2e1IhbhppADBNYkCBu5u+iRVnM/LTi3GJE8j4Z vZIVSthifYX6KWi2i7ZpoMLGe2kyy2loCTUOuzIy13nYFeZK7xDzSSmzJYQD3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=b693974d417d2751131991f2fb78f790da998817 commit b693974d417d2751131991f2fb78f790da998817 Author: Kai Knoblich AuthorDate: 2022-05-08 14:32:10 +0000 Commit: Kai Knoblich CommitDate: 2022-05-08 14:38:32 +0000 www/py-urlwatch: Update to 2.25 * Fix BUILD if DOCS option is unset as BINARY_ALIAS can only be used if textproc/py-sphinx (enabled via the DOCS option) is present. * Add EXAMPLES option to let users choose to install the supplied examples. Changelog: https://github.com/thp/urlwatch/blob/2.25/CHANGELOG.md MFH: 2022Q2 --- www/py-urlwatch/Makefile | 17 +++++++++++------ www/py-urlwatch/distinfo | 6 +++--- www/py-urlwatch/files/patch-setup.py | 15 +++++++++++++++ 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/www/py-urlwatch/Makefile b/www/py-urlwatch/Makefile index 0bdd627d1d57..04dff7348d78 100644 --- a/www/py-urlwatch/Makefile +++ b/www/py-urlwatch/Makefile @@ -1,5 +1,5 @@ PORTNAME= urlwatch -DISTVERSION= 2.24 +DISTVERSION= 2.25 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,9 +10,8 @@ COMMENT= Monitors webpages and sends notifications about changes LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}minidb>0:databases/py-minidb@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}minidb>=2.0.6:databases/py-minidb@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \ @@ -21,6 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}minidb>0:databases/py-minidb@${PY_FLAVOR} \ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pdftotext>0:textproc/py-pdftotext@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jq>0:textproc/py-jq@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytesseract>0:graphics/py-pytesseract@${PY_FLAVOR} \ @@ -30,13 +30,14 @@ USES= python:3.6+ USE_LOCALE= en_US.UTF-8 USE_PYTHON= autoplist concurrent distutils -BINARY_ALIAS= sphinx-build=sphinx-build-${PYTHON_VER} NO_ARCH= yes -OPTIONS_DEFINE= DOCS +PORTEXAMPLES= hooks.py.example urls.yaml.example + +OPTIONS_DEFINE= DOCS EXAMPLES DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_PORTDOCS= html/* text/* -DOCS_VARS= USES+=gmake +DOCS_VARS= BINARY_ALIAS=sphinx-build=sphinx-build-${PYTHON_VER} USES+=gmake post-build-DOCS-on: cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -j${MAKE_JOBS_NUMBER} html text @@ -47,6 +48,10 @@ post-install-DOCS-on: (cd ${WRKSRC}/docs/build && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR} "! -name .buildinfo") (cd ${WRKSRC}/docs/build && ${COPYTREE_SHARE} text ${STAGEDIR}${DOCSDIR}) +post-install-EXAMPLES-on: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/share/urlwatch/examples && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} + do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v diff --git a/www/py-urlwatch/distinfo b/www/py-urlwatch/distinfo index 2411066c4a4d..0da055093055 100644 --- a/www/py-urlwatch/distinfo +++ b/www/py-urlwatch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636312807 -SHA256 (urlwatch-2.24.tar.gz) = f0b36db4bccd38923b178b66408c0d80d3103b7257f286b78e87d991283b86d7 -SIZE (urlwatch-2.24.tar.gz) = 141175 +TIMESTAMP = 1647542896 +SHA256 (urlwatch-2.25.tar.gz) = 6802297d3318286e7f3d36b9a4567a2fb09b0ae779d4b76811dd29a7281c1f8a +SIZE (urlwatch-2.25.tar.gz) = 168241 diff --git a/www/py-urlwatch/files/patch-setup.py b/www/py-urlwatch/files/patch-setup.py new file mode 100644 index 000000000000..0dd8d8144b8a --- /dev/null +++ b/www/py-urlwatch/files/patch-setup.py @@ -0,0 +1,15 @@ +Let users decide to install the examples files via the EXAMPLES option. + +--- setup.py.orig 2022-05-08 10:57:35 UTC ++++ setup.py +@@ -39,10 +39,6 @@ m['data_files'] = [ + 'share/man/man7/urlwatch-deprecated.7', + 'share/man/man7/urlwatch-intro.7', + ]), +- ('share/urlwatch/examples', [ +- 'share/urlwatch/examples/hooks.py.example', +- 'share/urlwatch/examples/urls.yaml.example', +- ]), + ] + m['project_urls'] = { + 'Source': 'https://github.com/thp/urlwatch',