7 files changed, 127 insertions, 40 deletions
diff --git a/audio/milkytracker/64bit_freebsd_fix.patch b/audio/milkytracker/64bit_freebsd_fix.patch
new file mode 100644
index 0000000000000..c02b71d88f456
--- /dev/null
+++ b/audio/milkytracker/64bit_freebsd_fix.patch
@@ -0,0 +1,70 @@
+Description: Upstream changes introduced in version 0.90.85+dfsg-2
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ milkytracker (0.90.85+dfsg-2) unstable; urgency=low
+ .
+   * Apply 64bit_freebsd_fix.patch from homepage. (Closes: #626627)
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Gürkan Sengün <gurkan@phys.ethz.ch>
+Bug-Debian: http://bugs.debian.org/626627
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- milkytracker-0.90.85+dfsg.orig/src/tracker/sdl/SDL_Main.cpp
++++ milkytracker-0.90.85+dfsg/src/tracker/sdl/SDL_Main.cpp
+@@ -751,8 +751,8 @@ void processSDLUserEvents(const SDL_User
+ 		case SDLUserEventLMouseRepeat:
+ 		{
+ 			PPPoint p;
+-			p.x = (pp_int32)event.data1;
+-			p.y = (pp_int32)event.data2;
++			p.x = reinterpret_cast<intptr_t> (event.data1);
++			p.y = reinterpret_cast<intptr_t> (event.data2);
+ 			PPEvent myEvent(eLMouseRepeat, &p, sizeof(PPPoint));		
+ 			RaiseEventSerialized(&myEvent);
+ 			break;
+@@ -761,8 +761,8 @@ void processSDLUserEvents(const SDL_User
+ 		case SDLUserEventRMouseRepeat:
+ 		{
+ 			PPPoint p;
+-			p.x = (pp_int32)event.data1;
+-			p.y = (pp_int32)event.data2;
++			p.x = reinterpret_cast<intptr_t> (event.data1);
++			p.y = reinterpret_cast<intptr_t> (event.data2);
+ 			PPEvent myEvent(eRMouseRepeat, &p, sizeof(PPPoint));		
+ 			RaiseEventSerialized(&myEvent);
+ 			break;
+@@ -770,8 +770,8 @@ void processSDLUserEvents(const SDL_User
+ 
+ 		case SDLUserEventMidiKeyDown:
+ 		{
+-			pp_int32 note = (pp_int32)event.data1;
+-			pp_int32 volume = (pp_int32)event.data2;
++			pp_int32 note = reinterpret_cast<intptr_t> (event.data1);
++			pp_int32 volume = reinterpret_cast<intptr_t> (event.data2);
+ 			globalMutex->lock();
+ 			myTracker->sendNoteDown(note, volume);
+ 			globalMutex->unlock();
+@@ -780,7 +780,7 @@ void processSDLUserEvents(const SDL_User
+ 
+ 		case SDLUserEventMidiKeyUp:
+ 		{
+-			pp_int32 note = (pp_int32)event.data1;
++			pp_int32 note = reinterpret_cast<intptr_t> (event.data1);
+ 			globalMutex->lock();
+ 			myTracker->sendNoteUp(note);
+ 			globalMutex->unlock();
diff --git a/audio/milkytracker/README b/audio/milkytracker/README
index c33e3bc40ebd6..803623cf63e06 100644
--- a/audio/milkytracker/README
+++ b/audio/milkytracker/README
@@ -1,5 +1,7 @@
 This is MilkyTracker 0.90.80. MilkyTracker is an audio tracker, and can create
-standard .MOD and .XM module files. ALSA is required. JACK is not required,
-though support is available. If you have JACK and would like to use it with
-MilkyTracker, add --with-jack to the configuration options in the SlackBuild
-script.
+standard .MOD and .XM module files.
+
+JACK support can be added by doing:
+  JACK=yes ./milkytracker.SlackBuild
+
+This requires zziplib.
diff --git a/audio/milkytracker/doinst.sh b/audio/milkytracker/doinst.sh
index 4e8ba7071dea7..5fb28930db0b9 100644
--- a/audio/milkytracker/doinst.sh
+++ b/audio/milkytracker/doinst.sh
@@ -1,4 +1,3 @@
 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/milkytracker/milkytracker.SlackBuild b/audio/milkytracker/milkytracker.SlackBuild
index 3cefd158f9eb6..6313c91c4e73d 100644
--- a/audio/milkytracker/milkytracker.SlackBuild
+++ b/audio/milkytracker/milkytracker.SlackBuild
@@ -1,20 +1,37 @@
 #!/bin/sh
-
+#
 # Slackware build script for MilkyTracker
-
-# Written by nnyby (machpizza@gmail.com)
+#
+# Copyright 2010 nnyby (machpizza@gmail.com)
+# Copyright 2011  Erik W. Hanson, Minneapolis, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=milkytracker
-VERSION=${VERSION:-0.90.80}
+VERSION=${VERSION:-0.90.85}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 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
@@ -24,22 +41,21 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# make didn't like -O2
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-fPIC"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -54,7 +70,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# build configuration
+# Apply 64bit_freebsd_fix.patch from homepage. (Closes: #626627)
+patch -p1 < $CWD/64bit_freebsd_fix.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -62,26 +80,25 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --with-jack=${JACK:-no}
 
-# build & install
-make || exit
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
 
-# Manually copy desktop file and icon
 mkdir -p $PKG/usr/share/{applications,pixmaps}
 cp $CWD/milkytracker.desktop $PKG/usr/share/applications
 cp resources/pictures/carton.png $PKG/usr/share/pixmaps/milkytracker-icon-128.png
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
 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
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
diff --git a/audio/milkytracker/milkytracker.desktop b/audio/milkytracker/milkytracker.desktop
index 75f59b210b7ca..d9140f70b6f59 100644
--- a/audio/milkytracker/milkytracker.desktop
+++ b/audio/milkytracker/milkytracker.desktop
@@ -1,8 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=MilkyTracker
 GenericName=Tracker
 Exec=milkytracker
 Icon=/usr/share/pixmaps/milkytracker-icon-128.png
 Type=Application
-Categories=Application;AudioVideo;AudioVideoEditing
+Categories=AudioVideo;AudioVideoEditing;
diff --git a/audio/milkytracker/milkytracker.info b/audio/milkytracker/milkytracker.info
index 5c2b8b96b0dfd..aa49a58867fbb 100644
--- a/audio/milkytracker/milkytracker.info
+++ b/audio/milkytracker/milkytracker.info
@@ -1,10 +1,10 @@
 PRGNAM="milkytracker"
-VERSION="0.90.80"
+VERSION="0.90.85"
 HOMEPAGE="http://www.milkytracker.org/"
-DOWNLOAD="http://www.milkytracker.org/files/milkytracker-0.90.80.tar.bz2"
-MD5SUM="f8090ac13ec2f3cf89af483d1483d16c"
+DOWNLOAD="http://www.milkytracker.org/files/milkytracker-0.90.85.tar.bz2"
+MD5SUM="2e6795b0bff18b087bd7e4c658f512f3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Nikolas Nyby"
-EMAIL="machpizza@gmail.com"
-APPROVED="dsomero"
+MAINTAINER="Erik Hanson"
+EMAIL="erik@slackbuilds.org"
+APPROVED="Niels Horn"
diff --git a/audio/milkytracker/slack-desc b/audio/milkytracker/slack-desc
index 2bc84093e7e52..9d686dcfdb208 100644
--- a/audio/milkytracker/slack-desc
+++ b/audio/milkytracker/slack-desc
@@ -7,13 +7,13 @@
 
             |-----handy-ruler------------------------------------------------------|
 milkytracker: MilkyTracker (an open source, multi-platform music tracker)
-milkytracker:    
+milkytracker:
 milkytracker: MilkyTracker is a music editor inspired by the DOS program
 milkytracker: Fasttracker II. MilkyTracker can export .MOD and .XM file
 milkytracker: formats.
-milkytracker: 
+milkytracker:
 milkytracker: Homepage: http://www.milkytracker.net
-milkytracker: 
-milkytracker: 
-milkytracker: 
-milkytracker: 
+milkytracker:
+milkytracker:
+milkytracker:
+milkytracker: