pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
urlwatch: update to 2.0.
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Sun Jan 24 09:33:04 2016 +0100
Changeset: 4603404db172961ff5511dcf2cb6b3b043b27f93
Modified Files:
TODO
urlwatch/Makefile
urlwatch/PLIST
urlwatch/distinfo
Removed Files:
urlwatch/patches/patch-convert-to-python3.sh
urlwatch/patches/patch-setup.py
Log Message:
urlwatch: update to 2.0.
2016-01-16 Thomas Perl <thp.io/about>
* Version 2.0 with lots of changes, only a few listed here
* Requires Python 3, support for Python 2 dropped
* Uses SQLite 3 / minidb for cache storage
* Uses PyYAML for the URL list and configuration file
* Subclass-based hooking features
* Custom job types by subclassing Job
* Custom reporters by subclassing ReporterBase
* Custom filters by subclassing FilterBase
* Old data will be migrated as good as possible to the new formats
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4603404db172961ff5511dcf2cb6b3b043b27f93
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
TODO | 1 -
urlwatch/Makefile | 16 +++++++--------
urlwatch/PLIST | 30 +++++++++++++++++++++-------
urlwatch/distinfo | 9 ++++-----
urlwatch/patches/patch-convert-to-python3.sh | 13 ------------
urlwatch/patches/patch-setup.py | 15 --------------
6 files changed, 34 insertions(+), 50 deletions(-)
diffs:
diff --git a/TODO b/TODO
index 152d4cf..c65f604 100644
--- a/TODO
+++ b/TODO
@@ -129,7 +129,6 @@ Suggested package updates
o tmw-0.0.29.1
o torcs-1.3.6
o uget-2.0.1
- o urlwatch-2.0
o vidalia-0.2.21
o vidalia-devel-0.3.3
o virtualbox-5.0.4
diff --git a/urlwatch/Makefile b/urlwatch/Makefile
index 6bcc611..ced23f1 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-1.18
+DISTNAME= urlwatch-2.0
CATEGORIES= net
MASTER_SITES= http://thp.io/2008/urlwatch/
@@ -11,16 +11,14 @@ LICENSE= modified-bsd
USE_LANGUAGES= # none
-PYDISTUTILSPKG= YES
-# needs futures
-PYTHON_VERSIONS_INCOMPATIBLE= 27
+INSTALLATION_DIRS+= ${PKGMANDIR}/man1
-post-extract:
- cd ${WRKSRC} && ${MV} share/man man
+# no support for 2.x
+PYTHON_VERSIONS_INCOMPATIBLE= 27
-post-patch:
- cd ${WRKSRC} && ${TOOLS_PLATFORM.env} PYVERSSUFFIX=${PYVERSSUFFIX} ${SH} convert-to-python3.sh
+post-install:
+ ${MV} ${DESTDIR}${PREFIX}/share/man/man1/urlwatch.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/urlwatch/PLIST b/urlwatch/PLIST
index 80353f4..3396fbb 100644
--- a/urlwatch/PLIST
+++ b/urlwatch/PLIST
@@ -1,20 +1,36 @@
-@comment $NetBSD: PLIST,v 1.1 2015/08/18 18:36:32 yhardy Exp $
+@comment $NetBSD$
bin/urlwatch
+man/man1/urlwatch.1
+${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/urlwatch/__init__.py
${PYSITELIB}/urlwatch/__init__.pyc
${PYSITELIB}/urlwatch/__init__.pyo
+${PYSITELIB}/urlwatch/filters.py
+${PYSITELIB}/urlwatch/filters.pyc
+${PYSITELIB}/urlwatch/filters.pyo
+${PYSITELIB}/urlwatch/handler.py
${PYSITELIB}/urlwatch/handler.pyc
${PYSITELIB}/urlwatch/handler.pyo
+${PYSITELIB}/urlwatch/html2txt.py
${PYSITELIB}/urlwatch/html2txt.pyc
${PYSITELIB}/urlwatch/html2txt.pyo
+${PYSITELIB}/urlwatch/ical2txt.py
${PYSITELIB}/urlwatch/ical2txt.pyc
${PYSITELIB}/urlwatch/ical2txt.pyo
+${PYSITELIB}/urlwatch/jobs.py
+${PYSITELIB}/urlwatch/jobs.pyc
+${PYSITELIB}/urlwatch/jobs.pyo
+${PYSITELIB}/urlwatch/mailer.py
${PYSITELIB}/urlwatch/mailer.pyc
${PYSITELIB}/urlwatch/mailer.pyo
-${PYSITELIB}/urlwatch/handler.py
-${PYSITELIB}/urlwatch/html2txt.py
-${PYSITELIB}/urlwatch/ical2txt.py
-${PYSITELIB}/urlwatch/mailer.py
-man/man1/urlwatch.1
+${PYSITELIB}/urlwatch/reporters.py
+${PYSITELIB}/urlwatch/reporters.pyc
+${PYSITELIB}/urlwatch/reporters.pyo
+${PYSITELIB}/urlwatch/storage.py
+${PYSITELIB}/urlwatch/storage.pyc
+${PYSITELIB}/urlwatch/storage.pyo
+${PYSITELIB}/urlwatch/util.py
+${PYSITELIB}/urlwatch/util.pyc
+${PYSITELIB}/urlwatch/util.pyo
share/urlwatch/examples/hooks.py.example
-share/urlwatch/examples/urls.txt.example
+share/urlwatch/examples/urls.yaml.example
diff --git a/urlwatch/distinfo b/urlwatch/distinfo
index 12e2d44..0426967 100644
--- a/urlwatch/distinfo
+++ b/urlwatch/distinfo
@@ -1,7 +1,6 @@
$NetBSD: distinfo,v 1.1 2015/08/18 18:36:32 yhardy Exp $
-SHA1 (urlwatch-1.18.tar.gz) = 53b455dfe365788a9d9975726d5403ddf9c38cc9
-RMD160 (urlwatch-1.18.tar.gz) = 825cfef05c8721844687b46cbd812ccfa648d0fe
-Size (urlwatch-1.18.tar.gz) = 14987 bytes
-SHA1 (patch-convert-to-python3.sh) = f4238dcb9a7b9ebed0cf9c487efa2407f7619a1c
-SHA1 (patch-setup.py) = 4e6b7cea443dc1ff663a0945e87e9ae10345f9a7
+SHA1 (urlwatch-2.0.tar.gz) = d14f515d02824bc51bc6a071bd99f97c334119e8
+RMD160 (urlwatch-2.0.tar.gz) = 7f70dca21b4891fba61b404ba1a86e176a58144f
+SHA512 (urlwatch-2.0.tar.gz) = 00855557daccf2c418382082392173f03d694be0b6e643ad06fb2a6e0329d17fac37232867686d8e0a6cb79f037e4127a5ea78739bfcd8acfd1cffccf2d78b75
+Size (urlwatch-2.0.tar.gz) = 22988 bytes
diff --git a/urlwatch/patches/patch-convert-to-python3.sh b/urlwatch/patches/patch-convert-to-python3.sh
deleted file mode 100644
index 5181d33..0000000
--- a/urlwatch/patches/patch-convert-to-python3.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-convert-to-python3.sh,v 1.1 2015/08/18 18:36:32 yhardy Exp $
-
-Use the correct converter.
-
---- convert-to-python3.sh.orig 2015-02-15 08:32:51.000000000 +0000
-+++ convert-to-python3.sh
-@@ -3,5 +3,5 @@
-
- SOURCES="urlwatch lib/urlwatch/*.py share/urlwatch/examples/hooks.py.example setup.py"
-
--2to3 -w $SOURCES
-+2to3-${PYVERSSUFFIX} -w $SOURCES
-
diff --git a/urlwatch/patches/patch-setup.py b/urlwatch/patches/patch-setup.py
deleted file mode 100644
index 146e960..0000000
--- a/urlwatch/patches/patch-setup.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2015/08/18 18:36:32 yhardy Exp $
-
-Use the correct directory for man pages (man pages moved in post-extract)
-
---- setup.py.orig 2015-02-27 18:25:32.000000000 +0000
-+++ setup.py
-@@ -31,6 +31,8 @@ m['packages'] = ['.'.join(dirname.split(
- for dirname, _, files in os.walk('lib') if '__init__.py' in files]
- m['data_files'] = [(dirname, [os.path.join(dirname, file) for file in files])
- for dirname, _, files in os.walk('share')]
-+m['data_files'] = m['data_files'] + [(dirname, [os.path.join(dirname, file) for file in files])
-+ for dirname, _, files in os.walk('man')]
-
- setup(**m)
-
Home |
Main Index |
Thread Index |
Old Index