Update to 0.4.19:

* configure.in: be smarter about automatically finding espeak

* drivers/espeak/Makefile.am: remove libstdc++.  It is not needed
  and makes the Solaris build fail.

4 files changed, 26 insertions, 19 deletions

diff --git a/audio/gnome-speech-espeak/Makefile b/audio/gnome-speech-espeak/Makefile
index ebc256fa17f..451b44a3862 100644
--- a/audio/gnome-speech-espeak/Makefile
+++ b/audio/gnome-speech-espeak/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2008/02/28 20:54:56 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/26 00:25:02 wiz Exp $
 #
 
-DISTNAME=	gnome-speech-0.4.18
-PKGNAME=	gnome-speech-espeak-0.4.18
+DISTNAME=	gnome-speech-0.4.19
+PKGNAME=	gnome-speech-espeak-0.4.19
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-speech/0.4/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/gnome-speech/Makefile b/audio/gnome-speech/Makefile
index 6490fbe54cc..05441c1afcf 100644
--- a/audio/gnome-speech/Makefile
+++ b/audio/gnome-speech/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2008/02/28 20:54:56 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2008/04/26 00:25:02 wiz Exp $
 #
 
-DISTNAME=	gnome-speech-0.4.18
+DISTNAME=	gnome-speech-0.4.19
 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 9b5f7c04e31..46e7226cd5e 100644
--- a/audio/gnome-speech/distinfo
+++ b/audio/gnome-speech/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2008/02/28 20:54:56 drochner Exp $
+$NetBSD: distinfo,v 1.25 2008/04/26 00:25:02 wiz Exp $
 
-SHA1 (gnome-speech-0.4.18.tar.bz2) = c50e86fff5fe9656a5839c11b648998323a8adb7
-RMD160 (gnome-speech-0.4.18.tar.bz2) = 2e881a235e8985d7eaed67ce628565e9228042ac
-Size (gnome-speech-0.4.18.tar.bz2) = 319616 bytes
+SHA1 (gnome-speech-0.4.19.tar.bz2) = 32b6a8ad03a943115b83512bec4d685852135037
+RMD160 (gnome-speech-0.4.19.tar.bz2) = 33f7cf93c27a0646a88e33cfee6e765fcc102f7f
+Size (gnome-speech-0.4.19.tar.bz2) = 319681 bytes
 SHA1 (patch-aa) = 039606f4e47be7d6e812687504a577fc149b5722
 SHA1 (patch-ab) = 95750a125944a7071f2ea125d7e8d3e099edad47
-SHA1 (patch-ac) = 1d05adfe36978a0be91647e1eae66ca450343500
+SHA1 (patch-ac) = 8e058c0a3c179307e58ff8b566c6654721a47daf
diff --git a/audio/gnome-speech/patches/patch-ac b/audio/gnome-speech/patches/patch-ac
index 801aa3fc17b..5b95d635f93 100644
--- a/audio/gnome-speech/patches/patch-ac
+++ b/audio/gnome-speech/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2008/01/11 13:50:24 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2008/04/26 00:25:02 wiz Exp $
 
---- drivers/espeak/Makefile.in.orig	2007-12-17 20:15:00.000000000 +0100
+--- drivers/espeak/Makefile.in.orig	2008-04-17 14:35:22.000000000 +0000
 +++ drivers/espeak/Makefile.in
 @@ -55,7 +55,6 @@ espeak_synthesis_driver_OBJECTS =  \
  espeak_synthesis_driver_LDADD = $(LDADD)
@@ -10,21 +10,28 @@ $NetBSD: patch-ac,v 1.2 2008/01/11 13:50:24 drochner Exp $
  	$(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -247,13 +246,13 @@ INCLUDES = -I$(top_srcdir)          \
+@@ -215,7 +214,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@
+@@ -247,11 +246,12 @@ INCLUDES = -I$(top_srcdir)          \
  	-I$(top_srcdir)/gnome-speech\
  	$(gnome_speech_CFLAGS) \
  	$(WARN_CFLAGS) \
 -	-I$(espeak_INCLUDES)
-+	-I$(espeak_INCLUDES) -I ${LOCALBASE}/include/gnome-speech-1.0
++	-I$(espeak_INCLUDES) \
++	-I${LOCALBASE}/include/gnome-speech-1.0
  
 -LDADD = $(top_builddir)/gnome-speech/libgnomespeech.la 	\
-+LDADD = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lgnomespeech	\
++LDADD = -lgnomespeech \
  	$(gnome_speech_LIBS)	\
 -	-L$(espeak_LIBDIR)	\
 +	$(espeak_LIBS)	\
- 	-lespeak \
--	-lstdc++
-+	-lstdc++ -lm
+ 	-lespeak
  
  espeak_synthesis_driver_SOURCES = \
- 	espeaksynthesisdriver.c \