urlwatch: update to urlwatch-2.2

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Thu Jun 16 00:18:01 2016 +0200
Changeset:	865a8cbb75526afaaf516833c4aeb44a43eaac6a

Modified Files:
	urlwatch/Makefile
	urlwatch/PLIST
	urlwatch/distinfo
Added Files:
	urlwatch/patches/patch-setup.py

Log Message:
urlwatch: update to urlwatch-2.2

Update package to use the pkgsrc directory structure for example files.

Changelog:

2016-06-14 Thomas Perl <thp.io/about>
	* Add support for pushover (by Richard Palmer)
	* html2txt: Use -nonumbers and UTF-8 output for Lynx
	* Fix SMTP server connection setup (fixes #50)
	* setup.py: Allow running from non-source directory (Fixes #52)
	* Fix adding URLs with = in them (Fixes #59)
	* Add option to use sendmail instead of SMTP (by e-dschungel)
	* Add InverseGrepFilter which removes lines matching a regex (by e-dschungel)
	* New html2text method "pyhtml2text" using the Python module "html2text" (by e-dschungel)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=865a8cbb75526afaaf516833c4aeb44a43eaac6a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 urlwatch/Makefile               |  7 ++++++-
 urlwatch/PLIST                  |  4 ++--
 urlwatch/distinfo               |  9 +++++----
 urlwatch/patches/patch-setup.py | 15 +++++++++++++++
 4 files changed, 28 insertions(+), 7 deletions(-)

diffs:
diff --git a/urlwatch/Makefile b/urlwatch/Makefile
index 9861a78..091311b 100644
--- a/urlwatch/Makefile
+++ b/urlwatch/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2015/08/18 18:36:32 yhardy Exp $
 
-DISTNAME=	urlwatch-2.1
+DISTNAME=	urlwatch-2.2
 CATEGORIES=	net
 MASTER_SITES=	http://thp.io/2008/urlwatch/
 
@@ -20,6 +20,11 @@ INSTALLATION_DIRS+=	${PKGMANDIR}/man1 share/doc/${PKGBASE}
 # no support for 2.x
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
+pre-configure:
+	cd ${WRKSRC} && ${MKDIR} -p share/examples \
+	             && ${MV} share/urlwatch/examples share/examples/urlwatch \
+	             && ${RMDIR} share/urlwatch
+
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/share/man/man1/urlwatch.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
diff --git a/urlwatch/PLIST b/urlwatch/PLIST
index 3b97245..99f2b95 100644
--- a/urlwatch/PLIST
+++ b/urlwatch/PLIST
@@ -37,5 +37,5 @@ ${PYSITELIB}/urlwatch/storage.py
 ${PYSITELIB}/urlwatch/util.py
 man/man1/urlwatch.1
 share/doc/urlwatch/README.md
-share/urlwatch/examples/hooks.py.example
-share/urlwatch/examples/urls.yaml.example
+share/examples/urlwatch/hooks.py.example
+share/examples/urlwatch/urls.yaml.example
diff --git a/urlwatch/distinfo b/urlwatch/distinfo
index 9d5344c..39f4bab 100644
--- a/urlwatch/distinfo
+++ b/urlwatch/distinfo
@@ -1,6 +1,7 @@
 $NetBSD: distinfo,v 1.1 2015/08/18 18:36:32 yhardy Exp $
 
-SHA1 (urlwatch-2.1.tar.gz) = 0e0336cb621dcbd5e5bda720c06619d2c2936a07
-RMD160 (urlwatch-2.1.tar.gz) = 9bc6480d8c4b4eebe7e23462e7d4f857fb44e2d9
-SHA512 (urlwatch-2.1.tar.gz) = 60960b41b592d45a29f967d212580b2687afc5d5053adef7c796044e404a4a1e120ea66d8cd0cbf869cccead76373db0d0ab6d6541a77cc4f8885c02b098f6d2
-Size (urlwatch-2.1.tar.gz) = 25134 bytes
+SHA1 (urlwatch-2.2.tar.gz) = c3045eabb7853f9dad43ea70b9eb3e3229d05b61
+RMD160 (urlwatch-2.2.tar.gz) = 3c8b091e52bda2c9a1a94e7912ff06ace8b6f08c
+SHA512 (urlwatch-2.2.tar.gz) = 680547d01da6830059048247be4467c68ce9977786f3ba1ec0ad470eb77608b6938c244ed9341ddfd382d65cae167338c685bff2eac91a5f15e881c2aca7bb9b
+Size (urlwatch-2.2.tar.gz) = 24435 bytes
+SHA1 (patch-setup.py) = 088efe97c27d42b866d80344c240a468f1c4290a
diff --git a/urlwatch/patches/patch-setup.py b/urlwatch/patches/patch-setup.py
new file mode 100644
index 0000000..ec908dd
--- /dev/null
+++ b/urlwatch/patches/patch-setup.py
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix the case for an empty dirname.
+
+--- setup.py.orig	2016-06-14 18:14:55.000000000 +0000
++++ setup.py
+@@ -10,7 +10,7 @@ import re
+ 
+ PACKAGE_NAME = 'urlwatch'
+ DEPENDENCIES = ['minidb', 'PyYAML', 'requests']
+-HERE = os.path.dirname(__file__)
++HERE = os.path.dirname(os.path.abspath(__file__))
+ 
+ # Assumptions:
+ #  1. Package name equals main script file name (and only one script)