Add gnomemedia2-2.3.x.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@629 df743ca5-7f9a-e211-a948-0013205c9059

14 files changed, 594 insertions, 0 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
new file mode 100644
index 000000000..710185188
--- /dev/null
+++ b/audio/gnome-media/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for:	gnomemedia2
+# Date created:				06 May 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/audio/gnomemedia2/Makefile,v 1.36 2003/04/08 00:40:00 marcus Exp $
+#
+
+PORTNAME=	gnomemedia2
+PORTVERSION=	2.3.0
+CATEGORIES=	audio gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/gnome-media/2.3
+DISTNAME=	gnome-media-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Multimedia applications for the GNOME 2 desktop
+
+RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
+LIB_DEPENDS=	gstplay-0.6.0:${PORTSDIR}/multimedia/gstreamer-plugins
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_REINPLACE=	yes
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier gnomedesktop gail
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
new file mode 100644
index 000000000..99ed8e511
--- /dev/null
+++ b/audio/gnome-media/distinfo
@@ -0,0 +1 @@
+MD5 (gnome2/gnome-media-2.3.0.tar.bz2) = 0ad101b804a01ac0200cb90f843ccf27
diff --git a/audio/gnome-media/files/patch-ad b/audio/gnome-media/files/patch-ad
new file mode 100644
index 000000000..f49a888a5
--- /dev/null
+++ b/audio/gnome-media/files/patch-ad
@@ -0,0 +1,31 @@
+--- gmix/gmix.c.orig	Tue Oct  8 19:40:43 2002
++++ gmix/gmix.c	Fri Oct 11 09:20:13 2002
+@@ -60,7 +60,7 @@
+ #ifdef HAVE_LINUX_SOUNDCARD_H 
+ #include <linux/soundcard.h>
+ #else 
+-#include <machine/soundcard.h>
++#include <sys/soundcard.h>
+ #endif
+ #endif
+ 
+@@ -722,6 +722,7 @@
+ 	
+ 	cnt = 0;
+ 	devices = NULL;
++	num_mixers = 0;
+ 	device_by_name = g_hash_table_new (g_str_hash, g_str_equal);
+ 		
+ 	do {
+@@ -730,9 +731,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);
+ }
+ 
+ device_info *
diff --git a/audio/gnome-media/files/patch-configure b/audio/gnome-media/files/patch-configure
new file mode 100644
index 000000000..d5e0e924c
--- /dev/null
+++ b/audio/gnome-media/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Thu Jan 23 17:55:03 2003
++++ configure	Tue Feb  4 20:31:01 2003
+@@ -8336,6 +8336,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/gnome-media/files/patch-gmix::prefs.c b/audio/gnome-media/files/patch-gmix::prefs.c
new file mode 100644
index 000000000..b25b42b97
--- /dev/null
+++ b/audio/gnome-media/files/patch-gmix::prefs.c
@@ -0,0 +1,11 @@
+--- 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>
+ #else 
+-#include <machine/soundcard.h>
++#include <sys/soundcard.h>
+ #endif
+ #endif
+ 
diff --git a/audio/gnome-media/pkg-descr b/audio/gnome-media/pkg-descr
new file mode 100644
index 000000000..7b2258499
--- /dev/null
+++ b/audio/gnome-media/pkg-descr
@@ -0,0 +1,3 @@
+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/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
new file mode 100644
index 000000000..3d73afa13
--- /dev/null
+++ b/audio/gnome-media/pkg-plist
@@ -0,0 +1,205 @@
+bin/cddb-slave2-properties
+bin/gnome-cd
+bin/gnome-sound-recorder
+bin/gnome-volume-control
+bin/gstreamer-properties
+bin/vumeter
+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-sound-recorder/system-state/%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-sound-recorder/system-state/%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
+libexec/CDDBSlave2
+libexec/cddb-track-editor
+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/gnome-media-2.0/icons/gstreamer-properties.png
+share/gnome/gnome-media-2.0/interfaces/gstreamer-properties.glade
+share/gnome/gnome-sound-recorder/ui/gsr.xml
+share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/C/figures/eject_button.png
+share/gnome/help/gnome-cd/C/figures/forward_button.png
+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/figures/next_button.png
+share/gnome/help/gnome-cd/C/figures/pause_button.png
+share/gnome/help/gnome-cd/C/figures/play_button.png
+share/gnome/help/gnome-cd/C/figures/preferences_button.png
+share/gnome/help/gnome-cd/C/figures/previous_button.png
+share/gnome/help/gnome-cd/C/figures/rewind_button.png
+share/gnome/help/gnome-cd/C/figures/stop_button.png
+share/gnome/help/gnome-cd/C/gnome-cd.xml
+share/gnome/help/gnome-cd/C/legal.xml
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-path.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-play.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-rec.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-sound.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-ui.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/C/legal.xml
+share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png
+share/gnome/help/gnome-volume-control/C/figures/gmix.png
+share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/C/legal.xml
+share/gnome/idl/GNOME_Media_CDDBSlave2.idl
+share/gnome/omf/gnome-media/gnome-cd-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/gnome-volume-control-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/pixmaps/gnome-cd.png
+share/gnome/pixmaps/gnome-cd/cd.png
+share/gnome/pixmaps/gnome-cd/disc.png
+share/gnome/pixmaps/gnome-cd/media-eject.png
+share/gnome/pixmaps/gnome-cd/media-ffwd.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-record.png
+share/gnome/pixmaps/gnome-cd/media-rewind.png
+share/gnome/pixmaps/gnome-cd/media-stop.png
+share/gnome/pixmaps/gnome-cd/once.png
+share/gnome/pixmaps/gnome-cd/repeat.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/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.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/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-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/gstreamer-properties.png
+share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/bg/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/eu/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/fa/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/he/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/hi/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/ml/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/mn/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/sq/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/vi/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/wa/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/gnome-sound-recorder/ui
+@dirrm share/gnome/gnome-sound-recorder
+@dirrm share/gnome/help/gnome-volume-control/C/figures
+@dirrm share/gnome/help/gnome-volume-control/C
+@dirrm share/gnome/help/gnome-volume-control
+@dirrm share/gnome/help/gnome-sound-recorder/C/figures
+@dirrm share/gnome/help/gnome-sound-recorder/C
+@dirrm share/gnome/help/gnome-sound-recorder
+@dirrm share/gnome/help/gnome-cd/C/figures
+@dirrm share/gnome/help/gnome-cd/C
+@dirrm share/gnome/help/gnome-cd
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state
+@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/system-state
+@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
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
new file mode 100644
index 000000000..710185188
--- /dev/null
+++ b/audio/gnomemedia2/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for:	gnomemedia2
+# Date created:				06 May 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/audio/gnomemedia2/Makefile,v 1.36 2003/04/08 00:40:00 marcus Exp $
+#
+
+PORTNAME=	gnomemedia2
+PORTVERSION=	2.3.0
+CATEGORIES=	audio gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/gnome-media/2.3
+DISTNAME=	gnome-media-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Multimedia applications for the GNOME 2 desktop
+
+RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
+LIB_DEPENDS=	gstplay-0.6.0:${PORTSDIR}/multimedia/gstreamer-plugins
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_REINPLACE=	yes
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier gnomedesktop gail
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo
new file mode 100644
index 000000000..99ed8e511
--- /dev/null
+++ b/audio/gnomemedia2/distinfo
@@ -0,0 +1 @@
+MD5 (gnome2/gnome-media-2.3.0.tar.bz2) = 0ad101b804a01ac0200cb90f843ccf27
diff --git a/audio/gnomemedia2/files/patch-ad b/audio/gnomemedia2/files/patch-ad
new file mode 100644
index 000000000..f49a888a5
--- /dev/null
+++ b/audio/gnomemedia2/files/patch-ad
@@ -0,0 +1,31 @@
+--- gmix/gmix.c.orig	Tue Oct  8 19:40:43 2002
++++ gmix/gmix.c	Fri Oct 11 09:20:13 2002
+@@ -60,7 +60,7 @@
+ #ifdef HAVE_LINUX_SOUNDCARD_H 
+ #include <linux/soundcard.h>
+ #else 
+-#include <machine/soundcard.h>
++#include <sys/soundcard.h>
+ #endif
+ #endif
+ 
+@@ -722,6 +722,7 @@
+ 	
+ 	cnt = 0;
+ 	devices = NULL;
++	num_mixers = 0;
+ 	device_by_name = g_hash_table_new (g_str_hash, g_str_equal);
+ 		
+ 	do {
+@@ -730,9 +731,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);
+ }
+ 
+ device_info *
diff --git a/audio/gnomemedia2/files/patch-configure b/audio/gnomemedia2/files/patch-configure
new file mode 100644
index 000000000..d5e0e924c
--- /dev/null
+++ b/audio/gnomemedia2/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Thu Jan 23 17:55:03 2003
++++ configure	Tue Feb  4 20:31:01 2003
+@@ -8336,6 +8336,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::prefs.c b/audio/gnomemedia2/files/patch-gmix::prefs.c
new file mode 100644
index 000000000..b25b42b97
--- /dev/null
+++ b/audio/gnomemedia2/files/patch-gmix::prefs.c
@@ -0,0 +1,11 @@
+--- 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>
+ #else 
+-#include <machine/soundcard.h>
++#include <sys/soundcard.h>
+ #endif
+ #endif
+ 
diff --git a/audio/gnomemedia2/pkg-descr b/audio/gnomemedia2/pkg-descr
new file mode 100644
index 000000000..7b2258499
--- /dev/null
+++ b/audio/gnomemedia2/pkg-descr
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000..3d73afa13
--- /dev/null
+++ b/audio/gnomemedia2/pkg-plist
@@ -0,0 +1,205 @@
+bin/cddb-slave2-properties
+bin/gnome-cd
+bin/gnome-sound-recorder
+bin/gnome-volume-control
+bin/gstreamer-properties
+bin/vumeter
+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-sound-recorder/system-state/%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-sound-recorder/system-state/%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
+libexec/CDDBSlave2
+libexec/cddb-track-editor
+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/gnome-media-2.0/icons/gstreamer-properties.png
+share/gnome/gnome-media-2.0/interfaces/gstreamer-properties.glade
+share/gnome/gnome-sound-recorder/ui/gsr.xml
+share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/C/figures/eject_button.png
+share/gnome/help/gnome-cd/C/figures/forward_button.png
+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/figures/next_button.png
+share/gnome/help/gnome-cd/C/figures/pause_button.png
+share/gnome/help/gnome-cd/C/figures/play_button.png
+share/gnome/help/gnome-cd/C/figures/preferences_button.png
+share/gnome/help/gnome-cd/C/figures/previous_button.png
+share/gnome/help/gnome-cd/C/figures/rewind_button.png
+share/gnome/help/gnome-cd/C/figures/stop_button.png
+share/gnome/help/gnome-cd/C/gnome-cd.xml
+share/gnome/help/gnome-cd/C/legal.xml
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-path.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-play.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-rec.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-sound.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-ui.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord.png
+share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/C/legal.xml
+share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png
+share/gnome/help/gnome-volume-control/C/figures/gmix.png
+share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/C/legal.xml
+share/gnome/idl/GNOME_Media_CDDBSlave2.idl
+share/gnome/omf/gnome-media/gnome-cd-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/gnome-volume-control-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/pixmaps/gnome-cd.png
+share/gnome/pixmaps/gnome-cd/cd.png
+share/gnome/pixmaps/gnome-cd/disc.png
+share/gnome/pixmaps/gnome-cd/media-eject.png
+share/gnome/pixmaps/gnome-cd/media-ffwd.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-record.png
+share/gnome/pixmaps/gnome-cd/media-rewind.png
+share/gnome/pixmaps/gnome-cd/media-stop.png
+share/gnome/pixmaps/gnome-cd/once.png
+share/gnome/pixmaps/gnome-cd/repeat.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/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.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/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-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/gstreamer-properties.png
+share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/be/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/bg/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/eu/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/fa/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/he/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/hi/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/ml/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/mn/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/sq/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/vi/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/wa/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/gnome-sound-recorder/ui
+@dirrm share/gnome/gnome-sound-recorder
+@dirrm share/gnome/help/gnome-volume-control/C/figures
+@dirrm share/gnome/help/gnome-volume-control/C
+@dirrm share/gnome/help/gnome-volume-control
+@dirrm share/gnome/help/gnome-sound-recorder/C/figures
+@dirrm share/gnome/help/gnome-sound-recorder/C
+@dirrm share/gnome/help/gnome-sound-recorder
+@dirrm share/gnome/help/gnome-cd/C/figures
+@dirrm share/gnome/help/gnome-cd/C
+@dirrm share/gnome/help/gnome-cd
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state
+@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/system-state
+@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
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true