git: a4d040d0b925 - main - accessibility/(py-)speech-dispatcher: update to 0.11.5

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Mon, 09 Sep 2024 09:15:42 UTC
The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a4d040d0b925167743c2927bea54e8f6a9c03178

commit a4d040d0b925167743c2927bea54e8f6a9c03178
Author:     Olivier Duchateau <duchateau.olivier@gmail.com>
AuthorDate: 2024-01-17 18:36:37 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-09-09 09:15:25 +0000

    accessibility/(py-)speech-dispatcher: update to 0.11.5
    
    PR:             273740
---
 accessibility/py-speech-dispatcher/Makefile  |  1 -
 accessibility/py-speech-dispatcher/pkg-plist |  2 +-
 accessibility/speech-dispatcher/Makefile     | 29 +++++++++++++++-------------
 accessibility/speech-dispatcher/distinfo     |  8 +++-----
 accessibility/speech-dispatcher/pkg-plist    | 13 +++++++++++--
 5 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/accessibility/py-speech-dispatcher/Makefile b/accessibility/py-speech-dispatcher/Makefile
index 65683363f22e..f54681bf8466 100644
--- a/accessibility/py-speech-dispatcher/Makefile
+++ b/accessibility/py-speech-dispatcher/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION=	1
 CATEGORIES=	accessibility audio python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/accessibility/py-speech-dispatcher/pkg-plist b/accessibility/py-speech-dispatcher/pkg-plist
index b5e7077e7d48..1973fcece2ed 100644
--- a/accessibility/py-speech-dispatcher/pkg-plist
+++ b/accessibility/py-speech-dispatcher/pkg-plist
@@ -1,5 +1,4 @@
 bin/spd-conf
-share/man/man1/spd-conf.1.gz
 %%PYTHON_SITELIBDIR%%/speechd/__init__.py
 %%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -21,5 +20,6 @@ share/man/man1/spd-conf.1.gz
 %%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/speechd_config/buildconfig.py
 %%PYTHON_SITELIBDIR%%/speechd_config/config.py
+share/man/man1/spd-conf.1.gz
 share/sounds/speech-dispatcher/test.wav
 %%DATADIR%%/conf/desktop/speechd.desktop
diff --git a/accessibility/speech-dispatcher/Makefile b/accessibility/speech-dispatcher/Makefile
index 2a2632482f84..e89604bb54d5 100644
--- a/accessibility/speech-dispatcher/Makefile
+++ b/accessibility/speech-dispatcher/Makefile
@@ -1,12 +1,8 @@
 PORTNAME=	speech-dispatcher
-DISTVERSION=	0.11.2
-PORTREVISION=	4
+DISTVERSION=	0.11.5
 CATEGORIES?=	accessibility audio
 MASTER_SITES=	https://github.com/brailcom/speechd/releases/download/${PORTVERSION}/
 
-PATCH_SITES=	https://github.com/brailcom/speechd/commit/
-PATCHFILES=	c204a23db76345d0bce2cdf395517c99699a8a4a.diff:-p1
-
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT?=	Common interface to speech synthesis
 WWW=		https://devel.freebsoft.org/speechd
@@ -19,14 +15,15 @@ LIB_DEPENDS=	libdotconf.so:devel/dotconf \
 		libltdl.so:devel/libltdl \
 		libsndfile.so:audio/libsndfile
 
-USES=		alias autoreconf gettext gmake gnome libtool makeinfo pathfix pkgconfig
+USES=		alias gettext gmake gnome libtool makeinfo pathfix pkgconfig
 USE_GNOME=	glib20 intltool
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-espeak-ng=no \
 		--with-baratinoo=no \
 		--with-kali=no \
-		--with-ibmtts=no
+		--with-ibmtts=no \
+		--with-oss \
+		--without-systemdsystemunitdir
 CFLAGS+=	-fcommon -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
@@ -43,7 +40,7 @@ ETCFILES=	clients/emacs.conf modules/cicero.conf modules/dtk-generic.conf \
 		modules/flite.conf modules/llia_phon-generic.conf modules/mary-generic.conf \
 		modules/mimic3-generic.conf modules/swift-generic.conf speechd.conf
 
-PORTDOCS=	ANNOUNCE AUTHORS FAQ NEWS README TODO
+PORTDOCS=	ANNOUNCE AUTHORS FAQ NEWS README* TODO
 
 INFO=		spd-say speech-dispatcher speech-dispatcher-cs ssip
 
@@ -86,8 +83,14 @@ ETCFILES+=		modules/voxin.conf
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,g' \
-		${WRKSRC}/src/modules/*.c \
+# ibmtts.c is omitted, because it is disabled by default
+.for f in espeak.c ivona.c pico.c
+	${REINPLACE_CMD} -e 's,/usr/share,${LOCALBASE}/share,g' \
+		${WRKSRC}/src/modules/${f}
+.endfor
+	${REINPLACE_CMD} -e 's,/etc,${LOCALBASE}/etc,g ;\
+		s,/usr/bin,${LOCALBASE}/bin,g ;\
+		s,/usr/share,${LOCALBASE}/share,g' \
 		${WRKSRC}/config/modules/*.conf
 
 post-install:
@@ -107,9 +110,9 @@ NO_ARCH=	yes
 USES+=		python shebangfix
 SHEBANG_FILES=	src/api/python/speechd_config/spd-conf
 USE_PYTHON=	flavors
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR}
 LIB_DEPENDS+=	libspeechd.so:accessibility/speech-dispatcher
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${PY_FLAVOR}
-BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR}
 
 .endif
 
diff --git a/accessibility/speech-dispatcher/distinfo b/accessibility/speech-dispatcher/distinfo
index e159c4e6a320..6f9f3e8a5c81 100644
--- a/accessibility/speech-dispatcher/distinfo
+++ b/accessibility/speech-dispatcher/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1662527209
-SHA256 (speech-dispatcher-0.11.2.tar.gz) = 8b4649925e68cbe1a7b4c0a07bb041ce7738b35c906a602bf82986db1aa0f364
-SIZE (speech-dispatcher-0.11.2.tar.gz) = 7147526
-SHA256 (c204a23db76345d0bce2cdf395517c99699a8a4a.diff) = eaf5c67ef7e9cf5febeb397cf857fd69750f6cf1c56be7248a85d1de14150e3a
-SIZE (c204a23db76345d0bce2cdf395517c99699a8a4a.diff) = 422
+TIMESTAMP = 1694513565
+SHA256 (speech-dispatcher-0.11.5.tar.gz) = 1ce4759ffabbaf1aeb433a5ec0739be0676e9bdfbae9444a7b3be1b2af3ec12b
+SIZE (speech-dispatcher-0.11.5.tar.gz) = 7230756
diff --git a/accessibility/speech-dispatcher/pkg-plist b/accessibility/speech-dispatcher/pkg-plist
index 03a67016cc8b..10c5ae663130 100644
--- a/accessibility/speech-dispatcher/pkg-plist
+++ b/accessibility/speech-dispatcher/pkg-plist
@@ -45,8 +45,6 @@ libexec/speech-dispatcher-modules/sd_festival
 %%FLITE%%libexec/speech-dispatcher-modules/sd_flite
 libexec/speech-dispatcher-modules/sd_generic
 %%VOXIN%%libexec/speech-dispatcher-modules/sd_voxin
-share/man/man1/spd-say.1.gz
-share/man/man1/speech-dispatcher.1.gz
 share/locale/cs/LC_MESSAGES/speech-dispatcher.mo
 share/locale/de/LC_MESSAGES/speech-dispatcher.mo
 share/locale/eo/LC_MESSAGES/speech-dispatcher.mo
@@ -56,6 +54,8 @@ share/locale/nb_NO/LC_MESSAGES/speech-dispatcher.mo
 share/locale/pt/LC_MESSAGES/speech-dispatcher.mo
 share/locale/pt_BR/LC_MESSAGES/speech-dispatcher.mo
 share/locale/ru/LC_MESSAGES/speech-dispatcher.mo
+share/man/man1/spd-say.1.gz
+share/man/man1/speech-dispatcher.1.gz
 share/sounds/speech-dispatcher/dummy-message.wav
 %%DATADIR%%/locale/af/emojis.dic
 %%DATADIR%%/locale/am/emojis.dic
@@ -83,6 +83,7 @@ share/sounds/speech-dispatcher/dummy-message.wav
 %%DATADIR%%/locale/bg/orca-chars.dic
 %%DATADIR%%/locale/bg/orca.dic
 %%DATADIR%%/locale/bg/symbols.dic
+%%DATADIR%%/locale/bgn/emojis.dic
 %%DATADIR%%/locale/bn/emojis.dic
 %%DATADIR%%/locale/bn/orca-chars.dic
 %%DATADIR%%/locale/bn/orca.dic
@@ -166,6 +167,8 @@ share/sounds/speech-dispatcher/dummy-message.wav
 %%DATADIR%%/locale/eu/orca.dic
 %%DATADIR%%/locale/fa/emojis.dic
 %%DATADIR%%/locale/fa/symbols.dic
+%%DATADIR%%/locale/ff/emojis.dic
+%%DATADIR%%/locale/ff_Adlm/emojis.dic
 %%DATADIR%%/locale/fi/emojis.dic
 %%DATADIR%%/locale/fi/orca-chars.dic
 %%DATADIR%%/locale/fi/orca.dic
@@ -237,6 +240,7 @@ share/sounds/speech-dispatcher/dummy-message.wav
 %%DATADIR%%/locale/ky/emojis.dic
 %%DATADIR%%/locale/ky/symbols.dic
 %%DATADIR%%/locale/lb/emojis.dic
+%%DATADIR%%/locale/lij/emojis.dic
 %%DATADIR%%/locale/lo/emojis.dic
 %%DATADIR%%/locale/lt/emojis.dic
 %%DATADIR%%/locale/lt/orca-chars.dic
@@ -278,6 +282,8 @@ share/sounds/speech-dispatcher/dummy-message.wav
 %%DATADIR%%/locale/nn/orca-chars.dic
 %%DATADIR%%/locale/nn_NO/symbols.dic
 %%DATADIR%%/locale/no/emojis.dic
+%%DATADIR%%/locale/nso/emojis.dic
+%%DATADIR%%/locale/oc/emojis.dic
 %%DATADIR%%/locale/oc/orca-chars.dic
 %%DATADIR%%/locale/oc/orca.dic
 %%DATADIR%%/locale/or/emojis.dic
@@ -301,6 +307,7 @@ share/sounds/speech-dispatcher/dummy-message.wav
 %%DATADIR%%/locale/pt_PT/emojis.dic
 %%DATADIR%%/locale/pt_PT/symbols.dic
 %%DATADIR%%/locale/qu/emojis.dic
+%%DATADIR%%/locale/quc/emojis.dic
 %%DATADIR%%/locale/rm/emojis.dic
 %%DATADIR%%/locale/ro/emojis.dic
 %%DATADIR%%/locale/ro/orca-chars.dic
@@ -312,6 +319,7 @@ share/sounds/speech-dispatcher/dummy-message.wav
 %%DATADIR%%/locale/ru/symbols.dic
 %%DATADIR%%/locale/rw/emojis.dic
 %%DATADIR%%/locale/sa/emojis.dic
+%%DATADIR%%/locale/sat/emojis.dic
 %%DATADIR%%/locale/sc/emojis.dic
 %%DATADIR%%/locale/sd/emojis.dic
 %%DATADIR%%/locale/si/emojis.dic
@@ -355,6 +363,7 @@ share/sounds/speech-dispatcher/dummy-message.wav
 %%DATADIR%%/locale/th/orca.dic
 %%DATADIR%%/locale/ti/emojis.dic
 %%DATADIR%%/locale/tk/emojis.dic
+%%DATADIR%%/locale/tn/emojis.dic
 %%DATADIR%%/locale/to/emojis.dic
 %%DATADIR%%/locale/tr/emojis.dic
 %%DATADIR%%/locale/tr/orca-chars.dic