2 files changed, 24 insertions, 54 deletions

diff --git a/accessibility/speech-dispatcher/Makefile b/accessibility/speech-dispatcher/Makefile
index f3b647bc0f96..7c52a9385c36 100644
--- a/accessibility/speech-dispatcher/Makefile
+++ b/accessibility/speech-dispatcher/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	speech-dispatcher
 PORTVERSION=	0.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	accessibility audio
 MASTER_SITES=	http://www.freebsoft.org/pub/projects/speechd/
 
@@ -19,15 +19,16 @@ LICENSE_COMB=	multi
 LIB_DEPENDS=	dotconf.0:${PORTSDIR}/devel/dotconf \
 		sndfile.1:${PORTSDIR}/audio/libsndfile
 
-USE_GNOME=	glib20 pkgconfig
-MAKE_JOBS_SAFE=	yes
+# gnomehier is required because of share/sounds directory.
+USE_GNOME=	glib20 gnomehier pkgconfig
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+USE_GMAKE=	yes
+MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/${PORTNAME}
 
-CONFFILES=	clients/emacs.conf clients/gnome-speech.conf \
+ETCFILES=	clients/emacs.conf clients/gnome-speech.conf \
 		modules/cicero.conf modules/dtk-generic.conf \
 		modules/epos-generic.conf modules/espeak-generic.conf \
 		modules/espeak-mbrola-generic.conf modules/espeak.conf \
@@ -35,6 +36,8 @@ CONFFILES=	clients/emacs.conf clients/gnome-speech.conf \
 		modules/ivona.conf modules/llia_phon-generic.conf \
 		modules/swift-generic.conf speechd.conf
 
+PLIST_SUB+=	ETCFILES="${ETCFILES}"
+
 PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README TODO
 
 INFO=		spd-say ${PORTNAME} ssip
@@ -45,11 +48,15 @@ OPTIONS=	ALSA	"ALSA support" off \
 		FLITE	"Festival Lite output module" off \
 		LIBAO	"libao support" off \
 		NAS	"Network Audio System support" off \
-		PULSEAUDIO	"PulseAudio support (broken on FreeBSD 6.X)" off \
+		PULSEAUDIO	"PulseAudio support" off \
 		PYTHON	"Python support" off
 
 .include <bsd.port.options.mk>
 
+.if ${OSVERSION} < 800067 && ${ARCH} == "amd64"
+CFLAGS+=	-fPIC
+.endif
+
 .ifdef(WITH_ALSA)
 LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
 CONFIGURE_ARGS+=	--with-alsa
@@ -95,28 +102,20 @@ CONFIGURE_ARGS+=	--with-nas
 CONFIGURE_ARGS+=	--without-nas
 .endif
 
-.ifdef(WITH_PYTHON)
-USE_PYTHON=	2.5+
-CONFIGURE_ARGS+=	--enable-python
-PLIST_SUB+=	PYTHON=""
-.else
-CONFIGURE_ARGS+=	--disable-python
-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-pulse
-PLIST_SUB+=	GNOMEHIER="@comment "
 .else
 CONFIGURE_ARGS+=	--without-pulse
-PLIST_SUB+=	GNOMEHIER=""
 .endif
 
-.if ${OSVERSION} < 800067 && ${ARCH} == "amd64"
-CFLAGS+=	-fPIC
+.ifdef(WITH_PYTHON)
+USE_PYTHON=	2.5+
+CONFIGURE_ARGS+=	--enable-python
+PLIST_SUB+=	PYTHON=""
+.else
+CONFIGURE_ARGS+=	--disable-python
+PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 post-patch:
@@ -131,7 +130,7 @@ post-patch:
 		${WRKSRC}/src/server/Makefile.in
 
 post-install:
-.for f in ${CONFFILES}
+.for f in ${ETCFILES}
 	@if [ ! -f ${ETCDIR}/${f} ]; then \
 		${CP} -p ${ETCDIR}/${f}.sample ${ETCDIR}/${f}; \
 	fi
@@ -143,4 +142,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/accessibility/speech-dispatcher/pkg-plist b/accessibility/speech-dispatcher/pkg-plist
index 9e078b7202d5..6c1eadd9c80c 100644
--- a/accessibility/speech-dispatcher/pkg-plist
+++ b/accessibility/speech-dispatcher/pkg-plist
@@ -7,51 +7,23 @@ bin/run_test
 bin/spd-say
 bin/spdsend
 bin/speech-dispatcher
-@unexec if cmp -s %D/%%ETCDIR%%/clients/emacs.conf %D/%%ETCDIR%%/clients/emacs.conf.sample; then rm -f %D/%%ETCDIR%%/clients/emacs.conf; fi
+@unexec for f in %%ETCFILES%%; do cmp -s %D/%%ETCDIR%%/$f %D/%%ETCDIR%%/$f.sample && rm -f %D/%%ETCDIR%%/$f; done
 %%ETCDIR%%/clients/emacs.conf.sample
-@exec [ -f %B/emacs.conf ] || cp %D/%F %B/emacs.conf
-@unexec if cmp -s %D/%%ETCDIR%%/clients/gnome-speech.conf %D/%%ETCDIR%%/clients/gnome-speech.conf.sample; then rm -f %D/%%ETCDIR%%/clients/gnome-speech.conf; fi
 %%ETCDIR%%/clients/gnome-speech.conf.sample
-@exec [ -f %B/gnome-speech.conf ] || cp %D/%F %B/gnome-speech.conf
-@unexec if cmp -s %D/%%ETCDIR%%/modules/cicero.conf %D/%%ETCDIR%%/modules/cicero.conf.sample; then rm -f %D/%%ETCDIR%%/modules/cicero.conf; fi
 %%ETCDIR%%/modules/cicero.conf.sample
-@exec [ -f %B/cicero.conf ] || cp %D/%F %B/cicero.conf
-@unexec if cmp -s %D/%%ETCDIR%%/modules/dtk-generic.conf %D/%%ETCDIR%%/modules/dtk-generic.conf.sample; then rm -f %D/%%ETCDIR%%/modules/dtk-generic.conf; fi
 %%ETCDIR%%/modules/dtk-generic.conf.sample
-@exec [ -f %B/dtk-generic.conf ] || cp %D/%F %B/dtk-generic.conf
-@unexec if cmp -s %D/%%ETCDIR%%/modules/epos-generic.conf %D/%%ETCDIR%%/modules/epos-generic.conf.sample; then rm -f %D/%%ETCDIR%%/modules/epos-generic.conf; fi
 %%ETCDIR%%/modules/epos-generic.conf.sample
-@exec [ -f %B/epos-generic.conf ] || cp %D/%F %B/epos-generic.conf
-@unexec if cmp -s %D/%%ETCDIR%%/modules/espeak-generic.conf %D/%%ETCDIR%%/modules/espeak-generic.conf.sample; then rm -f %D/%%ETCDIR%%/modules/espeak-generic.conf; fi
 %%ETCDIR%%/modules/espeak-generic.conf.sample
-@exec [ -f %B/espeak-generic.conf ] || cp %D/%F %B/espeak-generic.conf
-@unexec if cmp -s %D/%%ETCDIR%%/modules/espeak-mbrola-generic.conf %D/%%ETCDIR%%/modules/espeak-mbrola-generic.conf.sample; then rm -f %D/%%ETCDIR%%/modules/espeak-mbrola-generic.conf; fi
 %%ETCDIR%%/modules/espeak-mbrola-generic.conf.sample
-@exec [ -f %B/espeak-mbrola-generic.conf ] || cp %D/%F %B/espeak-mbrola-generic.conf
-@unexec if cmp -s %D/%%ETCDIR%%/modules/espeak.conf %D/%%ETCDIR%%/modules/espeak.conf.sample; then rm -f %D/%%ETCDIR%%/modules/espeak.conf; fi
 %%ETCDIR%%/modules/espeak.conf.sample
-@exec [ -f %B/espeak.conf ] || cp %D/%F %B/espeak.conf
-@unexec if cmp -s %D/%%ETCDIR%%/modules/festival.conf %D/%%ETCDIR%%/modules/festival.conf.sample; then rm -f %D/%%ETCDIR%%/modules/festival.conf; fi
 %%ETCDIR%%/modules/festival.conf.sample
-@exec [ -f %B/festival.conf ] || cp %D/%F %B/festival.conf
-@unexec if cmp -s %D/%%ETCDIR%%/modules/flite.conf %D/%%ETCDIR%%/modules/flite.conf.sample; then rm -f %D/%%ETCDIR%%/modules/flite.conf; fi
 %%ETCDIR%%/modules/flite.conf.sample
-@exec [ -f %B/flite.conf ] || cp %D/%F %B/flite.conf
-@unexec if cmp -s %D/%%ETCDIR%%/modules/ibmtts.conf %D/%%ETCDIR%%/modules/ibmtts.conf.sample; then rm -f %D/%%ETCDIR%%/modules/ibmtts.conf; fi
 %%ETCDIR%%/modules/ibmtts.conf.sample
-@exec [ -f %B/ibmtts.conf ] || cp %D/%F %B/ibmtts.conf
-@unexec if cmp -s %D/%%ETCDIR%%/modules/ivona.conf %D/%%ETCDIR%%/modules/ivona.conf.sample; then rm -f %D/%%ETCDIR%%/modules/ivona.conf; fi
 %%ETCDIR%%/modules/ivona.conf.sample
-@exec [ -f %B/ivona.conf ] || cp %D/%F %B/ivona.conf
-@unexec if cmp -s %D/%%ETCDIR%%/modules/llia_phon-generic.conf %D/%%ETCDIR%%/modules/llia_phon-generic.conf.sample; then rm -f %D/%%ETCDIR%%/modules/llia_phon-generic.conf; fi
 %%ETCDIR%%/modules/llia_phon-generic.conf.sample
-@exec [ -f %B/llia_phon-generic.conf ] || cp %D/%F %B/llia_phon-generic.conf
-@unexec if cmp -s %D/%%ETCDIR%%/modules/swift-generic.conf %D/%%ETCDIR%%/modules/swift-generic.conf.sample; then rm -f %D/%%ETCDIR%%/modules/swift-generic.conf; fi
 %%ETCDIR%%/modules/swift-generic.conf.sample
-@exec [ -f %B/swift-generic.conf ] || cp %D/%F %B/swift-generic.conf
-@unexec if cmp -s %D/%%ETCDIR%%/speechd.conf %D/%%ETCDIR%%/speechd.conf.sample; then rm -f %D/%%ETCDIR%%/speechd.conf; fi
 %%ETCDIR%%/speechd.conf.sample
-@exec [ -f %B/speechd.conf ] || cp %D/%F %B/speechd.conf
+@exec for f in %%ETCFILES%%; do [ -f %D/%%ETCDIR%%/$f ] || cp -p %D/%%ETCDIR%%/$f.sample %D/%%ETCDIR%%/$f; done
 include/libspeechd.h
 lib/libspeechd.a
 lib/libspeechd.la
@@ -110,7 +82,6 @@ share/sounds/speech-dispatcher/dummy-message.wav
 @dirrm %%DATADIR%%/conf
 @dirrm %%DATADIR%%
 @dirrm share/sounds/speech-dispatcher
-%%GNOMEHIER%%@dirrmtry share/sounds
 @dirrm lib/speech-dispatcher-modules
 @dirrm lib/speech-dispatcher
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/speechd_config