From c66ebcebeb4de3ad83a640d3f018db40240d05d2 Mon Sep 17 00:00:00 2001
From: Jim Capozzoli <saltmiser@gmail.com>
Date: Wed, 12 May 2010 17:36:52 +0200
Subject: audio/cd-discid: Updated for version 0.9

---
 audio/cd-discid/cd-discid.SlackBuild | 22 ++++++++++++----------
 audio/cd-discid/cd-discid.info       |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'audio/cd-discid')

diff --git a/audio/cd-discid/cd-discid.SlackBuild b/audio/cd-discid/cd-discid.SlackBuild
index c93c1edb33..ef26196454 100644
--- a/audio/cd-discid/cd-discid.SlackBuild
+++ b/audio/cd-discid/cd-discid.SlackBuild
@@ -1,4 +1,5 @@
 #!/bin/bash
+
 # Slackware build script for cd-discid
 
 # Copyright 2007 Jim Capozzoli <saltmiser@gmail.com>  
@@ -23,15 +24,14 @@
 
 # Modified by the SlackBuilds.org project
 
-set -e
-
 PRGNAM=cd-discid
 VERSION=0.9
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -39,14 +39,16 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
  elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
-rm -rf $PKG 
-mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
+set -e
 
+mkdir -p $TMP $PKG $OUTPUT
+rm -rf $PKG $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar -xzvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
+tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -59,8 +61,8 @@ chmod -R u+w,go+r-w,a-s .
 # ownership setting has to be removed for that to work.  --rworkman
 patch -p1 < $CWD/Makefile.diff
 
-CFLAGS="$SLKCFLAGS" make || exit
-make install DESTDIR=$PKG || exit
+make CFLAGS+="$SLKCFLAGS"
+make install DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING README changelog $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/audio/cd-discid/cd-discid.info b/audio/cd-discid/cd-discid.info
index ab4f08ddca..f9948b71dd 100644
--- a/audio/cd-discid/cd-discid.info
+++ b/audio/cd-discid/cd-discid.info
@@ -1,7 +1,7 @@
 PRGNAM="cd-discid"
 VERSION="0.9"
-HOMEPAGE="http://www.hispalinux.es/~data/files/cd-discid/"
-DOWNLOAD="http://www.hispalinux.es/~data/files/cd-discid/cd-discid_0.9.orig.tar.gz"
+HOMEPAGE="http://freshmeat.net/projects/cddiscid/"
+DOWNLOAD="http://ftp.debian.org/debian/pool/main/c/cd-discid/cd-discid_0.9.orig.tar.gz"
 MD5SUM="64677b8b63d1db0db015043f5455171a"
 MAINTAINER="Jim Capozzoli"
 EMAIL="saltmiser@gmail.com"
-- 
cgit v1.2.3