6 files changed, 29 insertions, 109 deletions

diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 60f62b7fc40f..7c3a7ac36303 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sound-juicer
-PORTVERSION=	0.5.9
-PORTREVISION=	2
+PORTVERSION=	0.5.10.1
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.burtonini.com/computing/
 DIST_SUBDIR=	gnome2
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 83fbaab031a6..a2e4d7f73fab 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1 +1,2 @@
-MD5 (gnome2/sound-juicer-0.5.9.tar.gz) = 1c4b30e621e2697b8be82a47bbbf6d5e
+MD5 (gnome2/sound-juicer-0.5.10.1.tar.gz) = a879cce136a1f26274f0cb1906fbec71
+SIZE (gnome2/sound-juicer-0.5.10.1.tar.gz) = 432801
diff --git a/audio/sound-juicer/files/patch-src::Makefile.in b/audio/sound-juicer/files/patch-src::Makefile.in
index a95326528a96..95d58f32615b 100644
--- a/audio/sound-juicer/files/patch-src::Makefile.in
+++ b/audio/sound-juicer/files/patch-src::Makefile.in
@@ -1,20 +1,20 @@
---- src/Makefile.in.orig	Thu Jan 22 14:21:35 2004
-+++ src/Makefile.in	Thu Jan 22 14:21:56 2004
-@@ -128,7 +128,7 @@
- am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
+--- src/Makefile.in.orig	Sat Feb  7 03:17:47 2004
++++ src/Makefile.in	Sat Feb  7 03:19:58 2004
+@@ -110,7 +110,7 @@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lcam
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+@@ -171,7 +171,7 @@
+ target_alias = @target_alias@
+ 
+ # General compiler flags
 -AM_CFLAGS = -Wall -Werror -export-dynamic -W -Wno-unused-parameter
 +AM_CFLAGS = -Wall -export-dynamic -W
  
- AM_CPPFLAGS = \
- 	@DISABLE_DEPRECATED_CFLAGS@ \
-@@ -212,7 +212,7 @@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lcam
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bacon-cd-selection.Po \
+ # General CPP flags. When I can demand automake 1.8, this can become
+ # sound_juicer_CPPFLAGS.
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 d08924aa3537..000000000000
--- a/audio/sound-juicer/files/patch-src::cd-drive.c
+++ /dev/null
@@ -1,70 +0,0 @@
---- src/cd-drive.c.orig	Mon Dec  8 22:08:56 2003
-+++ src/cd-drive.c	Fri Jan 23 10:49:43 2004
-@@ -65,7 +65,7 @@
- 
- /* For dvd_plus_rw_utils.cpp */
- int get_dvd_r_rw_profile (const char *name);
--int get_mmc_profile (void *fd);
-+int get_mmc_profile (int fd);
- 
- static void
- add_dvd_plus (CDDrive *cdrom)
-@@ -99,7 +99,7 @@
- 		return CD_MEDIA_TYPE_ERROR;
- 	}
- 
--	mmc_profile = get_mmc_profile ((void *)&fd);
-+	mmc_profile = get_mmc_profile (fd);
- 	close (fd);
- 
- 	switch (mmc_profile) {
-@@ -790,7 +790,11 @@
- 		struct cam_device *cam_dev;
- 
- 		type = 0;
-+#if defined(__FreeBSD__) && (__FreeBSD_version > 500000)
-+		cam_path = g_strdup_printf ("/dev/%s%d", dev_type, i);
-+#else
- 		cam_path = g_strdup_printf ("/dev/%s%dc", dev_type, i);
-+#endif
- 
- 		if (!g_file_test (cam_path, G_FILE_TEST_EXISTS)) {
- 			g_free (cam_path);
-@@ -803,29 +807,18 @@
- 			continue;
- 		}
- 
--		/* XXX Other controllers might need to be added. */
--		if ((strncmp (cam_dev->sim_name, "ata", 3)) == 0) {
--			dev = g_strdup_printf ("/dev/a%s%dc", dev_type, i);
--		} else {
--			dev = g_strdup (cam_path);
--		}
-+		dev = g_strdup (cam_path);
- 
- 		g_free (cam_path);
- 
--		if ((fd = open (dev, O_RDWR, 0)) < 0) {
--			g_free (dev);
--			free (cam_dev);
--			i++;
--			continue;
--		}
--
--		type |= CDDRIVE_TYPE_CD_DRIVE;
--		if (ioctl (fd, CDRIOCWRITESPEED, &max_speed) >= 0) {
--			/* XXX is it CD-R or CD-RW ? */
--			type |= CDDRIVE_TYPE_CD_RECORDER;
-+		if ((fd = open (dev, O_RDWR, 0)) >= 0) {
-+			type |= CDDRIVE_TYPE_CD_DRIVE;
-+			if (ioctl (fd, CDRIOCWRITESPEED, &max_speed) >= 0) {
-+				/* XXX is it CD-R or CD-RW ? */
-+				type |= CDDRIVE_TYPE_CD_RECORDER;
-+			}
-+			close (fd);
- 		}
--
--		close (fd);
- 
- 		if (type & CDDRIVE_TYPE_CD_RECORDER
- 				|| type & CDDRIVE_TYPE_CDRW_RECORDER
diff --git a/audio/sound-juicer/files/patch-src::sj-prefs.c b/audio/sound-juicer/files/patch-src::sj-prefs.c
deleted file mode 100644
index fb5ed24ae2f2..000000000000
--- a/audio/sound-juicer/files/patch-src::sj-prefs.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/sj-prefs.c.orig	Tue Jan 20 22:45:59 2004
-+++ src/sj-prefs.c	Wed Jan 21 14:38:24 2004
-@@ -75,7 +75,6 @@
-       CDDrive *cdrom = cdroms->data;
-       cd_drive_free (cdrom);
-       cdroms = g_list_remove (cdroms, cdrom);
--      g_free (cdrom);    
-     }
-   }
-   return default_device;
diff --git a/audio/sound-juicer/files/patch-tests::Makefile.in b/audio/sound-juicer/files/patch-tests::Makefile.in
index e3325efd909c..0a2942850fb8 100644
--- a/audio/sound-juicer/files/patch-tests::Makefile.in
+++ b/audio/sound-juicer/files/patch-tests::Makefile.in
@@ -1,11 +1,11 @@
---- tests/Makefile.in.orig	Tue Jan 20 22:30:02 2004
-+++ tests/Makefile.in	Tue Jan 20 22:30:28 2004
-@@ -173,7 +173,7 @@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/src
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
+--- tests/Makefile.in.orig	Sat Feb  7 03:15:59 2004
++++ tests/Makefile.in	Sat Feb  7 03:17:01 2004
+@@ -110,7 +110,7 @@
+ LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+ LIBGLADE_LIBS = @LIBGLADE_LIBS@
+ LIBOBJS = @LIBOBJS@
 -LIBS = @LIBS@
 +LIBS = @LIBS@ -lcam
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cd-drive.Po \
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@