urlwatch: update to urlwatch-2.7

Changelog:

2017-11-08 Thomas Perl <thp.io/about>
	* Issue #127: Fix error reporting
	* ElementsByAttribute: look for matching tag in handle_endtag (by Gaetan Leurent)
	* Paths: Add XDG_CONFIG_DIR support (by Jelle van der Waa)
	* E-Mail: Fix encodings (by Seokjin Han), Allow 'user' parameter for SMTP (by Jay Sitter)
	* HTTP: Option to avoid 304 responses, Content-Type header (by Vinicius Massuchetto)
	* html2text: Configuration options (by Vinicius Massuchetto)
	* Filtering: style (by gvandenbroucke), tag (by cmichi)
	* New reporter: Telegram support (by gvandenbroucke)

urlwatch/Makefile

@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2015/08/18 18:36:32 yhardy Exp $
 
-DISTNAME=	urlwatch-2.5
+DISTNAME=	urlwatch-2.7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=thp/}
 
@@ -9,6 +9,7 @@ HOMEPAGE=	https://github.com/thp/urlwatch
 COMMENT=	Watch web pages and arbitrary URLs for changes
 LICENSE=	modified-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-appdirs-[0-9]*:../../devel/py-appdirs
 DEPENDS+=	${PYPKGPREFIX}-minidb-[0-9]*:../../wip/py-minidb
 DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml

urlwatch/PLIST

@@ -8,6 +8,10 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/urlwatch/__init__.py
 ${PYSITELIB}/urlwatch/__init__.pyo
 ${PYSITELIB}/urlwatch/__init__.pyc
+${PYSITELIB}/urlwatch/command.pyo
+${PYSITELIB}/urlwatch/command.pyc
+${PYSITELIB}/urlwatch/config.pyo
+${PYSITELIB}/urlwatch/config.pyc
 ${PYSITELIB}/urlwatch/filters.pyo
 ${PYSITELIB}/urlwatch/filters.pyc
 ${PYSITELIB}/urlwatch/handler.pyo
@@ -20,21 +24,32 @@ ${PYSITELIB}/urlwatch/jobs.pyo
 ${PYSITELIB}/urlwatch/jobs.pyc
 ${PYSITELIB}/urlwatch/mailer.pyo
 ${PYSITELIB}/urlwatch/mailer.pyc
+${PYSITELIB}/urlwatch/main.pyo
+${PYSITELIB}/urlwatch/main.pyc
+${PYSITELIB}/urlwatch/migration.pyo
+${PYSITELIB}/urlwatch/migration.pyc
 ${PYSITELIB}/urlwatch/reporters.pyo
 ${PYSITELIB}/urlwatch/reporters.pyc
 ${PYSITELIB}/urlwatch/storage.pyo
 ${PYSITELIB}/urlwatch/storage.pyc
 ${PYSITELIB}/urlwatch/util.pyo
 ${PYSITELIB}/urlwatch/util.pyc
+${PYSITELIB}/urlwatch/worker.pyo
+${PYSITELIB}/urlwatch/worker.pyc
+${PYSITELIB}/urlwatch/command.py
+${PYSITELIB}/urlwatch/config.py
 ${PYSITELIB}/urlwatch/filters.py
 ${PYSITELIB}/urlwatch/handler.py
 ${PYSITELIB}/urlwatch/html2txt.py
 ${PYSITELIB}/urlwatch/ical2txt.py
 ${PYSITELIB}/urlwatch/jobs.py
 ${PYSITELIB}/urlwatch/mailer.py
+${PYSITELIB}/urlwatch/main.py
+${PYSITELIB}/urlwatch/migration.py
 ${PYSITELIB}/urlwatch/reporters.py
 ${PYSITELIB}/urlwatch/storage.py
 ${PYSITELIB}/urlwatch/util.py
+${PYSITELIB}/urlwatch/worker.py
 man/man1/urlwatch.1
 share/doc/urlwatch/README.md
 share/examples/urlwatch/hooks.py.example

urlwatch/distinfo

@@ -1,8 +1,7 @@
 $NetBSD: distinfo,v 1.1 2015/08/18 18:36:32 yhardy Exp $
 
-SHA1 (urlwatch-2.5.tar.gz) = ada6a3ec2bc3297050422661789834d88f5ad9c6
-RMD160 (urlwatch-2.5.tar.gz) = 184655b13d7334ec117055dd9c14511cb6932900
-SHA512 (urlwatch-2.5.tar.gz) = 57cef97360df5886355ddf011f95f83a6767ed5a165bf504809267e0f25c5571bbb8694983779e9a07cbebd7d20b1f276208f0cc66d875c6fbc6a6aad52a63ad
-Size (urlwatch-2.5.tar.gz) = 24722 bytes
+SHA1 (urlwatch-2.7.tar.gz) = 320a452b5d964fbfb9ff4c8534084cc5ab182a7e
+RMD160 (urlwatch-2.7.tar.gz) = e01ce2eac0fe9199f061934b988f436ab414041c
+SHA512 (urlwatch-2.7.tar.gz) = 0cd0e8cc8f60d767d3eec2c6de2ef1cf2b5a49f27db761aab47b93104df57b1c4428c68b12d97f0b5b08b7a456f80d57de793bcae67855d05b9b9972655457ef
+Size (urlwatch-2.7.tar.gz) = 31653 bytes
 SHA1 (patch-setup.py) = 001337940b8b54370ca3f1f4422f5e09ab7e6c79
-SHA1 (patch-urlwatch) = 4652383c472dd7ca552dfe543446eaaca112940f

urlwatch/patches/patch-urlwatch

@@ -1,15 +0,0 @@
-$NetBSD$
-
-Use the pkgsrc directory structure.
-
---- urlwatch.orig	2016-07-12 18:58:17.000000000 +0000
-+++ urlwatch
-@@ -59,7 +59,7 @@ hooks_py = os.path.join(urlwatch_dir, 'h
- 
- if bindir == 'bin':
-     # Installed system-wide
--    examples_dir = os.path.join(prefix, 'share', pkgname, 'examples')
-+    examples_dir = os.path.join(prefix, 'share', 'examples', pkgname)
- else:
-     # Assume we are not yet installed
-     sys.path.insert(0, os.path.join(prefix, bindir, 'lib'))