Update to 2.9.91.

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

7 files changed, 68 insertions, 137 deletions

diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 3a09d1eec..e2d690401 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	sound-juicer
-PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTVERSION=	2.9.91
 CATEGORIES=	audio gnome
-MASTER_SITES=	http://www.burtonini.com/computing/
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.9
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -17,11 +17,12 @@ COMMENT=	Clean, mean and lean CD ripper for GNOME2
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui
+USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner
 USE_GSTREAMER=	cdparanoia
 USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--enable-ignore-missing-cd
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 49ba9dee4..5057dc114 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/sound-juicer-0.6.0.tar.gz) = bab9ac8e3f0ba66f360485aafdd379f8
-SIZE (gnome2/sound-juicer-0.6.0.tar.gz) = 597829
+MD5 (gnome2/sound-juicer-2.9.91.tar.bz2) = f82686eff27ddfb1b0864d350dd57e86
+SIZE (gnome2/sound-juicer-2.9.91.tar.bz2) = 486930
diff --git a/audio/sound-juicer/files/patch-src::bacon-cd-selection.c b/audio/sound-juicer/files/patch-src::bacon-cd-selection.c
deleted file mode 100644
index 3bf5d559e..000000000
--- a/audio/sound-juicer/files/patch-src::bacon-cd-selection.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index 56d594fb9..000000000
--- a/audio/sound-juicer/files/patch-src::cd-drive.c
+++ /dev/null
@@ -1,103 +0,0 @@
---- 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)
-+static int
-+get_device_max_read_speed (char *device)
-+{
-+	int fd;
-+	int max_speed;
-+	int read_speed, write_speed;
-+
-+	max_speed = -1;
-+
-+	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;
-+
-+	return max_speed;
-+}
-+#endif
-+
-+static int
-+get_device_max_write_speed (char *device)
-+{
-+	int fd;
-+	int max_speed;
-+	int read_speed, write_speed;
-+
-+	max_speed = -1;
-+
-+	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  (write_speed) / CD_ROM_SPEED;
-+
-+	return max_speed;
-+}
- 
- #endif /* __linux__ || __FreeBSD__ */
- 
-@@ -798,50 +840,6 @@
- 		}
- 	}
- 	return NULL;
--}
--
--#if !defined(__linux)
--static int
--get_device_max_read_speed (char *device)
--{
--	int fd;
--	int max_speed;
--	int read_speed, write_speed;
--
--	max_speed = -1;
--
--	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;
--
--	return max_speed;
--}
--#endif
--
--static int
--get_device_max_write_speed (char *device)
--{
--	int fd;
--	int max_speed;
--	int read_speed, write_speed;
--
--	max_speed = -1;
--
--	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  (write_speed) / CD_ROM_SPEED;
--
--	return max_speed;
- }
- 
- static char *
diff --git a/audio/sound-juicer/files/patch-src::sj-main.c b/audio/sound-juicer/files/patch-src::sj-main.c
deleted file mode 100644
index 547e5c245..000000000
--- a/audio/sound-juicer/files/patch-src::sj-main.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/sj-main.c.orig	Tue Jun 15 19:45:05 2004
-+++ src/sj-main.c	Tue Jun 15 19:46:13 2004
-@@ -535,8 +535,9 @@
-  */
- void device_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
- {
--  g_assert (strcmp (entry->key, GCONF_DEVICE) == 0);
-   gboolean ignore_no_media = GPOINTER_TO_INT (user_data);
-+
-+  g_assert (strcmp (entry->key, GCONF_DEVICE) == 0);
- 
-   if (entry->value == NULL
- 		  || !cd_drive_exists (gconf_value_get_string (entry->value))) {
diff --git a/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c b/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c
new file mode 100644
index 000000000..c510a48dc
--- /dev/null
+++ b/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c
@@ -0,0 +1,18 @@
+--- src/sj-metadata-musicbrainz.c.orig	Mon Jan 17 13:22:54 2005
++++ src/sj-metadata-musicbrainz.c	Mon Jan 17 13:23:02 2005
+@@ -18,7 +18,6 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
+-#include "sound-juicer.h"
+ 
+ #include <string.h>
+ #include <glib-object.h>
+@@ -32,6 +31,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#include "sound-juicer.h"
+ #include "sj-metadata-musicbrainz.h"
+ #include "sj-structures.h"
+ #include "sj-error.h"
diff --git a/audio/sound-juicer/files/patch-src::sj-util.c b/audio/sound-juicer/files/patch-src::sj-util.c
new file mode 100644
index 000000000..b29d97bbd
--- /dev/null
+++ b/audio/sound-juicer/files/patch-src::sj-util.c
@@ -0,0 +1,43 @@
+--- src/sj-util.c.orig	Tue Feb  8 14:06:57 2005
++++ src/sj-util.c	Tue Feb  8 14:25:03 2005
+@@ -157,6 +157,15 @@
+   if (fd < 0) {
+     return FALSE;
+   }
++#if defined(__FreeBSD__)
++  status = FALSE;
++
++  ioctl (fd, CDIOCCLOSE);
++
++  close (fd);
++
++  return status;
++#else
+   
+   status = ioctl (fd, CDROM_DRIVE_STATUS, CDSL_CURRENT);
+   if (status < 0) {
+@@ -167,6 +176,7 @@
+   close (fd);
+   
+   return status == CDS_TRAY_OPEN;
++#endif
+ }
+ 
+ gboolean is_audio_cd (const char *device)
+@@ -191,7 +201,7 @@
+     default:
+       return FALSE;
+   }
+-
++/*
+   fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL);
+   if (fd <0) {
+     return FALSE;
+@@ -206,6 +216,7 @@
+   close (fd);
+ 
+   return status == CDS_AUDIO;
++  */
+ }
+ 
+ /* Pass NULL to use g_free */