audio/Pd-extended: various cleanups and enhancements

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 46 insertions, 42 deletions

diff --git a/audio/Pd-extended/Pd-extended.SlackBuild b/audio/Pd-extended/Pd-extended.SlackBuild
index 238d93e04de7..104ed7fb758d 100644
--- a/audio/Pd-extended/Pd-extended.SlackBuild
+++ b/audio/Pd-extended/Pd-extended.SlackBuild
@@ -11,7 +11,7 @@ BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SRCNAM=Pd
-SRCVER=0.42.5-extended
+SRCVER=$VERSION-extended
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -64,30 +64,36 @@ patch -p1 < $CWD/Makefile.diff
 patch -p1 < $CWD/Pd-extended_libquicktime122.patch
 
 cd packages/linux_make
-make install \
-  prefix="/usr" \
-  libdir="/usr/lib$LIBDIRSUFFIX" \
-  mandir="/usr/man" \
-  DOC_TARGETS="media messageoddness pd_fileformat pd-msg pddp tutorials" \
-  DESTDIR=$PKG 
+  make install \
+    prefix="/usr" \
+    libdir="/usr/lib$LIBDIRSUFFIX" \
+    mandir="/usr/man" \
+    DOC_TARGETS="media messageoddness pd_fileformat pd-msg pddp tutorials" \
+    DESTDIR=$PKG 
+cd ../..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  $TMP/$SRCNAM-$SRCVER/doc/* $TMP/$SRCNAM-$SRCVER/packages/gpl-3.0.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/example.pdextended > $PKG/usr/doc/$PRGNAM-$VERSION/example.pdextended
-cat $CWD/Pd-extended.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-extended.SlackBuild
+if [ "$ARCH" = "x86_64" ]; then
+  echo '#!/bin/sh' > $PKG/usr/bin/pdextended64
+  echo 'cd /usr/lib64/pd-extended/bin' >> $PKG/usr/bin/pdextended64
+  echo '../pd' >> $PKG/usr/bin/pdextended64
+  chmod 755 $PKG/usr/bin/pdextended64
+fi
 
 # Seems Pd can't make their mind up how they want to be called, 
-#(Pd/pd or Pd/pd-extended), so we're hardcoding the files here.
+# (Pd/pd or Pd/pd-extended), so we're hardcoding the files here.
 mkdir -p $PKG/usr/share/{applications,pixmaps,mime/packages}
-cat $TMP/$SRCNAM-$SRCVER/packages/linux_make/pd-extended.desktop > $PKG/usr/share/applications/pd-extended.desktop
-cat $TMP/$SRCNAM-$SRCVER/packages/linux_make/pd.png > $PKG/usr/share/pixmaps/pd.png
-cat $TMP/$SRCNAM-$SRCVER/packages/linux_make/pd-extended.xml > $PKG/usr/share/mime/packages/pd-extended.xml
+cat packages/linux_make/pd-extended.desktop > $PKG/usr/share/applications/pd-extended.desktop
+cat packages/linux_make/pd.png > $PKG/usr/share/pixmaps/pd.png
+cat packages/linux_make/pd-extended.xml > $PKG/usr/share/mime/packages/pd-extended.xml
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/* packages/gpl-3.0.txt $PKG/usr/doc/$PRGNAM-$VERSION
+sed "s,/usr/lib/,/usr/lib${LIBDIRSUFFIX}/,g" $CWD/example.pdextended \
+  > $PKG/usr/doc/$PRGNAM-$VERSION/example.pdextended
+cat $CWD/Pd-extended.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-extended.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/audio/Pd-extended/Pd-extended.info b/audio/Pd-extended/Pd-extended.info
index ee5ac656f6af..b8aaf1c15bf3 100644
--- a/audio/Pd-extended/Pd-extended.info
+++ b/audio/Pd-extended/Pd-extended.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Felix Pfeifer"
 EMAIL="pfeifer[dot]felix[at]googlemail[dot]com"
-APPROVED="Michiel van Wessem"
+APPROVED="rworkman"
diff --git a/audio/Pd-extended/README b/audio/Pd-extended/README
index 4eeb0f77d14a..ce6499cc2589 100644
--- a/audio/Pd-extended/README
+++ b/audio/Pd-extended/README
@@ -1,22 +1,20 @@
-Pd-extended (Pure Data, by Miller Puckette) is a real-time
-audio synthesis/processing package. It is one of the
-"MUSIC N" family members, open source (BSD style) successor
-of the MAX branch. This package contains the core of Pd and
-many external objects.
+Pd-extended (Pure Data, by Miller Puckette) is a real-time audio 
+synthesis/processing package.  It is one of the "MUSIC N" family 
+members, open source (BSD style) successor of the MAX branch.  
+This package contains the core of Pd and many external objects.
 
-Since this version the programs binaries name is pdextended,
-in order to start Pd-extended you have to call it with this
-name.
+Since this version, the program binary's name is pdextended; in 
+order to start Pd-extended, you have to call it with this name.
 
-Pd-extended is usually based on an older version of Pd.
-Since version 0.42.5 Pd-extended doesn't conflict any more
-with Pd.
+Pd-extended is usually based on an older version of Pd.  Since 
+version 0.42.5 Pd-extended doesn't conflict any more with Pd.
 
-You find an example for $HOME/.pdextended in
-/usr/doc/Pd-<version>-extended/example.pdextended
-which should work out of the box on most machines and
-will enable most of the external libraries in pd.
+You find an example for $HOME/.pdextended in the usual documentation
+directory (named "example.pdextended"), which should work as is one
+most machines and will enable most of the external libraries in pd.
 
-It requires dssi, gsl, imlib2, jack-audio-connection-kit,
-ladspa_sdk, lame, liblo, libquicktime and speex at compile
-time.
+To start Pd-extended, type "pdextended" on 32 bit boxes, and use
+"pdextended64" on 64 bit boxes.
+
+This requires ladspa_sdk, liblo, jack-audio-connection-kit,
+dssi, gsl, imlib2, lame, libquicktime, and speex.
diff --git a/audio/Pd-extended/slack-desc b/audio/Pd-extended/slack-desc
index 262c1c8d0a84..780e52d4e5b6 100644
--- a/audio/Pd-extended/slack-desc
+++ b/audio/Pd-extended/slack-desc
@@ -8,12 +8,12 @@
            |-----handy-ruler------------------------------------------------------|
 Pd-extended: Pd-extended (real-time audio processing)
 Pd-extended:
-Pd-extended: Pd-extended (Pure Data, by Miller Puckette) is a real-time
-Pd-extended: audio synthesis/processing package. It is one of the
-Pd-extended: "MUSIC N" family members, open source (BSD style) successor
-Pd-extended: of the MAX branch. This package contains the core of Pd and
-Pd-extended: many external objetcs.
+Pd-extended: Pd-extended (Pure Data, by Miller Puckette) is a real-time audio
+Pd-extended: synthesis/processing package.  It is one of the "MUSIC N" family 
+Pd-extended: members, open source (BSD style) successor of the MAX branch.
+Pd-extended: This package contains the core of Pd and many external objects.
+Pd-extended:
+Pd-extended: Homepage: http://puredata.info/
 Pd-extended:
 Pd-extended:
-Pd-extended: homepage: http://puredata.info/
 Pd-extended: