1 files changed, 12 insertions, 17 deletions
diff --git a/audio/ocp/ocp.SlackBuild b/audio/ocp/ocp.SlackBuild
index 276b6c1e73..02b0282bcd 100644
--- a/audio/ocp/ocp.SlackBuild
+++ b/audio/ocp/ocp.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for Open Cubic Player
 #
-# Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2010  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,25 +23,23 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ocp
-VERSION=0.1.18
+VERSION=0.1.20
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -67,7 +65,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -I/usr/include/SDL" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -79,14 +77,11 @@ CFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | egrep "ELF.*executable" | cut -f 1 -d : \
-          | xargs strip --strip-unneeded 2> /dev/null || true
-find $PKG | xargs file | egrep "ELF.*shared object" | cut -f 1 -d : \
-          | xargs strip --strip-unneeded 2> /dev/null || true
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-mkdir -p $PKG/etc
-mv $PKG/usr/share/$PRGNAM-$VERSION/etc/ocp.ini $PKG/etc/ocp.ini.new
-rmdir $PKG/usr/share/$PRGNAM-$VERSION/etc/
+mv $PKG/usr/share/ocp/ultradir $PKG/usr/share/$PRGNAM-$VERSION
+rmdir $PKG/usr/share/ocp
 
 rm -f $PKG/usr/info/dir