8 files changed, 3 insertions, 86 deletions

diff --git a/MOVED b/MOVED
index 64393b1fb9a8..c47e15f5a342 100644
--- a/MOVED
+++ b/MOVED
@@ -2300,3 +2300,4 @@ x11/xfedor||2006-05-26|Has expired: old, old, old, unmaintained, no usable MASTE
 devel/p5-Encode|converters/p5-Encode|2006-05-27|Move to better category
 devel/p5-Encode-compat|converters/p5-Encode-compat|2006-05-27|Move to better category
 accessibility/gnomemag|accessibility/gnome-mag|2006-05-27|Renamed to use real vendor package name
+accessibility/gnomespeech|accessibility/gnome-speech|2006-05-27|Renamed to use real vendor package name
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 25dc976ac8b2..10d2c4b78981 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -457,7 +457,7 @@ gtkhtml3_LIB_DEPENDS=	gtkhtml-3.8.15:${PORTSDIR}/www/gtkhtml3
 gtkhtml3_DETECT=		${X11BASE}/libdata/pkgconfig/libgtkhtml-3.8.pc
 gtkhtml3_USE_GNOME_IMPL=gail libgnomeui libgnomeprintui
 
-gnomespeech_LIB_DEPENDS=gnomespeech.7:${PORTSDIR}/accessibility/gnomespeech
+gnomespeech_LIB_DEPENDS=gnomespeech.7:${PORTSDIR}/accessibility/gnome-speech
 gnomespeech_DETECT=		${LOCALBASE}/libdata/pkgconfig/gnome-speech-1.0.pc
 gnomespeech_USE_GNOME_IMPL=libbonobo
 
diff --git a/accessibility/Makefile b/accessibility/Makefile
index 6aa9e8b61c91..1d166ed5e7ab 100644
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@@ -11,7 +11,7 @@
     SUBDIR += gail
     SUBDIR += gail-reference
     SUBDIR += gnome-mag
-    SUBDIR += gnomespeech
+    SUBDIR += gnome-speech
     SUBDIR += gnopernicus
     SUBDIR += gok
     SUBDIR += kdeaccessibility
diff --git a/accessibility/gnomespeech/Makefile b/accessibility/gnomespeech/Makefile
deleted file mode 100644
index cfaac7a94ec7..000000000000
--- a/accessibility/gnomespeech/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:	gnomespeech
-# Date created:			11 May 2003
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomespeech
-PORTVERSION=	0.3.10
-CATEGORIES=	accessibility audio gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-speech/0.3
-DISTNAME=	gnome-speech-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME text-to-speech API
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack libbonobo
-GNU_CONFIGURE=  yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--enable-static
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/bin/festival)
-WITH_FESTIVAL=	yes
-.endif
-
-.if defined(WITH_FESTIVAL)
-RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/accessibility/gnomespeech/distinfo b/accessibility/gnomespeech/distinfo
deleted file mode 100644
index e94f410d3946..000000000000
--- a/accessibility/gnomespeech/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-speech-0.3.10.tar.bz2) = 5454e2b727d505459654cbaf5f893d3a
-SHA256 (gnome2/gnome-speech-0.3.10.tar.bz2) = 1740bbabdcccac7b365b73aa06bd5c8f400cfc1f8ec4d922435b38c5b42e1bcc
-SIZE (gnome2/gnome-speech-0.3.10.tar.bz2) = 272260
diff --git a/accessibility/gnomespeech/files/patch-configure b/accessibility/gnomespeech/files/patch-configure
deleted file mode 100644
index 62b94639b55c..000000000000
--- a/accessibility/gnomespeech/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig	Tue Jun  7 02:40:27 2005
-+++ configure	Tue Jun  7 02:41:02 2005
-@@ -20213,8 +20213,8 @@
- 
- fi
- if test "x$JAVAC" != "x" ; then
--  javac_version=`$JAVAC -version 2>&1 | sed -e "1s/javac //" -e "1q" `
--  echo JAVAC VERSION $javac_version
-+#  javac_version=`$JAVAC -version 2>&1 | sed -e "1s/javac //" -e "1q" `
-+#  echo JAVAC VERSION $javac_version
-   JAVAC="$JAVAC -source 1.4"
- fi
- 
-@@ -20423,6 +20423,7 @@
- fi
- 
- # Find the Java Access Bridge
-+JAB="no"
- 
- 
- # Check whether --with-jab_dir or --without-jab_dir was given.
diff --git a/accessibility/gnomespeech/pkg-descr b/accessibility/gnomespeech/pkg-descr
deleted file mode 100644
index bab24f6015fd..000000000000
--- a/accessibility/gnomespeech/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-GNOME Speech is a simple general API for producing text-to-speech output.
diff --git a/accessibility/gnomespeech/pkg-plist b/accessibility/gnomespeech/pkg-plist
deleted file mode 100644
index dc90aef8937f..000000000000
--- a/accessibility/gnomespeech/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-bin/festival-synthesis-driver
-bin/test-speech
-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.la
-lib/libgnomespeech.so
-lib/libgnomespeech.so.7
-lib/orbit-2.0/GNOME_Speech_module.a
-lib/orbit-2.0/GNOME_Speech_module.la
-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
-@dirrm share/idl/gnome-speech-1.0
-@dirrm include/gnome-speech-1.0/gnome-speech
-@dirrm include/gnome-speech-1.0