update audio/cheesetracker: 0.5.5 -> 0.8.0

PR:		54898
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

20 files changed, 217 insertions, 194 deletions

diff --git a/audio/cheesetracker/Makefile b/audio/cheesetracker/Makefile
index 8987cff437ca..b33db94d4230 100644
--- a/audio/cheesetracker/Makefile
+++ b/audio/cheesetracker/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	cheesetracker
-PORTVERSION=	0.5.5
+PORTVERSION=	0.8.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cheesetronic
@@ -15,24 +15,24 @@ MASTER_SITE_SUBDIR=	cheesetronic
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Impulse Tracker clone
 
-BUILD_DEPENDS=	${LOCALBASE}/share/automake14/install-sh:${PORTSDIR}/devel/automake14
-LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
+LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
 
-USE_REINPLACE=	yes
-USE_GNOME=	gtk12
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
-		AUTOHEADER="${TRUE}"
+USE_QT_VER=	3
+MAKE_ENV=	QTDIR="${QT_PREFIX}"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|[$$]CXXFLAGS_OPT |\$$CXXFLAGS |g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|AFMT_S16_NE|AFMT_S16_LE|g' ${WRKSRC}/waveout/sound_driver_oss.cpp
-
-pre-configure:
-.for file in install-sh missing mkinstalldirs
-	@${LN} -sf ${LOCALBASE}/share/automake14/${file} ${WRKSRC}
-.endfor
-	@${RM} -f ${WRKSRC}/config.cache
+	@${CP} ${FILESDIR}/cheesetracker.pro ${WRKSRC}
+
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
+		-spec ${X11BASE}/share/qt/mkspecs/freebsd-g++ cheesetracker.pro
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/cheesetracker ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.it ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.xm ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/audio/cheesetracker/distinfo b/audio/cheesetracker/distinfo
index 0e6cef80f7b9..cf27fb59bae1 100644
--- a/audio/cheesetracker/distinfo
+++ b/audio/cheesetracker/distinfo
@@ -1 +1 @@
-MD5 (cheesetracker-0.5.5.tar.gz) = 626482cf9d56931ecb4a7e5e1505dfb6
+MD5 (cheesetracker-0.8.0.tar.gz) = 2c310d1886cd55ba1610f60b224c1162
diff --git a/audio/cheesetracker/files/cheesetracker.pro b/audio/cheesetracker/files/cheesetracker.pro
new file mode 100644
index 000000000000..027d7dbd207c
--- /dev/null
+++ b/audio/cheesetracker/files/cheesetracker.pro
@@ -0,0 +1,177 @@
+TEMPLATE =	app
+CONFIG =	qt warn_on thread release 
+TERGET =	cheesetracker
+
+DEFINES =	POSIX_ENABLED OSS_ENABLED
+LIBS =		-L${LOCALBASE}/lib -lsigc-1.2
+INCLUDEPATH =	${LOCALBASE}/lib/sigc++-1.2/include \
+		${LOCALBASE}/include/sigc++-1.2 \
+		common \
+		common/components/audio \
+		common/components/data \
+		common/components/midi \
+		common/defines \
+		trackercore \
+		loaders \
+		savers
+
+HEADERS = \
+		common/interface__QT/helpers/ccolor_bridge.h \
+		common/interface__QT/helpers/ccolor_list.h \
+		common/interface__QT/helpers/ccolor_panel.h \
+		common/interface__QT/helpers/cspinbutton.h \
+		common/interface__QT/helpers/font_bridge.h \
+		common/interface__QT/helpers/keyboard_input_config.h \
+		common/interface__QT/helpers/property_bridge_edit.h \
+		common/interface__QT/helpers/property_bridge_edit_list.h \
+		common/interface__QT/helpers/vertical_scrolled_window.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/popups/cspindialog.h \
+		common/interface__QT/popups/text_area_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
+
+SOURCES = \
+		common/plugins/effects/custom/chorus.cpp \
+		common/plugins/effects/freeverb/allpass.cpp \
+		common/plugins/effects/freeverb/comb.cpp \
+		common/plugins/effects/freeverb/revmodel.cpp \
+		common/plugins/edit_effects/simple_edit_effects.cpp \
+		common/plugins/resamplers/resampler_raw.cpp \
+		common/plugins/resamplers/resampler_linear.cpp \
+		common/os/mutex_lock.cpp \
+		common/os/path_data.cpp \
+		common/os/threaded_class.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/ring_buffer.cpp \
+		common/components/audio/tables.cpp \
+		common/components/audio/edit_effect.cpp \
+		common/components/audio/sound_driver_dummy.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/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/interface__QT/helpers/property_bridge_edit.cpp \
+		common/interface__QT/helpers/cspinbutton.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/popups/cspindialog.cpp \
+		common/interface__QT/popups/text_area_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 \
+		savers/saver_it.cpp \
+		savers/saver_raw.cpp \
+		savers/saver_wav.cpp \
+		interface_binds/editor_commands.cpp \
+		interface_binds/editor.cpp \
+		interface_binds/editor_orderlist.cpp \
+		interface_binds/editor_selection.cpp \
+		interface_binds/editor_undo.cpp \
+		interface_binds/editor_insertion.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 \
+		program__QT/cheesetracker_qt.cpp
+
diff --git a/audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_oss.cpp b/audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_oss.cpp
new file mode 100644
index 000000000000..1eb58e78630c
--- /dev/null
+++ b/audio/cheesetracker/files/patch-common::drivers::posix::sound_driver_oss.cpp
@@ -0,0 +1,17 @@
+--- common/drivers/posix/sound_driver_oss.cpp.orig	Mon Jun 23 10:06:42 2003
++++ common/drivers/posix/sound_driver_oss.cpp	Fri Jul 11 11:49:31 2003
+@@ -40,6 +40,14 @@
+ 
+ #define DEFAULT_AUDIO_DEVICE "/dev/dsp"
+ 
++#if !defined(AFMT_S16_NE)
++#if defined(BYTE_ORDER) && (BYTE_ORDER == BIG_ENDIAN)
++#define AFMT_S16_NE AFMT_S16_BE
++#else
++#define AFMT_S16_NE AFMT_S16_LE
++#endif
++#endif
++
+ 
+ bool Sound_Driver_OSS::does_perform_disk_write() {
+ 
diff --git a/audio/cheesetracker/files/patch-interface_gtk::Makefile.in b/audio/cheesetracker/files/patch-interface_gtk::Makefile.in
deleted file mode 100644
index 3481787ffa11..000000000000
--- a/audio/cheesetracker/files/patch-interface_gtk::Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- interface_gtk/Makefile.in.orig	Wed Mar  6 15:08:40 2002
-+++ interface_gtk/Makefile.in	Wed Mar  6 15:08:51 2002
-@@ -75,3 +75,3 @@
- noinst_LIBRARIES = libinterface_gtk.a
--CXXFLAGS = @CXXFLAGS@ -I../trackercore -I../editor -I../freeverb
-+CXXFLAGS = @CXXFLAGS@ -I../trackercore -I../editor -I../freeverb -fhuge-objects
- 
diff --git a/audio/cheesetracker/files/patch-interface_gtk::interface_widget_envelope.cpp b/audio/cheesetracker/files/patch-interface_gtk::interface_widget_envelope.cpp
deleted file mode 100644
index 28a35bf51053..000000000000
--- a/audio/cheesetracker/files/patch-interface_gtk::interface_widget_envelope.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- interface_gtk/interface_widget_envelope.cpp.orig	Sun Jan 20 23:56:00 2002
-+++ interface_gtk/interface_widget_envelope.cpp	Fri Dec 27 21:58:41 2002
-@@ -373,7 +373,7 @@
- 		node_x=get_point_x(i);
- 		node_y=get_point_y(i);
- 
--		dist=(int)sqrt((p_node_x-node_x)*(p_node_x-node_x)+(p_node_y-node_y)*(p_node_y-node_y));
-+		dist=(int)sqrt((double)((p_node_x-node_x)*(p_node_x-node_x)+(p_node_y-node_y)*(p_node_y-node_y)));
- 
-                 if (dist<6) {
- 
diff --git a/audio/cheesetracker/files/patch-interface_gtk::properties.h b/audio/cheesetracker/files/patch-interface_gtk::properties.h
deleted file mode 100644
index 738d6ee29bd0..000000000000
--- a/audio/cheesetracker/files/patch-interface_gtk::properties.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- interface_gtk/properties.h.orig	Thu Apr 11 02:39:58 2002
-+++ interface_gtk/properties.h	Sun Dec 29 01:44:47 2002
-@@ -19,8 +19,14 @@
- #define PROPERTIES_H
- 
- #include "typedefs.h"
--#include <hash_map>
- #include <stdio.h>
-+
-+#if defined(__GNUC__) && (__GNUC__ > 2)
-+#include <ext/hash_map>  
-+using namespace __gnu_cxx;
-+#else
-+#include <hash_map>  
-+#endif
- 
- 
- /**
diff --git a/audio/cheesetracker/files/patch-program::Makefile b/audio/cheesetracker/files/patch-program::Makefile
deleted file mode 100644
index 11d33ab67f73..000000000000
--- a/audio/cheesetracker/files/patch-program::Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
---- program/Makefile.in.orig	Wed Mar  6 15:09:38 2002
-+++ program/Makefile.in	Wed Mar  6 15:09:49 2002
-@@ -74,3 +74,3 @@
- 
--CXXFLAGS = @CXXFLAGS@ $(SIGC_CFLAGS) -I../trackercore -I../editor -I../posix -I../waveout -I../interface_gtk -I../freeverb
-+CXXFLAGS = @CXXFLAGS@ $(SIGC_CFLAGS) -I../trackercore -I../editor -I../posix -I../waveout -I../interface_gtk -I../freeverb -fhuge-objects
- 
diff --git a/audio/cheesetracker/files/patch-trackercore::loader_it.cpp b/audio/cheesetracker/files/patch-trackercore::loader_it.cpp
deleted file mode 100644
index 020b4e974d40..000000000000
--- a/audio/cheesetracker/files/patch-trackercore::loader_it.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- trackercore/loader_it.cpp.orig	Wed May  1 09:11:51 2002
-+++ trackercore/loader_it.cpp	Fri Dec 27 21:53:21 2002
-@@ -192,7 +192,7 @@
- 
- }
- 
--void Loader_IT::free_info(bool free_sampledata=false) {
-+void Loader_IT::free_info(bool free_sampledata) {
- 
- 	clear_structs(free_sampledata);
- }
diff --git a/audio/cheesetracker/files/patch-trackercore::loader_s3m.cpp b/audio/cheesetracker/files/patch-trackercore::loader_s3m.cpp
deleted file mode 100644
index b943ac8356da..000000000000
--- a/audio/cheesetracker/files/patch-trackercore::loader_s3m.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- trackercore/loader_s3m.cpp.orig	Thu Sep  6 14:37:45 2001
-+++ trackercore/loader_s3m.cpp	Fri Dec 27 21:54:34 2002
-@@ -346,7 +346,7 @@
- 
- }
- 
--void Loader_S3M::free_info(bool free_sampledata=false) {
-+void Loader_S3M::free_info(bool free_sampledata) {
- 
- 	int i;
- 
diff --git a/audio/cheesetracker/files/patch-trackercore::loader_xm.cpp b/audio/cheesetracker/files/patch-trackercore::loader_xm.cpp
deleted file mode 100644
index f6fd066c31a6..000000000000
--- a/audio/cheesetracker/files/patch-trackercore::loader_xm.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- trackercore/loader_xm.cpp.orig	Wed Apr 24 12:33:40 2002
-+++ trackercore/loader_xm.cpp	Fri Dec 27 22:44:16 2002
-@@ -387,7 +387,7 @@
-         return FUNCTION_SUCCESS;
- }
- 
--int Loader_XM::load_instrument_internal(Instrument *p_instr,bool p_xi,int p_cpos, int p_hsize, int p_sampnum=-1) {
-+int Loader_XM::load_instrument_internal(Instrument *p_instr,bool p_xi,int p_cpos, int p_hsize, int p_sampnum) {
- 
-   		int sampnum;
-                 Uint32 aux;
-@@ -807,7 +807,7 @@
- 
- }
- 
--void Loader_XM::free_info(bool free_sampledata=false) {
-+void Loader_XM::free_info(bool free_sampledata) {
- 
-   	if (free_sampledata)
- 		for (int x=0;x<samples.size();x++) {
diff --git a/audio/cheesetracker/files/patch-trackercore::mixer_procedure.h b/audio/cheesetracker/files/patch-trackercore::mixer_procedure.h
deleted file mode 100644
index f759203535ba..000000000000
--- a/audio/cheesetracker/files/patch-trackercore::mixer_procedure.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- trackercore/mixer_procedure.h.orig	Tue Apr 30 16:11:28 2002
-+++ trackercore/mixer_procedure.h	Sun Dec 29 01:44:12 2002
-@@ -19,7 +19,13 @@
- #define MIXER_PROCEDURE_H
- 
- #include  "sample_data.h"
--#include <hash_map>
-+
-+#if defined(__GNUC__) && (__GNUC__ > 2)
-+#include <ext/hash_map>  
-+using namespace __gnu_cxx;
-+#else
-+#include <hash_map>  
-+#endif
- 
- /**Mixer Procedure
- 
diff --git a/audio/cheesetracker/files/patch-trackercore::nsf_export.cpp b/audio/cheesetracker/files/patch-trackercore::nsf_export.cpp
deleted file mode 100644
index 99936d928f9f..000000000000
--- a/audio/cheesetracker/files/patch-trackercore::nsf_export.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- trackercore/nsf_export.cpp.orig	Mon Apr 22 10:40:35 2002
-+++ trackercore/nsf_export.cpp	Fri Dec 27 21:57:08 2002
-@@ -72,7 +72,7 @@
- 	write_byte(0x8d); write_byte(p_register_addr&0xFF); write_byte(p_register_addr >> 8); // STA $p_register_addr
- }
- 
--void NSF_Export::update_voice_data(Uint8 p_voice, bool write_chunk=false) {
-+void NSF_Export::update_voice_data(Uint8 p_voice, bool write_chunk) {
- 
- 	if ((p_voice<2) || (p_voice==3)) {
- 	
diff --git a/audio/cheesetracker/files/patch-trackercore::pattern.h b/audio/cheesetracker/files/patch-trackercore::pattern.h
deleted file mode 100644
index 00e508732a5f..000000000000
--- a/audio/cheesetracker/files/patch-trackercore::pattern.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- trackercore/pattern.h.orig	Wed May  9 22:43:05 2001
-+++ trackercore/pattern.h	Fri Dec 27 21:14:20 2002
-@@ -18,11 +18,14 @@
- #ifndef PATTERN_H
- #define PATTERN_H
- 
-+#include <iostream>
- #include <map>
- #include <vector>
- 
- #include "note.h"
- #include "mutex_lock.h"
-+
-+using namespace std;
- 
- #define PATTERN_WIDTH 64
- #define MIN_PATTERN_LENGTH 32
diff --git a/audio/cheesetracker/files/patch-trackercore::player_data.cpp b/audio/cheesetracker/files/patch-trackercore::player_data.cpp
deleted file mode 100644
index bbef8a3bb111..000000000000
--- a/audio/cheesetracker/files/patch-trackercore::player_data.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- trackercore/player_data.cpp.orig	Mon Mar  4 10:02:51 2002
-+++ trackercore/player_data.cpp	Fri Dec 27 21:17:07 2002
-@@ -32,7 +32,7 @@
- Player_Data::~Player_Data(){
- }
- 
--void Player_Data::set_virtual_channels(int p_amount,bool p_lock = true) {
-+void Player_Data::set_virtual_channels(int p_amount,bool p_lock) {
- 
- 	if (p_amount<1) return;
- 	if (p_amount==control.max_voices) return;
diff --git a/audio/cheesetracker/files/patch-trackercore::player_data_effects.cpp b/audio/cheesetracker/files/patch-trackercore::player_data_effects.cpp
deleted file mode 100644
index 0c752e06ce5f..000000000000
--- a/audio/cheesetracker/files/patch-trackercore::player_data_effects.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- trackercore/player_data_effects.cpp.orig	Tue Apr 30 14:58:11 2002
-+++ trackercore/player_data_effects.cpp	Fri Dec 27 22:36:36 2002
-@@ -339,7 +339,7 @@
- 
- 		if (song->variables.use_linear_slides) {
- 
--			control.channel[p_track].period=control.channel[p_track].aux_period-abs(get_period((Uint16)46,0)-get_period((Uint16)44,0))*note;
-+			control.channel[p_track].period=control.channel[p_track].aux_period-abs((int)(get_period((Uint16)46,0)-get_period((Uint16)44,0)))*note;
- 		} else {
- 
- 			control.channel[p_track].period=get_period( (((Uint16)control.channel[p_track].note+control.channel[p_track].sample_ptr->data.note_offset)+note)<<1,control.channel[p_track].sample_ptr->data.finetune);
diff --git a/audio/cheesetracker/files/patch-trackercore::sample.cpp b/audio/cheesetracker/files/patch-trackercore::sample.cpp
deleted file mode 100644
index 22f298a6d927..000000000000
--- a/audio/cheesetracker/files/patch-trackercore::sample.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- trackercore/sample.cpp.orig	Wed May  9 22:43:01 2001
-+++ trackercore/sample.cpp	Fri Dec 27 21:53:58 2002
-@@ -24,7 +24,7 @@
- Sample::~Sample(){
- }
- 
--void Sample::reset(bool try_to_free_data=true) {
-+void Sample::reset(bool try_to_free_data) {
- 
- 	name="";
- 	filename="";
diff --git a/audio/cheesetracker/files/patch-trackercore::typedefs.h b/audio/cheesetracker/files/patch-trackercore::typedefs.h
deleted file mode 100644
index edf80b08db92..000000000000
--- a/audio/cheesetracker/files/patch-trackercore::typedefs.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- trackercore/typedefs.h.orig	Mon Jan 21 00:07:38 2002
-+++ trackercore/typedefs.h	Fri Dec 27 22:41:08 2002
-@@ -19,6 +19,9 @@
- #define TYPEDEFS_H
- 
- #include <string>
-+#include <iostream>
-+
-+using namespace std;
- 
- typedef unsigned char byte;
- 
diff --git a/audio/cheesetracker/pkg-descr b/audio/cheesetracker/pkg-descr
index 0d9ef68eb48f..be41c3111309 100644
--- a/audio/cheesetracker/pkg-descr
+++ b/audio/cheesetracker/pkg-descr
@@ -1,4 +1,4 @@
 CheeseTracker is intended to be an Impulse Tracker clone. Yet, even when
 some features are missing, It should be perfectly usable.
 
-WWW: http://www.reduz.com.ar/cheesetracker/
+WWW: http://reduz.com.ar/cheesetracker/
diff --git a/audio/cheesetracker/pkg-plist b/audio/cheesetracker/pkg-plist
index bffe37ca19da..4bc7939efa68 100644
--- a/audio/cheesetracker/pkg-plist
+++ b/audio/cheesetracker/pkg-plist
@@ -1 +1,5 @@
 bin/cheesetracker
+%%PORTDOCS%%%%EXAMPLESDIR%%/beek-dolphinisland.it
+%%PORTDOCS%%%%EXAMPLESDIR%%/ll-globule.it
+%%PORTDOCS%%%%EXAMPLESDIR%%/reduz-maschizo.it
+%%PORTDOCS%%%%EXAMPLESDIR%%/xerxes-mfc.xm