1 files changed, 20 insertions, 57 deletions
diff --git a/audio/jack-tools/jack-tools.SlackBuild b/audio/jack-tools/jack-tools.SlackBuild
index 8859c1e0f2..ade1c9e96e 100644
--- a/audio/jack-tools/jack-tools.SlackBuild
+++ b/audio/jack-tools/jack-tools.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=jack-tools
-VERSION=${VERSION:-0.0.2}
+VERSION=${VERSION:-20130616}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,67 +40,30 @@ fi
 
 set -e
 
-# This thing is packaged strangely. The tarball contains a bunch of
-# sub-tarballs named sw-NN where NN is a 2-digit number completely
-# unrelated to the contents of the code within...
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION.orig
-tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz
-cd $PRGNAM-$VERSION.orig
-
-# sw-26, aka jack.ctl, has no configure script or Makefile
-mkdir -p $PKG/usr/bin $PKG/usr/man/man1 $PKG/usr/doc/$PRGNAM-$VERSION/jack.ctl
-tar xvf sw-26.tar.bz2
-install -m0755 -oroot -groot sw-26/jack.ctl $PKG/usr/bin
-install -m0644 -oroot -groot sw-26/jack.ctl.1 $PKG/usr/man/man1
-install -m0644 -oroot -groot sw-26/ChangeLog \
-  $PKG/usr/doc/$PRGNAM-$VERSION/jack.ctl/
-rm -rf sw-26 sw-26.tar.bz2
-
-for src in *.tar.bz2; do
-  tar xvf $src
-  cd $( basename $src .tar.bz2 )
-  chown -R root:root .
-  find . \
-   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-   -exec chmod 755 {} \; -o \
-   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-   -exec chmod 644 {} \;
-
-  sh autogen.sh
-
-  CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS" \
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib${LIBDIRSUFFIX} \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --mandir=/usr/man \
-    --docdir=/usr/doc/$PRGNAM-$VERSION \
-    --build=$ARCH-slackware-linux
-
-  make clean all
-  make install-strip DESTDIR=$PKG
-
-  srcname=$( ls *.1 | head -1 | sed 's/\.1$//' )
-  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$srcname/
-  for doc in README ChangeLog ANNOUNCE; do
-    [ -e $doc ] && cp $doc $PKG/usr/doc/$PRGNAM-$VERSION/$srcname/
-  done
-
-  cd -
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+
+sed -i "s,-O.,$SLKCFLAGS," Makefile c-common/Makefile
+make -C c-common
+make
+
+mkdir -p $PKG/usr/bin $PKG/usr/include
+make install prefix=$PKG/usr
+strip $PKG/usr/bin/*
+
+# man pages generated from *.text asciidoc files, then manually edited
+# to clean up the formatting.
+mkdir -p $PKG/usr/man/man1
+for page in $CWD/man/*.1; do
+  gzip -9c < $page > $PKG/usr/man/man1/$( basename $page ).gz
 done
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-# COPYING is identical in every subdirectory, just include one copy.
-cp sw-04/COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat README > $PKG/usr/doc/$PRGNAM-$VERSION/README
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install