aboutsummaryrefslogtreecommitdiff
path: root/audio/cd-discid
diff options
context:
space:
mode:
Diffstat (limited to 'audio/cd-discid')
-rw-r--r--audio/cd-discid/Makefile.diff17
-rw-r--r--audio/cd-discid/cd-discid.SlackBuild12
-rw-r--r--audio/cd-discid/cd-discid.info6
3 files changed, 22 insertions, 13 deletions
diff --git a/audio/cd-discid/Makefile.diff b/audio/cd-discid/Makefile.diff
index 8fe60621dcbea..289b3b78bee2b 100644
--- a/audio/cd-discid/Makefile.diff
+++ b/audio/cd-discid/Makefile.diff
@@ -1,12 +1,19 @@
-diff -Nur cd-discid-1.3.1.orig/Makefile cd-discid-1.3.1/Makefile
---- cd-discid-1.3.1.orig/Makefile 2012-10-06 18:35:51.242035234 -0400
-+++ cd-discid-1.3.1/Makefile 2012-10-07 13:03:31.838165407 -0400
-@@ -9,9 +9,9 @@
+--- cd-discid-1.4.orig/Makefile 2013-05-14 05:02:00.000000000 -0400
++++ cd-discid-1.4/Makefile 2014-06-22 13:30:36.873539224 -0400
+@@ -6,16 +6,16 @@
+ STRIP = strip
+
+ CFLAGS ?= -g -O2
+-CFLAGS := -DVERSION=\"$(VERSION)\" $(CFLAGS)
++# CFLAGS := -DVERSION=\"$(VERSION)\" $(CFLAGS)
+ CPPFLAGS ?=
+ LDFLAGS ?=
+
SRCS = cd-discid.c
OBJS = $(SRCS:.c=.o)
-PREFIX ?= /usr/local
-+PREFIX ?= ${DESTDIR}/usr
++PREFIX ?= /usr
BINDIR = ${PREFIX}/bin
-MANDIR = ${PREFIX}/share/man/man1
+MANDIR = ${PREFIX}/man/man1
diff --git a/audio/cd-discid/cd-discid.SlackBuild b/audio/cd-discid/cd-discid.SlackBuild
index d4f7ede52afc1..b29840e3ea981 100644
--- a/audio/cd-discid/cd-discid.SlackBuild
+++ b/audio/cd-discid/cd-discid.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for cd-discid
# Copyright 2007 Jim Capozzoli <saltmiser@gmail.com>
+# Updated for version 1.4 by Glenn Becker <burningc@sdf.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +26,7 @@
# Modified by the SlackBuilds.org project
PRGNAM=cd-discid
-VERSION=1.3.1
+VERSION=${VERSION:-1.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -43,13 +44,13 @@ PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686 -DVERSION=\"1.4\""
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686 -DVERSION=\"1.4\""
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
+ SLKCFLAGS="-O2 -fPIC -DVERSION=\"1.4\""
LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
@@ -61,7 +62,8 @@ set -e
mkdir -p $TMP $PKG $OUTPUT
rm -rf $PKG $TMP/$PRGNAM-$VERSION
cd $TMP
-tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
+mv $CWD/${PRGNAM}-${VERSION}.tar.gz $CWD/${PRGNAM}-${VERSION}.orig.tar.gz
+tar xvf $CWD/${PRGNAM}-${VERSION}.orig.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
diff --git a/audio/cd-discid/cd-discid.info b/audio/cd-discid/cd-discid.info
index 2c8a7296b024a..a1cc4507884a5 100644
--- a/audio/cd-discid/cd-discid.info
+++ b/audio/cd-discid/cd-discid.info
@@ -1,8 +1,8 @@
PRGNAM="cd-discid"
-VERSION="1.3.1"
+VERSION="1.4"
HOMEPAGE="http://freshmeat.net/projects/cddiscid/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/cd-discid_1.3.1.orig.tar.gz"
-MD5SUM="6f3379fca313ed9b7bab9405ed25dd12"
+DOWNLOAD="http://linukz.org/download/cd-discid-1.4.tar.gz"
+MD5SUM="85027b71d08fbbfb11ac2f0db6e8cea7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""