svn commit: r334697 - head/accessibility/gnome-speech

[Koop Mast]

Author: kwm
Date: Sat Nov 23 22:47:39 2013
New Revision: 334697
URL: http://svnweb.freebsd.org/changeset/ports/334697

Log:
  Explicitly disable espeak or festival support if we haven't asked for it [1]
  While here stageify.
  
  PR:		ports/182522
  Submitted by:	rm@

Modified:
  head/accessibility/gnome-speech/Makefile
  head/accessibility/gnome-speech/pkg-plist

Modified: head/accessibility/gnome-speech/Makefile
==============================================================================
--- head/accessibility/gnome-speech/Makefile	Sat Nov 23 22:44:00 2013	(r334696)
+++ head/accessibility/gnome-speech/Makefile	Sat Nov 23 22:47:39 2013	(r334697)
@@ -4,6 +4,7 @@
 
 PORTNAME=	gnome-speech
 PORTVERSION=	0.4.25
+PORTREVISION=	1
 CATEGORIES=	accessibility audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -11,7 +12,6 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	GNOME text-to-speech API
 
-NO_STAGE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix libbonobo
 USES=		gmake pathfix pkgconfig
@@ -28,15 +28,20 @@ FESTIVAL_DESC=	Festival speech synthesis
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MESPEAK}
-LIB_DEPENDS+=	espeak:${PORTSDIR}/audio/espeak
+LIB_DEPENDS+=	libespeak.so:${PORTSDIR}/audio/espeak
 CONFIGURE_ARGS+=--with-espeak-dir=${LOCALBASE}
 PLIST_SUB+=	ESPEAK:=""
 .else
+CONFIGURE_ARGS+=--without-espeak
 PLIST_SUB+=	ESPEAK:="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFESTIVAL}
 RUN_DEPENDS+=	festival:${PORTSDIR}/audio/festival
+PLIST_SUB+=	FESTIVAL=""
+.else
+CONFIGURE_ARGS+=--without-festival
+PLIST_SUB+=	FESTIVAL="@comment "
 .endif
 
 post-patch:
@@ -51,4 +56,8 @@ post-patch:
 		${WRKSRC}/drivers/loquendo/*.[ch] \
 		${WRKSRC}/drivers/espeak/*.[ch]
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnomespeech.so.7
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/orbit-2.0/GNOME_Speech_module.so
+
 .include <bsd.port.mk>

Modified: head/accessibility/gnome-speech/pkg-plist
==============================================================================
--- head/accessibility/gnome-speech/pkg-plist	Sat Nov 23 22:44:00 2013	(r334696)
+++ head/accessibility/gnome-speech/pkg-plist	Sat Nov 23 22:47:39 2013	(r334697)
@@ -1,5 +1,5 @@
 %%ESPEAK:%%bin/espeak-synthesis-driver
-bin/festival-synthesis-driver
+%%FESTIVAL%%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
@@ -12,7 +12,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
 %%ESPEAK:%%libdata/bonobo/servers/GNOME_Speech_SynthesisDriver_Espeak.server
-libdata/bonobo/servers/GNOME_Speech_SynthesisDriver_Festival.server
+%%FESTIVAL%%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