19 files changed, 280 insertions, 1261 deletions

diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index b66b7bedd8be..45f3517bae7c 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -1,35 +1,41 @@
-# New ports collection makefile for:	gnomemedia
-# Date created:				20 January 1999
-# Whom:					Jeremy Lea <reg@shale.csir.co.za>
+# New ports collection makefile for:	gnomemedia2
+# Date created:				06 May 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gnomemedia
-PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTNAME=	gnomemedia2
+PORTVERSION=	1.520.2
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/gnome-media
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DISTNAME=	gnome-media-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
 RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
+LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
+		gailutil.13:${PORTSDIR}/x11-toolkits/gail
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--without-ncurses
+INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo
index ece2b633d459..195e407bcb13 100644
--- a/audio/gnomemedia2/distinfo
+++ b/audio/gnomemedia2/distinfo
@@ -1 +1 @@
-MD5 (gnome-media-1.2.3.tar.gz) = bcd99b4fe81141d36bbd40d74a9b448f
+MD5 (gnome2/gnome-media-1.520.2.tar.bz2) = 269f237dfb0a2312f9dc85fe91e75ae0
diff --git a/audio/gnomemedia2/files/patch-ac b/audio/gnomemedia2/files/patch-ac
deleted file mode 100644
index 550d1e6d083c..000000000000
--- a/audio/gnomemedia2/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- cddbslave/Makefile.in.orig	Wed May 24 14:53:10 2000
-+++ cddbslave/Makefile.in	Tue May 30 15:13:02 2000
-@@ -139,3 +139,3 @@
- 
--gnomedatadir = $(datadir)/gnome
-+gnomedatadir = $(datadir)
- 
---- tcd/Makefile.in.orig	Wed May 24 14:53:16 2000
-+++ tcd/Makefile.in	Tue May 30 15:12:38 2000
-@@ -147,3 +147,3 @@
- 
--tcd_LDADD = $(GNOME_LIBDIR) -lglib -lm $(CURSES_LIBS) $(INTLLIBS)
-+tcd_LDADD = `$(GLIB_CONFIG) --libs` -lm $(CURSES_LIBS) $(INTLLIBS)
- 
diff --git a/audio/gnomemedia2/files/patch-ad b/audio/gnomemedia2/files/patch-ad
index 3827d7a20da7..9dc4efce4c88 100644
--- a/audio/gnomemedia2/files/patch-ad
+++ b/audio/gnomemedia2/files/patch-ad
@@ -1,6 +1,6 @@
---- gmix/gmix.c.orig	Mon Jun 11 13:50:47 2001
-+++ gmix/gmix.c	Sat Apr  6 14:55:36 2002
-@@ -58,7 +58,7 @@
+--- gmix/gmix.c.orig	Tue May  7 00:43:15 2002
++++ gmix/gmix.c	Tue May  7 00:47:38 2002
+@@ -60,7 +60,7 @@
  #ifdef HAVE_LINUX_SOUNDCARD_H 
  #include <linux/soundcard.h>
  #else 
@@ -9,57 +9,37 @@
  #endif
  #endif
  
-@@ -499,11 +499,7 @@
+@@ -569,12 +569,7 @@
  	/*
  	 * open the mixer-device
  	 */
--	if (num==0) {
--		sprintf(device_name, "/dev/mixer");
+-	if (num == 0) {
+-		sprintf (device_name, "/dev/mixer");
 -	} else {
--		sprintf(device_name, "/dev/mixer%i", num);
+-		sprintf (device_name, "/dev/mixer%i", num);
 -	}
+-
 +	sprintf(device_name, "/dev/mixer%i", num);
- 	new_device->fd=open(device_name, O_RDWR, 0);
- 	if (new_device->fd<0) {
- 		g_free(new_device);
-@@ -535,6 +531,8 @@
- 		}			
- 	}
- #endif
-+
-+#if defined(OPEN_SOUND_SYSTEM)
- 	/*
- 	 * mixer-name
- 	 */
-@@ -545,6 +543,11 @@
- 	}
- 	if(!isalpha(new_device->info.name[0]))
- 		g_snprintf(new_device->info.name, 31, "Card %d", num+1);
-+#else
-+	g_snprintf(new_device->info.id, 15, "mixer%d", num);
-+	g_snprintf(new_device->info.name, 31, "Sound Card %d", num+1);
-+	new_device->info.modify_counter=0;
-+#endif
- 	/* 
- 	 * several bitmasks describing the mixer
- 	 */
-@@ -677,15 +680,16 @@
- {
- 	int cnt;
- 	device_info *new_device;
--	cnt=0; devices=NULL;
-+	cnt=0; num_mixers=0; devices=NULL;
+ 	new_device->fd = open (device_name, O_RDWR, 0);
+ 	
+ 	if (new_device->fd < 0) {
+@@ -689,6 +684,7 @@
+ 	
+ 	cnt = 0;
+ 	devices = NULL;
++	num_mixers = 0;
+ 	device_by_name = g_hash_table_new (g_str_hash, g_str_equal);
+ 		
  	do {
- 		new_device=open_device(cnt++);
- 		if (new_device) {
- 			new_device->channels=make_channels(new_device);
- 			devices=g_list_append(devices, new_device);
-+			num_mixers++;
+@@ -697,9 +693,8 @@
+ 			devices = g_list_append (devices, new_device);
+ 			g_hash_table_insert (device_by_name, new_device->info.name, new_device);
  		}
 -	} while (new_device);
--	num_mixers=cnt-1;
-+	} while ((errno == EACCES) || (errno == EINVAL) || (errno == ENXIO) \
-+		 || new_device);
+-	
+-	num_mixers = cnt - 1;
++    	} while ((errno == EACCES) || (errno == EINVAL) || (errno == ENXIO) \
++		|| new_device);
  }
  
- #ifdef ALSA
+ device_info *
diff --git a/audio/gnomemedia2/files/patch-ae b/audio/gnomemedia2/files/patch-ae
deleted file mode 100644
index 53c2143d301b..000000000000
--- a/audio/gnomemedia2/files/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- tcd/callbacks.c	2001/07/13 07:48:12	1.1
-+++ tcd/callbacks.c	2001/07/13 07:50:36
-@@ -13,7 +13,7 @@
- {
-     if(!cd.isplayable)
- 	return;
--    if(cd.sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED)
-+    if(SC_AUDIOSTATUS(cd.sc)==CDROM_AUDIO_PAUSED)
- 	tcd_pausecd(&cd);
-     else
- 	tcd_playtracks(&cd, cd.first_t, cd.last_t, prefs->only_use_trkind);
-@@ -45,7 +45,7 @@
-     cd.play_method = NORMAL;
-     cd.repeat_track = -1;
-     /* SDH: Make sure play/pause state change is noticed */
--    cd.sc.cdsc_audiostatus = -1;
-+    SC_AUDIOSTATUS(cd.sc) = -1;
-     if(cd.isplayable)
-     {
- 	make_goto_menu();
diff --git a/audio/gnomemedia2/files/patch-cddbslave::cddbsubmit.c b/audio/gnomemedia2/files/patch-cddbslave::cddbsubmit.c
deleted file mode 100644
index 0893335324cc..000000000000
--- a/audio/gnomemedia2/files/patch-cddbslave::cddbsubmit.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- cddbslave/cddbsubmit.c.orig	Tue Apr 16 15:53:12 2002
-+++ cddbslave/cddbsubmit.c	Tue Apr 16 15:53:20 2002
-@@ -210,7 +210,7 @@
-   poptFreeContext(gnomelib_parse_args(argc, argv, 0));
- 
-   /* config prefix points to cddb submission description file */
--  fname = gnome_datadir_file("gnome/cddb-submit-methods");
-+  fname = gnome_datadir_file("cddb-submit-methods");
-   prefix = g_strconcat("=", fname, "=/", service, "/", NULL);
-   g_free(fname);
-   gnome_config_push_prefix(prefix);
diff --git a/audio/gnomemedia2/files/patch-cddbslave::socks4.c b/audio/gnomemedia2/files/patch-cddbslave::socks4.c
deleted file mode 100644
index ecb4659df044..000000000000
--- a/audio/gnomemedia2/files/patch-cddbslave::socks4.c
+++ /dev/null
@@ -1,19 +0,0 @@
-
-$FreeBSD$
-
---- cddbslave/socks4.c	2001/12/06 08:10:34	1.1
-+++ cddbslave/socks4.c	2001/12/06 08:11:08
-@@ -33,12 +33,12 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/time.h>
- #include <netinet/in.h>
- #include <unistd.h>
- #include <pwd.h>
--#include <sys/types.h>
- #include <sys/select.h>
- #include <dlfcn.h>
- 
diff --git a/audio/gnomemedia2/files/patch-configure b/audio/gnomemedia2/files/patch-configure
new file mode 100644
index 000000000000..69445f92cc6d
--- /dev/null
+++ b/audio/gnomemedia2/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Tue May  7 01:02:03 2002
++++ configure	Tue May  7 01:04:35 2002
+@@ -7978,6 +7978,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/audio/gnomemedia2/files/patch-gmix::gmix.h b/audio/gnomemedia2/files/patch-gmix::gmix.h
deleted file mode 100644
index 7718b6cd4dba..000000000000
--- a/audio/gnomemedia2/files/patch-gmix::gmix.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- gmix/gmix.h	2001/07/13 09:44:04	1.1
-+++ gmix/gmix.h	2001/07/13 09:44:44
-@@ -39,6 +39,16 @@
- /* 
-  * All, that is known about a mixer-device
-  */
-+#if !defined(OPEN_SOUND_SYSTEM)
-+typedef struct mixer_info
-+{
-+  char id[16];
-+  char name[32];
-+  int  modify_counter;
-+  int fillers[10];
-+} mixer_info;
-+#endif
-+
- typedef struct device_info {
- #ifdef ALSA
- 	snd_mixer_t *handle;
diff --git a/audio/gnomemedia2/files/patch-gmix::prefs.c b/audio/gnomemedia2/files/patch-gmix::prefs.c
index cee2f1884aec..b25b42b9748e 100644
--- a/audio/gnomemedia2/files/patch-gmix::prefs.c
+++ b/audio/gnomemedia2/files/patch-gmix::prefs.c
@@ -1,5 +1,5 @@
---- gmix/prefs.c.orig	Fri Apr 12 11:53:51 2002
-+++ gmix/prefs.c	Fri Apr 12 11:53:57 2002
+--- gmix/prefs.c.orig	Tue May  7 00:52:42 2002
++++ gmix/prefs.c	Tue May  7 00:52:54 2002
 @@ -38,7 +38,7 @@
  #ifdef HAVE_LINUX_SOUNDCARD_H 
  #include <linux/soundcard.h>
diff --git a/audio/gnomemedia2/files/patch-tcd::cddb.c b/audio/gnomemedia2/files/patch-tcd::cddb.c
deleted file mode 100644
index 841fc4c6ba13..000000000000
--- a/audio/gnomemedia2/files/patch-tcd::cddb.c
+++ /dev/null
@@ -1,65 +0,0 @@
-
-$FreeBSD$
-
---- tcd/cddb.c	2001/07/13 07:50:57	1.1
-+++ tcd/cddb.c	2001/07/13 07:55:41
-@@ -199,16 +199,16 @@
- 	{
- 		int min, sec;
- 		
--		min = cd->trk[trk].toc.cdte_addr.msf.minute;
--		sec = cd->trk[trk].toc.cdte_addr.msf.second;
-+		min = TOC_MINUTE(cd->trk[trk]);
-+		sec = TOC_SECOND(cd->trk[trk]);
- 	
- 		n = (min*60)+sec;
--		fprintf( fp, "# %u\n", (n*75)+cd->trk[trk].toc.cdte_addr.msf.frame );
-+		fprintf( fp, "# %u\n", (n*75)+TOC_FRAME(cd->trk[trk]) );
- 	}
- 	/* Print the number of seconds */
- 	fprintf( fp, "#\n# Disc length: %i seconds\n", 
--		(cd->trk[cd->last_t+1].toc.cdte_addr.msf.minute*60)
--                +(cd->trk[cd->last_t+1].toc.cdte_addr.msf.second) );
-+		(TOC_MINUTE(cd->trk[cd->last_t+1])*60)
-+		+(TOC_SECOND(cd->trk[cd->last_t+1])) );
- 
- 	fprintf( fp, "#\n# Revision: %lu\n", cd->cddb_rev );
- 	fprintf( fp, "# Submitted via: tcd 2.0b\n" );
-@@ -245,10 +245,10 @@
-     {
- 	int min, sec;
- 	
--	min = cd->trk[i].toc.cdte_addr.msf.minute;
--	sec = cd->trk[i].toc.cdte_addr.msf.second;
-+	min = TOC_MINUTE(cd->trk[i]);
-+	sec = TOC_SECOND(cd->trk[i]);
-         
--	l=sprintf( tmp, "%u ", calc_offset(min,sec,cd->trk[i].toc.cdte_addr.msf.frame));
-+	l=sprintf( tmp, "%u ", calc_offset(min,sec,TOC_FRAME(cd->trk[i])));
- 	
- 	if(blen>l)
- 	{
-@@ -257,8 +257,8 @@
- 	}
-     }
-     l=sprintf( tmp, "%i\n",
--	       (cd->trk[cd->last_t+1].toc.cdte_addr.msf.minute*60)
--	       +(cd->trk[cd->last_t+1].toc.cdte_addr.msf.second) );
-+	       (TOC_MINUTE(cd->trk[cd->last_t+1])*60)
-+	       +(TOC_SECOND(cd->trk[cd->last_t+1])) );
-     if(blen>l)
- 	strcat( buf,tmp );
- 
-@@ -298,9 +298,9 @@
- 
- 	for( i=0; i <= cd->last_t+1; i++ )
- 	{
-- 		cdtoc[i].frame = cd->trk[i+1].toc.cdte_addr.msf.frame;
-- 		cdtoc[i].min = cd->trk[i+1].toc.cdte_addr.msf.minute;
-- 		cdtoc[i].sec = cd->trk[i+1].toc.cdte_addr.msf.second;
-+ 		cdtoc[i].frame = TOC_FRAME(cd->trk[i+1]);
-+ 		cdtoc[i].min = TOC_MINUTE(cd->trk[i+1]);
-+ 		cdtoc[i].sec = TOC_SECOND(cd->trk[i+1]);
-  	}
-  	
- 
diff --git a/audio/gnomemedia2/files/patch-tcd::gtcd.c b/audio/gnomemedia2/files/patch-tcd::gtcd.c
deleted file mode 100644
index b7ad854ee209..000000000000
--- a/audio/gnomemedia2/files/patch-tcd::gtcd.c
+++ /dev/null
@@ -1,100 +0,0 @@
-
-$FreeBSD$
-
---- tcd/gtcd.c.orig	Mon Jun 11 20:50:57 2001
-+++ tcd/gtcd.c	Fri Jul 13 12:49:33 2001
-@@ -163,7 +163,11 @@
- gint release_timer(gpointer *data)
- {
- 	cd.time_lock = TRUE;
-+#ifdef TCD_BSD
-+	ioctl(cd.cd_dev, CDIOCPAUSE);
-+#else
- 	ioctl(cd.cd_dev, CDROMPAUSE);
-+#endif
- 
- 	roll_t = gtk_timeout_add(40, (GtkFunction)roll_timer, data);
- 	release_t = 0;
-@@ -206,7 +210,11 @@
- 			if(GPOINTER_TO_INT(data) > 0)
- 			{
- 				if((cd.cur_t < cd.last_t) &&
-+#ifdef TCD_BSD
-+				   cd.trk[cd.cur_t+1].toc.control == 0x04)
-+#else
- 				   (cd.trk[cd.cur_t+1].toc.cdte_ctrl != CDROM_DATA_TRACK))
-+#endif
- 				{
- 					cd.cur_t++;
- 					tcd_playtracks(&cd,cd.cur_t, cd.last_t, prefs->only_use_trkind);
-@@ -541,8 +549,8 @@
- 		break;
- 	case TRACK_R: /* track time decending */
- 		cur = cd.cur_pos_rel;
--		end = (cd.trk[cd.cur_t].tot_min*60)+
--			cd.trk[cd.cur_t].tot_sec;
-+		end = (TOC_MINUTE(cd.trk[cd.cur_t])*60)+
-+			TOC_SECOND(cd.trk[cd.cur_t]);
- 		pos = end-cur;
- 		min = pos/60;
- 		sec = pos-(pos/60)*60;
-@@ -555,8 +563,8 @@
- 		break;
- 	case DISC_R:
- 		cur = cd.cur_pos_abs;
--		end = (cd.trk[cd.last_t+1].toc.cdte_addr.msf.minute
--		       *60)+cd.trk[cd.last_t+1].toc.cdte_addr.msf.second;
-+		end = (TOC_MINUTE(cd.trk[cd.last_t+1])*60
-+		       +TOC_SECOND(cd.trk[cd.last_t+1]));
- 		pos = end-cur;
- 		min = pos/60;
- 		sec = pos-(pos/60)*60;
-@@ -660,7 +668,7 @@
- 
- 	if( !cd.err )
- 	{
--		switch( cd.sc.cdsc_audiostatus )
-+		switch( SC_AUDIOSTATUS(cd.sc) )
- 		{
- 		case CDROM_AUDIO_INVALID:
- 			strcpy(tmp, _("No Disc"));
-@@ -756,8 +764,8 @@
- 	}
- 
- 	/* see if we need to repeat */
--	if( cd.sc.cdsc_audiostatus != CDROM_AUDIO_PLAY &&
--	    cd.sc.cdsc_audiostatus != CDROM_AUDIO_PAUSED )
-+	if( SC_AUDIOSTATUS(cd.sc) != CDROM_AUDIO_PLAY &&
-+	    SC_AUDIOSTATUS(cd.sc) != CDROM_AUDIO_PAUSED )
- 	{
- 		if( cd.play_method == REPEAT_CD )
- 			tcd_playtracks( &cd, cd.first_t, cd.last_t, prefs->only_use_trkind);
-@@ -774,14 +782,14 @@
- 
- void status_changed(void)
- {
--	if(old_status != cd.sc.cdsc_audiostatus)
-+	if(old_status != SC_AUDIOSTATUS(cd.sc))
- 	{
- 		GtkWidget *pixmap;
- 		GtkSignalFunc func;
- 		char tmp[256];
- 		char *name;
- 	
--		old_status = cd.sc.cdsc_audiostatus;
-+		old_status = SC_AUDIOSTATUS(cd.sc);
- 		g_snprintf(tmp, 255, "tcd/%s.xpm", 
- 			   (old_status==CDROM_AUDIO_PLAY)?"pause":"play");
- 
-@@ -846,7 +854,11 @@
- 
- 	for(i=1; i <= cd.last_t; i++)
- 	{
-+#ifdef TCD_BSD
-+		data_track = (cd.trk[C(i)].toc.control == 0x04);
-+#else
- 		data_track = (cd.trk[C(i)].toc.cdte_ctrl == CDROM_DATA_TRACK);
-+#endif
- 
- 		g_snprintf(buf, TRK_NAME_LEN, "%2d - %s", i,
- 			   data_track ? "[Data]" : cd.trk[C(i)].name);
diff --git a/audio/gnomemedia2/files/patch-tcd::gtracked.c b/audio/gnomemedia2/files/patch-tcd::gtracked.c
deleted file mode 100644
index 4d5bd3dda993..000000000000
--- a/audio/gnomemedia2/files/patch-tcd::gtracked.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- tcd/gtracked.c.orig	Mon Jun 11 13:50:57 2001
-+++ tcd/gtracked.c	Tue Apr 16 15:53:53 2002
-@@ -211,8 +211,8 @@
-     
-     /* Disc area */
-     g_snprintf(tmp, 63, _("Disc Information (%02u:%02u minutes)"),
--	       cd.trk[cd.last_t+1].toc.cdte_addr.msf.minute,
--	       cd.trk[cd.last_t+1].toc.cdte_addr.msf.second);
-+	       TOC_MINUTE(cd.trk[cd.last_t+1]),
-+	       TOC_SECOND(cd.trk[cd.last_t+1]));
- 
-     disc_frame = gtk_frame_new(tmp);
-     disc_vbox  = gtk_vbox_new(FALSE, GNOME_PAD_SMALL);
-@@ -397,7 +397,7 @@
-     
-     /* build service menu */
-     service_menu = gtk_menu_new();
--    key = gnome_datadir_file("gnome/cddb-submit-methods");
-+    key = gnome_datadir_file("cddb-submit-methods");
-     prefix = g_strconcat("=", key, "=/", NULL);
-     g_free(key);
- 
diff --git a/audio/gnomemedia2/files/patch-tcd::linux-cdrom.c b/audio/gnomemedia2/files/patch-tcd::linux-cdrom.c
deleted file mode 100644
index 6b8c36e856ff..000000000000
--- a/audio/gnomemedia2/files/patch-tcd::linux-cdrom.c
+++ /dev/null
@@ -1,668 +0,0 @@
---- tcd/linux-cdrom.c.orig	Mon Jun 11 13:50:58 2001
-+++ tcd/linux-cdrom.c	Tue Apr 16 15:55:46 2002
-@@ -67,6 +67,7 @@
-     return;
- }
- 
-+#ifndef TCD_BSD
- static void decrement_msf_end_by_one (struct cdrom_msf *msf)
- {
-     if (msf->cdmsf_frame1)
-@@ -87,13 +88,14 @@
- 	}
-     }
- }
-+#endif
- 
- int tcd_init_disc( cd_struct *cd, WarnFunc msg_cb )
- {
-     debug("cdrom.c: tcd_init_disc(%p) top\n", cd );
-     tcd_opencddev( cd, msg_cb );
-     
--#if defined(TCD_CHANGER_ENABLED)
-+#if defined(TCD_CHANGER_ENABLED) && !defined(TCD_BSD)
-     cd->nslots = ioctl( cd->cd_dev, CDROM_CHANGER_NSLOTS );
- #else
-     cd->nslots = 0;
-@@ -131,6 +133,9 @@
- int tcd_close_disc( cd_struct *cd )
- {
-     debug("cdrom.c: tcd_close_disc(%p) top\n", cd );
-+#ifdef TCD_BSD
-+    ioctl( cd->cd_dev, CDIOCALLOW);
-+#endif
-     close(cd->cd_dev);
-     cd->cd_dev = -1;
-     debug("cdrom.c: tcd_close_disc exiting normally\n" );
-@@ -141,6 +146,10 @@
- {
-     int i;
-     int delsecs;
-+#ifdef TCD_BSD
-+    struct ioc_read_toc_single_entry tocentry;
-+#endif
-+
- 
-     if(cd->time_lock)
- 	    return;
-@@ -152,7 +161,11 @@
-     cd->isplayable=FALSE;
- 	
-     /* read the TOC header */
-+#ifdef TCD_BSD
-+    if((ioctl( cd->cd_dev, CDIOREADTOCHEADER, &cd->tochdr))==-1)
-+#else
-     if(ioctl( cd->cd_dev, CDROMREADTOCHDR, &cd->tochdr))
-+#endif
-     {
- 	strcpy( cd->errmsg, "Can't read disc." );
- 	cd->err = TRUE;
-@@ -164,15 +177,29 @@
-     }
- 
-     /* grab first & last tracks */
-+#ifdef TCD_BSD
-+    cd->first_t = cd->tochdr.starting_track;
-+    cd->last_t = cd->tochdr.ending_track;
-+#else
-     cd->first_t = cd->tochdr.cdth_trk0;
-     cd->last_t = cd->tochdr.cdth_trk1;
-+#endif
- 
-     /* read the leadout track */
-+#ifdef TCD_BSD
-+    tocentry.track = 0xaa;   /* Magic last track */
-+    tocentry.address_format = CD_MSF_FORMAT;
-+#else
-     cd->trk[C(cd->last_t+1)].toc.cdte_track = CDROM_LEADOUT;
-     cd->trk[C(cd->last_t+1)].toc.cdte_format = CDROM_MSF;
-+#endif
- 
-     /* read the leadout toc */
-+#ifdef TCD_BSD
-+    if((ioctl(cd->cd_dev, CDIOREADTOCENTRY, &tocentry)) == -1)
-+#else
-     if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(cd->last_t+1)].toc))
-+#endif
-     {
- 	strcpy(cd->errmsg, "Can't read disc.");
- 	cd->err = TRUE;
-@@ -184,13 +211,30 @@
- 	return;
-     }                                         
- 
-+#ifdef TCD_BSD
-+    cd->trk[C(cd->last_t+1)].toc = tocentry.entry;
-+    cd->trk[C(cd->last_t+1)].length = TOC_MINUTE(cd->trk[C(cd->last_t+1)]) * 60 +
-+	TOC_SECOND(cd->trk[C(cd->last_t+1)]);
-+    cd->trk[C(cd->last_t+1)].start = cd->trk[C(cd->last_t+1)].length * 75 +
-+	TOC_FRAME(cd->trk[C(cd->last_t+1)]);
-+#endif
-+
-     /* read the rest of the tocs */
-     for( i = cd->first_t; i <= cd->last_t; i++ )
-     {
-+#ifdef TCD_BSD
-+	tocentry.track = i;
-+	tocentry.address_format = CD_MSF_FORMAT;
-+#else
- 	cd->trk[C(i)].toc.cdte_track = i;
- 	cd->trk[C(i)].toc.cdte_format = CDROM_MSF;
-+#endif
- 	
-+#ifdef TCD_BSD
-+	if((ioctl(cd->cd_dev, CDIOREADTOCENTRY, &tocentry)) == -1)
-+#else
- 	if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(i)].toc))
-+#endif
- 	{
- 	    strcpy( cd->errmsg, "Can't read disc." );
- 	    cd->err = TRUE;
-@@ -201,21 +245,34 @@
- 	    return;
- 	}
- 
-+#ifdef TCD_BSD
-+	cd->trk[C(i)].toc = tocentry.entry;
-+	cd->trk[C(i)].type = cd->trk[C(i)].toc.control;
-+	cd->trk[C(i)].length = TOC_MINUTE(cd->trk[C(i)]) * 60 +
-+	    TOC_SECOND(cd->trk[C(i)]);
-+	cd->trk[C(i)].start = cd->trk[C(i)].length * 75 +
-+	    TOC_FRAME(cd->trk[C(i)]);
-+#else
- 	cd->trk[C(i)].type = cd->trk[C(i)].toc.cdte_ctrl;
- 	cd->trk[C(i)].length = cd->trk[C(i)].toc.cdte_addr.msf.minute * 60 +
- 	    cd->trk[C(i)].toc.cdte_addr.msf.second;
- 	cd->trk[C(i)].start = cd->trk[C(i)].length * 75 + 
- 	    cd->trk[C(i)].toc.cdte_addr.msf.frame;
-+#endif
-     }
- 
-     /* calculate track times */
-     for(i = cd->first_t; i <= cd->last_t; i ++)
-     {
- 	/* Taken from cdtool...Thanks Thomas I.! */
-+#ifdef TCD_BSD
-+	delsecs = cd->trk[C(i+1)].length - cd->trk[C(i)].length;
-+#else
- 	delsecs = cd->trk[C(i+1)].toc.cdte_addr.msf.minute * 60
- 	    + cd->trk[C(i+1)].toc.cdte_addr.msf.second
- 	    - cd->trk[C(i)].toc.cdte_addr.msf.minute * 60
- 	    - cd->trk[C(i)].toc.cdte_addr.msf.second;
-+#endif
- 
- 	cd->trk[C(i)].tot_min = delsecs / 60;
- 	cd->trk[C(i)].tot_sec = delsecs - (delsecs/60)*60;
-@@ -245,9 +302,14 @@
- 	    return;
- 
-     /* calculate various timing values */
-+#ifdef TCD_BSD
-+    cd->cur_pos_abs = SC_MINUTE(cd->sc) * 60 + SC_SECOND(cd->sc);
-+    cd->cur_frame = cd->cur_pos_abs * 75 + SC_FRAME(cd->sc);
-+#else
-     cd->cur_pos_abs = cd->sc.cdsc_absaddr.msf.minute * 60 +
- 	cd->sc.cdsc_absaddr.msf.second;
-     cd->cur_frame = cd->cur_pos_abs * 75 + cd->sc.cdsc_absaddr.msf.frame;
-+#endif
-         
-     cd->cur_pos_rel = (cd->cur_frame - cd->trk[C(cd->cur_t)].start) / 75;
- 	
-@@ -266,10 +328,12 @@
-     cd->cd_min = cd->cur_pos_abs / 60;
- 
- #ifdef TCD_CHANGER_ENABLED
-+#ifndef TCD_BSD
-     tcd_opencddev( cd, NULL );
-     cd->cur_disc = ioctl( cd->cd_dev, CDROM_SELECT_DISC, CDSL_CURRENT );
-     tcd_close_disc ( cd );
- #endif
-+#endif
- }
- 
- void tcd_recalculate_fake(cd_struct *cd, gint abs_pos, gint track)
-@@ -305,7 +369,11 @@
- 	
- 	for(t = cd->first_t; t <= cd->last_t; t++)
- 	{
-+#ifdef TCD_BSD
-+		if(cd->trk[t].toc.control == 0x04)
-+#else
- 		if(cd->trk[t].toc.cdte_ctrl == CDROM_DATA_TRACK)
-+#endif
- 			return t-1;
- 		if(abs_pos >= cd->trk[t].start/75)
- 			continue;
-@@ -316,16 +384,35 @@
- 
- void tcd_gettime( cd_struct *cd )
- {
-+#ifdef TCD_BSD
-+	struct ioc_read_subchannel subch;
-+#endif
- 	cd->err = FALSE;
-+#ifdef TCD_BSD
-+	subch.address_format = CD_MSF_FORMAT;
-+	subch.data_format = CD_CURRENT_POSITION;
-+	subch.data_len = sizeof(cd->sc);
-+	subch.track = 0;
-+	subch.data = &(cd->sc);
-+#else
- 	cd->sc.cdsc_format = CDROM_MSF;
-+#endif
- 	
- 	if(cd->isplayable)
- 	{
- 	        int tmp;
- 		tcd_opencddev (cd, NULL);
-+#ifdef TCD_BSD
-+		tmp = ioctl( cd->cd_dev, CDIOCREADSUBCHANNEL, &subch);
-+#else
- 		tmp = ioctl( cd->cd_dev, CDROMSUBCHNL, &cd->sc);
-+#endif
- 		tcd_close_disc (cd);
-+#ifdef TCD_BSD
-+		if(tmp == -1)
-+#else
- 		if(tmp)
-+#endif
- 		{
- 			strcpy( cd->errmsg, "Can't read disc." );
- 			cd->err = TRUE;
-@@ -333,8 +420,18 @@
- 			cd->cur_t = 0;
- 			return;
- 		}
-+#ifdef TCD_BSD
-+		if( SC_AUDIOSTATUS(cd->sc)==CDROM_AUDIO_PLAY )
-+#else
- 		if(cd->sc.cdsc_audiostatus==CDROM_AUDIO_PLAY)
-+#endif
-+		{
-+#ifdef TCD_BSD
-+			cd->cur_t = SC_TRACK(cd->sc);
-+#else
- 			cd->cur_t = cd->sc.cdsc_trk;
-+#endif
-+		}
- 		else
- 			cd->cur_t = 0;
- 		tcd_recalculate(cd);
-@@ -343,14 +440,27 @@
- 
- int tcd_set_volume(cd_struct *cd, int volume)
- {
-+#ifdef TCD_BSD
-+    struct ioc_vol vol;
-+#else
-     struct cdrom_volctrl vol;
-+#endif
-     int tmp;
- 
-+#ifdef TCD_BSD
-+    vol.vol[0] = volume;
-+    vol.vol[1] = vol.vol[2] = vol.vol[3] = vol.vol[0];
-+#else
-     vol.channel0 = volume;
-     vol.channel1 = vol.channel2 = vol.channel3 = vol.channel0;
-+#endif
- 
-     tcd_opencddev( cd, NULL );
-+#ifdef TCD_BSD
-+    tmp = ioctl(cd->cd_dev, CDIOCSETVOL, &vol);
-+#else
-     tmp = ioctl(cd->cd_dev, CDROMVOLCTRL, &vol);
-+#endif
-     tcd_close_disc ( cd );
-     if(tmp < 0)
- 	return FALSE;
-@@ -360,6 +470,18 @@
- 
- int tcd_get_volume(cd_struct *cd)
- {
-+#ifdef TCD_BSD
-+    struct ioc_vol vol;
-+    int tmp;
-+
-+    tcd_opencddev( cd, NULL );
-+    tmp = ioctl(cd->cd_dev, CDIOCGETVOL, &vol);
-+    tcd_close_disc ( cd );
-+    if (tmp < 0)
-+	return -1;
-+
-+    return vol.vol[0];
-+#else
- #ifdef CDROMVOLREAD
-     struct cdrom_volctrl vol;
-     int tmp;
-@@ -374,12 +496,38 @@
- #else
-     return 0;
- #endif
-+#endif
- }	
- 	                                  
- void tcd_playtracks(cd_struct *cd, int start_t, int end_t, int only_use_trkind)
- {
-+#ifdef TCD_BSD
-+    struct ioc_play_msf msf;
-+#define MSF_START_MIN  (msf.start_m)
-+#define MSF_START_SEC  (msf.start_s)
-+#define MSF_START_FRM  (msf.start_f)
-+#define MSF_END_MIN    (msf.end_m)
-+#define MSF_END_SEC    (msf.end_s)
-+#define MSF_END_FRM    (msf.end_f)
-+    struct ioc_play_track trkind;
-+#define TI_START_TRK   (trkind.start_track)
-+#define TI_START_IND   (trkind.start_index)
-+#define TI_END_TRK     (trkind.end_track)
-+#define TI_END_IND     (trkind.end_index)
-+#else
-     struct cdrom_msf msf;
-+#define MSF_START_MIN  (msf.cdmsf_min0)
-+#define MSF_START_SEC  (msf.cdmsf_sec0)
-+#define MSF_START_FRM  (msf.cdmsf_frame0)
-+#define MSF_END_MIN    (msf.cdmsf_min1)
-+#define MSF_END_SEC    (msf.cdmsf_sec1)
-+#define MSF_END_FRM    (msf.cdmsf_frame0)
-     struct cdrom_ti trkind;
-+#define TI_START_TRK   (trkind.cdti_trk0)
-+#define TI_START_IND   (trkind.cdti_ind0)
-+#define TI_END_TRK     (trkind.cdti_trk1)
-+#define TI_END_IND     (trkind.cdti_ind1)
-+#endif
-     debug("cdrom.c: tcd_playtracks( %p, %d, %d )\n", cd, start_t, end_t );
-     cd->err = FALSE;
- 	
-@@ -390,7 +538,7 @@
-     tcd_gettime(cd);
-     if(cd->err) 
-     {
--	/* try and inject cd */
-+	/* try and eject cd */
- 	tcd_ejectcd(cd);
- 
- 	if(cd->err) 
-@@ -401,62 +549,79 @@
-     }
- 
-     tcd_opencddev( cd, NULL );
-+#ifdef TCD_BSD
-+    ioctl(cd->cd_dev, CDIOCCLOSE);
-+#else
- #if defined(CDROMCLOSETRAY)
-     if( ioctl( cd->cd_dev, CDROM_DRIVE_STATUS ) == CDS_TRAY_OPEN )
- 	    ioctl(cd->cd_dev, CDROMCLOSETRAY);
- #endif	        
-+#endif
- 	
-+#ifdef TCD_BSD
-+    if(cd->trk[start_t].toc.control == 0x04)
-+#else
-     if(cd->trk[start_t].toc.cdte_ctrl == CDROM_DATA_TRACK)
-+#endif
- 	start_t++;		/* bad hack. most data tracks are the first track... */
- 
--    msf.cdmsf_min0 = cd->trk[start_t].toc.cdte_addr.msf.minute;
--    msf.cdmsf_sec0 = cd->trk[start_t].toc.cdte_addr.msf.second;
--    msf.cdmsf_frame0 = cd->trk[start_t].toc.cdte_addr.msf.frame;
-+    MSF_START_MIN = TOC_MINUTE(cd->trk[start_t]);
-+    MSF_START_SEC = TOC_SECOND(cd->trk[start_t]);
-+    MSF_START_FRM = TOC_FRAME(cd->trk[start_t]);
- 	
-     if( end_t < 0 )
-     {
--	msf.cdmsf_min1 = cd->trk[start_t].tot_min+msf.cdmsf_min0;
--	msf.cdmsf_sec1 = cd->trk[start_t].tot_sec+msf.cdmsf_sec0;
--	msf.cdmsf_frame1=0;
-+	MSF_END_MIN = cd->trk[start_t].tot_min+MSF_START_MIN;
-+	MSF_END_SEC = cd->trk[start_t].tot_sec+MSF_START_SEC;
-+	MSF_END_FRM = 0;
-     }
-     else
-     {
--	msf.cdmsf_min1 = cd->trk[end_t+1].toc.cdte_addr.msf.minute;
--	msf.cdmsf_sec1 = cd->trk[end_t+1].toc.cdte_addr.msf.second;
--	msf.cdmsf_frame1 = cd->trk[end_t+1].toc.cdte_addr.msf.frame;
--	decrement_msf_end_by_one (&msf);
-+	MSF_END_MIN = TOC_MINUTE(cd->trk[end_t+1]);
-+	MSF_END_SEC = TOC_SECOND(cd->trk[end_t+1]);
-+	MSF_END_FRM = TOC_FRAME(cd->trk[end_t+1]);
-+	MSF_END_FRM -= 1;
- 
- #ifdef UNSIGNED_NUMBERS_CAN_BE_NEGATIVE
--	if(msf.cdmsf_frame1 < 0)
-+	if(MSF_END_FRM < 0)
- 	{
--	    msf.cdmsf_sec1 += msf.cdmsf_frame1;
--	    msf.cdmsf_frame1 = 0;
-+	    MSF_END_SEC += MSF_END_FRM;
-+	    MSF_END_FRM = 0;
- 	}
--	if(msf.cdmsf_sec1 < 0)
-+	if(MSF_END_SEC < 0)
- 	{
--	    msf.cdmsf_min1 += msf.cdmsf_sec1;
--	    msf.cdmsf_sec1 = 0;
-+	    MSF_END_MIN += MSF_END_SEC;
-+	    MSF_END_SEC = 0;
- 	}
--	if(msf.cdmsf_min1 < 0)
-+	if(MSF_END_MIN < 0)
- 	{
--	    msf.cdmsf_min1 = 0;
-+	    MSF_END_MIN = 0;
- 	}
- #endif
-     }
--    msf.cdmsf_min1 += (msf.cdmsf_sec1 / 60);
--    msf.cdmsf_sec1 %= 60;
-+    MSF_END_MIN += (MSF_END_SEC / 60);
-+    MSF_END_SEC %= 60;
- 
-+#ifdef TCD_BSD
-+    ioctl( cd->cd_dev, CDIOCPREVENT);
-+    if(only_use_trkind || ioctl( cd->cd_dev, CDIOCPLAYMSF, &msf))
-+#else
-     if(ioctl( cd->cd_dev, CDROMPLAYMSF, &msf) || only_use_trkind)
-+#endif
-     {
- 	debug("cdrom.c: tcd_playtracks error. CDROMPLAYMSF ioctl error (or user override). Trying PLAYTRKIND\n" );
- 
- 	/* Try alternate method of playing */
--	trkind.cdti_trk0 = start_t;     /* start track */
--	trkind.cdti_ind0 = 0;      	/* start index */
--	trkind.cdti_trk1 = end_t;      	/* end track */
--	trkind.cdti_ind1 = 0;      	/* end index */
-+	TI_START_TRK = start_t;		/* start track */
-+	TI_START_IND = 0;	      	/* start index */
-+	TI_END_TRK = end_t;      	/* end track */
-+	TI_END_IND = 0;         	/* end index */
- 		                                
-+#ifdef TCD_BSD
-+	if(ioctl(cd->cd_dev, CDIOCPLAYTRACKS, &trkind))
-+#else
- 	if(ioctl(cd->cd_dev, CDROMPLAYTRKIND, &trkind))
-+#endif
- 	{
- 	    strcpy( cd->errmsg, "Error playing disc" );
- 	    cd->err = TRUE;
-@@ -472,25 +637,15 @@
-     return;
- }       
- 
--static int msf_2_frame( cd_min_sec_frame *msf )
--{
--	return( ( msf->minute * CD_SECS + msf->second )
--			* CD_FRAMES + msf->frame );
--}
--
--static void frame_2_msf( int frame, cd_min_sec_frame *msf )
--{
--	msf->frame = frame % CD_FRAMES;
--	frame /= CD_FRAMES;
--	msf->second = frame % CD_SECS;
--	msf->minute = frame / CD_SECS;
--}
--
- int tcd_play_seconds( cd_struct *cd, long int offset )
- {
-+#ifdef TCD_BSD
-+    struct ioc_play_msf msf;
-+#else
-     struct cdrom_msf msf;
-     cd_min_sec_frame msf0;
-     int cur_frame, start_frame, end_frame;
-+#endif
-     int tmp;
- 
-     debug("cdrom.c: tcd_play_seconds( %p, %ld )\n", cd, offset );
-@@ -498,53 +653,54 @@
-     cd->err = FALSE;
-     cd->isplayable=FALSE;
- 
--    /* converting msf to frames makes life much easier */
--    start_frame = msf_2_frame( &cd->trk[C(cd->first_t)].toc.cdte_addr.msf );
--    end_frame = msf_2_frame( &cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf ) - 1;
--    cur_frame = cd->cur_frame + ( offset * CD_FRAMES );
--
--    /* keep the cur_frame within the boundaries of the first and last track */
--    if ( cur_frame < start_frame ) {
--	    cur_frame = start_frame;
--    } else if ( cur_frame > end_frame ) {
--	    cur_frame = end_frame;
--    }
--
--    /* convert frames back to msf */
--    frame_2_msf( cur_frame, &msf0 );
--    msf.cdmsf_min0 = msf0.minute;
--    msf.cdmsf_sec0 = msf0.second;
--    msf.cdmsf_frame0 = msf0.frame;
--    msf.cdmsf_min1 = cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.minute;
--    msf.cdmsf_sec1 = cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.second;
--    msf.cdmsf_frame1 = cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.frame;
--    decrement_msf_end_by_one (&msf);
-+    /* got subchannel? */
-+    MSF_START_SEC = SC_SECOND(cd->sc)+offset;
-+    MSF_START_MIN = SC_MINUTE(cd->sc);
-+    MSF_START_FRM = SC_FRAME(cd->sc);
-+    MSF_END_MIN = TOC_MINUTE(cd->trk[C(cd->last_t+1)]);
-+    MSF_END_SEC = TOC_SECOND(cd->trk[C(cd->last_t+1)]);
-+    MSF_END_FRM = TOC_FRAME(cd->trk[C(cd->last_t+1)]);
-+    MSF_END_FRM -= 1;
-  
- #ifdef UNSIGNED_NUMBERS_CAN_BE_NEGATIVE
--    if(msf.cdmsf_frame1 < 0)
-+    if((MSF_END_FRM < 0)
-     {
--	msf.cdmsf_sec1 += msf.cdmsf_frame1;
--	msf.cdmsf_frame1 = 0;
-+	MSF_END_SEC += MSF_END_FRM;
-+	MSF_END_FRM = 0;
-     }
--    if(msf.cdmsf_sec1 < 0)
-+    if(MSF_END_SEC < 0)
-     {
--	msf.cdmsf_min1 += msf.cdmsf_sec1;
--	msf.cdmsf_sec1 = 0;
-+	MSF_END_MIN += MSF_END_SEC;
-+	MSF_END_SEC = 0;
-     }
--    if(msf.cdmsf_min1 < 0)
-+    if(MSF_END_MIN < 0)
-     {
--	msf.cdmsf_min1 = 0;
-+	MSF_END_MIN = 0;
-     }
- #endif
--	
-+
-+    if(MSF_START_SEC > 60 && (offset<0))
-+    {
-+	MSF_START_SEC = 60-abs(offset);
-+	MSF_START_MIN--;
-+    }
-+
-     tcd_opencddev( cd, NULL );
-+#ifdef TCD_BSD
-+    ioctl( cd->cd_dev, CDIOCPREVENT );
-+    tmp = ioctl(cd->cd_dev, CDIOCPLAYMSF, &msf);
-+#else
-     tmp = ioctl(cd->cd_dev, CDROMPLAYMSF, &msf);
-+#endif
-     if(tmp)
-       {
- 	strcpy( cd->errmsg, "Error playing disc." );
- 	cd->err = TRUE;
- 
- 	debug("cdrom.c: tcd_play_seconds error. CDROMPLAYMSF ioctl error.\n" );
-+#ifdef TCD_BSD
-+	ioctl( cd->cd_dev, CDIOCALLOW );
-+#endif
-     }
-     cd->isplayable=TRUE;
-     tcd_close_disc( cd );
-@@ -562,7 +718,11 @@
-     cd->err = FALSE;
- 
-     tcd_opencddev( cd, NULL );
-+#ifdef TCD_BSD
-+    if(!ioctl(cd->cd_dev, CDIOCEJECT))
-+#else
-     if(!ioctl(cd->cd_dev, CDROMEJECT))
-+#endif
-     {
- 	cd->isplayable = FALSE;
- 	strcpy(cd->errmsg, "No disc in drive ");
-@@ -570,9 +730,17 @@
-     } 
-     else 
-     {
-+#ifdef TCD_BSD
-+	tmp = ioctl( cd->cd_dev, CDIOCCLOSE );
-+#else
- #ifdef CDROMCLOSETRAY
- 	tmp = ioctl( cd->cd_dev, CDROMCLOSETRAY );
- #endif
-+#endif
-+
-+#ifdef TCD_BSD
-+	ioctl( cd->cd_dev, CDIOCPREVENT);
-+#endif
- 
- 	if(tcd_post_init(cd))
- 	{
-@@ -582,6 +750,9 @@
- 	    debug("cdrom.c: tcd_eject - disc init error. %s\n",  
- 		  strerror(errno) );
- 
-+#ifdef TCD_BSD
-+	    ioctl( cd->cd_dev, CDIOCALLOW);
-+#endif
- 	    return(-1);
- 	}
- 	cd->isplayable = TRUE;
-@@ -600,12 +771,21 @@
-     debug("cdrom.c: tcd_stopcd(%p)\n", cd );
- 	
-     /* SDH: Makes things cleaner on eject */
-+#ifdef TCD_BSD
-+    if( SC_AUDIOSTATUS(cd->sc)==CDROM_AUDIO_PAUSED )
-+#else
-     if( cd->sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED )
-+#endif
- 	tcd_pausecd(cd);
- 
-     cd->err = FALSE;
-     tcd_opencddev( cd, NULL );
-+#ifdef TCD_BSD
-+    ioctl( cd->cd_dev, CDIOCALLOW);
-+    tmp = ioctl(cd->cd_dev, CDIOCSTOP);
-+#else
-     tmp = ioctl(cd->cd_dev, CDROMSTOP);
-+#endif
-     tcd_close_disc ( cd );
-     if(tmp)
-     {
-@@ -626,13 +806,25 @@
-     cd->err = FALSE;
- 	
-     tcd_opencddev( cd, NULL );
-+#ifdef TCD_BSD
-+    if(SC_AUDIOSTATUS(cd->sc)==CDROM_AUDIO_PAUSED)
-+#else
-     if(cd->sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED)
-+#endif
-     {
-+#ifdef TCD_BSD
-+	tmp=ioctl(cd->cd_dev, CDIOCRESUME);
-+#else
-         tmp = ioctl(cd->cd_dev, CDROMRESUME);
-+#endif
-     }	        
-     else
-     {
-+#ifdef TCD_BSD
-+	tmp=ioctl(cd->cd_dev, CDIOCPAUSE);
-+#else
-         tmp=ioctl(cd->cd_dev, CDROMPAUSE);
-+#endif
-     }
-     if(tmp < 0)
-     {
-@@ -647,6 +839,7 @@
- int tcd_change_disc( cd_struct *cd, int disc )
- {
- #ifdef TCD_CHANGER_ENABLED
-+#ifndef TCD_BSD
-     int tmp;
-     cd->err = FALSE;
- 
-@@ -657,6 +850,7 @@
- 	fprintf( stdout, "ioctl: %s\n", strerror(errno) );	
- 
-     return tmp;
-+#endif
- #else
-     debug("tcd_change_disc called, but changer support isn't compiled in. Ickyblah.\n" );
-     return 0;
diff --git a/audio/gnomemedia2/files/patch-tcd::linux-cdrom.h b/audio/gnomemedia2/files/patch-tcd::linux-cdrom.h
deleted file mode 100644
index dabc669f77d6..000000000000
--- a/audio/gnomemedia2/files/patch-tcd::linux-cdrom.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-$FreeBSD$
-
---- tcd/linux-cdrom.h	2001/07/13 09:27:50	1.1
-+++ tcd/linux-cdrom.h	2001/07/13 09:34:48
-@@ -27,8 +27,20 @@
- 
- #include <sys/types.h>
- #include <glib.h>
--#if !defined(linux) && !defined(sun) && !defined(__sun__)
--# error TCD only builds on linux and Solaris/SunOs
-+#if !defined(linux) && !defined(sun) && !defined(__sun__) && !defined(__FreeBSD__)
-+# error TCD only builds on linux, Solaris/SunOs and FreeBSD
-+#endif
-+
-+#ifdef __FreeBSD__
-+#define TCD_BSD
-+#include <sys/cdio.h>
-+#define CDROM_AUDIO_INVALID     CD_AS_AUDIO_INVALID
-+#define CDROM_AUDIO_PLAY        CD_AS_PLAY_IN_PROGRESS
-+#define CDROM_AUDIO_PAUSED      CD_AS_PLAY_PAUSED
-+#define CDROM_AUDIO_COMPLETED   CD_AS_PLAY_COMPLETED
-+#define CDROM_AUDIO_ERROR       CD_AS_PLAY_ERROR
-+#define CDROM_AUDIO_NO_STATUS   CD_AS_NO_STATUS
-+#define CDROM
- #endif
- 
- #ifdef linux
-@@ -126,7 +138,17 @@
- {
- 	char name[TRK_NAME_LEN+1];
- 	char extd[EXT_DATA_LEN+1];      /* extra information for this track */
-+#ifdef TCD_BSD
-+	struct cd_toc_entry toc;
-+#define TOC_MINUTE(trk)        (trk.toc.addr.msf.minute)
-+#define TOC_SECOND(trk)        (trk.toc.addr.msf.second)
-+#define TOC_FRAME(trk)         (trk.toc.addr.msf.frame)
-+#else
- 	struct cdrom_tocentry toc;
-+#define TOC_MINUTE(trk)        (trk.toc.cdte_addr.msf.minute)
-+#define TOC_SECOND(trk)        (trk.toc.cdte_addr.msf.second)
-+#define TOC_FRAME(trk)         (trk.toc.cdte_addr.msf.frame)
-+#endif
- 	int titled;
- 	int start, length;
- 	int tot_min, tot_sec;
-@@ -152,10 +174,26 @@
- 	char album[DISC_INFO_LEN+1], artist[DISC_INFO_LEN+1];
- 	char extd[EXT_DATA_LEN+1];      /* extra information for this disc */
- 
-+#ifdef TCD_BSD
-+	/* See /usr/include/sys/cdio.h */
-+	struct ioc_play_track ti;
-+	struct ioc_toc_header tochdr;
-+	struct cd_sub_channel_info sc;
-+#define SC_AUDIOSTATUS(sc)     (sc.header.audio_status)
-+#define SC_TRACK(sc)           (sc.what.position.track_number)
-+#define SC_MINUTE(sc)          (sc.what.position.absaddr.msf.minute)
-+#define SC_SECOND(sc)          (sc.what.position.absaddr.msf.second)
-+#define SC_FRAME(sc)           (sc.what.position.absaddr.msf.frame)
-+#else
- 	/* See /usr/src/linux/include/linux/cdrom.h */
- 	struct cdrom_ti ti;		/* Track info */
- 	struct cdrom_tochdr tochdr; 	/* TOC header */
- 	struct cdrom_subchnl sc;	/* Subchannel, for time */
-+#define SC_AUDIOSTATUS(sc)     (sc.cdsc_audiostatus)
-+#define SC_TRACK(sc)           (sc.cdsc_trk)
-+#define SC_SECOND(sc)          (sc.cdsc_absaddr.msf.second)
-+#define SC_FRAME(sc)           (sc.cdsc_absaddr.msf.frame)
-+#endif
- 	int volume;			/* Must range 0-100 */
- 
- 	int cd_min, cd_sec;		/* Total CD time */
diff --git a/audio/gnomemedia2/files/patch-tcd::tcd.c b/audio/gnomemedia2/files/patch-tcd::tcd.c
deleted file mode 100644
index 7946bdbe12ff..000000000000
--- a/audio/gnomemedia2/files/patch-tcd::tcd.c
+++ /dev/null
@@ -1,79 +0,0 @@
-
-$FreeBSD$
-
---- tcd/tcd.c	2001/07/13 09:35:21	1.1
-+++ tcd/tcd.c	2001/07/13 09:39:30
-@@ -142,8 +142,8 @@
- 		
- 	/* if the user hasn't stopped the cd, but it is 
- 	   stopped anyway, fix it. */
--	if( cd->sc.cdsc_audiostatus != CDROM_AUDIO_PLAY &&
--	    cd->sc.cdsc_audiostatus != CDROM_AUDIO_PAUSED )
-+	if( SC_AUDIOSTATUS(cd->sc) != CDROM_AUDIO_PLAY &&
-+	    SC_AUDIOSTATUS(cd->sc) != CDROM_AUDIO_PAUSED )
- 	{
- 	    if( cd->play_method == REPEAT_CD )
- 		tcd_playtracks(cd, cd->first_t, cd->last_t, 0);
-@@ -173,7 +173,7 @@
- 	case 'p':
- 	case 'P':
- 	    if(cd->isplayable) {
--		if( cd->sc.cdsc_audiostatus == CDROM_AUDIO_PAUSED )
-+		if( SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PAUSED )
- 		    tcd_pausecd(cd);
- 		else
- 		    tcd_playtracks(cd,cd->first_t,cd->last_t, 0);
-@@ -443,8 +443,8 @@
-     mvwprintw(win,maxy-2,30,"Track:" );
-     attron( C_RED+A_BOLD );
-     mvwprintw(win,maxy-4,38,"%02u:%02u",
--	      cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.minute,
--	      cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.second );
-+	      TOC_MINUTE(cd->trk[C(cd->last_t+1)]),
-+	      TOC_SECOND(cd->trk[C(cd->last_t+1)]) );
-     mvwprintw(win,maxy-3,38,cd->dtitle );
-     attroff( C_RED+A_BOLD );
- }
-@@ -481,11 +481,15 @@
-     j=height;
-     for(i=cd->first_t; i <= cd->last_t; i++) 
-     {
--	if(cd->cur_t == i && cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY)
-+	if(cd->cur_t == i && SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY)
- 	    stat = 'P';
- 	else if(cd->repeat_track == i)
- 	    stat = 'R';
-+#ifdef TCD_BSD
-+	else if(cd->trk[i].toc.control == 0x04)
-+#else
- 	else if(cd->trk[i].toc.cdte_ctrl == CDROM_DATA_TRACK)
-+#endif
- 	    stat = 'd';
- 	else
- 	    stat = 'a';
-@@ -501,14 +505,14 @@
- 	    x = 2;
- 	}
- 	
--	if( cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY && cd->cur_t == i )
-+	if( SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY && cd->cur_t == i )
- 	    attron( A_BOLD );
- 	
- 	mvwprintw(win,y,x,"%02u%c - %02u:%02u",
- 		  i, stat,cd->trk[C(i)].tot_min,
- 		  cd->trk[C(i)].tot_sec );
- 	
--	if(cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY && cd->cur_t == i)
-+	if(SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY && cd->cur_t == i)
- 	    attroff( A_BOLD );
-     }	
- }
-@@ -519,7 +523,7 @@
- 	
-     if( !cd->err )
-     {
--	switch( cd->sc.cdsc_audiostatus )
-+	switch( SC_AUDIOSTATUS(cd->sc) )
- 	{
- 	case CDROM_AUDIO_INVALID:
- 	    strcpy( tmp,"No Audio         " );
diff --git a/audio/gnomemedia2/pkg-comment b/audio/gnomemedia2/pkg-comment
index 0028a932b1e0..c2e90fe69c22 100644
--- a/audio/gnomemedia2/pkg-comment
+++ b/audio/gnomemedia2/pkg-comment
@@ -1 +1 @@
-Multimedia applications for the GNOME desktop
+Multimedia applications for the GNOME 2.0 desktop
diff --git a/audio/gnomemedia2/pkg-descr b/audio/gnomemedia2/pkg-descr
index 3d3117e6a73a..7b22584992ac 100644
--- a/audio/gnomemedia2/pkg-descr
+++ b/audio/gnomemedia2/pkg-descr
@@ -1,3 +1,3 @@
-Multimedia applications for the GNOME desktop.  Includes gtcd, a CDDB
-aware CD player; GMix, for controlling the sound card's mixer; and
-VU-Meter, to slow down your desktop...
+Multimedia applications for the GNOME 2.0 desktop.  Includes gnome-cd, a CDDB
+aware CD player; gnome-volume-control, for controlling the sound card's mixer; 
+and VU-Meter, to slow down your desktop...
diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist
index 8d5cfa19919c..1552dac351c8 100644
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@@ -1,113 +1,232 @@
-bin/cddbslave
-bin/cddbsubmit
-bin/gmix
-bin/grecord
-bin/gtcd
+bin/CDDBSlave2
+bin/cddb-slave2-properties
+bin/cddb-track-editor
+bin/gnome-cd
+bin/gnome-sound-recorder
+bin/gnome-volume-control
 bin/vumeter
-etc/CORBA/servers/gtcd.goad
-share/gnome/apps/Multimedia/Soundrecorder.desktop
-share/gnome/apps/Multimedia/gmix.desktop
-share/gnome/apps/Multimedia/gtcd.desktop
-share/gnome/apps/Multimedia/vumeter.desktop
-share/gnome/cddb-submit-methods
-share/gnome/help/gmix/C/authors.html
-share/gnome/help/gmix/C/bugs.html
+etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-cd/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-volume-control/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control/%gconf.xml
+etc/gconf/schemas/CDDB-Slave2.schemas
+etc/gconf/schemas/gnome-cd.schemas
+etc/gconf/schemas/gnome-sound-recorder.schemas
+etc/gconf/schemas/gnome-volume-control.schemas
+include/cddb-slave2/cddb-slave-client.h
+lib/libcddb-slave2.a
+lib/libcddb-slave2.so
+lib/libcddb-slave2.so.0
+libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server
+share/gnome/applications/gnome-cd.desktop
+share/gnome/applications/gnome-sound-recorder.desktop
+share/gnome/applications/gnome-volume-control.desktop
+share/gnome/applications/reclevel.desktop
+share/gnome/applications/vumeter.desktop
+share/gnome/control-center-2.0/capplets/cddb-slave.desktop
 share/gnome/help/gmix/C/figures/gmix-prefs.png
 share/gnome/help/gmix/C/figures/gmix.png
-share/gnome/help/gmix/C/gmix-prefs.html
-share/gnome/help/gmix/C/gmix-use.html
-share/gnome/help/gmix/C/gmix.sgml
-share/gnome/help/gmix/C/index.html
-share/gnome/help/gmix/C/license.html
-share/gnome/help/gmix/C/ln7.html
+share/gnome/help/gmix/C/gmix.xml
+share/gnome/help/gmix/C/legal.xml
 share/gnome/help/gmix/C/topic.dat
-share/gnome/help/gmix/it/authors.html
-share/gnome/help/gmix/it/bugs.html
-share/gnome/help/gmix/it/figures/gmix-prefs.png
-share/gnome/help/gmix/it/figures/gmix.png
-share/gnome/help/gmix/it/gmix-prefs.html
-share/gnome/help/gmix/it/gmix-use.html
-share/gnome/help/gmix/it/gmix.sgml
-share/gnome/help/gmix/it/index.html
-share/gnome/help/gmix/it/license.html
-share/gnome/help/gmix/it/ln10.html
-share/gnome/help/gmix/it/topic.dat
-share/gnome/help/gtcd/C/authors.html
-share/gnome/help/gtcd/C/bugs.html
-share/gnome/help/gtcd/C/figures/gtcd-props.png
-share/gnome/help/gtcd/C/figures/gtcd-window.png
-share/gnome/help/gtcd/C/figures/gtcd.png
-share/gnome/help/gtcd/C/figures/track-number.png
-share/gnome/help/gtcd/C/figures/track-time.png
-share/gnome/help/gtcd/C/figures/trackeditor.png
-share/gnome/help/gtcd/C/gtcd.sgml
-share/gnome/help/gtcd/C/index.html
-share/gnome/help/gtcd/C/license.html
-share/gnome/help/gtcd/C/ln7.html
-share/gnome/help/gtcd/C/topic.dat
-share/gnome/help/gtcd/C/usage.html
-share/gnome/idl/gtcd.idl
-share/gnome/mime-info/grecord.keys
-share/gnome/mime-info/grecord.mime
-share/gnome/omf/gnome-media/gmix-C.omf
-share/gnome/omf/gnome-media/gmix-it.omf
-share/gnome/omf/gnome-media/gtcd-C.omf
+share/gnome/help/gnome-cd/C/figures/gnome-cd-prefs.png
+share/gnome/help/gnome-cd/C/figures/gnome-cd-track.png
+share/gnome/help/gnome-cd/C/figures/gnome-cd.png
+share/gnome/help/gnome-cd/C/gnome-cd.xml
+share/gnome/help/gnome-cd/C/legal.xml
+share/gnome/help/grecord/C/figures/grecord-prefs-path.png
+share/gnome/help/grecord/C/figures/grecord-prefs-play.png
+share/gnome/help/grecord/C/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/C/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/C/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/C/figures/grecord.png
+share/gnome/help/grecord/C/grecord.xml
+share/gnome/help/grecord/C/legal.xml
+share/gnome/idl/GNOME_Media_CDDBSlave2.idl
+share/gnome/pixmaps/gnome-cd.png
+share/gnome/pixmaps/gnome-cd/a-eject-menu.png
+share/gnome/pixmaps/gnome-cd/a-eject-pressed.png
+share/gnome/pixmaps/gnome-cd/a-eject.png
+share/gnome/pixmaps/gnome-cd/a-first-menu.png
+share/gnome/pixmaps/gnome-cd/a-first-pressed.png
+share/gnome/pixmaps/gnome-cd/a-first.png
+share/gnome/pixmaps/gnome-cd/a-fwd-pressed.png
+share/gnome/pixmaps/gnome-cd/a-fwd.png
+share/gnome/pixmaps/gnome-cd/a-last-menu.png
+share/gnome/pixmaps/gnome-cd/a-last-pressed.png
+share/gnome/pixmaps/gnome-cd/a-last.png
+share/gnome/pixmaps/gnome-cd/a-pause-pressed.png
+share/gnome/pixmaps/gnome-cd/a-pause.png
+share/gnome/pixmaps/gnome-cd/a-play-menu.png
+share/gnome/pixmaps/gnome-cd/a-play-pressed.png
+share/gnome/pixmaps/gnome-cd/a-play.png
+share/gnome/pixmaps/gnome-cd/a-rwnd-pressed.png
+share/gnome/pixmaps/gnome-cd/a-rwnd.png
+share/gnome/pixmaps/gnome-cd/a-stop-menu.png
+share/gnome/pixmaps/gnome-cd/a-stop-pressed.png
+share/gnome/pixmaps/gnome-cd/a-stop.png
+share/gnome/pixmaps/gnome-cd/back.xpm
+share/gnome/pixmaps/gnome-cd/cd.png
+share/gnome/pixmaps/gnome-cd/cdrom.xpm
+share/gnome/pixmaps/gnome-cd/disc.png
+share/gnome/pixmaps/gnome-cd/eject.xpm
+share/gnome/pixmaps/gnome-cd/ffwd.xpm
+share/gnome/pixmaps/gnome-cd/goto.xpm
+share/gnome/pixmaps/gnome-cd/media-eject.png
+share/gnome/pixmaps/gnome-cd/media-fwd.png
+share/gnome/pixmaps/gnome-cd/media-next.png
+share/gnome/pixmaps/gnome-cd/media-pause.png
+share/gnome/pixmaps/gnome-cd/media-play.png
+share/gnome/pixmaps/gnome-cd/media-prev.png
+share/gnome/pixmaps/gnome-cd/media-rec.png
+share/gnome/pixmaps/gnome-cd/media-rew.png
+share/gnome/pixmaps/gnome-cd/media-stop.png
+share/gnome/pixmaps/gnome-cd/mixer.png
+share/gnome/pixmaps/gnome-cd/next.xpm
+share/gnome/pixmaps/gnome-cd/once.png
+share/gnome/pixmaps/gnome-cd/pause.xpm
+share/gnome/pixmaps/gnome-cd/play.xpm
+share/gnome/pixmaps/gnome-cd/repeat.png
+share/gnome/pixmaps/gnome-cd/rewind.xpm
+share/gnome/pixmaps/gnome-cd/stop.xpm
+share/gnome/pixmaps/gnome-cd/themes/lcd/a-eject-menu.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/a-eject.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/a-first-menu.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/a-first.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/a-fwd.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/a-last-menu.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/a-last.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/a-pause.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/a-play-menu.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/a-play.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/a-rwnd.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/a-stop-menu.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/a-stop.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-left.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-right.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/bottom.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/lcd.theme
+share/gnome/pixmaps/gnome-cd/themes/lcd/middle-left.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/middle-right.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/middle.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/top-left.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/top-right.png
+share/gnome/pixmaps/gnome-cd/themes/lcd/top.png
+share/gnome/pixmaps/gnome-cd/themes/media/a-eject-menu.png
+share/gnome/pixmaps/gnome-cd/themes/media/a-first-menu.png
+share/gnome/pixmaps/gnome-cd/themes/media/a-last-menu.png
+share/gnome/pixmaps/gnome-cd/themes/media/a-play-menu.png
+share/gnome/pixmaps/gnome-cd/themes/media/a-stop-menu.png
+share/gnome/pixmaps/gnome-cd/themes/media/bottom-left.png
+share/gnome/pixmaps/gnome-cd/themes/media/bottom-right.png
+share/gnome/pixmaps/gnome-cd/themes/media/bottom.png
+share/gnome/pixmaps/gnome-cd/themes/media/media-eject.png
+share/gnome/pixmaps/gnome-cd/themes/media/media-fwd.png
+share/gnome/pixmaps/gnome-cd/themes/media/media-next.png
+share/gnome/pixmaps/gnome-cd/themes/media/media-pause.png
+share/gnome/pixmaps/gnome-cd/themes/media/media-play.png
+share/gnome/pixmaps/gnome-cd/themes/media/media-prev.png
+share/gnome/pixmaps/gnome-cd/themes/media/media-rew.png
+share/gnome/pixmaps/gnome-cd/themes/media/media-stop.png
+share/gnome/pixmaps/gnome-cd/themes/media/media.theme
+share/gnome/pixmaps/gnome-cd/themes/media/middle-left.png
+share/gnome/pixmaps/gnome-cd/themes/media/middle-right.png
+share/gnome/pixmaps/gnome-cd/themes/media/middle.png
+share/gnome/pixmaps/gnome-cd/themes/media/top-left.png
+share/gnome/pixmaps/gnome-cd/themes/media/top-right.png
+share/gnome/pixmaps/gnome-cd/themes/media/top.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-eject-menu.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-eject.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-first-menu.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-first.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-fwd.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-last-menu.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-last.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-pause.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-play-menu.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-play.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-rwnd.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-stop-menu.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-stop.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-left.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-right.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/middle-left.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/middle-right.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/middle.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/red-lcd.theme
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-left.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-right.png
+share/gnome/pixmaps/gnome-cd/themes/red-lcd/top.png
+share/gnome/pixmaps/gnome-cd/track.png
+share/gnome/pixmaps/gnome-cd/volume.xpm
 share/gnome/pixmaps/gnome-grecord.png
+share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-play.png
+share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-rec.png
+share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png
 share/gnome/pixmaps/gnome-mixer.png
+share/gnome/pixmaps/gnome-reclevel.png
 share/gnome/pixmaps/gnome-vumeter.png
-share/gnome/pixmaps/gtcd.png
-share/gnome/pixmaps/tcd/cdrom.xpm
-share/gnome/pixmaps/tcd/eject.xpm
-share/gnome/pixmaps/tcd/ff.xpm
-share/gnome/pixmaps/tcd/goto.xpm
-share/gnome/pixmaps/tcd/next_t.xpm
-share/gnome/pixmaps/tcd/pause.xpm
-share/gnome/pixmaps/tcd/play.xpm
-share/gnome/pixmaps/tcd/prev_t.xpm
-share/gnome/pixmaps/tcd/rw.xpm
-share/gnome/pixmaps/tcd/stop.xpm
-share/locale/az/LC_MESSAGES/gnome-media.mo
-share/locale/ca/LC_MESSAGES/gnome-media.mo
-share/locale/cs/LC_MESSAGES/gnome-media.mo
-share/locale/da/LC_MESSAGES/gnome-media.mo
-share/locale/de/LC_MESSAGES/gnome-media.mo
-share/locale/el/LC_MESSAGES/gnome-media.mo
-share/locale/en_GB/LC_MESSAGES/gnome-media.mo
-share/locale/es/LC_MESSAGES/gnome-media.mo
-share/locale/et/LC_MESSAGES/gnome-media.mo
-share/locale/fi/LC_MESSAGES/gnome-media.mo
-share/locale/fr/LC_MESSAGES/gnome-media.mo
-share/locale/ga/LC_MESSAGES/gnome-media.mo
-share/locale/gl/LC_MESSAGES/gnome-media.mo
-share/locale/hu/LC_MESSAGES/gnome-media.mo
-share/locale/it/LC_MESSAGES/gnome-media.mo
-share/locale/ja/LC_MESSAGES/gnome-media.mo
-share/locale/ko/LC_MESSAGES/gnome-media.mo
-share/locale/lt/LC_MESSAGES/gnome-media.mo
-share/locale/nl/LC_MESSAGES/gnome-media.mo
-share/locale/no/LC_MESSAGES/gnome-media.mo
-share/locale/pl/LC_MESSAGES/gnome-media.mo
-share/locale/pt/LC_MESSAGES/gnome-media.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-media.mo
-share/locale/ro/LC_MESSAGES/gnome-media.mo
-share/locale/ru/LC_MESSAGES/gnome-media.mo
-share/locale/sk/LC_MESSAGES/gnome-media.mo
-share/locale/sl/LC_MESSAGES/gnome-media.mo
-share/locale/sv/LC_MESSAGES/gnome-media.mo
-share/locale/tr/LC_MESSAGES/gnome-media.mo
-share/locale/uk/LC_MESSAGES/gnome-media.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-media.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gnome-media.mo
-@dirrm share/gnome/pixmaps/tcd
-@dirrm share/gnome/omf/gnome-media
-@dirrm share/gnome/help/gtcd/C/stylesheet-images
-@dirrm share/gnome/help/gtcd/C/figures
-@dirrm share/gnome/help/gtcd/C
-@dirrm share/gnome/help/gtcd
-@dirrm share/gnome/help/gmix/it/stylesheet-images
-@dirrm share/gnome/help/gmix/it/figures
-@dirrm share/gnome/help/gmix/it
-@dirrm share/gnome/help/gmix/C/stylesheet-images
+share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/da/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/de/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/el/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/es/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/et/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/fi/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/fr/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ga/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/gl/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/hu/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/it/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ko/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/lt/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/lv/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/no/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/pl/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/pt/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ro/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ru/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/sk/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/sl/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
+@dirrm share/gnome/pixmaps/gnome-media/gnome-sound-recorder
+@dirrm share/gnome/pixmaps/gnome-media
+@dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd
+@dirrm share/gnome/pixmaps/gnome-cd/themes/media
+@dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
+@dirrm share/gnome/pixmaps/gnome-cd/themes
+@dirrm share/gnome/pixmaps/gnome-cd
+@dirrm share/gnome/help/grecord/C/figures
+@dirrm share/gnome/help/grecord/C
+@dirrm share/gnome/help/grecord
+@dirrm share/gnome/help/gnome-cd/C/figures
+@dirrm share/gnome/help/gnome-cd/C
+@dirrm share/gnome/help/gnome-cd
 @dirrm share/gnome/help/gmix/C/figures
 @dirrm share/gnome/help/gmix/C
 @dirrm share/gnome/help/gmix
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-volume-control
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-cd
+@dirrm etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2