Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Mar 2013 07:05:56 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r314134 - head/accessibility/gnome-speech
Message-ID:  <201303140705.r2E75uAr060971@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Thu Mar 14 07:05:55 2013
New Revision: 314134
URL: http://svnweb.freebsd.org/changeset/ports/314134

Log:
  Fix build with glib 2.34 when optional dependancy is enabled. [1]
  
  While here, us USES=pathfix instead of gnomehack and convert to OptionsNG.
  
  PR:		ports/176929 [1]
  Submitted by:	Chris Torek <torek@torek.net>

Modified:
  head/accessibility/gnome-speech/Makefile

Modified: head/accessibility/gnome-speech/Makefile
==============================================================================
--- head/accessibility/gnome-speech/Makefile	Thu Mar 14 06:32:04 2013	(r314133)
+++ head/accessibility/gnome-speech/Makefile	Thu Mar 14 07:05:55 2013	(r314134)
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomespeech
-# Date created:			11 May 2003
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/accessibility/gnome-speech/Makefile,v 1.21 2006/08/22 00:55:57 ahze Exp $
-#
 
 PORTNAME=	gnome-speech
 PORTVERSION=	0.4.25
@@ -17,37 +13,42 @@ COMMENT=	GNOME text-to-speech API
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix libbonobo
-GNU_CONFIGURE=  yes
+USE_GNOME=	gnomeprefix libbonobo
+USES=		pathfix
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	ESPEAK FESTIVAL
+ESPEAK_DESC=	Espeak speech synthesizer support
+FESTIVAL_DESC=	Festival speech synthesis support
 
-.if exists(${LOCALBASE}/lib/libespeak.so)
-WITH_ESPEAK=	yes
-.endif
-
-.if exists(${LOCALBASE}/bin/festival)
-WITH_FESTIVAL=	yes
-.endif
+.include <bsd.port.options.mk>
 
-.if defined(WITH_ESPEAK)
-LIB_DEPENDS+=	espeak.1:${PORTSDIR}/audio/espeak
+.if ${PORT_OPTIONS:MESPEAK}
+LIB_DEPENDS+=	espeak:${PORTSDIR}/audio/espeak
 CONFIGURE_ARGS+=--with-espeak-dir=${LOCALBASE}
 PLIST_SUB+=	ESPEAK:=""
 .else
 PLIST_SUB+=	ESPEAK:="@comment "
 .endif
 
-.if defined(WITH_FESTIVAL)
+.if ${PORT_OPTIONS:MFESTIVAL}
 RUN_DEPENDS+=	festival:${PORTSDIR}/audio/festival
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|== x|= x|g' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
+		${WRKSRC}/drivers/swift/*.[ch] \
+		${WRKSRC}/drivers/dectalk/*.[ch] \
+		${WRKSRC}/drivers/theta/*.[ch] \
+		${WRKSRC}/drivers/eloquence/*.[ch] \
+		${WRKSRC}/drivers/viavoice/*.[ch] \
+		${WRKSRC}/drivers/loquendo/*.[ch] \
+		${WRKSRC}/drivers/espeak/*.[ch]
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303140705.r2E75uAr060971>