audio/cmus: Updated for version 2.3.2.

5 files changed, 13 insertions, 49 deletions

diff --git a/audio/cmus/cmus.SlackBuild b/audio/cmus/cmus.SlackBuild
index 3635a973355d..8440c9bde874 100644
--- a/audio/cmus/cmus.SlackBuild
+++ b/audio/cmus/cmus.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cmus
 
-# Copyright (c) 2008-2009, Antonio Hernández Blas <hba.nihilismus@gmail.com>
+# Copyright (c) 2008-2010, Antonio Hernández Blas <hba.nihilismus@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -22,9 +22,9 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cmus
-VERSION=2.2.0
+VERSION=v2.3.2
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -49,7 +49,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -jxvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -58,11 +58,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Apply some patches from gentoo
-# Thanks to B Watson for made me notice the ffmpeg issue.
-cat $CWD/patches/cmus-2.2.0-new-ffmpeg.patch | patch -p1
-cat $CWD/patches/cmus-2.2.0-symlink_attack.patch | patch -p1
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -75,12 +70,8 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-( 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
 
 if [ -d $PKG/usr/man ]; then
   ( cd $PKG/usr/man
@@ -90,8 +81,8 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING HACKING README $PKG/usr/doc/$PRGNAM-$VERSION
-chmod -x $PKG/usr/doc/$PRGNAM-$VERSION/examples/*
+cp -a AUTHORS COPYING README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/examples/*
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/cmus/cmus.info b/audio/cmus/cmus.info
index 940fe1bcc0cb..cbf0485ec001 100644
--- a/audio/cmus/cmus.info
+++ b/audio/cmus/cmus.info
@@ -1,10 +1,10 @@
 PRGNAM="cmus"
-VERSION="2.2.0"
+VERSION="v2.3.2"
 HOMEPAGE="http://cmus.sourceforge.net/"
-DOWNLOAD="http://mirror.greaterscope.net/cmus/cmus-2.2.0.tar.bz2"
-MD5SUM="7a9895ecfc10cd16577c73051436962f"
+DOWNLOAD="http://download.sourceforge.net/cmus/cmus-v2.3.2.tar.bz2"
+MD5SUM="47698e355cff2e7b985a22475099c100"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Antonio Hernández Blas"
 EMAIL="hba.nihilismus@gmail.com"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/audio/cmus/patches/cmus-2.2.0-new-ffmpeg.patch b/audio/cmus/patches/cmus-2.2.0-new-ffmpeg.patch
deleted file mode 100644
index 89812b21b193..000000000000
--- a/audio/cmus/patches/cmus-2.2.0-new-ffmpeg.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- cmus-2.2.0-orig/ffmpeg.c	2007-07-27 16:52:13.000000000 +0200
-+++ cmus-2.2.0/ffmpeg.c	2008-04-25 16:32:40.000000000 +0200
-@@ -18,9 +18,9 @@
-  */
- 
- #include <stdio.h>
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/avio.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libavformat/avio.h>
- 
- #include "ip.h"
- #include "xmalloc.h"
diff --git a/audio/cmus/patches/cmus-2.2.0-symlink_attack.patch b/audio/cmus/patches/cmus-2.2.0-symlink_attack.patch
deleted file mode 100644
index 3c3e09c55cfe..000000000000
--- a/audio/cmus/patches/cmus-2.2.0-symlink_attack.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur cmus-2.2.0.orig/cmus-status-display cmus-2.2.0/cmus-status-display
---- cmus-2.2.0.orig/cmus-status-display	2007-07-27 17:52:13.000000000 +0300
-+++ cmus-2.2.0/cmus-status-display	2009-05-12 09:12:56.000000000 +0300
-@@ -19,7 +19,7 @@
- output()
- {
- 	# write status to /tmp/cmus-status (not very useful though)
--	echo "$*" >> /tmp/cmus-status 2>&1
-+	echo "$*" >> ~/.cmus-status 2>&1
- 
- 	# WMI (http://wmi.modprobe.de/)
- 	#wmiremote -t "$*" &> /dev/null
diff --git a/audio/cmus/slack-desc b/audio/cmus/slack-desc
index 2bde8facc67a..dba764cd4a57 100644
--- a/audio/cmus/slack-desc
+++ b/audio/cmus/slack-desc
@@ -11,7 +11,7 @@ cmus:
 cmus: cmus is a small and fast text mode music player
 cmus: for Linux and many other UNIX like operating systems.
 cmus:
-cmus: Homepage: http://onion.dynserv.net/~timo/cmus.html
+cmus: Homepage: http://cmus.sourceforge.net
 cmus:
 cmus:
 cmus: