Merge 0.5.15 update from the ports tree.

Requested by:	adamw


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

4 files changed, 34 insertions, 18 deletions

diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index af0f02c7e..b05d0f169 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sound-juicer
-PORTVERSION=	0.5.14
+PORTVERSION=	0.5.15
 PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.burtonini.com/computing/
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index ac518a1ee..b9e30b623 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/sound-juicer-0.5.14.tar.gz) = 21ac5d1b9497b3bba2e4050b995bb865
-SIZE (gnome2/sound-juicer-0.5.14.tar.gz) = 591553
+MD5 (gnome2/sound-juicer-0.5.15.tar.gz) = f1c344b2dcd3f0efd4f9e0318f8526e1
+SIZE (gnome2/sound-juicer-0.5.15.tar.gz) = 594694
diff --git a/audio/sound-juicer/files/patch-src::bacon-cd-selection.c b/audio/sound-juicer/files/patch-src::bacon-cd-selection.c
new file mode 100644
index 000000000..3bf5d559e
--- /dev/null
+++ b/audio/sound-juicer/files/patch-src::bacon-cd-selection.c
@@ -0,0 +1,15 @@
+--- src/bacon-cd-selection.c.orig	Sun Dec 12 10:27:00 2004
++++ src/bacon-cd-selection.c	Sun Dec 12 10:27:57 2004
+@@ -179,10 +179,10 @@
+ static void
+ bacon_cd_selection_init (BaconCdSelection *bcs)
+ {
+-	bcs->priv = g_new0 (BaconCdSelectionPrivate, 1);
+-  
+ 	GtkCellRenderer *cell;
+ 	GtkListStore *store;
++
++	bcs->priv = g_new0 (BaconCdSelectionPrivate, 1);
+ 
+   store = gtk_list_store_new (1, G_TYPE_STRING);
+ 	gtk_combo_box_set_model (GTK_COMBO_BOX (bcs),
diff --git a/audio/sound-juicer/files/patch-src::cd-drive.c b/audio/sound-juicer/files/patch-src::cd-drive.c
index 690b0953e..56d594fb9 100644
--- a/audio/sound-juicer/files/patch-src::cd-drive.c
+++ b/audio/sound-juicer/files/patch-src::cd-drive.c
@@ -1,10 +1,10 @@
---- src/cd-drive.c.orig	Tue Sep 28 23:37:37 2004
-+++ src/cd-drive.c	Wed Nov 10 22:37:44 2004
-@@ -578,7 +578,49 @@
+--- src/cd-drive.c.orig	Sun Dec 12 01:39:32 2004
++++ src/cd-drive.c	Sun Dec 12 01:41:50 2004
+@@ -596,7 +596,49 @@
  
  #if defined(__linux__) || defined(__FreeBSD__)
  
-+#if !defined(__linux__)
++#if !defined(__linux)
 +static int
 +get_device_max_read_speed (char *device)
 +{
@@ -14,11 +14,11 @@
 +
 +	max_speed = -1;
 +
-+	fd = open (device, O_RDONLY|O_EXCL|O_NONBLOCK);
++	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
 +	if (fd < 0) {
 +		return -1;
 +	}
-+
+ 
 +	get_read_write_speed (fd, &read_speed, &write_speed);
 +	close (fd);
 +	max_speed = (int)floor  (read_speed) / CD_ROM_SPEED;
@@ -26,7 +26,7 @@
 +	return max_speed;
 +}
 +#endif
- 
++
 +static int
 +get_device_max_write_speed (char *device)
 +{
@@ -36,7 +36,7 @@
 +
 +	max_speed = -1;
 +
-+	fd = open (device, O_RDONLY|O_EXCL|O_NONBLOCK);
++	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
 +	if (fd < 0) {
 +		return -1;
 +	}
@@ -50,10 +50,12 @@
  
  #endif /* __linux__ || __FreeBSD__ */
  
-@@ -782,49 +824,6 @@
+@@ -798,50 +840,6 @@
+ 		}
+ 	}
  	return NULL;
- }
- 
+-}
+-
 -#if !defined(__linux)
 -static int
 -get_device_max_read_speed (char *device)
@@ -64,7 +66,7 @@
 -
 -	max_speed = -1;
 -
--	fd = open (device, O_RDONLY|O_EXCL|O_NONBLOCK);
+-	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
 -	if (fd < 0) {
 -		return -1;
 -	}
@@ -86,7 +88,7 @@
 -
 -	max_speed = -1;
 -
--	fd = open (device, O_RDONLY|O_EXCL|O_NONBLOCK);
+-	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
 -	if (fd < 0) {
 -		return -1;
 -	}
@@ -96,7 +98,6 @@
 -	max_speed = (int)floor  (write_speed) / CD_ROM_SPEED;
 -
 -	return max_speed;
--}
+ }
  
  static char *
- get_scsi_cd_name (int bus, int id, int lun, const char *dev,