urlwatch: update to urlwatch-2.4

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

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Tue Jul 12 21:57:32 2016 +0200
Changeset:	7d85ef26da6e52f1f1315c5f8f82af1e328f1cd1

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

Log Message:
urlwatch: update to urlwatch-2.4

While updating, use patches to copy files to the correct
places instead of the post-install target.

Changelog:

2016-07-12 Thomas Perl <thp.io/about>
	* Check current directory and use os.path.relpath (Fixes #73)
	* Add link to watched location in email report (by Guillaume Maudoux)
	* setup.py: Remove the discovery logic that fails with pip, just hardcode most things

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

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

diffstat:
 urlwatch/Makefile               |  8 +-------
 urlwatch/distinfo               | 11 ++++++-----
 urlwatch/patches/patch-setup.py | 24 +++++++++++++-----------
 urlwatch/patches/patch-urlwatch | 15 +++++++++++++++
 4 files changed, 35 insertions(+), 23 deletions(-)

diffs:
diff --git a/urlwatch/Makefile b/urlwatch/Makefile
index 8ff3c36..f376f49 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.2
+DISTNAME=	urlwatch-2.4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=thp/}
 
@@ -20,13 +20,7 @@ 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}
 
 .include "../../lang/python/application.mk"
diff --git a/urlwatch/distinfo b/urlwatch/distinfo
index 39f4bab..7e59671 100644
--- a/urlwatch/distinfo
+++ b/urlwatch/distinfo
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.1 2015/08/18 18:36:32 yhardy Exp $
 
-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
+SHA1 (urlwatch-2.4.tar.gz) = ec859d3c6d8d3bc55b714b663fa2f4550eae8eef
+RMD160 (urlwatch-2.4.tar.gz) = 06a545258002abbf95d466f1290aff65213f967c
+SHA512 (urlwatch-2.4.tar.gz) = 7cb5b057491e4b76e910e84bbed55ac6a33edea3050ae8f90aca3f2aef2e1c82b37947c8f83d7da8e9e0f7d247affa277a005fd303ede80897734d832d38ea52
+Size (urlwatch-2.4.tar.gz) = 24364 bytes
+SHA1 (patch-setup.py) = 001337940b8b54370ca3f1f4422f5e09ab7e6c79
+SHA1 (patch-urlwatch) = 4652383c472dd7ca552dfe543446eaaca112940f
diff --git a/urlwatch/patches/patch-setup.py b/urlwatch/patches/patch-setup.py
index ec908dd..0b5d7c6 100644
--- a/urlwatch/patches/patch-setup.py
+++ b/urlwatch/patches/patch-setup.py
@@ -1,15 +1,17 @@
 $NetBSD$
 
-Fix the case for an empty dirname.
+Use the pkgsrc directory structure.
 
---- setup.py.orig	2016-06-14 18:14:55.000000000 +0000
+--- setup.py.orig	2016-07-12 18:58:17.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)
+@@ -18,8 +18,8 @@ m['scripts'] = ['urlwatch']
+ m['package_dir'] = {'': 'lib'}
+ m['packages'] = ['urlwatch']
+ m['data_files'] = [
+-    ('share/man/man1', ['share/man/man1/urlwatch.1']),
+-    ('share/urlwatch/examples', [
++    (os.getenv('PKGMANDIR') + '/man1', ['share/man/man1/urlwatch.1']),
++    ('share/examples/urlwatch', [
+         'share/urlwatch/examples/hooks.py.example',
+         'share/urlwatch/examples/urls.yaml.example',
+     ]),
diff --git a/urlwatch/patches/patch-urlwatch b/urlwatch/patches/patch-urlwatch
new file mode 100644
index 0000000..54b3798
--- /dev/null
+++ b/urlwatch/patches/patch-urlwatch
@@ -0,0 +1,15 @@
+$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'))