From 5a09cde910a3b3d588f5587035bc77846d75649d Mon Sep 17 00:00:00 2001
From: Tom Canich <tcanich@canich.net>
Date: Mon, 15 Mar 2010 21:25:58 -0500
Subject: [PATCH] network/r2e: Updated for version 2.66.

---
 network/r2e/README          |  8 ++++++--
 network/r2e/config.py.patch |  6 +++---
 network/r2e/r2e.SlackBuild  | 13 +++++++------
 network/r2e/r2e.info        |  8 ++++----
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/network/r2e/README b/network/r2e/README
index 2cc355059b..6ec2f3e747 100644
--- a/network/r2e/README
+++ b/network/r2e/README
@@ -2,11 +2,15 @@ rss2email is a free tool for delivering news from RSS feeds to your
 email program.  This allows you to view RSS feeds in an interface you
 are already familiar with and to apply filters to incoming feeds.
 
-After installing this package, you need to do the following:
+After installing this package, edit /etc/r2e/config.py to taste, then do
+the following:
+
 	mkdir ~/.rss2email
 	r2e new you@yourdomain.com
 	r2e add http://yourfeed.yourdomain.com
 	r2e run --no-send
 
-You will probably want to create a cron job to periodically execute "r2e run".
+You will probably want to create a cron job to periodically 
+execute "r2e run".
+
 See http://rss2email.infogami.com for additional information.
diff --git a/network/r2e/config.py.patch b/network/r2e/config.py.patch
index 69dadca270..da0905832d 100644
--- a/network/r2e/config.py.patch
+++ b/network/r2e/config.py.patch
@@ -1,6 +1,6 @@
-diff -Nur r2e-2.6.5.orig/rss2email.py r2e-2.6.5/rss2email.py
---- r2e-2.6.5.orig/rss2email.py	2009-01-05 13:15:15.000000000 -0600
-+++ r2e-2.6.5/rss2email.py	2009-03-27 20:35:32.561832322 -0500
+diff -Nur r2e-2.6.6.orig/rss2email.py r2e-2.6.6/rss2email.py
+--- r2e-2.6.6.orig/rss2email.py	2009-01-05 13:15:15.000000000 -0600
++++ r2e-2.6.6/rss2email.py	2009-03-27 20:35:32.561832322 -0500
 @@ -200,7 +200,7 @@
  				print >>warn, ('Fatal error: sendmail exited with code %s' % status)
  				sys.exit(1)
diff --git a/network/r2e/r2e.SlackBuild b/network/r2e/r2e.SlackBuild
index ec76f082fe..a052197a29 100644
--- a/network/r2e/r2e.SlackBuild
+++ b/network/r2e/r2e.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 # Slackware build script for r2e
-
+# Written by Tom Canich <tcanich@canich.net>
+# Released under the BSD
 # Copyright (c) 2009, Tom Canich, State College, Pennsylvania, USA
 # All rights reserved.
 #
@@ -34,8 +35,8 @@
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=r2e
-VERSION=2.6.5
-ARCH=noarch
+VERSION=2.66
+ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -50,8 +51,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+tar xvf $CWD/rss2email-$VERSION.tar.gz
+cd rss2email-$VERSION
 
 # Patch rss2email.py so that our config.py location is shown
 patch -p1 < $CWD/config.py.patch
@@ -85,4 +86,4 @@ sed "s%@VERSION@%$VERSION%g" $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/network/r2e/r2e.info b/network/r2e/r2e.info
index df5ab53be8..8a557596c1 100644
--- a/network/r2e/r2e.info
+++ b/network/r2e/r2e.info
@@ -1,10 +1,10 @@
 PRGNAM="r2e"
-VERSION="2.6.5"
+VERSION="2.6.6"
 HOMEPAGE="http://rss2email.infogami.com"
-DOWNLOAD="http://slackbuilds.org/sources/13.0/r2e-2.6.5.tar.bz2"
-MD5SUM="4b15d10da531a35cbd8aa6eae46da3e4"
+DOWNLOAD="http://www.allthingsrss.com/rss2email/rss2email-2.66.tar.gz"
+MD5SUM="84a7aa98b52952e37dd239fefb01e9d9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Tom Canich"
 EMAIL="tcanich@canich.net"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"