On 2019/09/01 19:20, Kaashif Hymabaccus wrote:
> Hi ports@,
>
> Here is the new release of rss2email. As before, it is a new port and
> not an update of rss2email since it is completely incompatible and I
> don't want to break users' perfectly fine configurations.
Let's just cut across and tell people in release notes to save
their config first. 2.x will not be seeing any updates and it's a one
time change. I've put an @ask-update in pkg/PLIST so that people know
to save feeds, and will write something for faq/current.html (to copy
to OpenBSD upgrade notes) telling people what to do.
Other changes compared to your version, remove HOMEPAGE (it's the default
for a MODPY_PI=Yes port), remove TEST_DEPENDS (RUN_DEPENDS is automatically
added, see "make show=TEST_DEPENDS"), rerun "make plist".
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/rss2email/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 24 Aug 2019 20:14:06 -0000 1.4
+++ Makefile 5 Sep 2019 09:03:42 -0000
@@ -1,39 +1,29 @@
-# $OpenBSD: Makefile,v 1.4 2019/08/24 20:14:06 sthen Exp $
+# $OpenBSD$
-COMMENT= get news from RSS feeds in email
+COMMENT = convert RSS/Atom newsfeeds to email
-DISTNAME= rss2email-2.71
-FIX_EXTRACT_PERMISSIONS= Yes
+MODPY_EGG_VERSION = 3.10
+DISTNAME = rss2email-${MODPY_EGG_VERSION}
+CATEGORIES = mail www
-CATEGORIES= mail textproc
+MAINTAINER = Kaashif Hymabaccus <[email protected]>
-HOMEPAGE= http://www.allthingsrss.com/rss2email/
-
-# GPLv2/v3
-PERMIT_PACKAGE= Yes
-
-MASTER_SITES= ${HOMEPAGE}
-
-MODULES= lang/python
-BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= converters/py-html2text \
- textproc/py-feedparser
-SUBST_VARS+= MODPY_SITEPKG
-
-NO_BUILD= Yes
-NO_TEST= Yes
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rss2email/ \
- ${PREFIX}/share/doc/rss2email/ ${WRKINST}/${MODPY_SITEPKG}/
- ${INSTALL_SCRIPT} ${WRKSRC}/rss2email.py ${WRKINST}/${MODPY_SITEPKG}/
- ${INSTALL_DATA} ${WRKSRC}/readme.html ${PREFIX}/share/doc/rss2email/
- ${INSTALL_DATA} ${WRKSRC}/config.py.example \
- ${PREFIX}/share/examples/rss2email/
- ${INSTALL_DATA} ${WRKSRC}/config.py.example \
- ${PREFIX}/share/examples/rss2email/
- ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
- ${WRKINST}/${MODPY_SITEPKG}/rss2email.py
- ${SUBST_PROGRAM} ${FILESDIR}/r2e ${PREFIX}/bin/r2e
+# GPLv2+
+PERMIT_PACKAGE = Yes
+
+MODULES = lang/python
+
+RUN_DEPENDS += converters/py-html2text${MODPY_FLAVOR} \
+ textproc/py-feedparser${MODPY_FLAVOR}
+
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+MODPY_PI = Yes
+MODPY_SETUPTOOLS = Yes
+
+post-install:
+ ${INSTALL_MAN} ${WRKSRC}/r2e.1 ${PREFIX}/man/man1/
+
+do-test:
+ cd ${WRKSRC} && env PYTHONPATH=. ${MODPY_BIN} test/test.py
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/rss2email/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 24 Aug 2019 20:14:06 -0000 1.2
+++ distinfo 5 Sep 2019 09:03:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (rss2email-2.71.tar.gz) = 1SRRl6UDRBBAXx9XlGELhL8mwMQMjQX+CJURZ5epmzE=
-SIZE (rss2email-2.71.tar.gz) = 63268
+SHA256 (rss2email-3.10.tar.gz) = AcZbUrEO+E/2ZJLU5157uJ4p1qfEmsm5v1XKhO9bT/o=
+SIZE (rss2email-3.10.tar.gz) = 65388
Index: files/r2e
===================================================================
RCS file: files/r2e
diff -N files/r2e
--- files/r2e 26 Jun 2013 16:23:10 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-[ -d ~/.rss2email ] || mkdir ~/.rss2email
-cd ~/.rss2email
-exec ${MODPY_BIN} ${MODPY_SITEPKG}/rss2email.py feeds.dat $*
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/mail/rss2email/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 26 Jun 2013 16:23:10 -0000 1.1.1.1
+++ pkg/DESCR 5 Sep 2019 09:03:42 -0000
@@ -1,2 +1,6 @@
-rss2email is a free tool for delivering news from RSS feeds to your
-email program.
+rss2email is a simple program which you can run in your crontab. It
+watches RSS feeds and sends you nicely formatted email messages for
+each new item.
+
+rss2email was started by Aaron Swartz and is currently maintained by
+by the community at https://github.com/rss2email.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/rss2email/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 26 Jun 2013 16:23:10 -0000 1.1.1.1
+++ pkg/PLIST 5 Sep 2019 09:03:42 -0000
@@ -1,8 +1,43 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2013/06/26 16:23:10 sthen Exp $
+@comment $OpenBSD: PLIST,v$
+@ask-update rss2email-<3 Make sure your feed list is exported
bin/r2e
-lib/python${MODPY_VERSION}/site-packages/rss2email.py
-lib/python${MODPY_VERSION}/site-packages/rss2email.pyc
-share/doc/rss2email/
-share/doc/rss2email/readme.html
-share/examples/rss2email/
-share/examples/rss2email/config.py.example
+lib/python${MODPY_VERSION}/site-packages/rss2email/
+lib/python${MODPY_VERSION}/site-packages/rss2email-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/rss2email-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/rss2email-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/rss2email-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/rss2email-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/rss2email-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/rss2email/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}command.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}email.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}feed.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}feeds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/command.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/config.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/email.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/error.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/feed.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/feeds.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/main.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/post_process/
+lib/python${MODPY_VERSION}/site-packages/rss2email/post_process/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/rss2email/post_process/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/rss2email/post_process/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/post_process/${MODPY_PYCACHE}downcase.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/post_process/${MODPY_PYCACHE}prettify.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/post_process/${MODPY_PYCACHE}redirect.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/post_process/downcase.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/post_process/prettify.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/post_process/redirect.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/util.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/version.py
+@man man/man1/r2e.1
+share/doc/pkg-readmes/${PKGSTEM}
Index: pkg/README
===================================================================
RCS file: pkg/README
diff -N pkg/README
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/README 5 Sep 2019 09:03:42 -0000
@@ -0,0 +1,36 @@
+$OpenBSD$
+
++-------------------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-------------------------------------------------------------------------------
+
+Migrating from rss2email 2
+==========================
+rss2email 3 uses a different config and data format from previous versions.
+
+Hopefully you read the OpenBSD upgrade instructions before updating the
+package and have saved the old feed list with "r2e opmlexport > ~/r2e.opml",
+and the output of "r2e list" if you have any feeds sending to a non-default
+email address.
+
+After updating, create a new feed database, set the default email address
+and import saved feeds:
+
+ r2e new
+ r2e email [email protected]
+ cat ~/r2e.opml | r2e opmlimport
+
+For any feeds with a non-default email address, delete and re-add with the
+correct address. Adjust other config in ~/.config/rss2email.cfg as needed
+based on the old settings in ~/.rss2email/config.py.
+
+The "last read" information is not transferred. If you don't want to re-send
+old messages (and don't mind missing any new messages since the last run with
+the old version), you can skip sending mail for the first run:
+
+ r2e run --no-send
+
+Alternatively use "r2e run" as usual if you want to be sure to avoid missing
+anything.
+
+The new feed data is stored in ~/.local/share/rss2email.json.
