7 files changed, 36 insertions, 82 deletions

diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 60b01a1e7808..1ee5d80cccca 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sound-juicer
-PORTVERSION=	0.5.11
-PORTREVISION=	1
+PORTVERSION=	0.5.12
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.burtonini.com/computing/
 DIST_SUBDIR=	gnome2
@@ -19,6 +18,7 @@ LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui gstreamerplugins
 USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--enable-ignore-missing-cd
@@ -28,4 +28,7 @@ pre-everything::
 	@${ECHO_MSG} "You must have gstreamer-plugins built with Cdparanoia support!"
 	@${ECHO_MSG}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|^\(SUBDIRS = .*\)tests\(.*\)|\1\2|' ${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index c2162ae5dde5..4714706f9b6a 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/sound-juicer-0.5.11.tar.gz) = ff6fd389727de46db65330eb4a9eee4f
-SIZE (gnome2/sound-juicer-0.5.11.tar.gz) = 496625
+MD5 (gnome2/sound-juicer-0.5.12.tar.gz) = 5ad2cbb1acb91d51d2a67f14d552ae4e
+SIZE (gnome2/sound-juicer-0.5.12.tar.gz) = 476944
diff --git a/audio/sound-juicer/files/patch-src::Makefile.in b/audio/sound-juicer/files/patch-src::Makefile.in
index 95d58f32615b..e593af77a75d 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	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@
+--- src/Makefile.in.orig	Tue Jun 15 19:11:10 2004
++++ src/Makefile.in	Tue Jun 15 19:30:57 2004
+@@ -131,7 +131,7 @@
+ install_sh = @install_sh@
  
  # General compiler flags
 -AM_CFLAGS = -Wall -Werror -export-dynamic -W -Wno-unused-parameter
-+AM_CFLAGS = -Wall -export-dynamic -W
++AM_CFLAGS = -Wall -export-dynamic -W -Wno-unused-parameter
  
  # General CPP flags. When I can demand automake 1.8, this can become
  # sound_juicer_CPPFLAGS.
+@@ -218,7 +218,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 \
diff --git a/audio/sound-juicer/files/patch-src::sj-extracting.c b/audio/sound-juicer/files/patch-src::sj-extracting.c
deleted file mode 100644
index b2aa88dc0bfa..000000000000
--- a/audio/sound-juicer/files/patch-src::sj-extracting.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/sj-extracting.c.orig	Tue Jan 13 20:19:03 2004
-+++ src/sj-extracting.c	Sat Feb  7 19:12:38 2004
-@@ -226,7 +226,13 @@
- pop_and_extract (void)
- {
-   if (pending == NULL) {
--    g_assert_not_reached ();
-+    gtk_widget_hide (progress_dialog);
-+    show_finished_dialog ();
-+    cleanup ();
-+    extracting = FALSE;
-+    if (autostart) {
-+      gtk_main_quit ();
-+    }
-   } else {
-     char *file_path, *directory;
-     GError *error = NULL;
diff --git a/audio/sound-juicer/files/patch-src::sj-main.c b/audio/sound-juicer/files/patch-src::sj-main.c
index 2bf4272ad2ce..547e5c245d67 100644
--- a/audio/sound-juicer/files/patch-src::sj-main.c
+++ b/audio/sound-juicer/files/patch-src::sj-main.c
@@ -1,31 +1,13 @@
---- src/sj-main.c.orig	Wed Jan  7 20:38:00 2004
-+++ src/sj-main.c	Thu Jan 22 14:22:54 2004
-@@ -535,9 +535,10 @@
+--- 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) {
-     device = prefs_get_default_device();
-     if (device == NULL) {
-@@ -833,7 +834,7 @@
- void on_contents_activate(GtkWidget *button, gpointer user_data) {
-   GError *error = NULL;
- 
--  gnome_help_display ("sound-juicer", NULL, &error);
-+  gnome_help_display ("sound-juicer.xml", NULL, &error);
-   if (error) {
-     GtkWidget *dialog;
- 
-@@ -870,6 +871,7 @@
-                       VERSION, LIBGNOMEUI_MODULE,
-                       argc, argv,
-                       GNOME_PARAM_POPT_TABLE, options,
-+                      GNOME_PARAM_APP_DATADIR, DATADIR,
-                       NULL);
-   g_set_application_name (_("Sound Juicer"));
++  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-util.c b/audio/sound-juicer/files/patch-src::sj-util.c
index ac2bcfbd80a6..c276ef1f6cd8 100644
--- a/audio/sound-juicer/files/patch-src::sj-util.c
+++ b/audio/sound-juicer/files/patch-src::sj-util.c
@@ -1,6 +1,6 @@
---- src/sj-util.c.orig	Wed Jan  7 20:38:00 2004
-+++ src/sj-util.c	Fri Jan 23 10:48:36 2004
-@@ -120,6 +120,9 @@
+--- 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;
    }
@@ -10,19 +10,16 @@
    result = ioctl (fd, CDROMEJECT);
    if (result == -1) {
      GtkWidget *dialog;
-@@ -148,21 +151,33 @@
- tray_is_opened (const char *device)
+@@ -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) {
@@ -49,7 +46,7 @@
  }
  
  gboolean is_audio_cd (const char *device)
-@@ -170,6 +185,10 @@
+@@ -172,6 +187,10 @@
    CDMediaType type;
    int fd, status;
  
@@ -60,7 +57,7 @@
    type = guess_media_type (device);
    switch (type) {
      case CD_MEDIA_TYPE_CD:
-@@ -189,15 +208,18 @@
+@@ -191,15 +210,19 @@
      return FALSE;
    }
  
@@ -71,7 +68,7 @@
 -    close (fd);
      return FALSE;
    }
--
+ 
 -  close (fd);
 -
    return status == CDS_AUDIO;
diff --git a/audio/sound-juicer/files/patch-tests::Makefile.in b/audio/sound-juicer/files/patch-tests::Makefile.in
deleted file mode 100644
index 0a2942850fb8..000000000000
--- a/audio/sound-juicer/files/patch-tests::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@