17 files changed, 128 insertions, 283 deletions

diff --git a/accessibility/speech-dispatcher/Makefile b/accessibility/speech-dispatcher/Makefile
index 63db12712f74..49337dee0c83 100644
--- a/accessibility/speech-dispatcher/Makefile
+++ b/accessibility/speech-dispatcher/Makefile
@@ -5,24 +5,23 @@
 # $FreeBSD$
 
 PORTNAME=	speech-dispatcher
-PORTVERSION=	0.6.7
-PORTREVISION=	2
+PORTVERSION=	0.7
 CATEGORIES=	accessibility audio
 MASTER_SITES=	http://www.freebsoft.org/pub/projects/speechd/
 
 MAINTAINER=	avilla@FreeBSD.org
 COMMENT=	Common interface to speech synthesis
 
-LIB_DEPENDS=	dotconf.0:${PORTSDIR}/devel/dotconf
+LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	multi
 
-SUB_FILES=	pkg-message
+LIB_DEPENDS=	dotconf.0:${PORTSDIR}/devel/dotconf \
+		sndfile.1:${PORTSDIR}/audio/libsndfile
 
-USE_RC_SUBR=	speechd
 USE_GNOME=	glib20 pkgconfig
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--without-ibmtts --without-alsa --without-ivona
 USE_GMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/${PORTNAME}
@@ -35,19 +34,27 @@ CONFFILES=	clients/emacs.conf clients/gnome-speech.conf \
 		modules/ivona.conf modules/llia_phon-generic.conf \
 		modules/swift-generic.conf speechd.conf
 
-PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
+PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README TODO
 
 INFO=		spd-say ${PORTNAME}-cs ${PORTNAME} ssip
 
-OPTIONS=	ESPEAK	"eSpeak output module" on \
+OPTIONS=	ALSA	"ALSA support" off \
+		ESPEAK	"eSpeak output module" on \
 		FESTIVAL	"Festival output module" off \
+		FLITE	"Festival Lite output module" off \
+		LIBAO	"libao support" off \
 		NAS	"Network Audio System support" off \
-		PULSEAUDIO	"PulseAudio support" off
+		PULSEAUDIO	"PulseAudio support (broken on FreeBSD 6.X)" off \
+		PYTHON	"Python support" off
 
-# no *.so library installed to link to
-#FLITE	"Festival Lite output module" off \
+.include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
+.ifdef(WITH_ALSA)
+LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+CONFIGURE_ARGS+=	--with-alsa
+.else
+CONFIGURE_ARGS+=	--without-alsa
+.endif
 
 .ifndef(WITHOUT_ESPEAK)
 LIB_DEPENDS+=	espeak.1:${PORTSDIR}/audio/espeak
@@ -63,15 +70,22 @@ RUN_DEPENDS+=	festival:${PORTSDIR}/audio/festival \
 		${LOCALBASE}/share/festival/lib/${PORTNAME}.scm:${PORTSDIR}/audio/festival-freebsoft-utils
 .endif
 
-#.ifdef(WITH_FLITE)
-#BUILD_DEPENDS+=	flite:${PORTSDIR}/audio/flite
-#RUN_DEPENDS+=	flite:${PORTSDIR}/audio/flite
-#CONFIGURE_ARGS+=	--with-flite
-#PLIST_SUB+=	FLITE=""
-#.else
+.ifdef(WITH_FLITE)
+BUILD_DEPENDS+=	flite:${PORTSDIR}/audio/flite
+RUN_DEPENDS+=	flite:${PORTSDIR}/audio/flite
+CONFIGURE_ARGS+=	--with-flite
+PLIST_SUB+=	FLITE=""
+.else
 CONFIGURE_ARGS+=	--without-flite
 PLIST_SUB+=	FLITE="@comment "
-#.endif
+.endif
+
+.ifdef(WITH_LIBAO)
+LIB_DEPENDS+=	ao.4:${PORTSDIR}/audio/libao
+CONFIGURE_ARGS+=	--with-libao
+.else
+CONFIGURE_ARGS+=	--without-libao
+.endif
 
 .ifdef(WITH_NAS)
 LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
@@ -80,11 +94,22 @@ CONFIGURE_ARGS+=	--with-nas
 CONFIGURE_ARGS+=	--without-nas
 .endif
 
-.ifdef(WITH_PULSEAUDIO)
+.ifdef(WITH_PYTHON)
+USE_PYTHON=	yes
+PLIST_SUB+=	PYTHON=""
+.else
+PLIST_SUB+=	PYTHON="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_PULSEAUDIO) && ${OSVERSION} >= 700041
 LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
-CONFIGURE_ARGS+=	--with-pulseaudio
+CONFIGURE_ARGS+=	--with-pulse
+PLIST_SUB+=	GNOMEHIER="@comment "
 .else
-CONFIGURE_ARGS+=	--without-pulseaudio
+CONFIGURE_ARGS+=	--without-pulse
+PLIST_SUB+=	GNOMEHIER=""
 .endif
 
 .if ${OSVERSION} < 800067
@@ -105,20 +130,19 @@ post-extract:
 .endif
 
 post-patch:
-.if ${OSVERSION} < 700042
-	@${REINPLACE_CMD} -E -e 's/^(LDFLAGS =.+)/\1 ${PTHREAD_LIBS}/' \
-		${WRKSRC}/src/c/clients/say/Makefile.in \
-		${WRKSRC}/src/tests/Makefile.in
-.endif
-	@${REINPLACE_CMD} -e 's/-pthread/${PTHREAD_LIBS}/g' \
+	${REINPLACE_CMD} -e 's/-pthread/${PTHREAD_LIBS}/g' \
 		${WRKSRC}/ltmain.sh
-	@${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' \
+	${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/src/audio/Makefile.in \
 		${WRKSRC}/src/c/api/Makefile.in \
 		${WRKSRC}/src/c/clients/spdsend/Makefile.in \
 		${WRKSRC}/src/modules/Makefile.in \
 		${WRKSRC}/src/server/Makefile.in
+.ifndef(WITH_PYTHON)
+	${REINPLACE_CMD} -e 's/python[^ ]*//g' \
+		${WRKSRC}/src/Makefile.in
+.endif
 
 post-install:
 .for f in ${CONFFILES}
@@ -132,6 +156,5 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
-	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/accessibility/speech-dispatcher/distinfo b/accessibility/speech-dispatcher/distinfo
index 2baab3990307..c5f1e1452dfe 100644
--- a/accessibility/speech-dispatcher/distinfo
+++ b/accessibility/speech-dispatcher/distinfo
@@ -1,3 +1,3 @@
-MD5 (speech-dispatcher-0.6.7.tar.gz) = 67432ad655b50fd7c1f1f79e012cfe3f
-SHA256 (speech-dispatcher-0.6.7.tar.gz) = 3b5c8b9df90f8e2069c92e1e0d9760c9b940aaec9994491a9e255c892e62434b
-SIZE (speech-dispatcher-0.6.7.tar.gz) = 1186677
+MD5 (speech-dispatcher-0.7.tar.gz) = 8e0d833c680c8217cc40d88c68c5265f
+SHA256 (speech-dispatcher-0.7.tar.gz) = b7976b4c325b792156cc60c21442cced03f6d0e89dec6b3b78148eab52e42ae6
+SIZE (speech-dispatcher-0.7.tar.gz) = 1115738
diff --git a/accessibility/speech-dispatcher/files/extrapatch-src-c-clients-spdsend-Makefile.in b/accessibility/speech-dispatcher/files/extrapatch-src-c-clients-spdsend-Makefile.in
deleted file mode 100644
index bb90cb46bfa0..000000000000
--- a/accessibility/speech-dispatcher/files/extrapatch-src-c-clients-spdsend-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/c/clients/spdsend/Makefile.in.orig	2010-01-15 19:46:14.737593506 +0100
-+++ src/c/clients/spdsend/Makefile.in	2010-01-15 19:46:29.284418153 +0100
-@@ -47,7 +47,7 @@
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(bin_PROGRAMS)
- am_spdsend_OBJECTS = spdsend.$(OBJEXT) server.$(OBJEXT) \
--	client.$(OBJEXT) common.$(OBJEXT)
-+	client.$(OBJEXT) common.$(OBJEXT) ../../../freebsd.$(OBJEXT)
- spdsend_OBJECTS = $(am_spdsend_OBJECTS)
- spdsend_DEPENDENCIES =
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
diff --git a/accessibility/speech-dispatcher/files/extrapatch-src-modules-Makefile.in b/accessibility/speech-dispatcher/files/extrapatch-src-modules-Makefile.in
deleted file mode 100644
index 8d23bb06697c..000000000000
--- a/accessibility/speech-dispatcher/files/extrapatch-src-modules-Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/modules/Makefile.in.orig	2010-01-15 19:47:30.277280590 +0100
-+++ src/modules/Makefile.in	2010-01-15 19:49:05.729978711 +0100
-@@ -57,44 +57,44 @@
- 	"$(DESTDIR)$(snddatadir)"
- modulebinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(modulebin_PROGRAMS)
--am_sd_cicero_OBJECTS = cicero.$(OBJEXT) module_utils.$(OBJEXT)
-+am_sd_cicero_OBJECTS = cicero.$(OBJEXT) module_utils.$(OBJEXT) ../freebsd.$(OBJEXT)
- sd_cicero_OBJECTS = $(am_sd_cicero_OBJECTS)
- sd_cicero_DEPENDENCIES =
--am_sd_dummy_OBJECTS = dummy.$(OBJEXT) module_utils.$(OBJEXT)
-+am_sd_dummy_OBJECTS = dummy.$(OBJEXT) module_utils.$(OBJEXT) ../freebsd.$(OBJEXT)
- sd_dummy_OBJECTS = $(am_sd_dummy_OBJECTS)
- sd_dummy_DEPENDENCIES =
- sd_dummy_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sd_dummy_LDFLAGS) \
- 	$(LDFLAGS) -o $@
--am_sd_espeak_OBJECTS = espeak.$(OBJEXT) module_utils.$(OBJEXT)
-+am_sd_espeak_OBJECTS = espeak.$(OBJEXT) module_utils.$(OBJEXT) ../freebsd.$(OBJEXT)
- sd_espeak_OBJECTS = $(am_sd_espeak_OBJECTS)
- sd_espeak_DEPENDENCIES =
- sd_espeak_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(sd_espeak_LDFLAGS) $(LDFLAGS) -o $@
--am_sd_festival_OBJECTS = festival.$(OBJEXT) module_utils.$(OBJEXT)
-+am_sd_festival_OBJECTS = festival.$(OBJEXT) module_utils.$(OBJEXT) ../freebsd.$(OBJEXT)
- sd_festival_OBJECTS = $(am_sd_festival_OBJECTS)
- sd_festival_DEPENDENCIES =
- sd_festival_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(sd_festival_LDFLAGS) $(LDFLAGS) -o $@
--am_sd_flite_OBJECTS = flite.$(OBJEXT) module_utils.$(OBJEXT)
-+am_sd_flite_OBJECTS = flite.$(OBJEXT) module_utils.$(OBJEXT) ../freebsd.$(OBJEXT)
- sd_flite_OBJECTS = $(am_sd_flite_OBJECTS)
- am__DEPENDENCIES_1 =
- sd_flite_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- sd_flite_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sd_flite_LDFLAGS) \
- 	$(LDFLAGS) -o $@
--am_sd_generic_OBJECTS = generic.$(OBJEXT) module_utils.$(OBJEXT)
-+am_sd_generic_OBJECTS = generic.$(OBJEXT) module_utils.$(OBJEXT) ../freebsd.$(OBJEXT)
- sd_generic_OBJECTS = $(am_sd_generic_OBJECTS)
- sd_generic_DEPENDENCIES =
--am_sd_ibmtts_OBJECTS = ibmtts.$(OBJEXT) module_utils.$(OBJEXT)
-+am_sd_ibmtts_OBJECTS = ibmtts.$(OBJEXT) module_utils.$(OBJEXT) ../freebsd.$(OBJEXT)
- sd_ibmtts_OBJECTS = $(am_sd_ibmtts_OBJECTS)
- sd_ibmtts_DEPENDENCIES =
- sd_ibmtts_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(sd_ibmtts_LDFLAGS) $(LDFLAGS) -o $@
--am_sd_ivona_OBJECTS = ivona.$(OBJEXT) module_utils.$(OBJEXT)
-+am_sd_ivona_OBJECTS = ivona.$(OBJEXT) module_utils.$(OBJEXT) ../freebsd.$(OBJEXT)
- sd_ivona_OBJECTS = $(am_sd_ivona_OBJECTS)
- sd_ivona_DEPENDENCIES =
- sd_ivona_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
diff --git a/accessibility/speech-dispatcher/files/extrapatch-src-server-Makefile.in b/accessibility/speech-dispatcher/files/extrapatch-src-server-Makefile.in
deleted file mode 100644
index 07ea4b5896cd..000000000000
--- a/accessibility/speech-dispatcher/files/extrapatch-src-server-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/server/Makefile.in.orig	2010-01-15 19:44:32.014987477 +0100
-+++ src/server/Makefile.in	2010-01-15 19:44:56.313346422 +0100
-@@ -50,7 +50,7 @@
- 	parse.$(OBJEXT) set.$(OBJEXT) alloc.$(OBJEXT) \
- 	compare.$(OBJEXT) speaking.$(OBJEXT) options.$(OBJEXT) \
- 	output.$(OBJEXT) sem_functions.$(OBJEXT) \
--	index_marking.$(OBJEXT)
-+	index_marking.$(OBJEXT) ../freebsd.$(OBJEXT)
- speech_dispatcher_OBJECTS = $(am_speech_dispatcher_OBJECTS)
- speech_dispatcher_DEPENDENCIES =
- speech_dispatcher_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
diff --git a/accessibility/speech-dispatcher/files/patch-config-Makefile.in b/accessibility/speech-dispatcher/files/patch-config-Makefile.in
index 766cfedd5cef..1dac98f88f10 100644
--- a/accessibility/speech-dispatcher/files/patch-config-Makefile.in
+++ b/accessibility/speech-dispatcher/files/patch-config-Makefile.in
@@ -1,11 +1,17 @@
---- config/Makefile.in.orig	2008-07-31 08:57:42.000000000 +0000
-+++ config/Makefile.in	2009-12-09 08:40:24.020226284 +0000
-@@ -252,7 +252,7 @@
+--- config/Makefile.in.orig	2010-08-25 01:32:29.007194513 +0200
++++ config/Makefile.in	2010-08-25 01:58:14.194467567 +0200
+@@ -304,11 +304,9 @@
+ 	@list='$(spdconf_DATA)'; test -n "$(spdconfdir)" || list=; \
+ 	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
- 	  echo " $(spdconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(spdconfdir)/$$f'"; \
--	  $(spdconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(spdconfdir)/$$f"; \
-+	  $(spdconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(spdconfdir)/$$f.sample"; \
+-	  echo "$$d$$p"; \
+-	done | $(am__base_list) | \
+-	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(spdconfdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(spdconfdir)" || exit $$?; \
++	  $(am__strip_dir) \
++	  echo " $(INSTALL_DATA) $$d$$p '$(DESTDIR)$(spdconfdir)/$$f'"; \
++	  $(INSTALL_DATA) $$d$$p "$(DESTDIR)$(spdconfdir)/$$f.sample" || exit $$?; \
  	done
  
  uninstall-spdconfDATA:
diff --git a/accessibility/speech-dispatcher/files/patch-config-clients-Makefile.in b/accessibility/speech-dispatcher/files/patch-config-clients-Makefile.in
index 7c5b43e6811e..1c67fea6b8c6 100644
--- a/accessibility/speech-dispatcher/files/patch-config-clients-Makefile.in
+++ b/accessibility/speech-dispatcher/files/patch-config-clients-Makefile.in
@@ -1,11 +1,17 @@
---- config/clients/Makefile.in.orig	2009-12-09 08:31:05.740198777 +0000
-+++ config/clients/Makefile.in	2009-12-09 08:31:26.505338395 +0000
-@@ -238,7 +238,7 @@
+--- config/clients/Makefile.in.orig	2010-08-25 02:00:47.363039128 +0200
++++ config/clients/Makefile.in	2010-08-25 02:02:07.456297674 +0200
+@@ -262,11 +262,9 @@
+ 	@list='$(dist_clientconf_DATA)'; test -n "$(clientconfdir)" || list=; \
+ 	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
- 	  echo " $(dist_clientconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(clientconfdir)/$$f'"; \
--	  $(dist_clientconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(clientconfdir)/$$f"; \
-+	  $(dist_clientconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(clientconfdir)/$$f.sample"; \
+-	  echo "$$d$$p"; \
+-	done | $(am__base_list) | \
+-	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(clientconfdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(clientconfdir)" || exit $$?; \
++	  $(am__strip_dir) \
++	  echo " $(INSTALL_DATA) $$d$$p '$(DESTDIR)$(clientconfdir)/$$f'"; \
++	  $(INSTALL_DATA) $$d$$p "$(DESTDIR)$(clientconfdir)/$$f.sample" || exit $$?; \
  	done
  
  uninstall-dist_clientconfDATA:
diff --git a/accessibility/speech-dispatcher/files/patch-config-modules-Makefile.in b/accessibility/speech-dispatcher/files/patch-config-modules-Makefile.in
index edc0b81b604f..4d5480ea7870 100644
--- a/accessibility/speech-dispatcher/files/patch-config-modules-Makefile.in
+++ b/accessibility/speech-dispatcher/files/patch-config-modules-Makefile.in
@@ -1,11 +1,17 @@
---- config/modules/Makefile.in.orig	2009-12-09 08:34:23.051988348 +0000
-+++ config/modules/Makefile.in	2009-12-09 08:38:28.256188947 +0000
-@@ -238,7 +238,7 @@
+--- config/modules/Makefile.in.orig	2010-08-25 02:02:45.920937579 +0200
++++ config/modules/Makefile.in	2010-08-25 02:04:07.949176894 +0200
+@@ -262,11 +262,9 @@
+ 	@list='$(dist_moduleconf_DATA)'; test -n "$(moduleconfdir)" || list=; \
+ 	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
- 	  echo " $(dist_moduleconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(moduleconfdir)/$$f'"; \
--	  $(dist_moduleconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(moduleconfdir)/$$f"; \
-+	  $(dist_moduleconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(moduleconfdir)/$$f.sample"; \
+-	  echo "$$d$$p"; \
+-	done | $(am__base_list) | \
+-	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(moduleconfdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(moduleconfdir)" || exit $$?; \
++	  $(am__strip_dir) \
++	  echo " $(INSTALL_DATA) $$d$$p '$(DESTDIR)$(moduleconfdir)/$$f'"; \
++	  $(INSTALL_DATA) $$d$$p "$(DESTDIR)$(moduleconfdir)/$$f.sample" || exit $$?; \
  	done
  
  uninstall-dist_moduleconfDATA:
diff --git a/accessibility/speech-dispatcher/files/patch-config-speechd.conf.in b/accessibility/speech-dispatcher/files/patch-config-speechd.conf.in
deleted file mode 100644
index 20029452067e..000000000000
--- a/accessibility/speech-dispatcher/files/patch-config-speechd.conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/speechd.conf.in.orig	2010-01-06 00:02:39.200150051 +0000
-+++ config/speechd.conf.in	2010-01-06 00:03:20.389964326 +0000
-@@ -142,7 +142,7 @@
- # PulseAudio is a sound server for POSIX and WIN32 systems. 
- #
- 
--# AudioOutputMethod "alsa"
-+AudioOutputMethod "oss"
- 
- # What ALSA device to use when Advanced Linux Sound Architecture is
- # chosen for the audio output.
diff --git a/accessibility/speech-dispatcher/files/patch-configure b/accessibility/speech-dispatcher/files/patch-configure
index e9d16d67a6d4..0e9914a4cfdb 100644
--- a/accessibility/speech-dispatcher/files/patch-configure
+++ b/accessibility/speech-dispatcher/files/patch-configure
@@ -1,24 +1,20 @@
---- configure.orig	2009-12-08 15:59:23.733772839 +0000
-+++ configure	2009-12-08 16:02:56.218512701 +0000
-@@ -20456,66 +20456,10 @@
+--- configure.orig	2010-08-25 02:22:44.937559878 +0200
++++ configure	2010-08-25 02:23:12.962288324 +0200
+@@ -10761,41 +10761,6 @@
    echo "*** Required math library missing! See INSTALL .";exit 1
  fi
  
--{ echo "$as_me:$LINENO: checking for main in -ldl" >&5
--echo $ECHO_N "checking for main in -ldl... $ECHO_C" >&6; }
--if test "${ac_cv_lib_dl_main+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5
+-$as_echo_n "checking for main in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_main+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
 -else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ldl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
- 
- 
+-
+-
 -int
 -main ()
 -{
@@ -27,43 +23,22 @@
 -  return 0;
 -}
 -_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
+-if ac_fn_c_try_link "$LINENO"; then :
 -  ac_cv_lib_dl_main=yes
 -else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_lib_dl_main=no
+-  ac_cv_lib_dl_main=no
 -fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_main" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_main" >&6; }
--if test $ac_cv_lib_dl_main = yes; then
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_main" >&5
+-$as_echo "$ac_cv_lib_dl_main" >&6; }
+-if test "x$ac_cv_lib_dl_main" = x""yes; then :
 -  echo ""
 -else
 -  echo "*** Required dl library missing! See INSTALL .";exit 1
 -fi
  
- { echo "$as_me:$LINENO: checking for main in -ldotconf" >&5
- echo $ECHO_N "checking for main in -ldotconf... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldotconf" >&5
+ $as_echo_n "checking for main in -ldotconf... " >&6; }
diff --git a/accessibility/speech-dispatcher/files/patch-src-c-clients-say-say.c b/accessibility/speech-dispatcher/files/patch-src-c-clients-say-say.c
deleted file mode 100644
index b02744639a23..000000000000
--- a/accessibility/speech-dispatcher/files/patch-src-c-clients-say-say.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/c/clients/say/say.c.orig	2009-12-08 19:26:30.807446567 +0000
-+++ src/c/clients/say/say.c	2009-12-08 19:55:12.734039491 +0000
-@@ -27,7 +27,6 @@
- #include <stdlib.h>
- #include <assert.h>
- #include <semaphore.h>
--#include <error.h>
- #include <errno.h>
- #include "libspeechd.h"
- #include "options.h"
diff --git a/accessibility/speech-dispatcher/files/patch-src-server-options.c b/accessibility/speech-dispatcher/files/patch-src-server-options.c
deleted file mode 100644
index 6e518076165e..000000000000
--- a/accessibility/speech-dispatcher/files/patch-src-server-options.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/server/options.c.orig	2009-12-08 16:50:48.424488834 +0000
-+++ src/server/options.c	2009-12-08 16:52:00.074660414 +0000
-@@ -24,6 +24,7 @@
- /* NOTE: Be careful not to include options.h, we would
-    get repetitive initializations warnings */
- 
-+#include <sys/stat.h>
- #include "speechd.h"
- 
- #include "options.h"
diff --git a/accessibility/speech-dispatcher/files/patch-src-server-output.c b/accessibility/speech-dispatcher/files/patch-src-server-output.c
deleted file mode 100644
index f7a8ad18e236..000000000000
--- a/accessibility/speech-dispatcher/files/patch-src-server-output.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/server/output.c.orig	2009-12-08 19:17:41.617402825 +0000
-+++ src/server/output.c	2009-12-08 19:19:33.043039976 +0000
-@@ -25,6 +25,13 @@
- 
- #include "fdsetconv.c"
- #include "parse.h"
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expr) \
-+  ({ long int _res; \
-+     do _res = (long int) (expr); \
-+     while (_res == -1L && errno == EINTR); \
-+     _res; })
-+#endif
- 
- void
- output_set_speaking_monitor(TSpeechDMessage *msg, OutputModule *output)
diff --git a/accessibility/speech-dispatcher/files/patch-src-server-speechd.h b/accessibility/speech-dispatcher/files/patch-src-server-speechd.h
index cac9d703cda5..3aa644c838d0 100644
--- a/accessibility/speech-dispatcher/files/patch-src-server-speechd.h
+++ b/accessibility/speech-dispatcher/files/patch-src-server-speechd.h
@@ -1,11 +1,11 @@
---- src/server/speechd.h.orig	2009-12-08 16:41:26.578943406 +0000
-+++ src/server/speechd.h	2009-12-08 16:42:16.923002174 +0000
-@@ -53,7 +53,7 @@
- #include <sys/sem.h>
- 
- /* Definition of semun needed for semaphore manipulation */
--#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
+--- src/server/speechd.h.orig	2010-08-25 03:20:44.157056094 +0200
++++ src/server/speechd.h	2010-08-25 03:21:00.004912354 +0200
+@@ -56,7 +56,7 @@
+ /* TODO: This fixes compilation for Mac OS X but might not be a correct
+    solution for other platforms. A better check is needed, possibly including
+    _POSIX_C_SOURCE and friends*/
+-#if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) || defined(__APPLE__)
 +#if 1
- /* union semun is defined by including <sys/sem.h> */
+  /* union semun is defined by including <sys/sem.h> */
  #else
- /* according to X/OPEN we have to define it ourselves */
+  /* according to X/OPEN we have to define it ourselves */
diff --git a/accessibility/speech-dispatcher/files/pkg-message.in b/accessibility/speech-dispatcher/files/pkg-message.in
deleted file mode 100644
index 85235cfbc54f..000000000000
--- a/accessibility/speech-dispatcher/files/pkg-message.in
+++ /dev/null
@@ -1,12 +0,0 @@
-======================================================================
-
-To start speech-dispatcher daemon locally, instead of using the rc.d
-script, you have to export SPEECHD_PORT to a number between 1024 and
-65535 (it must be a free port). The following example works on
-/bin/sh:
-
-$ export SPEECHD_PORT=1138
-$ speech-dispatcher -C %%ETCDIR%% \
-> -p $SPEECHD_PORT
-
-======================================================================
diff --git a/accessibility/speech-dispatcher/files/speechd.in b/accessibility/speech-dispatcher/files/speechd.in
deleted file mode 100644
index d17a7238e706..000000000000
--- a/accessibility/speech-dispatcher/files/speechd.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# PROVIDE: speechd
-# REQUIRE: DAEMON dbus
-#
-# Add the following to /etc/rc.conf to start speech-dispatcher at boot time:
-#
-# speechd_enable="YES"
-#
-
-. /etc/rc.subr
-
-speechd_enable=${speechd_enable-"NO"}
-
-name="speechd"
-rcvar=`set_rcvar`
-
-real_name="speech-dispatcher"
-command="%%PREFIX%%/bin/${real_name}"
-command_args="-C %%ETCDIR%%"
-pidfile="/var/run/${real_name}.pid"
-
-start_precmd="${name}_prestart"
-stop_postcmd="${name}_poststop"
-
-speechd_prestart()
-{
-	mkdir -p /var/log/${real_name}
-}
-
-speechd_poststop()
-{
-	rm -f $pidfile
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/accessibility/speech-dispatcher/pkg-plist b/accessibility/speech-dispatcher/pkg-plist
index 6ab1b04c0bc9..9740cd9dcf66 100644
--- a/accessibility/speech-dispatcher/pkg-plist
+++ b/accessibility/speech-dispatcher/pkg-plist
@@ -55,7 +55,7 @@ include/libspeechd.h
 lib/libspeechd.a
 lib/libspeechd.la
 lib/libspeechd.so
-lib/libspeechd.so.3
+lib/libspeechd.so.4
 lib/speech-dispatcher-modules/sd_cicero
 lib/speech-dispatcher-modules/sd_dummy
 %%ESPEAK%%lib/speech-dispatcher-modules/sd_espeak
@@ -67,9 +67,10 @@ lib/speech-dispatcher/libsdaudio.la
 lib/speech-dispatcher/libsdaudio.so
 lib/speech-dispatcher/libsdaudio.so.2
 share/sounds/speech-dispatcher/dummy-message.wav
-share/sounds/speech-dispatcher/test.wav
+%%PYTHON%%share/sounds/speech-dispatcher/test.wav
 %%DATADIR%%/conf/clients/emacs.conf
 %%DATADIR%%/conf/clients/gnome-speech.conf
+%%PYTHON%%%%DATADIR%%/conf/desktop/speechd.desktop
 %%DATADIR%%/conf/modules/cicero.conf
 %%DATADIR%%/conf/modules/dtk-generic.conf
 %%DATADIR%%/conf/modules/epos-generic.conf
@@ -84,11 +85,12 @@ share/sounds/speech-dispatcher/test.wav
 %%DATADIR%%/conf/modules/swift-generic.conf
 %%DATADIR%%/conf/speechd.conf
 @dirrm %%DATADIR%%/conf/modules
+%%PYTHON%%@dirrm %%DATADIR%%/conf/desktop
 @dirrm %%DATADIR%%/conf/clients
 @dirrm %%DATADIR%%/conf
 @dirrm %%DATADIR%%
 @dirrm share/sounds/speech-dispatcher
-@dirrmtry share/sounds
+%%GNOMEHIER%%@dirrmtry share/sounds
 @dirrm lib/speech-dispatcher-modules
 @dirrm lib/speech-dispatcher
 @dirrmtry %%ETCDIR%%/modules