4 files changed, 6 insertions, 111 deletions
diff --git a/audio/milkytracker/64bit_freebsd_fix.patch b/audio/milkytracker/64bit_freebsd_fix.patch
deleted file mode 100644
index c02b71d88f45..000000000000
--- a/audio/milkytracker/64bit_freebsd_fix.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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/fix-FBTS-with-new-zlib.patch b/audio/milkytracker/fix-FBTS-with-new-zlib.patch
deleted file mode 100644
index deb3e9357650..000000000000
--- a/audio/milkytracker/fix-FBTS-with-new-zlib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- milkytracker-0.90.85/src/compression/DecompressorGZIP.cpp	2009-04-17 22:34:16.000000000 +0200
-+++ milkytracker-trunk/src/compression/DecompressorGZIP.cpp	2012-02-20 20:24:49.161937553 +0100
-@@ -61,7 +61,7 @@
- 	int len = 0;
- 	pp_uint8 *buf;
- 	
--	if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL)
-+	if ((gz_input_file = (gzFile*)gzopen (fileName.getStrBuffer(), "r")) == NULL)
- 		return false;
- 	
- 	if ((buf = new pp_uint8[0x10000]) == NULL)
-@@ -71,7 +71,7 @@
- 	
-     while (true) 
- 	{
--        len = gzread (gz_input_file, buf, 0x10000);
-+        len = gzread (*gz_input_file, buf, 0x10000);
- 		
-         if (len < 0) 
- 		{
-@@ -84,7 +84,7 @@
- 		fOut.write(buf, 1, len);
-     }
- 	
--    if (gzclose (gz_input_file) != Z_OK)
-+    if (gzclose (*gz_input_file) != Z_OK)
- 	{
- 	    delete[] buf;
-         return false;
diff --git a/audio/milkytracker/milkytracker.SlackBuild b/audio/milkytracker/milkytracker.SlackBuild
index acff4e83c21d..7f6841c8f1b4 100644
--- a/audio/milkytracker/milkytracker.SlackBuild
+++ b/audio/milkytracker/milkytracker.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for MilkyTracker
 #
 # Copyright 2010 nnyby (machpizza@gmail.com)
-# Copyright 2011  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2011-2013  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=milkytracker
-VERSION=${VERSION:-0.90.85}
+VERSION=${VERSION:-0.90.86}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,14 +70,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Apply 64bit_freebsd_fix.patch from homepage. (Closes: #626627)
-patch -p1 < $CWD/64bit_freebsd_fix.patch
-
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661906
-patch -p1 < $CWD/fix-FBTS-with-new-zlib.patch
-
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -lasound" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/audio/milkytracker/milkytracker.info b/audio/milkytracker/milkytracker.info
index 7e17e157bed5..cdab01e8f059 100644
--- a/audio/milkytracker/milkytracker.info
+++ b/audio/milkytracker/milkytracker.info
@@ -1,8 +1,8 @@
 PRGNAM="milkytracker"
-VERSION="0.90.85"
+VERSION="0.90.86"
 HOMEPAGE="http://www.milkytracker.org/"
-DOWNLOAD="http://www.milkytracker.org/files/milkytracker-0.90.85.tar.bz2"
-MD5SUM="2e6795b0bff18b087bd7e4c658f512f3"
+DOWNLOAD="http://www.milkytracker.org/files/milkytracker-0.90.86.tar.bz2"
+MD5SUM="1ef462969cf54ba61748d4d878b5747e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="zziplib"