4 files changed, 14 insertions, 60 deletions
diff --git a/audio/chuck/README b/audio/chuck/README
index 14b71b4813..a93e6f7328 100644
--- a/audio/chuck/README
+++ b/audio/chuck/README
@@ -11,5 +11,7 @@ synthesis/analysis programs, and real-time interactive control.
 
 Please e-mail me if it works for 64-bit.
 
-SOUNDENGINE=jack to enable jack support. In that case you need jack installed.
-Valid options are: alsa (default), jack, oss.
+SOUNDENGINE=jack or SOUNDENGINE=oss to enable jack or oss support:
+in these cases you will need jack-audio-connection-kit or oss (and
+the build script will produce a different binary).
+SOUNDENGINE=alsa is the default.
diff --git a/audio/chuck/chuck.SlackBuild b/audio/chuck/chuck.SlackBuild
index 0f3235b49d..815714a440 100644
--- a/audio/chuck/chuck.SlackBuild
+++ b/audio/chuck/chuck.SlackBuild
@@ -8,8 +8,6 @@ VERSION=${VERSION:-1.3.1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SOUNDENGINE=${SOUNDENGINE:-alsa}
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -37,6 +35,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+SOUNDENGINE=${SOUNDENGINE:-alsa}
+
 set -e
 
 rm -rf $PKG
@@ -52,9 +52,11 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Set our CFLAGS
+sed -i "s|-O3|$SLKCFLAGS|" makefile*
+
 make linux-$SOUNDENGINE
-mkdir -p $PKG/usr/bin
-cp $PRGNAM $PKG/usr/bin/$PRGNAM-$SOUNDENGINE # binaries can co-exist.
+install -m 0755 -D $PRGNAM $PKG/usr/bin/$PRGNAM-$SOUNDENGINE # binaries can co-exist.
 
 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
@@ -71,4 +73,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/${PRGNAM}_${SOUNDENGINE}-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/${PRGNAM}-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/chuck/doinst.sh b/audio/chuck/doinst.sh
deleted file mode 100644
index cb44d46a56..0000000000
--- a/audio/chuck/doinst.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-schema_install() {
-  SCHEMA="$1"
-  GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
-  chroot . gconftool-2 --makefile-install-rule \
-    /etc/gconf/schemas/$SCHEMA \
-    1>/dev/null
-}
-
-schema_install blah.schemas
-preserve_perms etc/rc.d/rc.INIT.new
-config etc/configfile.new
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
-
diff --git a/audio/chuck/slack-desc b/audio/chuck/slack-desc
index 0a8f4b850e..556d9c60cc 100644
--- a/audio/chuck/slack-desc
+++ b/audio/chuck/slack-desc
@@ -7,10 +7,10 @@
 
      |-----handy-ruler------------------------------------------------------|
 chuck: ChucK (audio programming language)
-chuck: 
+chuck:
 chuck: ChucK presents a new time-based, concurrent programming model that's
-chuck: highly precise and expressive (we call this strongly-timed), as well as
-chuck: dynamic control rates, and the ability to add and modify code
+chuck: highly precise and expressive (we call this strongly-timed), as well
+chuck: as dynamic control rates, and the ability to add and modify code
 chuck: on-the-fly. In addition, ChucK supports MIDI, OSC, HID device, and
 chuck: multi-channel audio. It's fun and easy to learn, and offers composers,
 chuck: researchers, and performers a powerful programming tool for building