diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/Makefile /home/trasz/cheesetracker/Makefile --- /usr/ports/audio/cheesetracker/Makefile Wed Jun 21 22:28:24 2006 +++ /home/trasz/cheesetracker/Makefile Wed Mar 28 00:56:18 2007 @@ -7,8 +7,7 @@ # PORTNAME= cheesetracker -PORTVERSION= 0.9.1 -PORTREVISION= 1 +PORTVERSION= 0.9.9 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= cheesetronic @@ -18,10 +17,12 @@ BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \ qmake:${PORTSDIR}/devel/qmake -LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 +LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \ + jack.0:${PORTSDIR}/audio/jack USE_QT_VER= 3 MAKE_ENV= QTDIR="${QT_PREFIX}" +USE_SCONS= yes .include @@ -30,18 +31,15 @@ .endif post-patch: - @${CP} ${FILESDIR}/cheesetracker.pro ${WRKSRC} - -do-configure: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \ - -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ cheesetracker.pro + @${REINPLACE_CMD} -e 's,%%CFLAGS%%,${CFLAGS},' ${WRKSRC}/SConstruct + @${REINPLACE_CMD} -e 's,%%X11BASE%%,${X11BASE},' ${WRKSRC}/detect.py do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/cheesetracker ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/cheesetracker/program__QT/cheesetracker_qt ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/*.it ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/*.xm ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/cheesetracker/examples/*.it ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/cheesetracker/examples/*.xm ${EXAMPLESDIR} .endif .include diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/distinfo /home/trasz/cheesetracker/distinfo --- /usr/ports/audio/cheesetracker/distinfo Thu Nov 24 00:29:30 2005 +++ /home/trasz/cheesetracker/distinfo Wed Mar 28 00:56:18 2007 @@ -1,3 +1,3 @@ -MD5 (cheesetracker-0.9.1.tar.gz) = 3bf109b9733485ad760b636e4791e0c5 -SHA256 (cheesetracker-0.9.1.tar.gz) = c3567c964b795213d515fb6965955ffb8a816ccd9870c192103e69906f1fede8 -SIZE (cheesetracker-0.9.1.tar.gz) = 960168 +MD5 (cheesetracker-0.9.9.tar.gz) = d2cb55cd35eaaaef48454a5aad41a08d +SHA256 (cheesetracker-0.9.9.tar.gz) = 97ddb3a7e6959400c1f042b8661a43540b3d5790db39c18bb9ce413a76d41d55 +SIZE (cheesetracker-0.9.9.tar.gz) = 842246 diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/cheesetracker.pro /home/trasz/cheesetracker/files/cheesetracker.pro --- /usr/ports/audio/cheesetracker/files/cheesetracker.pro Fri Oct 31 22:55:34 2003 +++ /home/trasz/cheesetracker/files/cheesetracker.pro Thu Jan 1 01:00:00 1970 @@ -1,202 +0,0 @@ -TEMPLATE = app -CONFIG = qt warn_on thread release -TERGET = cheesetracker - -DEFINES = POSIX_ENABLED OSS_ENABLED LADSPA_ENABLED -LIBS = -L${LOCALBASE}/lib -lsigc-1.2 -INCLUDEPATH = common \ - common/components/audio \ - common/components/data \ - common/components/midi \ - common/defines \ - trackercore \ - loaders \ - savers \ - ${LOCALBASE}/lib/sigc++-1.2/include \ - ${LOCALBASE}/include/sigc++-1.2 \ - ${LOCALBASE}/include - -HEADERS = \ - common/interface__QT/helpers/property_bridge_edit.h \ - common/interface__QT/helpers/cspinbutton.h \ - common/interface__QT/helpers/ccolor_bridge.h \ - common/interface__QT/helpers/ccolor_list.h \ - common/interface__QT/helpers/font_bridge.h \ - common/interface__QT/helpers/keyboard_input_config.h \ - common/interface__QT/audio/audio_config.h \ - common/interface__QT/audio/sample_editor.h \ - common/interface__QT/audio/sample_editor_format.h \ - common/interface__QT/audio/sample_viewer.h \ - common/interface__QT/audio/sample_viewer_zoom.h \ - common/interface__QT/audio/envelope_point_editor.h \ - common/interface__QT/audio/envelope_editor.h \ - common/interface__QT/audio/resampler_config.h \ - common/interface__QT/audio/note_bridge.h \ - common/interface__QT/audio/sample_editor_clipboard.h \ - common/interface__QT/audio/sample_editor_effects.h \ - common/interface__QT/audio/mixer_effects_manager.h \ - common/interface__QT/audio/effect_chain_editor.h \ - common/interface__QT/popups/effect_select_popup.h \ - interface__QT/pattern_edit.h \ - interface__QT/pattern_edit_widget.h \ - interface__QT/sample_edit.h \ - interface__QT/instrument_edit.h \ - interface__QT/interface.h \ - interface__QT/order_and_defaults_editor.h \ - interface__QT/variables_edit.h \ - interface__QT/mdi_main_window.h \ - interface__QT/sample_player_fdialog.h - -SOURCES = \ - common/plugins/effects/custom/dummy_effect.cpp \ - common/plugins/effects/custom/chorus_effect.cpp \ - common/plugins/effects/custom/freeverb_effect.cpp \ - common/plugins/effects/custom/effect_amp.cpp \ - common/plugins/effects/custom/effect_distort.cpp \ - common/plugins/effects/custom/effect_echo.cpp \ - common/plugins/effects/custom/effect_stereo_enhancer.cpp \ - common/plugins/effects/freeverb/allpass.cpp \ - common/plugins/effects/freeverb/comb.cpp \ - common/plugins/effects/freeverb/revmodel.cpp \ - common/plugins/effects/ladspa/ladspa_effect_source.cpp \ - common/plugins/effects/ladspa/ladspa_effect.cpp \ - common/plugins/edit_effects/simple_edit_effects.cpp \ - common/plugins/resamplers/resampler_raw.cpp \ - common/plugins/resamplers/resampler_linear.cpp \ - common/plugins/resamplers/resampler_dummy.cpp \ - common/os/mutex_lock.cpp \ - common/os/threaded_class.cpp \ - common/os/path_data.cpp \ - common/os/timer.cpp \ - common/components/audio/sound_driver_manager.cpp \ - common/components/audio/effect.cpp \ - common/components/audio/sound_driver.cpp \ - common/components/audio/mixer.cpp \ - common/components/audio/voice.cpp \ - common/components/audio/lfo.cpp \ - common/components/audio/envelope.cpp \ - common/components/audio/midi_voice.cpp \ - common/components/audio/resampler.cpp \ - common/components/audio/resampler_manager.cpp \ - common/components/audio/resampler_instance.cpp \ - common/components/audio/sample_data.cpp \ - common/components/audio/sample_conversion.cpp \ - common/components/audio/mixer_base.cpp \ - common/components/audio/mixer__buffers.cpp \ - common/components/audio/ring_buffer.cpp \ - common/components/audio/tables.cpp \ - common/components/audio/edit_effect.cpp \ - common/components/audio/effect_source_internal.cpp \ - common/components/audio/effect_source_manager.cpp \ - common/components/audio/effect_chain.cpp \ - common/components/audio/sound_driver_dummy.cpp \ - common/components/audio/dds_helpers.cpp \ - common/components/midi/midi_client.cpp \ - common/components/midi/midi_out_device.cpp \ - common/components/midi/midioutdevicemanager.cpp \ - common/components/midi/engine.cpp \ - common/components/midi/engine_manager.cpp \ - common/components/midi/midi_control.cpp \ - common/components/midi/midi_control_base.cpp \ - common/components/file/file_access.cpp \ - common/components/file/file_browser.cpp \ - common/components/data/property_bridges.cpp \ - common/components/data/config_handler.cpp \ - common/components/data/keyboard_input.cpp \ - common/components/data/selection.cpp \ - common/components/data/dds.cpp \ - common/components/data/dds_packer.cpp \ - common/drivers/posix/timer_rtc.cpp \ - common/drivers/posix/timer_sigalarm.cpp \ - common/drivers/posix/sound_driver_jack.cpp \ - common/drivers/posix/sound_driver_oss.cpp \ - common/drivers/posix/midi_out_device_alsa.cpp \ - common/drivers/posix/midi_out_device_oss.cpp \ - common/drivers/rtaudio/rt_audio.cpp \ - common/drivers/rtaudio/sound_driver_rtaudio.cpp \ - common/interface__QT/helpers/property_bridge_edit.cpp \ - common/interface__QT/helpers/cspinbutton.cpp \ - common/interface__QT/helpers/clist_manager.cpp \ - common/interface__QT/helpers/vertical_scrolled_window.cpp \ - common/interface__QT/helpers/ccolor_panel.cpp \ - common/interface__QT/helpers/ccolor_bridge.cpp \ - common/interface__QT/helpers/ccolor_list.cpp \ - common/interface__QT/helpers/font_bridge.cpp \ - common/interface__QT/helpers/keyboard_input_config.cpp \ - common/interface__QT/helpers/property_bridge_edit_list.cpp \ - common/interface__QT/audio/audio_config.cpp \ - common/interface__QT/audio/sample_viewer.cpp \ - common/interface__QT/audio/sample_viewer_zoom.cpp \ - common/interface__QT/audio/sample_editor.cpp \ - common/interface__QT/audio/sample_editor_format.cpp \ - common/interface__QT/audio/envelope_point_editor.cpp \ - common/interface__QT/audio/envelope_editor.cpp \ - common/interface__QT/audio/resampler_config.cpp \ - common/interface__QT/audio/note_bridge.cpp \ - common/interface__QT/audio/sample_editor_clipboard.cpp \ - common/interface__QT/audio/sample_editor_effects.cpp \ - common/interface__QT/audio/mixer_effects_manager.cpp \ - common/interface__QT/audio/effect_chain_editor.cpp \ - common/interface__QT/popups/cspindialog.cpp \ - common/interface__QT/popups/text_area_popup.cpp \ - common/interface__QT/popups/effect_select_popup.cpp \ - trackercore/file_format_manager.cpp \ - trackercore/file_reader.cpp \ - trackercore/file_writer.cpp \ - trackercore/instrument.cpp \ - trackercore/loader.cpp \ - trackercore/pattern.cpp \ - trackercore/player_data.cpp \ - trackercore/player_data_control.cpp \ - trackercore/player_data_effects.cpp \ - trackercore/player_data_envelopes.cpp \ - trackercore/player_data_events.cpp \ - trackercore/player_data_nna.cpp \ - trackercore/player_data_notes.cpp \ - trackercore/player_data_reserved.cpp \ - trackercore/player_data_utils.cpp \ - trackercore/sample.cpp \ - trackercore/saver.cpp \ - trackercore/song.cpp \ - trackercore/player_data_filter.cpp \ - trackercore/tracker_voice.cpp \ - trackercore/voice_control.cpp \ - trackercore/freq_conversion.cpp \ - trackercore/channel_control.cpp \ - loaders/loader_it.cpp \ - loaders/loader_it_info.cpp \ - loaders/loader_it_instruments.cpp \ - loaders/loader_it_patterns.cpp \ - loaders/loader_it_samples.cpp \ - loaders/loader_s3m.cpp \ - loaders/loader_wav.cpp \ - loaders/loader_xm.cpp \ - loaders/loader_ct.cpp \ - savers/saver_ct.cpp \ - savers/saver_it.cpp \ - savers/saver_raw.cpp \ - savers/saver_wav.cpp \ - interface_binds/editor_commands.cpp \ - interface_binds/editor.cpp \ - interface_binds/editor_insertion.cpp \ - interface_binds/editor_orderlist.cpp \ - interface_binds/editor_selection.cpp \ - interface_binds/editor_undo.cpp \ - interface_binds/tracker_instance.cpp \ - interface_binds/player_rt_keyboard.cpp \ - interface__QT/sample_edit.cpp \ - interface__QT/instrument_edit.cpp \ - interface__QT/interface.cpp \ - interface__QT/variables_edit.cpp \ - interface__QT/order_and_defaults_editor.cpp \ - interface__QT/mdi_main_window.cpp \ - interface__QT/settings_window.cpp \ - interface__QT/pattern_edit.cpp \ - interface__QT/pattern_edit__keys.cpp \ - interface__QT/orderlist_edit.cpp \ - interface__QT/sample_instrument_table.cpp \ - interface__QT/pattern_edit_widget.cpp \ - interface__QT/table_base.cpp \ - interface__QT/sample_player_fdialog.cpp \ - program__QT/cheesetracker_qt.cpp - diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-SConstruct /home/trasz/cheesetracker/files/patch-SConstruct --- /usr/ports/audio/cheesetracker/files/patch-SConstruct Thu Jan 1 01:00:00 1970 +++ /home/trasz/cheesetracker/files/patch-SConstruct Wed Mar 28 00:56:17 2007 @@ -0,0 +1,11 @@ +--- SConstruct.orig Tue Mar 27 22:35:53 2007 ++++ SConstruct Tue Mar 27 22:36:54 2007 +@@ -87,7 +87,7 @@ + env.optimize_resampler_hack=0 + + if (env['optimize']): +- env.Append(CXXFLAGS=['-O3','-ffast-math']); ++ env.Append(CXXFLAGS="%%CFLAGS%%"); + env.optimize_resampler_hack=0 + + profile=0; diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-common::components::audio::sample_data.cpp /home/trasz/cheesetracker/files/patch-common::components::audio::sample_data.cpp --- /usr/ports/audio/cheesetracker/files/patch-common::components::audio::sample_data.cpp Fri Sep 17 09:08:13 2004 +++ /home/trasz/cheesetracker/files/patch-common::components::audio::sample_data.cpp Thu Jan 1 01:00:00 1970 @@ -1,20 +0,0 @@ ---- common/components/audio/sample_data.cpp.orig Thu Sep 16 18:34:33 2004 -+++ common/components/audio/sample_data.cpp Thu Sep 16 18:40:05 2004 -@@ -325,7 +325,7 @@ - - if (is_16bits) { - -- (void*)new_sample_8bits=malloc(size); -+ new_sample_8bits=(Sint8*)malloc(size); - if (new_sample_8bits==NULL) { - - ERROR("Cannot convert sample! not enough memory?"); -@@ -339,7 +339,7 @@ - } else { - - Sint8 *sample_8bits_ptr=(Sint8*)data_ptr; -- (void*)new_sample_16bits=malloc(size*2); -+ new_sample_16bits=(Sint16*)malloc(size*2); - if (new_sample_16bits==NULL) { - - ERROR("Cannot convert sample! not enough memory?"); diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-common::components::file::file_access.cpp /home/trasz/cheesetracker/files/patch-common::components::file::file_access.cpp --- /usr/ports/audio/cheesetracker/files/patch-common::components::file::file_access.cpp Fri Sep 17 09:08:13 2004 +++ /home/trasz/cheesetracker/files/patch-common::components::file::file_access.cpp Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- common/components/file/file_access.cpp.orig Fri Sep 17 10:37:01 2004 -+++ common/components/file/file_access.cpp Fri Sep 17 10:37:23 2004 -@@ -164,7 +164,7 @@ - - for (i=0;i -+#include - - /** - *@author Juan Linietsky diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_jack.cpp /home/trasz/cheesetracker/files/patch-common::drivers::posix::sound_driver_jack.cpp --- /usr/ports/audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_jack.cpp Thu Jan 1 01:00:00 1970 +++ /home/trasz/cheesetracker/files/patch-common::drivers::posix::sound_driver_jack.cpp Wed Mar 28 00:56:17 2007 @@ -0,0 +1,17 @@ +--- common/drivers/posix/sound_driver_jack.cpp.orig Wed Mar 28 00:43:48 2007 ++++ common/drivers/posix/sound_driver_jack.cpp Wed Mar 28 00:44:18 2007 +@@ -225,12 +225,12 @@ + + //printf("JACK: Connect Ports...\n"); + +- if (jack_connect (client, jack_port_name (output_port_l), "alsa_pcm:playback_1")) { ++ if (jack_connect (client, jack_port_name (output_port_l), "oss:playback_1")) { + ERROR("cannot connect output ports\n"); + //jack_client_close (client); + //return FUNCTION_FAILED; + } +- if (jack_connect (client, jack_port_name (output_port_r), "alsa_pcm:playback_2")) { ++ if (jack_connect (client, jack_port_name (output_port_r), "oss:playback_2")) { + ERROR("cannot connect output ports\n"); + //jack_client_close (client); + //return FUNCTION_FAILED; diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_oss.cpp /home/trasz/cheesetracker/files/patch-common::drivers::posix::sound_driver_oss.cpp --- /usr/ports/audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_oss.cpp Fri Sep 17 09:08:13 2004 +++ /home/trasz/cheesetracker/files/patch-common::drivers::posix::sound_driver_oss.cpp Wed Mar 28 00:56:17 2007 @@ -15,12 +15,3 @@ bool Sound_Driver_OSS::does_perform_disk_write() { -@@ -154,7 +162,7 @@ - - - -- (void*)audiobuffer=calloc(1,buffinf.fragsize); -+ audiobuffer=(Sint8*)calloc(1,buffinf.fragsize); - - if ( audiobuffer==NULL ) { - diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-common::drivers::posix::timer_sigalarm.cpp /home/trasz/cheesetracker/files/patch-common::drivers::posix::timer_sigalarm.cpp --- /usr/ports/audio/cheesetracker/files/patch-common::drivers::posix::timer_sigalarm.cpp Fri Sep 17 09:08:13 2004 +++ /home/trasz/cheesetracker/files/patch-common::drivers::posix::timer_sigalarm.cpp Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- common/drivers/posix/timer_sigalarm.cpp.orig Fri Sep 17 10:49:31 2004 -+++ common/drivers/posix/timer_sigalarm.cpp Fri Sep 17 10:50:25 2004 -@@ -67,7 +67,7 @@ - - Timer_SigAlarm *dangit; - -- (void*)dangit=data; -+ dangit=(Timer_SigAlarm*)data; - - dangit->callback(); - diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-common::plugins::effects::custom::chorus_effect.cpp /home/trasz/cheesetracker/files/patch-common::plugins::effects::custom::chorus_effect.cpp --- /usr/ports/audio/cheesetracker/files/patch-common::plugins::effects::custom::chorus_effect.cpp Fri Oct 31 22:55:34 2003 +++ /home/trasz/cheesetracker/files/patch-common::plugins::effects::custom::chorus_effect.cpp Wed Mar 28 00:56:17 2007 @@ -1,19 +1,11 @@ ---- common/plugins/effects/custom/chorus_effect.cpp.orig Sun Oct 26 05:07:38 2003 -+++ common/plugins/effects/custom/chorus_effect.cpp Thu Oct 30 12:00:04 2003 -@@ -10,10 +10,16 @@ +--- common/plugins/effects/custom/chorus_effect.cpp.orig Fri Apr 23 05:21:14 2004 ++++ common/plugins/effects/custom/chorus_effect.cpp Tue Mar 27 20:51:01 2007 +@@ -10,7 +10,7 @@ // // #include "chorus_effect.h" +- +#include - - #define FRACTIONAL_BITS 13 #define MIX_CALCULATE_INCREMENT_INTERVAL 8 -+ -+#if defined(__FreeBSD__) -+ #define lrint(flt) ((int) (flt)) -+ #define lrintf(flt) ((int) (flt)) -+#endif - - inline static double get_msecs_from_samples(double p_samples,double p_mixfreq) { diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-common::plugins::resamplers::helpers.h /home/trasz/cheesetracker/files/patch-common::plugins::resamplers::helpers.h --- /usr/ports/audio/cheesetracker/files/patch-common::plugins::resamplers::helpers.h Fri Oct 31 22:55:34 2003 +++ /home/trasz/cheesetracker/files/patch-common::plugins::resamplers::helpers.h Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ ---- common/plugins/resamplers/helpers.h.orig Sun Oct 26 04:16:26 2003 -+++ common/plugins/resamplers/helpers.h Thu Oct 30 12:02:04 2003 -@@ -17,6 +17,11 @@ - #define HELPERS_H - - -+#if defined(__FreeBSD__) -+ #define lrint(flt) ((int) (flt)) -+ #define lrintf(flt) ((int) (flt)) -+#endif -+ - //hardcoded for now! - #define FILTER_BITS 12 - #define RAMP_BITS 11 diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-detect.py /home/trasz/cheesetracker/files/patch-detect.py --- /usr/ports/audio/cheesetracker/files/patch-detect.py Thu Jan 1 01:00:00 1970 +++ /home/trasz/cheesetracker/files/patch-detect.py Wed Mar 28 00:56:17 2007 @@ -0,0 +1,96 @@ +--- detect.py.orig Fri Apr 23 05:21:08 2004 ++++ detect.py Tue Mar 27 22:05:54 2007 +@@ -49,35 +49,11 @@ + + def check_libdl(libdata): + +- print "Checking for libdl..."; +- dl_search_dirs=[ \ +- "/sw", \ +- "/usr", \ +- "/usr/local", \ +- ]; +- +- # search for extra include dirs to add +- for x in dl_search_dirs: +- if (os.path.isfile(x + "/include/dlfcn.h")): +- print "Found dlfcn.h in " + x + "/include"; +- libdata.dl_flags=["-I" + x + "/include"]; +- break; ++ libdata.dl_libs=['']; ++ libdata.dl_flags=['']; ++ libdata.dl_link_flags=['']; + +- f=open("test.cpp","w"); +- f.write("#include \n#include \nint main() { printf(\"Testing dlfcn.\"); return 0; }\n"); +- f.close(); +- +- for x in dl_search_dirs: +- execline="c++ -L" + x + "/lib " + libdata.dl_flags[0] + " test.cpp -o test -ldl 2>>config_errors.log"; +- res=os.system(execline); +- +- if (res == 0): +- libdata.dl_libs=['dl']; +- libdata.dl_link_flags=["-L" + x + "/lib"]; +- os.system("rm test.cpp"); +- os.system("rm test"); +- return 0; +- return 1; ++ return 0; + + def check_alsa(libdata): + +@@ -271,48 +247,13 @@ + + print "Looking for QT 3.x 'moc' Binary:"; + +- qt_found=0; +- +- for x in qt_unix_bin_dirs: +- if (not qt_lib_found): +- break; +- +- command="moc"; +- if (len(x)): +- command=x+"/moc"; +- +- res=os.system(command + " -v 2>/dev/null"); +- if (res!=256): +- continue; +- +- version=os.popen(command +" -v 2>&1").readlines(); +- if (not len(version)): +- continue; +- +- pos=version[0].find(" 3."); +- if (pos<0): +- print("Not version 3:" + command); +- continue; +- +- qt_found=1; +- print "found moc command: " + command; +- libdata.moc_bin=command; +- break; +- +- +- if (not qt_found): +- print("I Couldnt find QT in your system :(\n"); +- print("If you think it is actually installed, you could try the following:\n"); +- print("-Define/undefine the $QTDIR env var. Some distros/unixes dont place Qt in standard locations (Like Debian)\n"); +- print("-Check if the path where your Qt 3.x stuff is and add it to the list at detect.py!\n"); +- print("-I am not a good python coder so detect.py may be buggy, if you fixed it, please send patches to coding@reduz.com.ar :)\n"); ++ qt_found=1; + +- return 1; +- +- else: +- print("QT was found!\n"); +- return 0; ++ libdata.moc_bin='moc' ++ libdata.qt_libs='-lqt-mt' ++ libdata.qt_link_flags='-lqt-mt -L%%X11BASE%%/lib' + ++ return 0; + + + def check_system(libdata): diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-interface_binds::editor.cpp /home/trasz/cheesetracker/files/patch-interface_binds::editor.cpp --- /usr/ports/audio/cheesetracker/files/patch-interface_binds::editor.cpp Fri Sep 17 09:08:13 2004 +++ /home/trasz/cheesetracker/files/patch-interface_binds::editor.cpp Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- interface_binds/editor.cpp.orig Fri Sep 17 11:15:06 2004 -+++ interface_binds/editor.cpp Fri Sep 17 11:30:35 2004 -@@ -358,7 +358,7 @@ - - void Editor::set_note_increment_table(Uint8* p_table) { - -- (Uint8*)note_increments=p_table; -+ note_increments=(char*)p_table; - - } - diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/files/patch-trackercore::tracker_voice.cpp /home/trasz/cheesetracker/files/patch-trackercore::tracker_voice.cpp --- /usr/ports/audio/cheesetracker/files/patch-trackercore::tracker_voice.cpp Fri Oct 31 22:55:34 2003 +++ /home/trasz/cheesetracker/files/patch-trackercore::tracker_voice.cpp Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ ---- trackercore/tracker_voice.cpp.orig Sun Oct 26 05:00:37 2003 -+++ trackercore/tracker_voice.cpp Thu Oct 30 12:02:37 2003 -@@ -16,6 +16,11 @@ - - #include "tracker_voice.h" - -+#if defined(__FreeBSD__) -+ #define lrint(flt) ((int) (flt)) -+ #define lrintf(flt) ((int) (flt)) -+#endif -+ - - int Tracker_Voice::get_current_freq() { - diff -ruN --exclude=CVS /usr/ports/audio/cheesetracker/pkg-plist /home/trasz/cheesetracker/pkg-plist --- /usr/ports/audio/cheesetracker/pkg-plist Fri Jan 30 13:36:05 2004 +++ /home/trasz/cheesetracker/pkg-plist Wed Mar 28 00:56:18 2007 @@ -1,4 +1,4 @@ -bin/cheesetracker +bin/cheesetracker_qt %%PORTDOCS%%%%EXAMPLESDIR%%/beek-dolphinisland.it %%PORTDOCS%%%%EXAMPLESDIR%%/ll-globule.it %%PORTDOCS%%%%EXAMPLESDIR%%/reduz-maschizo.it