audio/cheesetracker-0.5.5 is no longer maintained by the author. It does

not compile with gcc 3.2.2, and it has several bugs that cause it to
corrupt its own datafiles.  The author is now maintaining
cheesetracker-0.9.1, which depends on a (linux,windows)-only package named
JACK.

10 files changed, 1 insertions, 244 deletions

diff --git a/audio/Makefile b/audio/Makefile
index a1fa8513a50..ff8f05be815 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.185 2003/09/26 10:26:36 martti Exp $
+# $NetBSD: Makefile,v 1.186 2003/12/02 15:46:35 ben Exp $
 #
 
 COMMENT=	Audio tools
@@ -19,7 +19,6 @@ SUBDIR+=	cd-discid
 SUBDIR+=	cdd
 SUBDIR+=	cddbd
 SUBDIR+=	cdparanoia
-SUBDIR+=	cheesetracker
 SUBDIR+=	cmp3
 SUBDIR+=	cs4235
 SUBDIR+=	csound
diff --git a/audio/cheesetracker/DESCR b/audio/cheesetracker/DESCR
deleted file mode 100644
index a1918ddd8b8..00000000000
--- a/audio/cheesetracker/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Cheese Tracker is a clone of Impulse Tracker, written in C++ and using GTK--
-
-For more information, please refer to the Cheese Tracker web page and to
-information about Impulse Tracker:
-	http://www.reduz.com.ar/cheesetracker/
-	http://www.united-trackers.org/resources/itidiot/
-	http://www.united-trackers.org/resources/handbook/
diff --git a/audio/cheesetracker/Makefile b/audio/cheesetracker/Makefile
deleted file mode 100644
index 151490de412..00000000000
--- a/audio/cheesetracker/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2003/09/12 20:07:06 grant Exp $
-#
-
-DISTNAME=		cheesetracker-0.5.5
-PKGREVISION=		4
-CATEGORIES=		audio
-MASTER_SITES=		http://www.reduz.com.ar/cheesetracker/
-
-MAINTAINER=		collver1@comcast.net
-HOMEPAGE=		http://www.reduz.com.ar/cheesetracker/
-COMMENT=		Impulse tracker clone
-
-USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ENV=		CXXFLAGS="${CXXFLAGS}"
-CXXFLAGS+=		-O
-
-AUTOMAKE_REQD=		1.4
-PTHREAD_OPTS+=		require
-
-pre-configure:
-	${RM} -f ${WRKSRC}/install-sh
-	${RM} -f ${WRKSRC}/mkinstalldirs
-	${RM} -f ${WRKSRC}/missing
-	cd ${WRKSRC} && ${AUTOMAKE} --add-missing
-
-.include "../../mk/automake.mk"
-.include "../../mk/pthread.buildlink2.mk"
-.include "../../x11/gtk--/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cheesetracker/PLIST b/audio/cheesetracker/PLIST
deleted file mode 100644
index 4cb76181a1b..00000000000
--- a/audio/cheesetracker/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:28 zuntum Exp $
-bin/cheesetracker
diff --git a/audio/cheesetracker/distinfo b/audio/cheesetracker/distinfo
deleted file mode 100644
index 913e13d5146..00000000000
--- a/audio/cheesetracker/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.6 2002/08/01 05:48:02 jlam Exp $
-
-SHA1 (cheesetracker-0.5.5.tar.gz) = a1f6c9310db97ab151670ec5af22e2a7dd42c099
-Size (cheesetracker-0.5.5.tar.gz) = 703797 bytes
-SHA1 (patch-aa) = e6c9db09b838f25b88a2e94f17145fea0357458c
-SHA1 (patch-ab) = 2189819631fe44cb1306db0ab45c3d8a8d3bc044
-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
deleted file mode 100644
index 550241665f5..00000000000
--- a/audio/cheesetracker/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/06/23 13:51:42 kent Exp $
-
---- 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>
- #include <fcntl.h>
-+#if defined(__NetBSD__)
-+#include <sys/audioio.h>
-+#include <soundcard.h>
-+#else
- #include <sys/soundcard.h>
-+#endif
- #include <sys/ioctl.h>
- 
- #include "mutex_lock_pthreads.h"
diff --git a/audio/cheesetracker/patches/patch-ab b/audio/cheesetracker/patches/patch-ab
deleted file mode 100644
index b59f81dd311..00000000000
--- a/audio/cheesetracker/patches/patch-ab
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/08/01 05:48:03 jlam Exp $
-
---- program/cheesetracker.cpp.orig	Fri Apr 12 02:24:16 2002
-+++ program/cheesetracker.cpp
-@@ -186,12 +186,21 @@ void start_player() {
- 
- }
- 
-+#ifdef _POSIX_THREAD_IS_GNU_PTH
-+gint pth_nbschedule(gint no_need_this) {
-+	pthread_yield_np();
-+	return 1;
-+}
-+#endif
-+
- 
- int main(int argc, char *argv[]) {
- 
- 
- 	pthread_attr_t thread_attr;
-+#if !defined(_POSIX_THREAD_IS_GNU_PTH) || defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
-         sched_param thread_sched_param;
-+#endif
- 
- 	int tmperror,counter=0;
- 	char * filename;
-@@ -238,9 +247,19 @@ int main(int argc, char *argv[]) {
- 	quit_player=false;
- 
- 	pthread_attr_init(&thread_attr);
-+#if !defined(_POSIX_THREAD_IS_GNU_PTH) || defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
- 	thread_sched_param.sched_priority=0;
-         pthread_attr_setschedparam (&thread_attr,&thread_sched_param);
-+#endif
- 	pthread_create(&player_thread,&thread_attr,&player_thread_callback,NULL);
-+
-+#ifdef _POSIX_THREAD_IS_GNU_PTH
-+	SigC::Slot0<gint> my_slot = SigC::bind(
-+		SigC::slot(pth_nbschedule),
-+		0);
-+	Gtk::Connection conn = Gtk::Main::timeout.connect(my_slot, 150);
-+#endif
-+
- 
- 
- 
diff --git a/audio/cheesetracker/patches/patch-ac b/audio/cheesetracker/patches/patch-ac
deleted file mode 100644
index 2899ca642d4..00000000000
--- a/audio/cheesetracker/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2002/06/23 13:51:43 kent Exp $
-
---- 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 "
- 
- 
-@@ -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
deleted file mode 100644
index 7f7a22b5ee3..00000000000
--- a/audio/cheesetracker/patches/patch-ad
+++ /dev/null
@@ -1,94 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/06/23 13:51:43 kent Exp $
-
---- 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"
- 
-+#if defined(__NetBSD__)
-+#define AUDIO_DEVICE "/dev/audio"
-+#else
- #define AUDIO_DEVICE "/dev/dsp"
-+#endif
- 
- int Sound_Driver_OSS::init() {
- 
-@@ -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
- 
- 	
- 
-@@ -163,17 +189,35 @@
- 	
- 	for (;;) {
- 
-+#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
- 		if ((ioctl(sound_fd,SNDCTL_DSP_GETOSPACE,&buffinf)<0)) {
- 
- 			buffinf.fragments--;
- 			buffinf.fragsize = buffinf.bytes = buffersize;
- 		}
-+#endif
- 
-                 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
deleted file mode 100644
index 827dca113e8..00000000000
--- a/audio/cheesetracker/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/06/23 13:51:43 kent Exp $
-
---- 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
-+   FILE* Source = fopen( p_filename, "rb" ); // haha I used b
-    if( !Source ) return FILE_ERROR;
- 
-    // our detection scheme is simple, we just need to see a riff chunk first thing.