Update to 0.4.25:

gnome-speech 0.4.25:

* Respin due to use of incompatible libtool for 0.4.24.

gnome-speech 0.4.24

* drivers/espeak/espeakspeaker.c: Fix for bug #571217 - espeak driver
  parameter ranges do not match espeak

* gnome-speech/speaker.c, drivers/eloquence/eloquencespeaker.c: Fix
  for bug #560439 - GNOME Goal: Remove deprecated GLib symbols.  NOTE:
  I don't have the eloquence package (it's a commercial system), so I
  was unable to verify the changes made to that file.

gnome-speech 0.4.23:

* drivers/espeak/Makefile.am Fix for bug #568786 - Trivial build patch
  (Vincent Untz)

* test/test-speech.c: Fix for bug #563577 - GNOME Goal: Clean up GLib
  and GTK+ includes (Luis Menina)

3 files changed, 14 insertions, 24 deletions

diff --git a/audio/gnome-speech/Makefile.common b/audio/gnome-speech/Makefile.common
index 264db3d68f2..222f21f5336 100644
--- a/audio/gnome-speech/Makefile.common
+++ b/audio/gnome-speech/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.1 2009/01/18 11:29:44 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2009/02/24 15:04:15 wiz Exp $
 #
 # used by audio/gnome-speech/Makefile
 # used by audio/gnome-speech-espeak/Makefile
 
-DISTNAME=	gnome-speech-0.4.22
+DISTNAME=	gnome-speech-0.4.25
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-speech/0.4/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/gnome-speech/distinfo b/audio/gnome-speech/distinfo
index cc5e0f4129d..6ddd6937380 100644
--- a/audio/gnome-speech/distinfo
+++ b/audio/gnome-speech/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2009/01/18 11:28:56 wiz Exp $
+$NetBSD: distinfo,v 1.29 2009/02/24 15:04:15 wiz Exp $
 
-SHA1 (gnome-speech-0.4.22.tar.bz2) = 73c9d7ce1082274a1d1084e9d2ea049bc1e1ad74
-RMD160 (gnome-speech-0.4.22.tar.bz2) = 23d3ac4bc75083174c7614a882ecc561eaf064c5
-Size (gnome-speech-0.4.22.tar.bz2) = 309401 bytes
+SHA1 (gnome-speech-0.4.25.tar.bz2) = c229af1583c522212e067990eafaf6a58df42966
+RMD160 (gnome-speech-0.4.25.tar.bz2) = 305f0e820ce77039776a1c3d3fa259d4f628b88e
+Size (gnome-speech-0.4.25.tar.bz2) = 336706 bytes
 SHA1 (patch-aa) = d858b42547ff02b1ee47bfaee83ffc5230d4df31
 SHA1 (patch-ab) = 2a0212e0dab613371db44c278f96d88acd1f5b1c
-SHA1 (patch-ac) = 04a982736770728f3a9e016944105029b55799d2
+SHA1 (patch-ac) = 44c38746c51fc6dbf3e086532ed05f1b0c0c158c
diff --git a/audio/gnome-speech/patches/patch-ac b/audio/gnome-speech/patches/patch-ac
index 564ed92e871..385e8e2ff7e 100644
--- a/audio/gnome-speech/patches/patch-ac
+++ b/audio/gnome-speech/patches/patch-ac
@@ -1,25 +1,18 @@
-$NetBSD: patch-ac,v 1.4 2008/11/16 17:24:40 wiz Exp $
+$NetBSD: patch-ac,v 1.5 2009/02/24 15:04:15 wiz Exp $
 
---- drivers/espeak/Makefile.in.orig	2008-11-16 16:25:02.000000000 +0000
+For separating gnome-speech-espeak into a separate package.
+
+--- drivers/espeak/Makefile.in.orig	2009-02-15 17:43:44.000000000 +0000
 +++ drivers/espeak/Makefile.in
 @@ -55,7 +55,6 @@ espeak_synthesis_driver_OBJECTS =  \
  espeak_synthesis_driver_LDADD = $(LDADD)
  am__DEPENDENCIES_1 =
  espeak_synthesis_driver_DEPENDENCIES =  \
 -	$(top_builddir)/gnome-speech/libgnomespeech.la \
- 	$(am__DEPENDENCIES_1)
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -217,7 +216,7 @@ infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
--localedir = @localedir@
-+localedir = /usr/pkg/share/locale
- localstatedir = @localstatedir@
- loquendo_INCLUDES = @loquendo_INCLUDES@
- loquendo_LIBS = @loquendo_LIBS@
-@@ -250,11 +249,12 @@ INCLUDES = -I$(top_srcdir)          \
+@@ -250,9 +249,10 @@ INCLUDES = -I$(top_srcdir)          \
  	-I$(top_srcdir)/gnome-speech\
  	$(gnome_speech_CFLAGS) \
  	$(WARN_CFLAGS) \
@@ -30,8 +23,5 @@ $NetBSD: patch-ac,v 1.4 2008/11/16 17:24:40 wiz Exp $
 -LDADD = $(top_builddir)/gnome-speech/libgnomespeech.la 	\
 +LDADD = -lgnomespeech \
  	$(gnome_speech_LIBS)	\
--	-L$(espeak_LIBDIR)	\
-+	$(espeak_LIBS)	\
- 	-lespeak
+ 	$(espeak_LIBS)
  
- espeak_synthesis_driver_SOURCES = \