Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1579721154128850"
MIME-Version: 1.0
Date: Wed, 22 Jan 2020 19:25:54 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/audio/speech-dispatcher
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20200122192554.E4E7EFBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1579721154128850
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Wed Jan 22 19:25:54 UTC 2020

Modified Files:
	pkgsrc/audio/speech-dispatcher: Makefile PLIST

Log Message:
speech-dispatcher: Make python support work.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/audio/speech-dispatcher/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/speech-dispatcher/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1579721154128850
Content-Disposition: inline
Content-Length: 4177
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/audio/speech-dispatcher/Makefile
diff -u pkgsrc/audio/speech-dispatcher/Makefile:1.12 pkgsrc/audio/speech-dispatcher/Makefile:1.13
--- pkgsrc/audio/speech-dispatcher/Makefile:1.12	Fri Dec 20 00:00:11 2019
+++ pkgsrc/audio/speech-dispatcher/Makefile	Wed Jan 22 19:25:54 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2019/12/20 00:00:11 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2020/01/22 19:25:54 nia Exp $
 
 DISTNAME=	speech-dispatcher-0.9.1
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=brailcom/}
 GITHUB_PROJECT=	speechd
@@ -19,7 +20,10 @@ USE_LANGUAGES=	c c++03
 
 INFO_FILES=	yes
 
+PY_PATCHPLIST=	yes
+
 TOOL_DEPENDS+=	help2man-[0-9]*:../../converters/help2man
+TOOL_DEPENDS+=	${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
 
 # To avoid PLIST complexity, let the libao package select the most
 # fitting audio backend for the platform.
@@ -29,8 +33,6 @@ CONFIGURE_ARGS+=	--without-nas
 CONFIGURE_ARGS+=	--without-oss
 CONFIGURE_ARGS+=	--without-pulse
 
-CONFIGURE_ARGS+=	--disable-python
-
 # msgfmt: unknown option -- desktop
 _TOOLS_USE_PKGSRC.msgfmt=	yes
 
@@ -74,6 +76,8 @@ CONF_FILES+=	${PREFIX}/share/examples/sp
 CONF_FILES+=	${PREFIX}/share/examples/speech-dispatcher/speechd.conf \
 		${PKG_SYSCONFDIR}/speechd.conf
 
+REPLACE_PYTHON+=	src/api/python/speechd_config/spd-conf
+
 .include "../../audio/espeak/buildlink3.mk"
 .include "../../audio/flite/buildlink3.mk"
 .include "../../audio/libao/buildlink3.mk"
@@ -82,6 +86,8 @@ CONF_FILES+=	${PREFIX}/share/examples/sp
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/speech-dispatcher/PLIST
diff -u pkgsrc/audio/speech-dispatcher/PLIST:1.3 pkgsrc/audio/speech-dispatcher/PLIST:1.4
--- pkgsrc/audio/speech-dispatcher/PLIST:1.3	Thu Nov 28 16:51:49 2019
+++ pkgsrc/audio/speech-dispatcher/PLIST	Wed Jan 22 19:25:54 2020
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2019/11/28 16:51:49 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/01/22 19:25:54 nia Exp $
+bin/spd-conf
 bin/spd-say
 bin/spdsend
 bin/speech-dispatcher
@@ -13,6 +14,27 @@ info/speech-dispatcher.info
 info/ssip.info
 lib/libspeechd.la
 lib/pkgconfig/speech-dispatcher.pc
+${PYSITELIB}/speechd/__init__.py
+${PYSITELIB}/speechd/__init__.pyo
+${PYSITELIB}/speechd/__init__.pyc
+${PYSITELIB}/speechd/_test.pyo
+${PYSITELIB}/speechd/_test.pyc
+${PYSITELIB}/speechd/client.pyo
+${PYSITELIB}/speechd/client.pyc
+${PYSITELIB}/speechd/paths.pyo
+${PYSITELIB}/speechd/paths.pyc
+${PYSITELIB}/speechd/_test.py
+${PYSITELIB}/speechd/client.py
+${PYSITELIB}/speechd/paths.py
+${PYSITELIB}/speechd_config/__init__.py
+${PYSITELIB}/speechd_config/__init__.pyo
+${PYSITELIB}/speechd_config/__init__.pyc
+${PYSITELIB}/speechd_config/config.pyo
+${PYSITELIB}/speechd_config/config.pyc
+${PYSITELIB}/speechd_config/paths.pyo
+${PYSITELIB}/speechd_config/paths.pyc
+${PYSITELIB}/speechd_config/config.py
+${PYSITELIB}/speechd_config/paths.py
 lib/speech-dispatcher-modules/sd_baratinoo
 lib/speech-dispatcher-modules/sd_cicero
 lib/speech-dispatcher-modules/sd_dummy
@@ -23,6 +45,7 @@ lib/speech-dispatcher-modules/sd_generic
 lib/speech-dispatcher-modules/sd_ibmtts
 lib/speech-dispatcher-modules/sd_kali
 lib/speech-dispatcher/spd_libao.la
+man/man1/spd-conf.1
 man/man1/spd-say.1
 man/man1/speech-dispatcher.1
 share/examples/speech-dispatcher/clients/emacs.conf
@@ -49,7 +72,9 @@ share/locale/cs/LC_MESSAGES/speech-dispa
 share/locale/de/LC_MESSAGES/speech-dispatcher.mo
 share/locale/hu/LC_MESSAGES/speech-dispatcher.mo
 share/sounds/speech-dispatcher/dummy-message.wav
+share/sounds/speech-dispatcher/test.wav
 share/speech-dispatcher/conf/clients/emacs.conf
+share/speech-dispatcher/conf/desktop/speechd.desktop
 share/speech-dispatcher/conf/modules/baratinoo.conf
 share/speech-dispatcher/conf/modules/cicero.conf
 share/speech-dispatcher/conf/modules/espeak-ng.conf


--_----------=_1579721154128850--