On Fri, Nov 15, 2013 at 01:51:51PM -0500, Brian Callahan wrote: > > Ping. >
Let's add the desktop file and examples while we are here. Tested the desktop file under gnome 3. Index: Makefile =================================================================== RCS file: /home/edd/cvsync/cvs/ports/audio/milkytracker/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile 10 Mar 2013 22:55:03 -0000 1.7 +++ Makefile 21 Nov 2013 19:10:44 -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/ @@ -16,12 +15,13 @@ WANTLIB = SDL c m pthread stdc++ z MASTER_SITES = ${HOMEPAGE}files/ # libjack accessed via dlopen() -RUN_DEPENDS = audio/jack -BUILD_DEPENDS = ${RUN_DEPENDS} +RUN_DEPENDS = audio/jack \ + devel/desktop-file-utils \ + x11/gtk+2,-guic +BUILD_DEPENDS = audio/jack LIB_DEPENDS = devel/sdl -CONFIGURE_STYLE = autoconf -AUTOCONF_VERSION = 2.64 +CONFIGURE_STYLE = gnu CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -29,5 +29,13 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/milkytracker cd ${WRKSRC}/docs && ${INSTALL_DATA} FAQ.html MilkyTracker.html \ ${PREFIX}/share/doc/milkytracker - + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/milkytracker + ${INSTALL_DATA} ${WRKSRC}/resources/music/*.xm \ + ${PREFIX}/share/examples/milkytracker + ${INSTALL_DATA_DIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/resources/milkytracker.desktop \ + ${PREFIX}/share/applications + ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/128x128/apps + ${INSTALL_DATA} ${WRKSRC}/resources/pictures/carton.png \ + ${PREFIX}/share/icons/hicolor/128x128/apps/milkytracker.png .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/edd/cvsync/cvs/ports/audio/milkytracker/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 19 Nov 2012 15:06:51 -0000 1.2 +++ distinfo 21 Nov 2013 18:27:06 -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: /home/edd/cvsync/cvs/ports/audio/milkytracker/patches/patch-src_tracker_sdl_SDL_Main_cpp,v retrieving revision 1.1 diff -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 21 Nov 2013 18:27:06 -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: /home/edd/cvsync/cvs/ports/audio/milkytracker/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 11 May 2008 07:09:03 -0000 1.1.1.1 +++ pkg/PLIST 21 Nov 2013 19:10:55 -0000 @@ -1,5 +1,17 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2008/05/11 07:09:03 jakemsr Exp $ -bin/milkytracker +@bin bin/milkytracker +share/applications/milkytracker.desktop share/doc/milkytracker/ share/doc/milkytracker/FAQ.html share/doc/milkytracker/MilkyTracker.html +share/examples/milkytracker/ +share/examples/milkytracker/milky.xm +share/examples/milkytracker/slumberjack.xm +share/examples/milkytracker/sv_ttt.xm +share/examples/milkytracker/theday.xm +share/examples/milkytracker/universalnetwork2_real.xm +share/icons/hicolor/128x128/apps/milkytracker.png +@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor +@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor +@exec %D/bin/update-desktop-database +@unexec-delete %D/bin/update-desktop-database -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
