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

[Baptiste Daroussin]

Author: bapt
Date: Sun Feb  8 12:30:24 2015
New Revision: 378645
URL: https://svnweb.freebsd.org/changeset/ports/378645
QAT: https://qat.redports.org/buildarchive/r378645/

Log:
  Use options helpers

Modified:
  head/accessibility/gnome-speech/Makefile

Modified: head/accessibility/gnome-speech/Makefile
==============================================================================
--- head/accessibility/gnome-speech/Makefile	Sun Feb  8 12:17:48 2015	(r378644)
+++ head/accessibility/gnome-speech/Makefile	Sun Feb  8 12:30:24 2015	(r378645)
@@ -24,24 +24,14 @@ OPTIONS_DEFINE=	ESPEAK FESTIVAL
 ESPEAK_DESC=	Espeak speech synthesizer support
 FESTIVAL_DESC=	Festival speech synthesis support
 
-.include <bsd.port.options.mk>
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MESPEAK}
-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
+ESPEAK_LIB_DEPENDS=	libespeak.so:${PORTSDIR}/audio/espeak
+ESPEAK_CONFIGURE_ON=--with-espeak-dir=${LOCALBASE}
+ESPEAK_CONFIGURE_OFF=--without-espeak
+
+FESTIVAL_RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
+FESTIVAL_CONFIGURE_OFF=--without-festival
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|== x|= x|g' \