On 11/10/2013 9:37 PM, Brian Callahan wrote:
Hi ports --
Here's an update to milkytracker. Tests good on amd64 and macppc.
OK?
~Brian
Repinging - diff reattached
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/milkytracker/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile 10 Mar 2013 22:55:03 -0000 1.7
+++ Makefile 11 Nov 2013 01:30:38 -0000
@@ -2,8 +2,7 @@
COMMENT = Fasttracker II inspired MOD tracker
-DISTNAME = milkytracker-0.90.85
-REVISION = 0
+DISTNAME = milkytracker-0.90.86
CATEGORIES = audio
HOMEPAGE = http://www.milkytracker.org/
@@ -20,8 +19,7 @@ RUN_DEPENDS = audio/jack
BUILD_DEPENDS = ${RUN_DEPENDS}
LIB_DEPENDS = devel/sdl
-CONFIGURE_STYLE = autoconf
-AUTOCONF_VERSION = 2.64
+CONFIGURE_STYLE = gnu
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/milkytracker/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 19 Nov 2012 15:06:51 -0000 1.2
+++ distinfo 11 Nov 2013 01:30:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (milkytracker-0.90.85.tar.gz) =
+7oPvtbe4tXuLH/EjCbnsinHhVnUQB2MCoZsmyaYl6A=
-SIZE (milkytracker-0.90.85.tar.gz) = 3057134
+SHA256 (milkytracker-0.90.86.tar.gz) =
/wuFGVbr9SavSbR6Rn33Km7KJBZrWBrqt7BcLzecElc=
+SIZE (milkytracker-0.90.86.tar.gz) = 2596667
Index: patches/patch-configure_in
===================================================================
RCS file: patches/patch-configure_in
diff -N patches/patch-configure_in
--- patches/patch-configure_in 19 Nov 2012 15:06:51 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.1 2012/11/19 15:06:51 sthen Exp $
---- configure.in.orig Thu Sep 17 20:35:47 2009
-+++ configure.in Mon Nov 19 13:14:12 2012
-@@ -43,7 +43,7 @@ fi
-
- AC_SEARCH_LIBS(gzopen, z, AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you
have the 'libz' library.]),)
- #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip"))
--PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75])
-+#PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75])
-
- SDL_VERSION=1.2.0
- AM_PATH_SDL($SDL_VERSION,, AC_MSG_ERROR([Please install libSDL]))
Index: patches/patch-src_tracker_sdl_SDL_Main_cpp
===================================================================
RCS file:
/cvs/ports/audio/milkytracker/patches/patch-src_tracker_sdl_SDL_Main_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_tracker_sdl_SDL_Main_cpp
--- patches/patch-src_tracker_sdl_SDL_Main_cpp 19 Nov 2012 15:06:51 -0000
1.1
+++ patches/patch-src_tracker_sdl_SDL_Main_cpp 11 Nov 2013 01:30:39 -0000
@@ -1,45 +1,12 @@
$OpenBSD: patch-src_tracker_sdl_SDL_Main_cpp,v 1.1 2012/11/19 15:06:51 sthen
Exp $
---- src/tracker/sdl/SDL_Main.cpp.orig Sun Nov 18 21:28:51 2012
-+++ src/tracker/sdl/SDL_Main.cpp Sun Nov 18 21:33:18 2012
-@@ -751,8 +751,8 @@ void processSDLUserEvents(const SDL_UserEvent& event)
- 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_UserEvent& event)
- 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_UserEvent& event)
-
- 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_UserEvent& event)
-
- 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();
+--- src/tracker/sdl/SDL_Main.cpp.orig Sun Nov 10 20:15:19 2013
++++ src/tracker/sdl/SDL_Main.cpp Sun Nov 10 20:16:54 2013
+@@ -740,7 +740,7 @@ void processSDLUserEvents(const SDL_UserEvent& event)
+ {
+ union {
+ void *ptr;
+- pp_int32 i32;
++ intptr_t i32;
+ } data1, data2;
+ data1.ptr = event.data1;
+ data2.ptr = event.data2;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/milkytracker/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 11 May 2008 07:09:03 -0000 1.1.1.1
+++ pkg/PLIST 11 Nov 2013 01:30:39 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/05/11 07:09:03 jakemsr Exp $
-bin/milkytracker
+@bin bin/milkytracker
share/doc/milkytracker/
share/doc/milkytracker/FAQ.html
share/doc/milkytracker/MilkyTracker.html
