audio/pd: Rebuilt to include some headers

This commit also cleans up some of the build script
(yep, changes by rworkman)

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

5 files changed, 34 insertions, 33 deletions

diff --git a/audio/pd/README b/audio/pd/README
index f714558b75743..8ef083e94bfd0 100644
--- a/audio/pd/README
+++ b/audio/pd/README
@@ -1,9 +1,6 @@
-pd - Pure Data, by Miller Puckette
+pd 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 just the core of Pd; more external objects
+have been written: many of them are in the CVS at SourceForge.
 
-pd 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 just the core of Pd, more external objetcs have
-been written, many of them are in the CVS at SourceForge.
-
-Optional: jack-audio-connection-kit, portmidi
+Optional dependencies are jack-audio-connection-kit and portmidi.
diff --git a/audio/pd/pd.SlackBuild b/audio/pd/pd.SlackBuild
index f8598f974fb5f..ec185d7e6f58e 100644
--- a/audio/pd/pd.SlackBuild
+++ b/audio/pd/pd.SlackBuild
@@ -11,13 +11,15 @@
 # - version bump
 # - desktop icon
 # - enable jack and portmidi
+# - include all .h files
 
 PRGNAM=pd
-VERSION=${VERSION:-0.43-0}
-CANONICALIZEDVERSION=$(echo $VERSION | tr - .)
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.43.0}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
+SRCVERSION=0.43-0
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -50,9 +52,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.src.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVERSION
+tar xvf $CWD/$PRGNAM-$SRCVERSION.src.tar.gz
+cd $PRGNAM-$SRCVERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -70,9 +72,9 @@ cd src
     --enable-jack \
     --disable-portaudio \
     --enable-portmidi
-make
-make install DESTDIR=$PKG
-cd -
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -81,23 +83,26 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir -p $PKG/usr/share/applications
 mkdir -p $PKG/usr/share/$PRGNAM
 cp -a $CWD/$PRGNAM.desktop $PKG/usr/share/applications
-convert $TMP/$PRGNAM-$VERSION/src/pd.ico $TMP/$PRGNAM\_48.xpm
-cp $TMP/$PRGNAM\_48-3.xpm $PKG/usr/share/$PRGNAM
+convert $TMP/$PRGNAM-$SRCVERSION/src/pd.ico $TMP/${PRGNAM}_48.xpm
+cp $TMP/${PRGNAM}_48-3.xpm $PKG/usr/share/$PRGNAM
 
 # For 0.43-0 version
 mkdir -p $PKG/usr/lib/pd/tcl/
-cp -a $TMP/$PRGNAM-$VERSION/tcl/*.tcl $PKG/usr/lib/pd/tcl/
+cp -a $TMP/$PRGNAM-$SRCVERSION/tcl/*.tcl $PKG/usr/lib/pd/tcl/
+
+# copy all header files (for pd_mrpeach)
+cp -p $TMP/$PRGNAM-$SRCVERSION/src/*.h $PKG/usr/include/
 
 mv $PKG/usr/share/man $PKG/usr/man
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$CANONICALIZEDVERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a INSTALL.txt README.txt LICENSE.txt src/CHANGELOG.txt \
-  $PKG/usr/doc/$PRGNAM-$CANONICALIZEDVERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$CANONICALIZEDVERSION/$PRGNAM.SlackBuild
-ln -s /usr/lib/pd/doc/ $PKG/usr/doc/$PRGNAM-$CANONICALIZEDVERSION/docs
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+ln -s /usr/lib/pd/doc/ $PKG/usr/doc/$PRGNAM-$VERSION/docs
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$CANONICALIZEDVERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/pd/pd.desktop b/audio/pd/pd.desktop
index 19c3496f8ba1f..713e8204d09a9 100644
--- a/audio/pd/pd.desktop
+++ b/audio/pd/pd.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Exec=pd
 Icon=/usr/share/pd/pd_48-3.xpm
 Name=Pure Data
@@ -7,4 +6,4 @@ GenericName=Real-time graphical programming environment for audio, video, and gr
 GenericName[el]=Γραφικό περιβάλλον προγραμματισμού ήχου, midi και εικόνας.
 StartupNotify=true
 Type=Application
-Categories=MIDI;Audio;Sound;AudioVideo;
+Categories=Audio;AudioVideo;
diff --git a/audio/pd/pd.info b/audio/pd/pd.info
index c2910e8f9d75b..60bd28b2c7c50 100644
--- a/audio/pd/pd.info
+++ b/audio/pd/pd.info
@@ -1,5 +1,5 @@
 PRGNAM="pd"
-VERSION="0.43-0"
+VERSION="0.43.0"
 HOMEPAGE="http://www-crca.ucsd.edu/~msp/software.html"
 DOWNLOAD="http://www-crca.ucsd.edu/~msp/Software/pd-0.43-0.src.tar.gz"
 MD5SUM="b7e7bab14220146748c2ed596e1c18f2"
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Michales Michaloudes"
 EMAIL="korgie@gmail.com"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"
diff --git a/audio/pd/slack-desc b/audio/pd/slack-desc
index 572f89f12f17e..2c788936f644f 100644
--- a/audio/pd/slack-desc
+++ b/audio/pd/slack-desc
@@ -11,9 +11,9 @@ pd:
 pd: pd is a real-time audio synthesis/processing package.
 pd: It is one of the "MUSIC N" family members, open source
 pd: (BSD style) successor of the MAX branch. This package 
-pd: contains just the core of Pd, more external objetcs have
+pd: contains just the core of Pd, more external objects have
 pd: been written, many of them are in the CVS at SourceForge.
-pd: 
+pd:
 pd: Community resource: http://puredata.info
-pd: 
-pd: 
+pd:
+pd: