Update to 0.90.86

5 files changed, 4 insertions, 78 deletions

diff --git a/audio/milkytracker/Makefile b/audio/milkytracker/Makefile
index 307236c4874d..56108db189fd 100644
--- a/audio/milkytracker/Makefile
+++ b/audio/milkytracker/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	milkytracker
-PORTVERSION=	0.90.85
-PORTREVISION=	3
+PORTVERSION=	0.90.86
 CATEGORIES=	audio
 MASTER_SITES=	http://www.milkytracker.org/files/ \
 		CRITICAL/${PORTNAME}/${PORTVERSION}/${PORTREVISION}
@@ -40,7 +39,7 @@ post-install:
 		${STAGEDIR}${PREFIX}/share/pixmaps/${f:C/carton/milkytracker/}
 .endfor
 	${MKDIR} ${STAGEDIR}${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/resources/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/audio/milkytracker/distinfo b/audio/milkytracker/distinfo
index e752ef0c1581..fc1b54df4af1 100644
--- a/audio/milkytracker/distinfo
+++ b/audio/milkytracker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (milkytracker-0.90.85.tar.gz) = fbba0fbed6dee2d5ee2c7fc48c26e7b229c78559d4401d8c0a866c9b269897a0
-SIZE (milkytracker-0.90.85.tar.gz) = 3057134
+SHA256 (milkytracker-0.90.86.tar.gz) = 3c57a1cc02947591678b6b691bdfee8098d5dc02e5b016893964679a541adc8f
+SIZE (milkytracker-0.90.86.tar.gz) = 23609302
diff --git a/audio/milkytracker/files/patch-milkytracker.desktop b/audio/milkytracker/files/patch-milkytracker.desktop
deleted file mode 100644
index 0d2d70c286d9..000000000000
--- a/audio/milkytracker/files/patch-milkytracker.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./milkytracker.desktop.orig	2013-03-22 16:45:01.000000000 +0100
-+++ ./milkytracker.desktop	2013-03-22 16:44:53.000000000 +0100
-@@ -0,0 +1,10 @@
-+
-+[Desktop Entry]
-+Name=MilkyTracker
-+Comment=Module tracker
-+Exec=milkytracker %U
-+Terminal=false
-+Type=Application
-+Icon=milkytracker
-+StartupNotify=false
-+Categories=AudioVideo;Audio;Sequencer;
diff --git a/audio/milkytracker/files/patch-src__compression__DecompressorGZIP.cpp b/audio/milkytracker/files/patch-src__compression__DecompressorGZIP.cpp
deleted file mode 100644
index 8af35429a93b..000000000000
--- a/audio/milkytracker/files/patch-src__compression__DecompressorGZIP.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./src/compression/DecompressorGZIP.cpp.orig	2013-03-22 17:21:02.000000000 +0100
-+++ ./src/compression/DecompressorGZIP.cpp	2013-03-22 17:21:46.000000000 +0100
-@@ -57,11 +57,11 @@
- 	
- bool DecompressorGZIP::decompress(const PPSystemString& outFileName, Hints hint)
- {
--    gzFile *gz_input_file = NULL;
-+	gzFile gz_input_file = NULL;
- 	int len = 0;
- 	pp_uint8 *buf;
- 	
--	if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL)
-+	if ((gz_input_file = gzopen (fileName.getStrBuffer(), "r")) == NULL)
- 		return false;
- 	
- 	if ((buf = new pp_uint8[0x10000]) == NULL)
diff --git a/audio/milkytracker/files/patch-src__tracker__sdl__SDL_Main.cpp b/audio/milkytracker/files/patch-src__tracker__sdl__SDL_Main.cpp
deleted file mode 100644
index ad37baed2729..000000000000
--- a/audio/milkytracker/files/patch-src__tracker__sdl__SDL_Main.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- ./src/tracker/sdl/SDL_Main.cpp.orig	2010-01-03 19:15:39.000000000 +0100
-+++ ./src/tracker/sdl/SDL_Main.cpp	2010-01-03 19:15:53.000000000 +0100
-@@ -751,8 +751,8 @@
- 		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 @@
- 		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 @@
- 
- 		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 @@
- 
- 		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();