Update to 0.6.0, and switch maintainer to gnome@.

Approved by:	bland


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

5 files changed, 9 insertions, 98 deletions

diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index b05d0f169..3a09d1eec 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	sound-juicer
-PORTVERSION=	0.5.15
+PORTVERSION=	0.6.0
 PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.burtonini.com/computing/
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	bland@FreeBSD.org
+MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Clean, mean and lean CD ripper for GNOME2
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
@@ -23,7 +23,7 @@ INSTALLS_OMF=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui
 USE_GSTREAMER=	cdparanoia
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--enable-ignore-missing-cd
 
 GCONF_SCHEMAS=	sound-juicer.schemas
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index b9e30b623..49ba9dee4 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/sound-juicer-0.5.15.tar.gz) = f1c344b2dcd3f0efd4f9e0318f8526e1
-SIZE (gnome2/sound-juicer-0.5.15.tar.gz) = 594694
+MD5 (gnome2/sound-juicer-0.6.0.tar.gz) = bab9ac8e3f0ba66f360485aafdd379f8
+SIZE (gnome2/sound-juicer-0.6.0.tar.gz) = 597829
diff --git a/audio/sound-juicer/files/patch-src::Makefile.in b/audio/sound-juicer/files/patch-src::Makefile.in
index f6adec0b4..460020551 100644
--- a/audio/sound-juicer/files/patch-src::Makefile.in
+++ b/audio/sound-juicer/files/patch-src::Makefile.in
@@ -1,5 +1,5 @@
---- src/Makefile.in.orig	Wed Nov 10 22:28:19 2004
-+++ src/Makefile.in	Wed Nov 10 22:35:34 2004
+--- src/Makefile.in.orig	Mon Feb  7 02:21:49 2005
++++ src/Makefile.in	Mon Feb  7 02:22:46 2005
 @@ -61,7 +61,7 @@
  	sj-about.$(OBJEXT) sj-extracting.$(OBJEXT) $(am__objects_1) \
  	$(am__objects_2)
@@ -9,11 +9,11 @@
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -228,7 +228,7 @@
+@@ -233,7 +233,7 @@
  target_alias = @target_alias@
  
  # General compiler flags
--AM_CFLAGS = -Wall -Werror -export-dynamic -W -Wno-unused-parameter
+-AM_CFLAGS = -Wall -export-dynamic -W -Wno-unused-parameter
 +AM_CFLAGS = -Wall -export-dynamic -W
  
  # General CPP flags. When I can demand automake 1.8, this can become
diff --git a/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c b/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c
deleted file mode 100644
index c510a48dc..000000000
--- a/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
deleted file mode 100644
index feea811fc..000000000
--- a/audio/sound-juicer/files/patch-src::sj-util.c
+++ /dev/null
@@ -1,71 +0,0 @@
---- src/sj-util.c.orig	Tue Jun 15 19:14:09 2004
-+++ src/sj-util.c	Tue Jun 15 19:29:16 2004
-@@ -122,6 +122,9 @@
-     gtk_widget_destroy (dialog);
-     goto done;
-   }
-+#ifdef __FreeBSD__
-+  ioctl (fd, CDIOCALLOW);
-+#endif
-   result = ioctl (fd, CDROMEJECT);
-   if (result == -1) {
-     GtkWidget *dialog;
-@@ -151,20 +154,32 @@
- {
-   int fd, status;
-   
-+#if defined(__linux__)
-   fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL);
-   if (fd < 0) {
-     return FALSE;
-   }
-   
-   status = ioctl (fd, CDROM_DRIVE_STATUS, CDSL_CURRENT);
-+  close (fd);
-   if (status < 0) {
--    close (fd);
-     return FALSE;
-   }
-   
--  close (fd);
--  
-   return status == CDS_TRAY_OPEN;
-+#elif defined(__FreeBSD__)
-+  struct ioc_toc_header h;
-+
-+  fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL);
-+  if (fd < 0) {
-+    return FALSE;
-+  }
-+
-+  status = ioctl (fd, CDIOREADTOCHEADER, &h);
-+  close (fd);
-+
-+  return status < 0;
-+#endif
- }
- 
- gboolean is_audio_cd (const char *device)
-@@ -191,15 +210,19 @@
-     return FALSE;
-   }
- 
-+#if defined(__linux__)
-   status = ioctl (fd, CDROM_DISC_STATUS, CDSL_CURRENT);
-+  close (fd);
-   if (status < 0) {
--    close (fd);
-     return FALSE;
-   }
- 
--  close (fd);
--
-   return status == CDS_AUDIO;
-+#elif defined (__FreeBSD__)
-+  return TRUE;
-+#else
-+  return TRUE;
-+#endif
- }
- 
- /* Pass NULL to use g_free */