Update to 0.5.5.

Sumbitted by Ben Collver in pkg/17349.

Changes aftter 0.2.2:
April 30, 2002- cheesetracker 0.5.5 released!
   - Stereo Chorus! you can configure it per channel! use S1X effect.
   - bugfixes.

April 12, 2002- cheesetracker 0.5.1 released!
   - Bugfix release! sorry evryone.
   - Fixes a bug with wrongly initialized reverb buffer in the
     reserved channel (trying samples out would have blown your
     ears ;)
   - Fixed a bug in config file parsing.

April 11, 2002- cheesetracker 0.5.0 released!
   - Well, I decided to spend the weekend in adding the most
     wanted features, and a lot more
   - There's been just too many changes, so that's why the
     version boost.
   - So.. Important news first... well, too much important stuff!
   - First, fixed the evil crash bug that was avoiding some
     people from running cheesetracker.
   - Then, wrote a context sensitive help system! this will help
     new users a lot.
   - Also added XM/XI loading, so importing you can import your
     existing SoundTracker projects and enjoy the cool features
     of cheesetracker!
   - You can now also save native IT samples and instruments.
   - For users with non-US keyboards, editor keys can be configured now!
   - And if you dont like the default editor font, you can
     change it (monospaced only!)
   - Ahh.. and dont forget about default song and data paths!
   - Tired of setting options over and over? now they are saved
     to a config file.
   - Also, i did many graphical fixed/enhancements to the
     interface (nice buttons!!!!)
   - The menu for browsing samples inside another module or
     instrument (XM/IT/XI/II) now works fine.
   - A bug in pgcc 2.95.2 made it crash in some place, it doesnt
     now with a workaround.
   - There's a win32 directsound driver written by James Martin
     (yesso/TheHornet) that he kindly donated to saturno,
     althought it should work with cheesetracker.. so now you
     can try to compile cheesetracker on cygwin.
   - Well, besides that, I did a lot of bugfixing/interface
     cleanups, Kasper Souren sent me some interface patches but
     didnt have time to apply them. I'll try to have them
     included in the next version.  - no more! so enjoy
     cheesetracker!

March 5, 2002- cheesetracker 0.2.7 released!
   - It's been a long coding night, and decided to take the day
     off to implement as much as i can.. so..
   - REVERB!!, selectable per channel, use effect Z90-ZFF to
     control reverb send. Config the reverberator in the config
     menu.
   - Improved Volume Ramping! Now songs should be much less
     clicky. Specially chiptunes.  - WAVE EXPORT! Save your
     song, or the selected tracks you want to .wav - Many more
     bugfixes.

March 4, 2002- cheesetracker 0.2.6 released!
   - bugfixes
   - FILTERS!!! Yeah, now you have IT-style filters. Z00->Z7F is
     cutoff, Z80->Z8F resonance (Q).
   - You can also set filter envelopes and default cutoff/Q in
     the instrument->filter menu

January 23, 2002- cheesetracker 0.2.4 released!
   - bugfixes
   - NSF file exporter, see changelog to learn how it works.

January 20, 2002- cheesetracker 0.2.3 released!
   - Volume Ramping! (no more clicking/poping artifacts!)
   - Dont get version 2.2.. it's broken
   - Also, much nicer configure scripts.
   - I guess I can mantain this after all, but development will
     be very slow.

8 files changed, 100 insertions, 65 deletions

diff --git a/audio/cheesetracker/Makefile b/audio/cheesetracker/Makefile
index f3e6bc369cb..456d5d14237 100644
--- a/audio/cheesetracker/Makefile
+++ b/audio/cheesetracker/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2002/03/31 13:32:22 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2002/06/23 13:51:41 kent Exp $
 #
 
-DISTNAME=		cheesetracker-0.2.2
+DISTNAME=		cheesetracker-0.5.5
 CATEGORIES=		audio
 MASTER_SITES=		http://www.reduz.com.ar/cheesetracker/
 
-MAINTAINER=		collver@linuxfreemail.com
+MAINTAINER=		collver1@attbi.com
 HOMEPAGE=		http://www.reduz.com.ar/cheesetracker/
 COMMENT=		impulse tracker clone
 
@@ -17,6 +17,14 @@ GCC_VERSION!=           gcc --version
 .include "../../lang/gcc/Makefile.gcc"
 .endif
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV=		CXXFLAGS="-O -Dusleep=pth_usleep -Dwrite=__pthread_write"
+# XXX: This package assumes pthread is pth.
+#      (glib specifies `USE_PTHREAD=native pth.')
+CONFIGURE_ENV=		CXXFLAGS="-O -Dusleep=pth_usleep"
+
+post-extract:
+	${RM} -f ${WRKSRC}/install-sh
+	${RM} -f ${WRKSRC}/mkinstalldirs
+	${LN} -s ${LOCALBASE}/share/automake/install-sh ${WRKSRC}/install-sh
+	${LN} -s ${LOCALBASE}/share/automake/mkinstalldirs ${WRKSRC}/mkinstalldirs
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/cheesetracker/distinfo b/audio/cheesetracker/distinfo
index fa4f8186213..ae8f18e9ce0 100644
--- a/audio/cheesetracker/distinfo
+++ b/audio/cheesetracker/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.4 2002/04/21 11:22:13 cjep Exp $
+$NetBSD: distinfo,v 1.5 2002/06/23 13:51:42 kent Exp $
 
-SHA1 (cheesetracker-0.2.2.tar.gz) = 29683ca15f3306f3a580f7f8baf31d8ad79c249b
-Size (cheesetracker-0.2.2.tar.gz) = 196767 bytes
-SHA1 (patch-aa) = 363a9f2595723c9a2cfccaf351965405f60775a5
-SHA1 (patch-ab) = 81a12ba155e08608ad608a3e9229be1c819ca844
-SHA1 (patch-ac) = 6941553d51917ad267870e8c03af6a0816de86e5
-SHA1 (patch-ad) = ae6d9096984a82edbde66a341703a3baf19722bb
-SHA1 (patch-ae) = 3380911c6806188c6dcdf0f572c4d983a745f112
-SHA1 (patch-af) = 860549927a44009d38380fca35409513ba2af8dd
+SHA1 (cheesetracker-0.5.5.tar.gz) = a1f6c9310db97ab151670ec5af22e2a7dd42c099
+Size (cheesetracker-0.5.5.tar.gz) = 703797 bytes
+SHA1 (patch-aa) = e6c9db09b838f25b88a2e94f17145fea0357458c
+SHA1 (patch-ab) = 19a744e00bb7b3d18739a78747f519451ffaa934
+SHA1 (patch-ac) = 0899a7117405f0f1ec4f3566db17a61948c3ddf4
+SHA1 (patch-ad) = 83c5724488ec351bae98cd78f09b95aff28aa1e5
+SHA1 (patch-ae) = b861d569c15e044092e6346cdea87448e7e0d42b
diff --git a/audio/cheesetracker/patches/patch-aa b/audio/cheesetracker/patches/patch-aa
index 134eae81032..550241665f5 100644
--- a/audio/cheesetracker/patches/patch-aa
+++ b/audio/cheesetracker/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/06/18 12:27:36 rh Exp $
+$NetBSD: patch-aa,v 1.2 2002/06/23 13:51:42 kent Exp $
 
---- src/sound_driver_oss.h.orig	Wed May  9 06:43:05 2001
-+++ src/sound_driver_oss.h	Thu Jun 14 23:33:41 2001
+--- waveout/sound_driver_oss.h.orig	Wed Jun 19 22:49:41 2002
++++ waveout/sound_driver_oss.h
 @@ -22,7 +22,12 @@
  
  #include <sound_driver.h>
diff --git a/audio/cheesetracker/patches/patch-ab b/audio/cheesetracker/patches/patch-ab
index 4757fb14385..66ea4efdb83 100644
--- a/audio/cheesetracker/patches/patch-ab
+++ b/audio/cheesetracker/patches/patch-ab
@@ -1,19 +1,18 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/06/18 12:27:36 rh Exp $
+$NetBSD: patch-ab,v 1.2 2002/06/23 13:51:42 kent Exp $
 
---- src/main.cpp.orig	Wed May  9 06:43:01 2001
-+++ src/main.cpp	Thu Jun 14 23:25:55 2001
-@@ -78,6 +78,10 @@
- 	return NULL;
+--- program/cheesetracker.cpp.orig	Thu Apr 11 23:24:16 2002
++++ program/cheesetracker.cpp
+@@ -186,12 +186,19 @@
+ 
  }
  
 +gint pth_nbschedule(gint no_need_this) {
 +	pthread_yield_np();
 +	return 1;
 +}
++
  
- void initialize_objects () {
- 
-@@ -145,7 +149,9 @@
+ int main(int argc, char *argv[]) {
  
  
  	pthread_attr_t thread_attr;
@@ -23,7 +22,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/06/18 12:27:36 rh Exp $
  
  	int tmperror,counter=0;
  	char * filename;
-@@ -182,9 +188,18 @@
+@@ -238,9 +245,19 @@
  	quit_player=false;
  
  	pthread_attr_init(&thread_attr);
@@ -39,6 +38,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/06/18 12:27:36 rh Exp $
 +		0);
 +	Gtk::Connection conn = Gtk::Main::timeout.connect(my_slot, 150);
 +#endif
++
+ 
  
- 	begin_threads=true;
  
diff --git a/audio/cheesetracker/patches/patch-ac b/audio/cheesetracker/patches/patch-ac
index 01bc138a18f..2899ca642d4 100644
--- a/audio/cheesetracker/patches/patch-ac
+++ b/audio/cheesetracker/patches/patch-ac
@@ -1,22 +1,22 @@
-$NetBSD: patch-ac,v 1.3 2002/04/21 11:22:13 cjep Exp $
+$NetBSD: patch-ac,v 1.4 2002/06/23 13:51:43 kent Exp $
 
---- configure.orig	Wed May  9 16:13:18 2001
-+++ configure	Sun Apr 21 11:08:32 2002
-@@ -2480,7 +2480,7 @@
- 
- echo $ac_n "checking for C++ compiler version""... $ac_c" 1>&6
- echo "configure:2483: checking for C++ compiler version" >&5
--TF_CXX_VERSION=`c++ --version`
-+TF_CXX_VERSION=`${CXX-c++} --version`
- echo "$ac_t""$TF_CXX_VERSION" 1>&6
- 
- echo $ac_n "checking if C++ compiler supports GNU g++ options""... $ac_c" 1>&6
-@@ -2754,7 +2754,7 @@
+--- configure.orig	Tue Apr 30 19:19:52 2002
++++ configure
+@@ -1823,7 +1823,6 @@
+     CXXFLAGS_OPT="-O2"
  fi
  
+-CXXFLAGS_OPT=" -O3 -ffast-math"
+ #CXXFLAGS_OPT=" -g3 "
  
--TF_CXXFLAGS="-O3 $TF_CXXFLAGS"
-+TF_GTKMM_LIBS="$TF_GTKMM_LIBS -lpthread -lossaudio"
  
+@@ -1834,7 +1833,8 @@
  
  
+ 
+-CXXFLAGS="$CXXFLAGS_OPT $CXXFLAGS_DBG $CXXFLAGS_PROF $CXXFLAGS_SIGC $CXXFLAGS_GTKMM"
++CXXFLAGS="$CXXFLAGS $CXXFLAGS_OPT $CXXFLAGS_DBG $CXXFLAGS_PROF $CXXFLAGS_SIGC $CXXFLAGS_GTKMM"
++LDFLAGS="$LDFLAGS -lpthread -lossaudio"
+ 
+ 
+ ## When you add new directories / subdirs with Makefile.am files,
diff --git a/audio/cheesetracker/patches/patch-ad b/audio/cheesetracker/patches/patch-ad
index c1dc60e0181..7f7a22b5ee3 100644
--- a/audio/cheesetracker/patches/patch-ad
+++ b/audio/cheesetracker/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/06/18 12:27:36 rh Exp $
+$NetBSD: patch-ad,v 1.2 2002/06/23 13:51:43 kent Exp $
 
---- src/sound_driver_oss.cpp.orig	Wed May  9 06:43:01 2001
-+++ src/sound_driver_oss.cpp	Thu Jun 14 23:31:06 2001
+--- waveout/sound_driver_oss.cpp.orig	Wed Apr 10 20:46:44 2002
++++ waveout/sound_driver_oss.cpp
 @@ -18,7 +18,11 @@
  #include "sound_driver_oss.h"
  #include "math.h"
@@ -14,15 +14,48 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/06/18 12:27:36 rh Exp $
  
  int Sound_Driver_OSS::init() {
  
-@@ -155,16 +159,37 @@
- 
- 	int done;
+@@ -28,6 +32,10 @@
+ 	long supported_formats;
  	audio_buf_info buffinf;
+  	int request_buffer_size;
 +#if defined(__NetBSD__) && SOUND_VERSION <= 0x030000
 +	struct audio_info info;
 +#endif
++
+ 
+ 	if (mix_frequency==-1) {
+          	
+@@ -106,11 +114,29 @@
+ 	}
+ 
+ 
++#if defined(__NetBSD__) && SOUND_VERSION <= 0x030000
++/*
++	This is to work around a bug in NetBSD-1.5.1 and earlier, in which
++	the SNDCTL_DSP_GETOSPACE(&buf_info) ioctl was not handled properly.
++	The correct information is always available via the native audio
++	driver, so use that instead.
++*/
++	if (ioctl(sound_fd, AUDIO_GETINFO, &info) == 0) {
++		buffinf.fragsize = info.blocksize;
++		buffinf.fragments = info.hiwat - info.play.seek /
++			info.blocksize;
++		buffinf.bytes = info.play.buffer_size;
++	} else {
++		buffinf.fragments--;
++		buffinf.fragsize = buffinf.bytes = buffersize;
++	}
++#else
+ 	/* This call fails on Linux/PPC */
+ 	if( (ioctl(sound_fd,SNDCTL_DSP_GETOSPACE,&buffinf)<0) ) {
+ 
+ 		ioctl(sound_fd,SNDCTL_DSP_GETBLKSIZE,&buffinf.fragsize);
+ 	}
++#endif
  
- 	if (!active) return false;
+ 	
+ 
+@@ -163,17 +189,35 @@
  	
  	for (;;) {
  
@@ -52,3 +85,10 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/06/18 12:27:36 rh Exp $
  
                  if(!buffinf.fragments) break;
  
+ 		done=mixer->write_bytes(audiobuffer,buffinf.fragsize>buffinf.bytes?buffinf.bytes:buffinf.fragsize);
+ 
+-                write(sound_fd,audiobuffer,done);
++                __pthread_write(sound_fd,audiobuffer,done);
+ 	}		
+ 
+ 	return true;	
diff --git a/audio/cheesetracker/patches/patch-ae b/audio/cheesetracker/patches/patch-ae
index 071143248ba..827dca113e8 100644
--- a/audio/cheesetracker/patches/patch-ae
+++ b/audio/cheesetracker/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.1 2001/11/22 15:37:20 agc Exp $
+$NetBSD: patch-ae,v 1.2 2002/06/23 13:51:43 kent Exp $
 
---- src/loader_wav.cpp.orig	Wed Sep  5 21:51:35 2001
-+++ src/loader_wav.cpp
-@@ -162,7 +162,7 @@
-    cout << "--- loading " << p_filename << endl;
+--- trackercore/loader_wav.cpp.orig	Wed Jun 19 23:08:42 2002
++++ trackercore/loader_wav.cpp
+@@ -159,7 +159,7 @@
+ 
  
     // try and open the file
 -   FILE* Source = fopen( p_filename, "rb+" ); // haha I used b
diff --git a/audio/cheesetracker/patches/patch-af b/audio/cheesetracker/patches/patch-af
deleted file mode 100644
index e7a63136561..00000000000
--- a/audio/cheesetracker/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/11/22 15:37:20 agc Exp $
-
---- src/loader_it_info.cpp.orig	Wed Sep  5 22:40:40 2001
-+++ src/loader_it_info.cpp
-@@ -24,6 +24,7 @@
- 
- 	file_read.get_byte_array((Uint8*)header.identifier,4);
- 	header.identifier[4]=0;
-+	aux_string=(char*)header.identifier;
-         if ( aux_string!="IMPM" ) return FILE_FORMAT_NOT_RECOGNIZED;
- 
- 	file_read.get_byte_array((Uint8*)header.songname,26);