diff options
| -rw-r--r-- | audio/ocp/doinst.sh | 15 | ||||
| -rw-r--r-- | audio/ocp/ocp.SlackBuild | 29 | ||||
| -rw-r--r-- | audio/ocp/ocp.info | 8 |
3 files changed, 16 insertions, 36 deletions
diff --git a/audio/ocp/doinst.sh b/audio/ocp/doinst.sh index 5c0a7e0f89..1f8ff67ded 100644 --- a/audio/ocp/doinst.sh +++ b/audio/ocp/doinst.sh @@ -1,18 +1,3 @@ -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... -} - -config etc/ocp.ini.new - if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi 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 diff --git a/audio/ocp/ocp.info b/audio/ocp/ocp.info index 43b9479d15..1c9fd9aef8 100644 --- a/audio/ocp/ocp.info +++ b/audio/ocp/ocp.info @@ -1,10 +1,10 @@ PRGNAM="ocp" -VERSION="0.1.18" +VERSION="0.1.20" HOMEPAGE="http://stian.cubic.org/project-ocp.php" -DOWNLOAD="http://stian.cubic.org/ocp/ocp-0.1.18.tar.bz2" -MD5SUM="1a93bf617c10d3569ec0188fbf74df8a" +DOWNLOAD="http://stian.cubic.org/ocp/ocp-0.1.20.tar.bz2" +MD5SUM="f34eca80239e619bff0593b8bf665f98" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Erik Hanson" EMAIL="erik@slackbuilds.org" -APPROVED="dsomero" +APPROVED="rworkman" |