Instead of creating files from patches, place them readably in

${FILESDIR} for easier tracking of external changes (e.g., Debian,
whence they came). No functional change.

8 files changed, 132 insertions, 149 deletions

diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile
index 2df7c495b2e..c6730d27966 100644
--- a/mail/rss2email/Makefile
+++ b/mail/rss2email/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:59 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/18 23:08:24 schmonz Exp $
 #
 
 DISTNAME=		rss2email-2.59
@@ -31,7 +31,8 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-extract:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${CP} ${DISTDIR}/${DISTFILES:Q} ${WRKSRC}/rss2email.py
+	${CP} ${DISTDIR}/${DISTFILES:Q} ${WRKSRC}/rss2email.py;		\
+	cd ${FILESDIR} && cp config.py r2e r2e.1 ${WRKSRC}
 
 do-install:
 	cd ${WRKSRC} &&							\
diff --git a/mail/rss2email/distinfo b/mail/rss2email/distinfo
index cdf8c42107a..516da5032d8 100644
--- a/mail/rss2email/distinfo
+++ b/mail/rss2email/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.12 2006/07/01 19:32:40 schmonz Exp $
+$NetBSD: distinfo,v 1.13 2007/01/18 23:08:24 schmonz Exp $
 
 SHA1 (rss2email-2.59.py) = 32091d8cc9378e6346a9589d9783505259564337
 RMD160 (rss2email-2.59.py) = ef21bc4dab3efbf52449319e736b23a9eb3ae591
 Size (rss2email-2.59.py) = 24152 bytes
-SHA1 (patch-aa) = bc095413de3a22da143535acdc501d08e08203b6
-SHA1 (patch-ab) = ffd6f8131e156abb2faf91b47c2250953fce21ff
-SHA1 (patch-ac) = 0742748bad328241b858cb2e54e9a91868feedeb
 SHA1 (patch-ad) = 58b80c4bb0c4c00f2a4994d36da35f29f0dc59e8
diff --git a/mail/rss2email/files/config.py b/mail/rss2email/files/config.py
new file mode 100644
index 00000000000..007b19753d6
--- /dev/null
+++ b/mail/rss2email/files/config.py
@@ -0,0 +1,27 @@
+# The email address messages are from by default:
+DEFAULT_FROM = "bozo@dev.null"
+
+# 1: Only use the DEFAULT_FROM address.
+# 0: Use the email address specified by the feed, when possible.
+FORCE_FROM = 0
+
+# 1: Receive HTML mail
+# 0: Have entries converted to plain text
+HTML_MAIL = 1
+
+# 1: Receive one email per post
+# 0: Receive an email every time a post changes
+TRUST_GUID = 1
+
+# 1: Generate Date header based on item's date, when possible
+# 0: Generate Date header based on time sent
+DATE_HEADER = 0
+
+# 1: Apply Q-P conversion (required for some MUAs)
+# 0: Send message in 8-bits
+# http://cr.yp.to/smtp/8bitmime.html
+QP_REQUIRED = 0
+
+# 1: Name feeds as they're being processed.
+# 0: Keep quiet.
+VERBOSE = 0
diff --git a/mail/rss2email/files/r2e b/mail/rss2email/files/r2e
new file mode 100644
index 00000000000..112ced9c29e
--- /dev/null
+++ b/mail/rss2email/files/r2e
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+if [ ! -d ~/.rss2email ]; then
+	mkdir ~/.rss2email
+fi
+cd ~/.rss2email
+exec @PYTHONBIN@ @PREFIX@/share/rss2email/rss2email.py feeds.dat $*
diff --git a/mail/rss2email/files/r2e.1 b/mail/rss2email/files/r2e.1
new file mode 100644
index 00000000000..5cd8e60da4a
--- /dev/null
+++ b/mail/rss2email/files/r2e.1
@@ -0,0 +1,94 @@
+.TH R2E 1a
+.SH NAME
+r2e \- receive RSS feeds by email
+.SH SYNOPSIS
+.B r2e action [options]
+.SH DESCRIPTION
+.BR r2e
+is a simple program which you can run in your crontab.
+It watches RSS feeds and sends you nicely formatted email message
+for each new item.
+.P
+The program is configured by ~/.rss2email/config.py
+.P
+For a quick start with r2e, try these steps:
+.P
+.RS
+.nf
+.BI "r2e new " your@address
+.BI "r2e add " http://feed.url/somewhere.rss
+.BI "r2e run "
+.RE
+.P
+The last command should eventually be put into your crontab, if you
+want things be sent you automatically.
+.SH ACTIONS
+.TP
+.B new [youremail]
+Create a new feedfile. If the second option is specified, it sets the
+default email address that mails are sent to.
+.TP
+.B add url [youremail]
+Subscribe to a feed. The first option is the URL of the feed.
+The optional second option is the email address to send new items to.
+Repeat for each feed you want to subscribe to.
+.TP
+.B run [--no-send]
+Scan the feeds and send emails for new items. This can be run in a cron
+job.
+The --no-send option stops r2e from sending any email. This can be
+useful the first time you run it, as otherwise it would send every
+available story.
+.TP
+.B email yournewemail
+Change the default email address.
+.TP
+.B list
+List all your currently subscribed feeds.
+.TP
+.B delete n
+Delete a feed, using its number from the list command.
+.SH "CONFIGURATION"
+The following configuration variables can be set in the ~/.rss2email/config.py
+config file. The file is a python file, so variables are set using a syntax
+like this: VARIABLE = "value"
+.P
+If the value is a number, the quotes may be omitted. Most configuration
+variables in the file are boolean values, where a 1 indicates the option is
+set, and a 0 disables it.
+.TP
+.B DEFAULT_FROM
+The email address messages are from by default, if the rss feed does not
+specify an email address. The default valus is "bozo@dev.null"
+.TP
+.B FORCE_FROM
+If set, the DEFAULT_FROM address will always be used, otherwise use 
+the email address specified by the feed, when possible.
+.TP
+.B HTML_MAIL
+If set, HTML mail will be sent as such. Otherwise, entries will be
+converted to plain text before sending.
+.TP
+.B TRUST_GUID
+If set, receive one email per post. Otherwise, a new email will be sent
+each time a post changes.
+.TP
+.B DATE_HEADER
+If set, the mail's date will be set to the date the item was posted, if
+possible. Otherwise, the date will be based on the time the email is sent.
+.TP
+.B QP_REQUIRED
+If set, do a quoted printible conversion; otherwise send message in 8 bits.
+.TP
+.B VERBOSE
+If set, feeds are named as they're processed.
+.SH FILES
+.TP
+.B ~/.rss2email/feeds.dat
+The database of feeds. Use r2e to add, remove, or modify feeds, do not edit
+it directly.
+.TP
+.B ~/.rss2email/config.py
+If this file exists, it it read to configure the program.
+.SH AUTHOR
+Aaron Swartz <me@aaronsw.com>
diff --git a/mail/rss2email/patches/patch-aa b/mail/rss2email/patches/patch-aa
deleted file mode 100644
index 25d045da317..00000000000
--- a/mail/rss2email/patches/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/06/30 20:19:35 schmonz Exp $
-
---- config.py.orig	2004-06-30 15:33:08.000000000 -0400
-+++ config.py
-@@ -0,0 +1,27 @@
-+# The email address messages are from by default:
-+DEFAULT_FROM = "bozo@dev.null"
-+
-+# 1: Only use the DEFAULT_FROM address.
-+# 0: Use the email address specified by the feed, when possible.
-+FORCE_FROM = 0
-+
-+# 1: Receive HTML mail
-+# 0: Have entries converted to plain text
-+HTML_MAIL = 1
-+
-+# 1: Receive one email per post
-+# 0: Receive an email every time a post changes
-+TRUST_GUID = 1
-+
-+# 1: Generate Date header based on item's date, when possible
-+# 0: Generate Date header based on time sent
-+DATE_HEADER = 0
-+
-+# 1: Apply Q-P conversion (required for some MUAs)
-+# 0: Send message in 8-bits
-+# http://cr.yp.to/smtp/8bitmime.html
-+QP_REQUIRED = 0
-+
-+# 1: Name feeds as they're being processed.
-+# 0: Keep quiet.
-+VERBOSE = 0
diff --git a/mail/rss2email/patches/patch-ab b/mail/rss2email/patches/patch-ab
deleted file mode 100644
index 44afcf4ddde..00000000000
--- a/mail/rss2email/patches/patch-ab
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/06/30 20:19:35 schmonz Exp $
-
---- r2e.1.orig	2004-06-30 15:33:08.000000000 -0400
-+++ r2e.1
-@@ -0,0 +1,94 @@
-+.TH R2E 1a
-+.SH NAME
-+r2e \- receive RSS feeds by email
-+.SH SYNOPSIS
-+.B r2e action [options]
-+.SH DESCRIPTION
-+.BR r2e
-+is a simple program which you can run in your crontab.
-+It watches RSS feeds and sends you nicely formatted email message
-+for each new item.
-+.P
-+The program is configured by ~/.rss2email/config.py
-+.P
-+For a quick start with r2e, try these steps:
-+.P
-+.RS
-+.nf
-+.BI "r2e new " your@address
-+.BI "r2e add " http://feed.url/somewhere.rss
-+.BI "r2e run "
-+.RE
-+.P
-+The last command should eventually be put into your crontab, if you
-+want things be sent you automatically.
-+.SH ACTIONS
-+.TP
-+.B new [youremail]
-+Create a new feedfile. If the second option is specified, it sets the
-+default email address that mails are sent to.
-+.TP
-+.B add url [youremail]
-+Subscribe to a feed. The first option is the URL of the feed.
-+The optional second option is the email address to send new items to.
-+Repeat for each feed you want to subscribe to.
-+.TP
-+.B run [--no-send]
-+Scan the feeds and send emails for new items. This can be run in a cron
-+job.
-+The --no-send option stops r2e from sending any email. This can be
-+useful the first time you run it, as otherwise it would send every
-+available story.
-+.TP
-+.B email yournewemail
-+Change the default email address.
-+.TP
-+.B list
-+List all your currently subscribed feeds.
-+.TP
-+.B delete n
-+Delete a feed, using its number from the list command.
-+.SH "CONFIGURATION"
-+The following configuration variables can be set in the ~/.rss2email/config.py
-+config file. The file is a python file, so variables are set using a syntax
-+like this: VARIABLE = "value"
-+.P
-+If the value is a number, the quotes may be omitted. Most configuration
-+variables in the file are boolean values, where a 1 indicates the option is
-+set, and a 0 disables it.
-+.TP
-+.B DEFAULT_FROM
-+The email address messages are from by default, if the rss feed does not
-+specify an email address. The default valus is "bozo@dev.null"
-+.TP
-+.B FORCE_FROM
-+If set, the DEFAULT_FROM address will always be used, otherwise use 
-+the email address specified by the feed, when possible.
-+.TP
-+.B HTML_MAIL
-+If set, HTML mail will be sent as such. Otherwise, entries will be
-+converted to plain text before sending.
-+.TP
-+.B TRUST_GUID
-+If set, receive one email per post. Otherwise, a new email will be sent
-+each time a post changes.
-+.TP
-+.B DATE_HEADER
-+If set, the mail's date will be set to the date the item was posted, if
-+possible. Otherwise, the date will be based on the time the email is sent.
-+.TP
-+.B QP_REQUIRED
-+If set, do a quoted printible conversion; otherwise send message in 8 bits.
-+.TP
-+.B VERBOSE
-+If set, feeds are named as they're processed.
-+.SH FILES
-+.TP
-+.B ~/.rss2email/feeds.dat
-+The database of feeds. Use r2e to add, remove, or modify feeds, do not edit
-+it directly.
-+.TP
-+.B ~/.rss2email/config.py
-+If this file exists, it it read to configure the program.
-+.SH AUTHOR
-+Aaron Swartz <me@aaronsw.com>
diff --git a/mail/rss2email/patches/patch-ac b/mail/rss2email/patches/patch-ac
deleted file mode 100644
index 91950a67f77..00000000000
--- a/mail/rss2email/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2006/07/01 19:32:40 schmonz Exp $
-
---- r2e.orig	2006-07-01 14:29:52.000000000 -0400
-+++ r2e
-@@ -0,0 +1,7 @@
-+#!/bin/sh
-+set -e
-+if [ ! -d ~/.rss2email ]; then
-+	mkdir ~/.rss2email
-+fi
-+cd ~/.rss2email
-+exec @PYTHONBIN@ @PREFIX@/share/rss2email/rss2email.py feeds.dat $*