network/newsbeuter: Updated for version 1.2

4 files changed, 13 insertions, 40 deletions

diff --git a/network/newsbeuter/README b/network/newsbeuter/README
index 393f3463fdb25..d4bcc5fd95b81 100644
--- a/network/newsbeuter/README
+++ b/network/newsbeuter/README
@@ -1,5 +1,3 @@
-This is the README for the SlackBuild for the Newsbeuter RSS feedreader.
-
 Newsbeuter is an RSS feedreader. RSS is a number of widely-used
 XML formats to transmit, publish and syndicate articles, for
 example news or blog articles. Newsbeuter is designed to be used
@@ -7,10 +5,4 @@ on text terminals on Unix or Unix-like systems such as Linux,
 BSD or Mac OS X.
 
 You will need to have stfl and sqlite (from SlackBuilds.org) installed to 
-build this, and swig is an optional dependency if you want ruby scripting 
-support.  Note that stfl will need to have been built with swig installed
-(from SlackBuilds.org) as well if you want the additional ruby scripting 
-support. However, the author of the script has been unsuccessful in getting
-ruby scripting support to build; there is a variable in the build script
-to enable, so if you have any luck, please notify the maintainer listed in
-the newsbeuter.info file.
+build this.
diff --git a/network/newsbeuter/newsbeuter.SlackBuild b/network/newsbeuter/newsbeuter.SlackBuild
index 0fb4ccd19a866..1c9a67d945108 100644
--- a/network/newsbeuter/newsbeuter.SlackBuild
+++ b/network/newsbeuter/newsbeuter.SlackBuild
@@ -5,7 +5,7 @@
 # Released under the WTFPL
 
 PRGNAM=newsbeuter
-VERSION=0.8.2
+VERSION=1.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -15,11 +15,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Pass "yes" as the value to ENABLE_SWIG on the command line when executing 
-# this script if you have swig and ruby and want the ruby scripting support 
-# and are willing to figure out why the build fails with ruby/swig enabled
-ENABLE_SWIG=${ENABLE_SWIG:-no}
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
@@ -41,29 +36,15 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
   -o -perm 400 \) -exec chmod 644 {} \;
 
-# This ugly thing is because the Makefile/config.sh scripts check for ruby but
-# fail to check for swig and the build bombs if ruby is enabled and swig isn't
-# there. Of course, it fails even if ruby is enabled and swig *is* there, but
-# that's a different story.
-if [ "$ENABLE_SWIG" == "no" ]; then
-  sed -i~ 's/if find_rubyflags/if false/' config.sh
-fi
-
-# It would be nice to use $(mandir) here, but the Makefile doesn't use it
-# consistently. Rather than sed yet another file, we'll just move the man page.
 CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \
-  prefix=/usr docdir=/usr/doc/$PRGNAM-$VERSION make
+  prefix=/usr docdir=/usr/doc/$PRGNAM-$VERSION mandir=/usr/man make
 
-make prefix=$PKG/usr docdir=$PKG/usr/doc/$PRGNAM-$VERSION install
+make prefix=$PKG/usr docdir=$PKG/usr/doc/$PRGNAM-$VERSION \
+  mandir=$PKG/usr/man install
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : |
-    xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : |
-    xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object"| grep ELF | \
+  cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mv $PKG/usr/share/man $PKG/usr/man
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
diff --git a/network/newsbeuter/newsbeuter.info b/network/newsbeuter/newsbeuter.info
index 93f289d1ecc23..e610e3e22c58a 100644
--- a/network/newsbeuter/newsbeuter.info
+++ b/network/newsbeuter/newsbeuter.info
@@ -1,8 +1,8 @@
 PRGNAM="newsbeuter"
-VERSION="0.8.2"
-HOMEPAGE="http://synflood.at/newsbeuter.html"
-DOWNLOAD="http://synflood.at/newsbeuter/newsbeuter-0.8.2.tar.gz"
-MD5SUM="403891c24d999206d57b33ee630c42b3"
+VERSION="1.2"
+HOMEPAGE="http://www.newsbeuter.org/"
+DOWNLOAD="http://www.newsbeuter.org/downloads/newsbeuter-1.2.tar.gz"
+MD5SUM="3280583b502aa3b77524ce88bcea430f"
 MAINTAINER="slakmagik"
 EMAIL="jsun@freeshell.org"
-APPROVED="David Somero"
+APPROVED="dsomero"
diff --git a/network/newsbeuter/slack-desc b/network/newsbeuter/slack-desc
index a8d261b9ab206..75ae5144d3de4 100644
--- a/network/newsbeuter/slack-desc
+++ b/network/newsbeuter/slack-desc
@@ -14,6 +14,6 @@ newsbeuter: example news or blog articles. Newsbeuter is designed to be used
 newsbeuter: on text terminals on Unix or Unix-like systems such as Linux,
 newsbeuter: BSD or Mac OS X.
 newsbeuter: 
-newsbeuter: Homepage: http://synflood.at/newsbeuter/newsbeuter.html
+newsbeuter: Homepage: http://www.newsbeuter.org/
 newsbeuter: 
 newsbeuter: