From owner-svn-ports-all@freebsd.org Mon Jun 29 15:51:24 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E342298F757; Mon, 29 Jun 2015 15:51:23 +0000 (UTC) (envelope-from avilla@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C76941E74; Mon, 29 Jun 2015 15:51:23 +0000 (UTC) (envelope-from avilla@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5TFpNVK006026; Mon, 29 Jun 2015 15:51:23 GMT (envelope-from avilla@FreeBSD.org) Received: (from avilla@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5TFpMYY006021; Mon, 29 Jun 2015 15:51:22 GMT (envelope-from avilla@FreeBSD.org) Message-Id: <201506291551.t5TFpMYY006021@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avilla set sender to avilla@FreeBSD.org using -f From: Alberto Villa Date: Mon, 29 Jun 2015 15:51:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390919 - in head/accessibility/speech-dispatcher: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jun 2015 15:51:24 -0000 Author: avilla Date: Mon Jun 29 15:51:22 2015 New Revision: 390919 URL: https://svnweb.freebsd.org/changeset/ports/390919 Log: accessibility/speech-dispatcher: update to 0.8.3 - Enable optional Python bindings (Python 3 required) - Make NLS optional - Remove original .conf files from DATADIR (.sample files available) - Remove stale patches Deleted: head/accessibility/speech-dispatcher/files/patch-include__spd_utils.h head/accessibility/speech-dispatcher/files/patch-src__common__spd_getline.c head/accessibility/speech-dispatcher/files/patch-src__modules__cicero.c head/accessibility/speech-dispatcher/files/patch-src__server__output.c head/accessibility/speech-dispatcher/files/patch-src__server__sem_functions.c head/accessibility/speech-dispatcher/files/patch-src__server__speaking.c Modified: head/accessibility/speech-dispatcher/Makefile head/accessibility/speech-dispatcher/distinfo head/accessibility/speech-dispatcher/files/patch-src__server__speechd.h head/accessibility/speech-dispatcher/pkg-plist Modified: head/accessibility/speech-dispatcher/Makefile ============================================================================== --- head/accessibility/speech-dispatcher/Makefile Mon Jun 29 15:47:44 2015 (r390918) +++ head/accessibility/speech-dispatcher/Makefile Mon Jun 29 15:51:22 2015 (r390919) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= speech-dispatcher -PORTVERSION= 0.8 -PORTREVISION= 2 +PORTVERSION= 0.8.3 CATEGORIES= accessibility audio MASTER_SITES= http://devel.freebsoft.org/pub/projects/speechd/ @@ -17,14 +16,14 @@ LIB_DEPENDS= libdotconf.so:${PORTSDIR}/d libsndfile.so:${PORTSDIR}/audio/libsndfile USE_GNOME= glib20 intltool -USES= alias gettext gmake pathfix pkgconfig libtool +USES= alias gmake pathfix pkgconfig libtool GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes INSTALL_TARGET= install-strip -ETCFILES= clients/emacs.conf clients/gnome-speech.conf \ +ETCFILES= clients/emacs.conf modules/pico-generic.conf \ modules/cicero.conf modules/dtk-generic.conf \ modules/epos-generic.conf modules/espeak-generic.conf \ modules/espeak-mbrola-generic.conf modules/espeak.conf \ @@ -32,13 +31,12 @@ ETCFILES= clients/emacs.conf clients/gno modules/ivona.conf modules/llia_phon-generic.conf \ modules/swift-generic.conf speechd.conf -PLIST_SUB+= ETCFILES="${ETCFILES}" - -PORTDOCS= AUTHORS ChangeLog FAQ INSTALL NEWS README TODO +PORTDOCS= ANNOUNCE AUTHORS ChangeLog FAQ NEWS README TODO INFO= spd-say speech-dispatcher ssip -OPTIONS_DEFINE= ALSA AO DOCS ESPEAK FESTIVAL FLITE NAS PULSEAUDIO #PYTHON +OPTIONS_DEFINE= ALSA AO DOCS ESPEAK FESTIVAL FLITE NAS NLS \ + PULSEAUDIO PYTHON OPTIONS_DEFAULT=ESPEAK OPTIONS_SUB= yes @@ -63,25 +61,40 @@ FLITE_CONFIGURE_WITH= flite NAS_LIB_DEPENDS= libaudio.so:${PORTSDIR}/audio/nas NAS_CONFIGURE_WITH= nas +NLS_USES= gettext + PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_WITH=pulse -# devel/py-xdg doesn't support Python 3. -CONFIGURE_ARGS+= --disable-python -PLIST_SUB+= PYTHON="@comment " -#PYTHON_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg -#PYTHON_USE= PYTHON=3 -#PYTHON_CONFIGURE_ENABLE=python +PYTHON_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py3-xdg +PYTHON_USES= python:3 +PYTHON_USE= PYTHON=py3kplist +PYTHON_CONFIGURE_ENABLE=python + +.include + +.if ${PORT_OPTIONS:MNLS} +INFO+= speech-dispatcher-cs +.endif post-patch: @${REINPLACE_CMD} -e '/SUBDIRS/ s/tests//' \ ${WRKSRC}/src/Makefile.in +.if ! ${PORT_OPTIONS:MNLS} + @${REINPLACE_CMD} -e '/SUBDIRS/ s/po//' \ + ${WRKSRC}/Makefile.in +.endif post-install: .for f in ${ETCFILES} @${MV} ${STAGEDIR}${ETCDIR}/${f} ${STAGEDIR}${ETCDIR}/${f}.sample .endfor + @${RM} -rf ${STAGEDIR}${DATADIR}/conf + @${RMDIR} ${STAGEDIR}${DATADIR} || ${TRUE} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} +.if ! ${PORT_OPTIONS:MNLS} + @${RM} -f ${STAGEDIR}${PREFIX}/${INFO_PATH}/speech-dispatcher-cs.info +.endif .include Modified: head/accessibility/speech-dispatcher/distinfo ============================================================================== --- head/accessibility/speech-dispatcher/distinfo Mon Jun 29 15:47:44 2015 (r390918) +++ head/accessibility/speech-dispatcher/distinfo Mon Jun 29 15:51:22 2015 (r390919) @@ -1,2 +1,2 @@ -SHA256 (speech-dispatcher-0.8.tar.gz) = 0a6ce544cfbac8592a8ea08e3ab24c389153904ea51c6fd68756cea52de9efa2 -SIZE (speech-dispatcher-0.8.tar.gz) = 1229312 +SHA256 (speech-dispatcher-0.8.3.tar.gz) = 96a293b2ba1e2498f1280c75a9607891a9990947a8d87e9855c2a642c93f1e4f +SIZE (speech-dispatcher-0.8.3.tar.gz) = 1292321 Modified: head/accessibility/speech-dispatcher/files/patch-src__server__speechd.h ============================================================================== --- head/accessibility/speech-dispatcher/files/patch-src__server__speechd.h Mon Jun 29 15:47:44 2015 (r390918) +++ head/accessibility/speech-dispatcher/files/patch-src__server__speechd.h Mon Jun 29 15:51:22 2015 (r390919) @@ -1,11 +1,11 @@ ---- ./src/server/speechd.h.orig 2012-07-11 11:05:06.000000000 +0200 -+++ ./src/server/speechd.h 2013-11-15 08:44:05.115355454 +0100 +--- src/server/speechd.h.orig 2015-06-04 01:52:14 UTC ++++ src/server/speechd.h @@ -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 (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) || defined(__APPLE__) || defined(__FreeBSD__) - /* union semun is defined by including */ + /* union semun is defined by including */ #else - /* according to X/OPEN we have to define it ourselves */ + /* according to X/OPEN we have to define it ourselves */ Modified: head/accessibility/speech-dispatcher/pkg-plist ============================================================================== --- head/accessibility/speech-dispatcher/pkg-plist Mon Jun 29 15:47:44 2015 (r390918) +++ head/accessibility/speech-dispatcher/pkg-plist Mon Jun 29 15:51:22 2015 (r390919) @@ -3,7 +3,6 @@ bin/spd-say bin/spdsend bin/speech-dispatcher @sample %%ETCDIR%%/clients/emacs.conf.sample -@sample %%ETCDIR%%/clients/gnome-speech.conf.sample @sample %%ETCDIR%%/modules/cicero.conf.sample @sample %%ETCDIR%%/modules/dtk-generic.conf.sample @sample %%ETCDIR%%/modules/epos-generic.conf.sample @@ -15,15 +14,18 @@ bin/speech-dispatcher @sample %%ETCDIR%%/modules/ibmtts.conf.sample @sample %%ETCDIR%%/modules/ivona.conf.sample @sample %%ETCDIR%%/modules/llia_phon-generic.conf.sample +@sample %%ETCDIR%%/modules/pico-generic.conf.sample @sample %%ETCDIR%%/modules/swift-generic.conf.sample @sample %%ETCDIR%%/speechd.conf.sample include/speech-dispatcher/libspeechd.h +include/speech-dispatcher/libspeechd_version.h include/speech-dispatcher/spd_audio_plugin.h +include/speech-dispatcher/speechd_defines.h include/speech-dispatcher/speechd_types.h lib/libspeechd.a lib/libspeechd.so lib/libspeechd.so.2 -lib/libspeechd.so.2.4.0 +lib/libspeechd.so.2.6.0 %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/__init__.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/speechd/__init__.pyo @@ -62,22 +64,7 @@ lib/speech-dispatcher/spd_oss.so %%PULSEAUDIO%%lib/speech-dispatcher/spd_pulse.a %%PULSEAUDIO%%lib/speech-dispatcher/spd_pulse.so libdata/pkgconfig/speech-dispatcher.pc -share/locale/cs/LC_MESSAGES/speech-dispatcher.mo -share/locale/hu/LC_MESSAGES/speech-dispatcher.mo +%%NLS%%share/locale/cs/LC_MESSAGES/speech-dispatcher.mo +%%NLS%%share/locale/hu/LC_MESSAGES/speech-dispatcher.mo share/sounds/speech-dispatcher/dummy-message.wav %%PYTHON%%share/sounds/speech-dispatcher/test.wav -%%DATADIR%%/conf/clients/emacs.conf -%%DATADIR%%/conf/clients/gnome-speech.conf -%%DATADIR%%/conf/modules/cicero.conf -%%DATADIR%%/conf/modules/dtk-generic.conf -%%DATADIR%%/conf/modules/epos-generic.conf -%%DATADIR%%/conf/modules/espeak-generic.conf -%%DATADIR%%/conf/modules/espeak-mbrola-generic.conf -%%DATADIR%%/conf/modules/espeak.conf -%%DATADIR%%/conf/modules/festival.conf -%%DATADIR%%/conf/modules/flite.conf -%%DATADIR%%/conf/modules/ibmtts.conf -%%DATADIR%%/conf/modules/ivona.conf -%%DATADIR%%/conf/modules/llia_phon-generic.conf -%%DATADIR%%/conf/modules/swift-generic.conf -%%DATADIR%%/conf/speechd.conf