From 6c8f4a5c474d408aba23521a1fa8827f31a78ecd Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <ponce@slackbuilds.org>
Date: Sun, 30 Sep 2012 11:23:51 +0200
Subject: system/cdrkit: Added some components from the bundled stuff.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 system/cdrkit/README            |  5 ++++-
 system/cdrkit/cdrkit.SlackBuild | 19 +++++++++++++------
 system/cdrkit/cdrkit.info       |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'system')

diff --git a/system/cdrkit/README b/system/cdrkit/README
index a382b17c4f..f10f9757ba 100644
--- a/system/cdrkit/README
+++ b/system/cdrkit/README
@@ -14,8 +14,11 @@ that there is no license incompatibility.  We at SlackBuilds.org
 are not taking a stance on that - we simply provide the build script
 if you wish to use it.
 
-This package will conflict with cdrtools - in other words, you need
+This package will conflict with cdrtools - in other words, you *need*
 to remove cdrtools before installing cdrkit.
 
 This script will create symlinks for mkisofs and cdda2wav for backwards
 compatibility with cdrtools and previous versions of cdrkit.
+
+The script cdda2mp3 included in this package needs the optional
+dependency lame.
diff --git a/system/cdrkit/cdrkit.SlackBuild b/system/cdrkit/cdrkit.SlackBuild
index 07e99dc8f0..4c7415e2a6 100644
--- a/system/cdrkit/cdrkit.SlackBuild
+++ b/system/cdrkit/cdrkit.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=cdrkit
 VERSION=${VERSION:-1.1.11}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -57,7 +57,6 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
@@ -87,14 +86,22 @@ make install DESTDIR=$PKG
     ln -s genisoimage mkisofs
 )
 
+( cd 3rd-party/zisofs_tools
+  CFLAGS="$SLKCFLAGS" ./configure
+  make )
+
 # Move manpages from /usr/share/man to /usr/man
 mv $PKG/usr/share/man $PKG/usr/man/
 rm -fR $PKG/usr/share
 
-install -m 0755 3rd-party/geteltorito/geteltorito.pl \
-  $PKG/usr/bin/geteltorito.pl
-install -m 0644 3rd-party/geteltorito.1 \
-  $PKG/usr/man/man1/geteltorito.1
+# Add other useful stuff
+install -m 0755 icedax/cdda2mp3 $PKG/usr/bin/cdda2mp3
+install -m 0755 3rd-party/zisofs_tools/mkzftree $PKG/usr/bin/mkzftree
+install -m 0755 3rd-party/geteltorito/geteltorito.pl $PKG/usr/bin/geteltorito
+install -m 0644 3rd-party/zisofs_tools/mkzftree.1 $PKG/usr/man/man1/mkzftree.1
+install -m 0644 3rd-party/geteltorito.1 $PKG/usr/man/man1/geteltorito.1
+install -m 0644 -D wodim/wodim.dfl $PKG/etc/wodim.conf
+install -m 0644 netscsid/netscsid.dfl $PKG/etc/netscsid.conf
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/system/cdrkit/cdrkit.info b/system/cdrkit/cdrkit.info
index 972c253bdd..825fd57332 100644
--- a/system/cdrkit/cdrkit.info
+++ b/system/cdrkit/cdrkit.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://cdrkit.org/releases/cdrkit-1.1.11.tar.gz"
 MD5SUM="efe08e2f3ca478486037b053acd512e9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="zisofs-tools"
+REQUIRES="%README%"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"
-- 
cgit v1.2.3