Presenting GNOME 2.12 for FreeBSD. The release is chock full of bug fixes

and new features.  Don't believe me?  Then see for yourself at
http://www.gnome.org/start/2.12/notes/en/.

DO NOT USE portupgrade by itself to upgrade to GNOME 2.12.  Instead, use
the gnome_upgrade.sh script from
http://www.marcuscom.com/downloads/gnome_upgrade212.sh.  This script will
circumvent some potential pitfalls users can see if they use portupgrade
by itself.

In keeping with tradition, GNOME 2.12 for FreeBSD comes with a special
splash screen.  The winner of this release's contest is
Dominique Goncalves <dominique.goncalves@gmail.com>.  His splash screen
was inspired by http://art.gnome.org/contests/2.12-splash/83.

The FreeBSD GNOME Team would lank to thank the following users for
their contributions to this release:

Matthew Luckie <mjl@luckie.org.nz>
ade
sajd on #freebsd-gnome
Caelian on #freebsd-gnome
mnag
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Mark Hobden <markhobden@gmail.com>
Sergey Akifyev <asa@agava.com>
Andreas Kohn

For more information on GNOME on FreeBSD, checkout
http://www.FreeBSD.org/gnome/.  The 2.12 documentation will be
posted shortly.

6 files changed, 33 insertions, 72 deletions

diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index a4bea86..c3df43e 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -3,13 +3,14 @@
 # Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/audio/sound-juicer/Makefile,v 1.29 2005/09/19 13:18:32 marcus Exp $
 #
 
 PORTNAME=	sound-juicer
-PORTVERSION=	2.10.1
+PORTVERSION=	2.12.2
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,9 +24,10 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner
+USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner \
+		gnomedocutils
 USE_GSTREAMER=	cdparanoia vorbis flac gconf
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--enable-ignore-missing-cd
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 3227b06..49c965a 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/sound-juicer-2.10.1.tar.bz2) = 59a5e142cf39152bcbc1467d02e4494a
-SIZE (gnome2/sound-juicer-2.10.1.tar.bz2) = 518894
+MD5 (gnome2/sound-juicer-2.12.2.tar.bz2) = e7e873cc77a002eb0d9c4cf502bd343d
+SIZE (gnome2/sound-juicer-2.12.2.tar.bz2) = 573186
diff --git a/audio/sound-juicer/files/patch-src::Makefile.in b/audio/sound-juicer/files/patch-src::Makefile.in
index 4600205..187926f 100644
--- a/audio/sound-juicer/files/patch-src::Makefile.in
+++ b/audio/sound-juicer/files/patch-src::Makefile.in
@@ -1,15 +1,15 @@
---- 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)
+--- src/Makefile.in.orig	Tue Aug 23 20:23:29 2005
++++ src/Makefile.in	Tue Aug 23 20:23:57 2005
+@@ -63,7 +63,7 @@
+ 	sj-about.$(OBJEXT) sj-extracting.$(OBJEXT) \
+ 	bacon-volume.$(OBJEXT) $(am__objects_1) $(am__objects_2)
  sound_juicer_OBJECTS = $(am_sound_juicer_OBJECTS)
 -sound_juicer_LDADD = $(LDADD)
 +sound_juicer_LDADD = $(LDADD) -lcam
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -233,7 +233,7 @@
+@@ -257,7 +257,7 @@
  target_alias = @target_alias@
  
  # General compiler flags
diff --git a/audio/sound-juicer/files/patch-src::sj-genres.c b/audio/sound-juicer/files/patch-src::sj-genres.c
deleted file mode 100644
index 5bbf888..0000000
--- a/audio/sound-juicer/files/patch-src::sj-genres.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/sj-genres.c.orig	Mon Jan 17 13:22:28 2005
-+++ src/sj-genres.c	Mon Jan 17 13:22:34 2005
-@@ -20,9 +20,9 @@
-  * Authors: Ross Burton <ross@burtonini.com>
-  */
- 
--#include "sound-juicer.h"
- 
- #include <glib/gi18n.h>
-+#include "sound-juicer.h"
- 
- #include "sj-genres.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 b29d97b..0000000
--- a/audio/sound-juicer/files/patch-src::sj-util.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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 */
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index af79515..e3ebca0 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -1,13 +1,21 @@
 bin/sound-juicer
 share/gnome/applications/sound-juicer.desktop
 share/gnome/help/sound-juicer/C/fdl-appendix.xml
-share/gnome/help/sound-juicer/C/figures/prefs.png
-share/gnome/help/sound-juicer/C/figures/startup.png
 share/gnome/help/sound-juicer/C/legal.xml
 share/gnome/help/sound-juicer/C/sound-juicer.xml
-share/gnome/omf/sound-juicer/sound-juicer-manual-C.omf
+share/gnome/help/sound-juicer/es/fdl-appendix.xml
+share/gnome/help/sound-juicer/es/legal.xml
+share/gnome/help/sound-juicer/es/sound-juicer.xml
+share/gnome/help/sound-juicer/uk/fdl-appendix.xml
+share/gnome/help/sound-juicer/uk/legal.xml
+share/gnome/help/sound-juicer/uk/sound-juicer.xml
+share/gnome/omf/sound-juicer/sound-juicer-C.omf
+share/gnome/omf/sound-juicer/sound-juicer-es.omf
+share/gnome/omf/sound-juicer/sound-juicer-uk.omf
 share/gnome/pixmaps/sound-juicer.png
 share/gnome/sound-juicer/orange-slice.png
+share/gnome/sound-juicer/sj-play.png
+share/gnome/sound-juicer/sj-record.png
 share/gnome/sound-juicer/sound-juicer.glade
 share/locale/ar/LC_MESSAGES/sound-juicer.mo
 share/locale/az/LC_MESSAGES/sound-juicer.mo
@@ -15,6 +23,7 @@ share/locale/be/LC_MESSAGES/sound-juicer.mo
 share/locale/bg/LC_MESSAGES/sound-juicer.mo
 share/locale/ca/LC_MESSAGES/sound-juicer.mo
 share/locale/cs/LC_MESSAGES/sound-juicer.mo
+share/locale/cy/LC_MESSAGES/sound-juicer.mo
 share/locale/da/LC_MESSAGES/sound-juicer.mo
 share/locale/de/LC_MESSAGES/sound-juicer.mo
 share/locale/el/LC_MESSAGES/sound-juicer.mo
@@ -23,8 +32,10 @@ share/locale/en_GB/LC_MESSAGES/sound-juicer.mo
 share/locale/es/LC_MESSAGES/sound-juicer.mo
 share/locale/et/LC_MESSAGES/sound-juicer.mo
 share/locale/eu/LC_MESSAGES/sound-juicer.mo
+share/locale/fa/LC_MESSAGES/sound-juicer.mo
 share/locale/fi/LC_MESSAGES/sound-juicer.mo
 share/locale/fr/LC_MESSAGES/sound-juicer.mo
+share/locale/gl/LC_MESSAGES/sound-juicer.mo
 share/locale/gu/LC_MESSAGES/sound-juicer.mo
 share/locale/hi/LC_MESSAGES/sound-juicer.mo
 share/locale/hr/LC_MESSAGES/sound-juicer.mo
@@ -48,18 +59,22 @@ share/locale/pt_BR/LC_MESSAGES/sound-juicer.mo
 share/locale/ro/LC_MESSAGES/sound-juicer.mo
 share/locale/ru/LC_MESSAGES/sound-juicer.mo
 share/locale/rw/LC_MESSAGES/sound-juicer.mo
+share/locale/sk/LC_MESSAGES/sound-juicer.mo
 share/locale/sq/LC_MESSAGES/sound-juicer.mo
 share/locale/sr/LC_MESSAGES/sound-juicer.mo
 share/locale/sr@Latn/LC_MESSAGES/sound-juicer.mo
 share/locale/sv/LC_MESSAGES/sound-juicer.mo
+share/locale/ta/LC_MESSAGES/sound-juicer.mo
 share/locale/th/LC_MESSAGES/sound-juicer.mo
 share/locale/tr/LC_MESSAGES/sound-juicer.mo
+share/locale/ug/LC_MESSAGES/sound-juicer.mo
 share/locale/uk/LC_MESSAGES/sound-juicer.mo
 share/locale/xh/LC_MESSAGES/sound-juicer.mo
 share/locale/zh_CN/LC_MESSAGES/sound-juicer.mo
 share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo
 @dirrm share/gnome/sound-juicer
 @dirrm share/gnome/omf/sound-juicer
-@dirrm share/gnome/help/sound-juicer/C/figures
+@dirrm share/gnome/help/sound-juicer/uk
+@dirrm share/gnome/help/sound-juicer/es
 @dirrm share/gnome/help/sound-juicer/C
 @dirrm share/gnome/help/sound-juicer