Update to 0.2.5.

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

10 files changed, 36 insertions, 40 deletions

diff --git a/accessibility/gnome-speech/Makefile b/accessibility/gnome-speech/Makefile
index f88770d38..386f6a497 100644
--- a/accessibility/gnome-speech/Makefile
+++ b/accessibility/gnome-speech/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomespeech
-PORTVERSION=	0.2.3
+PORTVERSION=	0.2.5
 CATEGORIES=	audio gnome accessibility
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-speech/0.2
@@ -36,7 +36,4 @@ WITH_FESTIVAL=	yes
 RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
 .endif
 
-pre-build:
-	@cd ${WRKSRC}/gnome-speech && ${GMAKE} clean
-
 .include <bsd.port.post.mk>
diff --git a/accessibility/gnome-speech/distinfo b/accessibility/gnome-speech/distinfo
index c04417614..5a8c18864 100644
--- a/accessibility/gnome-speech/distinfo
+++ b/accessibility/gnome-speech/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-speech-0.2.3.tar.bz2) = d767cc3001bd5a08ed1760e44de7fa6d
+MD5 (gnome2/gnome-speech-0.2.5.tar.bz2) = 796ed911321d78813e3c9b740d1ff70b
diff --git a/accessibility/gnome-speech/files/patch-drivers_festival_festivalsynthesisdriver.c b/accessibility/gnome-speech/files/patch-drivers_festival_festivalsynthesisdriver.c
new file mode 100644
index 000000000..9204b3add
--- /dev/null
+++ b/accessibility/gnome-speech/files/patch-drivers_festival_festivalsynthesisdriver.c
@@ -0,0 +1,12 @@
+--- drivers/festival/festivalsynthesisdriver.c.orig	Tue Aug 12 14:59:50 2003
++++ drivers/festival/festivalsynthesisdriver.c	Tue Aug 12 15:00:08 2003
+@@ -338,8 +338,8 @@
+ static void
+ festival_synthesis_driver_class_init (FestivalSynthesisDriverClass *klass)
+ {
+-	parent_class = g_type_class_peek_parent (klass);
+ 	GObjectClass *object_class = G_OBJECT_CLASS(klass);
++	parent_class = g_type_class_peek_parent (klass);
+ 
+ 	object_class->finalize = festival_synthesis_driver_finalize;
+ 	
diff --git a/accessibility/gnome-speech/files/patch-gnome-speech_Makefile.in b/accessibility/gnome-speech/files/patch-gnome-speech_Makefile.in
deleted file mode 100644
index d9d039ef0..000000000
--- a/accessibility/gnome-speech/files/patch-gnome-speech_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-speech/Makefile.in.orig	Sun Jun 15 17:44:08 2003
-+++ gnome-speech/Makefile.in	Sun Jun 15 17:45:03 2003
-@@ -157,7 +157,7 @@
- orbittypelib_LTLIBRARIES = GNOME_Speech_SynthesisDriver_module.la
- 
- GNOME_Speech_SynthesisDriver_module_la_LDFLAGS = \
--	-export-dynamic -module
-+	-export-dynamic -module -avoid-version
- 
- 
- GNOME_Speech_SynthesisDriver_module_la_SOURCES = \
diff --git a/accessibility/gnome-speech/pkg-plist b/accessibility/gnome-speech/pkg-plist
index a1efc4db2..a72413cfd 100644
--- a/accessibility/gnome-speech/pkg-plist
+++ b/accessibility/gnome-speech/pkg-plist
@@ -1,15 +1,15 @@
 bin/festival-synthesis-driver
 bin/test-speech
-include/gnome-speech-1.0/gnome-speech/GNOME_Speech_SynthesisDriver.h
+include/gnome-speech-1.0/gnome-speech/GNOME_Speech.h
 include/gnome-speech-1.0/gnome-speech/gnome-speech.h
 include/gnome-speech-1.0/gnome-speech/speaker.h
 lib/libgnomespeech.a
 lib/libgnomespeech.so
-lib/libgnomespeech.so.2
-lib/orbit-2.0/GNOME_Speech_SynthesisDriver_module.so
-libdata/bonobo/servers/GNOME_Speech_SynthesisDriver_Dectalk.server
+lib/libgnomespeech.so.5
+lib/orbit-2.0/GNOME_Speech_module.so
 libdata/bonobo/servers/GNOME_Speech_SynthesisDriver_Festival.server
 libdata/pkgconfig/gnome-speech-1.0.pc
+share/idl/gnome-speech-1.0/GNOME_Speech.idl
 share/idl/gnome-speech-1.0/GNOME_Speech_Speaker.idl
 share/idl/gnome-speech-1.0/GNOME_Speech_SpeechCallback.idl
 share/idl/gnome-speech-1.0/GNOME_Speech_SynthesisDriver.idl
diff --git a/accessibility/gnomespeech/Makefile b/accessibility/gnomespeech/Makefile
index f88770d38..386f6a497 100644
--- a/accessibility/gnomespeech/Makefile
+++ b/accessibility/gnomespeech/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomespeech
-PORTVERSION=	0.2.3
+PORTVERSION=	0.2.5
 CATEGORIES=	audio gnome accessibility
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-speech/0.2
@@ -36,7 +36,4 @@ WITH_FESTIVAL=	yes
 RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
 .endif
 
-pre-build:
-	@cd ${WRKSRC}/gnome-speech && ${GMAKE} clean
-
 .include <bsd.port.post.mk>
diff --git a/accessibility/gnomespeech/distinfo b/accessibility/gnomespeech/distinfo
index c04417614..5a8c18864 100644
--- a/accessibility/gnomespeech/distinfo
+++ b/accessibility/gnomespeech/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-speech-0.2.3.tar.bz2) = d767cc3001bd5a08ed1760e44de7fa6d
+MD5 (gnome2/gnome-speech-0.2.5.tar.bz2) = 796ed911321d78813e3c9b740d1ff70b
diff --git a/accessibility/gnomespeech/files/patch-drivers_festival_festivalsynthesisdriver.c b/accessibility/gnomespeech/files/patch-drivers_festival_festivalsynthesisdriver.c
new file mode 100644
index 000000000..9204b3add
--- /dev/null
+++ b/accessibility/gnomespeech/files/patch-drivers_festival_festivalsynthesisdriver.c
@@ -0,0 +1,12 @@
+--- drivers/festival/festivalsynthesisdriver.c.orig	Tue Aug 12 14:59:50 2003
++++ drivers/festival/festivalsynthesisdriver.c	Tue Aug 12 15:00:08 2003
+@@ -338,8 +338,8 @@
+ static void
+ festival_synthesis_driver_class_init (FestivalSynthesisDriverClass *klass)
+ {
+-	parent_class = g_type_class_peek_parent (klass);
+ 	GObjectClass *object_class = G_OBJECT_CLASS(klass);
++	parent_class = g_type_class_peek_parent (klass);
+ 
+ 	object_class->finalize = festival_synthesis_driver_finalize;
+ 	
diff --git a/accessibility/gnomespeech/files/patch-gnome-speech_Makefile.in b/accessibility/gnomespeech/files/patch-gnome-speech_Makefile.in
deleted file mode 100644
index d9d039ef0..000000000
--- a/accessibility/gnomespeech/files/patch-gnome-speech_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-speech/Makefile.in.orig	Sun Jun 15 17:44:08 2003
-+++ gnome-speech/Makefile.in	Sun Jun 15 17:45:03 2003
-@@ -157,7 +157,7 @@
- orbittypelib_LTLIBRARIES = GNOME_Speech_SynthesisDriver_module.la
- 
- GNOME_Speech_SynthesisDriver_module_la_LDFLAGS = \
--	-export-dynamic -module
-+	-export-dynamic -module -avoid-version
- 
- 
- GNOME_Speech_SynthesisDriver_module_la_SOURCES = \
diff --git a/accessibility/gnomespeech/pkg-plist b/accessibility/gnomespeech/pkg-plist
index a1efc4db2..a72413cfd 100644
--- a/accessibility/gnomespeech/pkg-plist
+++ b/accessibility/gnomespeech/pkg-plist
@@ -1,15 +1,15 @@
 bin/festival-synthesis-driver
 bin/test-speech
-include/gnome-speech-1.0/gnome-speech/GNOME_Speech_SynthesisDriver.h
+include/gnome-speech-1.0/gnome-speech/GNOME_Speech.h
 include/gnome-speech-1.0/gnome-speech/gnome-speech.h
 include/gnome-speech-1.0/gnome-speech/speaker.h
 lib/libgnomespeech.a
 lib/libgnomespeech.so
-lib/libgnomespeech.so.2
-lib/orbit-2.0/GNOME_Speech_SynthesisDriver_module.so
-libdata/bonobo/servers/GNOME_Speech_SynthesisDriver_Dectalk.server
+lib/libgnomespeech.so.5
+lib/orbit-2.0/GNOME_Speech_module.so
 libdata/bonobo/servers/GNOME_Speech_SynthesisDriver_Festival.server
 libdata/pkgconfig/gnome-speech-1.0.pc
+share/idl/gnome-speech-1.0/GNOME_Speech.idl
 share/idl/gnome-speech-1.0/GNOME_Speech_Speaker.idl
 share/idl/gnome-speech-1.0/GNOME_Speech_SpeechCallback.idl
 share/idl/gnome-speech-1.0/GNOME_Speech_SynthesisDriver.idl