summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--desktop/wmmixer/slack-desc16
-rw-r--r--desktop/wmmixer/wmmixer.SlackBuild40
-rw-r--r--desktop/wmmixer/wmmixer.info2
3 files changed, 25 insertions, 33 deletions
diff --git a/desktop/wmmixer/slack-desc b/desktop/wmmixer/slack-desc
index 24fd4fd3db..fb39051d7f 100644
--- a/desktop/wmmixer/slack-desc
+++ b/desktop/wmmixer/slack-desc
@@ -9,11 +9,11 @@
wmmixer: wmmixer (Window Maker sound mixer dockable application)
wmmixer:
wmmixer: wmmixer is a mixer application designed for WindowMaker.
-wmmixer:
-wmmixer:
-wmmixer:
-wmmixer:
-wmmixer:
-wmmixer:
-wmmixer:
-wmmixer:
+wmmixer:
+wmmixer:
+wmmixer:
+wmmixer:
+wmmixer:
+wmmixer:
+wmmixer:
+wmmixer:
diff --git a/desktop/wmmixer/wmmixer.SlackBuild b/desktop/wmmixer/wmmixer.SlackBuild
index 28f2e6cf79..df93edcc87 100644
--- a/desktop/wmmixer/wmmixer.SlackBuild
+++ b/desktop/wmmixer/wmmixer.SlackBuild
@@ -18,10 +18,13 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
set -e
@@ -30,7 +33,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find . \
@@ -39,38 +42,25 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" make
+make \
+ CXXFLAGS="$SLKCFLAGS" \
+ prefix=/usr \
+ mandir=/usr/man
+
+make install \
+ prefix=/usr \
+ mandir=/usr/man \
+ DESTDIR=$PKG
-mkdir $PKG/usr
-mkdir -p $PKG/usr/bin
-mkdir -p $PKG/usr/man/man1
-
-# Executable and manual are copied to the correct location
-cp -a wmmixer $PKG/usr/bin
-cp -a wmmixer.1 $PKG/usr/man/man1
-
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
- xargs strip --strip-unneeded 2> /dev/null || true
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
- xargs strip --strip-unneeded 2> /dev/null
-)
-
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+gzip -9c $PKG/usr/man/man1/wmmixer.1
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a CHANGES COPYING INSTALL README home.wmmixer \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cp -a home.wmmixer $PKG/usr/doc/$PRGNAM-$VERSION
-
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
-
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/wmmixer/wmmixer.info b/desktop/wmmixer/wmmixer.info
index 4f37f05b6a..129cb9b457 100644
--- a/desktop/wmmixer/wmmixer.info
+++ b/desktop/wmmixer/wmmixer.info
@@ -3,6 +3,8 @@ VERSION="1.5"
HOMEPAGE="http://c.kruk.webpark.pl/"
DOWNLOAD="http://c.kruk.webpark.pl/wmmixer-1.5.tar.gz"
MD5SUM="bfb1ded801910dd39e1bb0b273c4e1c3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="Cezary M. Kruk"
EMAIL="c.kruk@bigfoot.com"
APPROVED="dsomero"