From f70dcdf24e6caa197288ea64874aa52dfef01422 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 11 Sep 2018 12:53:56 +0200 Subject: [PATCH] */*: sync with upstream Taken from: HardenedBSD --- audio/Makefile | 1 + audio/ncmpc/Makefile | 55 +- audio/ncmpc/distinfo | 6 +- audio/ncmpc/files/patch-doc_meson.build | 50 ++ audio/ncmpc/files/patch-meson__options.txt | 14 + audio/ncmpc/files/patch-src_screen.hxx | 21 + audio/ncmpc/pkg-plist | 60 ++ audio/openal-soft/Makefile | 11 +- audio/openal-soft/distinfo | 6 +- audio/openal-soft/files/patch-Alc_ALc.c | 22 - audio/openal-soft/pkg-plist | 14 +- audio/rhvoice/Makefile | 29 + audio/rhvoice/distinfo | 3 + audio/rhvoice/pkg-descr | 9 + audio/rhvoice/pkg-plist | 733 ++++++++++++++++++ comms/freedv/Makefile | 6 +- comms/freedv/distinfo | 6 +- comms/freedv/files/patch-src__fdmdv2_main.cpp | 15 + comms/freedv/pkg-descr | 2 +- devel/py-game_sdl2/Makefile | 2 +- devel/py-game_sdl2/distinfo | 6 +- devel/radare2/Makefile | 2 +- devel/radare2/distinfo | 6 +- .../files/patch-libr_debug_p_native_reg.c | 11 - ...atch-libr_debug_p_native_reg_kfbsd-arm64.h | 196 ----- devel/radare2/pkg-plist | 38 +- finance/alkimia/Makefile | 1 - finance/alkimia/pkg-descr | 2 +- games/renpy/Makefile | 2 +- games/renpy/distinfo | 6 +- games/renpy/files/patch-system-fribidi | 57 ++ graphics/partio/Makefile | 25 +- graphics/partio/distinfo | 5 +- graphics/partio/pkg-descr | 12 +- graphics/partio/pkg-plist | 11 +- graphics/piglit/Makefile | 5 +- graphics/piglit/distinfo | 6 +- graphics/piglit/files/patch-CMakeLists.txt | 11 +- graphics/piglit/files/pkg-message.in | 2 +- graphics/piglit/pkg-plist | 32 +- lang/yabasic/Makefile | 2 +- lang/yabasic/distinfo | 6 +- math/maxima/Makefile | 12 +- multimedia/plexmediaserver-plexpass/Makefile | 4 +- multimedia/plexmediaserver-plexpass/distinfo | 6 +- science/getdp/Makefile | 2 +- science/getdp/distinfo | 6 +- security/libntlm/Makefile | 2 +- security/libntlm/distinfo | 5 +- security/libntlm/pkg-plist | 2 +- shells/zsh/Makefile | 2 +- shells/zsh/distinfo | 10 +- shells/zsh/pkg-plist | 1 + sysutils/android-file-transfer/Makefile | 4 +- sysutils/android-file-transfer/distinfo | 6 +- www/ddgr/Makefile | 2 +- www/ddgr/distinfo | 6 +- www/moodle31/Makefile | 2 +- www/moodle31/distinfo | 6 +- www/moodle33/Makefile | 2 +- www/moodle33/distinfo | 6 +- www/moodle34/Makefile | 2 +- www/moodle34/distinfo | 6 +- www/moodle35/Makefile | 2 +- www/moodle35/distinfo | 6 +- www/mybb/Makefile | 4 +- www/mybb/distinfo | 6 +- www/mybb/pkg-plist | 1 + www/p5-HTML-TokeParser-Simple/Makefile | 4 + x11-wm/e16/Makefile | 3 +- x11/sddm/Makefile | 14 + x11/sddm/files/git-patch-147cec38d | 28 + x11/sddm/files/git-patch-b02b00559 | 70 ++ x11/sddm/pkg-message | 2 + 74 files changed, 1313 insertions(+), 430 deletions(-) create mode 100644 audio/ncmpc/files/patch-doc_meson.build create mode 100644 audio/ncmpc/files/patch-meson__options.txt create mode 100644 audio/ncmpc/files/patch-src_screen.hxx create mode 100644 audio/ncmpc/pkg-plist delete mode 100644 audio/openal-soft/files/patch-Alc_ALc.c create mode 100644 audio/rhvoice/Makefile create mode 100644 audio/rhvoice/distinfo create mode 100644 audio/rhvoice/pkg-descr create mode 100644 audio/rhvoice/pkg-plist create mode 100644 comms/freedv/files/patch-src__fdmdv2_main.cpp delete mode 100644 devel/radare2/files/patch-libr_debug_p_native_reg.c delete mode 100644 devel/radare2/files/patch-libr_debug_p_native_reg_kfbsd-arm64.h create mode 100644 games/renpy/files/patch-system-fribidi create mode 100644 x11/sddm/files/git-patch-147cec38d create mode 100644 x11/sddm/files/git-patch-b02b00559 create mode 100644 x11/sddm/pkg-message diff --git a/audio/Makefile b/audio/Makefile index 09b2677a9a2..d02b49907f2 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -723,6 +723,7 @@ SUBDIR += resid SUBDIR += rexima SUBDIR += rezound + SUBDIR += rhvoice SUBDIR += rhythmbox SUBDIR += rio500 SUBDIR += rioutil diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile index b44c148e0d5..84fa40266e7 100644 --- a/audio/ncmpc/Makefile +++ b/audio/ncmpc/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= ncmpc -PORTVERSION= 0.29 +PORTVERSION= 0.30 CATEGORIES= audio MASTER_SITES= http://www.musicpd.org/download/ncmpc/0/ -MAINTAINER= henrik@affekt.org +MAINTAINER= laurent@nuxi.ca COMMENT= Ncurses client for the musicpd LICENSE= GPLv2+ @@ -14,50 +14,27 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libmpdclient.so:audio/libmpdclient -USES= iconv localbase meson ncurses pkgconfig tar:xz +USES= compiler:c++14-lang gnome iconv localbase meson ncurses pkgconfig tar:xz USE_GNOME= glib20 -OPTIONS_DEFINE= NLS LYRICS -OPTIONS_DEFAULT= LYRICS -LYRICS_DESC= Compile with lyrics screen +OPTIONS_DEFINE= DOCS LYRICS MANPAGES NLS +OPTIONS_DEFAULT= LYRICS MANPAGES +OPTIONS_SUB= yes -PLIST_FILES= bin/ncmpc \ - man/man1/ncmpc.1.gz \ - ${EXAMPLESDIR}/config \ - ${EXAMPLESDIR}/keys \ - ${EXAMPLESDIR}/ncmpc.lirc +LYRICS_DESC= Compile with lyrics screen -NLS_USES= gettext -NLS_MESON_TRUE= nls - -LANGUAGES=cs da de eo es fi fr gl he hu it ko nb nl pl pt_BR ru sk sv uk zh_CN -.for language in ${LANGUAGES} -NLS_PLIST_FILES+=share/locale/${language}/LC_MESSAGES/ncmpc.mo -.endfor +DOCS_IMPLIES= MANPAGES +DOCS_MESON_TRUE= html_manual LYRICS_MESON_TRUE= lyrics_screen -LYRICS_PLIST_FILES= lib/ncmpc/lyrics/10-hd.sh \ - lib/ncmpc/lyrics/20-lyricwiki.rb -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/_build/ncmpc ${STAGEDIR}${PREFIX}/bin - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/config.sample ${STAGEDIR}${EXAMPLESDIR}/config - ${INSTALL_DATA} ${WRKSRC}/doc/keys.sample ${STAGEDIR}${EXAMPLESDIR}/keys - ${INSTALL_DATA} ${WRKSRC}/doc/ncmpc.lirc ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/doc/ncmpc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 +MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} +MANPAGES_MAKE_ENV= PYTHON=${PYTHON_CMD} \ + SPHINX=sphinx-build-${PYTHON_VER} +MANPAGES_MESON_TRUE= manual +MANPAGES_USES= python:build -do-install-NLS-on: -.for language in ${LANGUAGES} - @${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${language}/LC_MESSAGES - ${INSTALL_DATA} ${WRKSRC}/po/${language}.po \ - ${STAGEDIR}${PREFIX}/share/locale/${language}/LC_MESSAGES/ncmpc.mo -.endfor - -do-install-LYRICS-on: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ncmpc/lyrics - (cd ${WRKSRC}/lyrics && ${INSTALL_SCRIPT} \ - 10-hd.sh 20-lyricwiki.rb \ - ${STAGEDIR}${PREFIX}/lib/ncmpc/lyrics) +NLS_MESON_TRUE= nls +NLS_USES= gettext .include diff --git a/audio/ncmpc/distinfo b/audio/ncmpc/distinfo index d55edae8a4e..a4a8618216a 100644 --- a/audio/ncmpc/distinfo +++ b/audio/ncmpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1515767012 -SHA256 (ncmpc-0.29.tar.xz) = ef68a9b67172383ea80ee46579015109433fa058728812d2b0ebede660d85f12 -SIZE (ncmpc-0.29.tar.xz) = 233876 +TIMESTAMP = 1534510290 +SHA256 (ncmpc-0.30.tar.xz) = e3fe0cb58b8a77f63fb1645c2f974b334f1614efdc834ec698ee7d861f1b12a3 +SIZE (ncmpc-0.30.tar.xz) = 245212 diff --git a/audio/ncmpc/files/patch-doc_meson.build b/audio/ncmpc/files/patch-doc_meson.build new file mode 100644 index 00000000000..f5c882e962b --- /dev/null +++ b/audio/ncmpc/files/patch-doc_meson.build @@ -0,0 +1,50 @@ +--- doc/meson.build.orig 2018-04-04 08:23:50 UTC ++++ doc/meson.build +@@ -1,24 +1,28 @@ + sphinx = find_program('sphinx-build', required:false) +-if sphinx.found() +- custom_target( +- 'HTML documentation', +- output: 'html', +- input: ['index.rst', 'conf.py'], +- command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'], +- build_by_default: true, +- install: true, +- install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()), +- ) ++if sphinx.found() and get_option('manual') ++ if get_option('html_manual') ++ custom_target( ++ 'HTML documentation', ++ output: 'html', ++ input: ['index.rst', 'conf.py'], ++ command: [sphinx, '-q', '-b', 'html', '-d', '@OUTDIR@/html_doctrees', meson.current_source_dir(), '@OUTPUT@'], ++ build_by_default: true, ++ install: true, ++ install_dir: join_paths(get_option('datadir'), 'doc', meson.project_name()), ++ ) ++ endif + +- custom_target( +- 'Manpage documentation', +- output: 'man', +- input: ['index.rst', 'conf.py'], +- command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@/man1'], +- build_by_default: true, +- install: true, +- install_dir: get_option('datadir'), +- ) ++ if get_option('manual') ++ custom_target( ++ 'Manpage documentation', ++ output: 'man1', ++ input: ['index.rst', 'conf.py'], ++ command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@'], ++ build_by_default: true, ++ install: true, ++ install_dir: get_option('mandir'), ++ ) ++ endif + endif + + if get_option('documentation') diff --git a/audio/ncmpc/files/patch-meson__options.txt b/audio/ncmpc/files/patch-meson__options.txt new file mode 100644 index 00000000000..bcccaf848dd --- /dev/null +++ b/audio/ncmpc/files/patch-meson__options.txt @@ -0,0 +1,14 @@ +--- meson_options.txt.orig 2018-04-04 08:23:50 UTC ++++ meson_options.txt +@@ -83,3 +83,11 @@ option('chat_screen', type: 'boolean', + option('documentation', type: 'boolean', + value: false, + description: 'Build API documentation') ++ ++option('manual', type: 'boolean', ++ value: true, ++ description: 'Build the manual') ++ ++option('html_manual', type: 'boolean', ++ value: true, ++ description: 'Build the HTML manual') diff --git a/audio/ncmpc/files/patch-src_screen.hxx b/audio/ncmpc/files/patch-src_screen.hxx new file mode 100644 index 00000000000..b2a1df31b30 --- /dev/null +++ b/audio/ncmpc/files/patch-src_screen.hxx @@ -0,0 +1,21 @@ +--- src/screen.hxx.orig 2018-04-04 08:23:50 UTC ++++ src/screen.hxx +@@ -82,8 +82,7 @@ class ScreenManager { (public) + StatusBar status_bar; + + private: +- using PageMap = std::map>; ++ using PageMap = std::map; + PageMap pages; + PageMap::iterator current_page = pages.begin(); + +@@ -120,7 +119,7 @@ class ScreenManager { (public) + + gcc_pure + bool IsVisible(const Page &page) const { +- return &page == current_page->second.get(); ++ return &page == current_page->second; + } + + void Switch(const struct screen_functions &sf, struct mpdclient &c); diff --git a/audio/ncmpc/pkg-plist b/audio/ncmpc/pkg-plist new file mode 100644 index 00000000000..bad679a0aab --- /dev/null +++ b/audio/ncmpc/pkg-plist @@ -0,0 +1,60 @@ +bin/ncmpc +%%MANPAGES%%man/man1/ncmpc.1.gz +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/README.rst +%%PORTDOCS%%%%DOCSDIR%%/keys.sample +%%PORTDOCS%%%%DOCSDIR%%/ncmpc.lirc +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/config.sample +%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js +%%PORTDOCS%%%%DOCSDIR%%/html/objects.inv +%%PORTDOCS%%%%DOCSDIR%%/html/_sources/index.rst.txt +%%PORTDOCS%%%%DOCSDIR%%/html/search.html +%%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/ajax-loader.gif +%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore.js +%%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css +%%PORTDOCS%%%%DOCSDIR%%/html/_static/alabaster.css +%%PORTDOCS%%%%DOCSDIR%%/html/_static/searchtools.js +%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore-1.3.1.js +%%PORTDOCS%%%%DOCSDIR%%/html/_static/doctools.js +%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery-3.1.0.js +%%PORTDOCS%%%%DOCSDIR%%/html/_static/up-pressed.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/websupport.js +%%PORTDOCS%%%%DOCSDIR%%/html/_static/down.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/plus.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/pygments.css +%%PORTDOCS%%%%DOCSDIR%%/html/_static/down-pressed.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-close.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-bright.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/up.png +%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js +%%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo +%%PORTDOCS%%%%DOCSDIR%%/html/genindex.html +%%PORTDOCS%%%%DOCSDIR%%/html/index.html +%%LYRICS%%lib/ncmpc/lyrics/10-hd.sh +%%LYRICS%%lib/ncmpc/lyrics/20-lyricwiki.rb +%%NLS%%share/locale/he/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/cs/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/nl/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/fr/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/nb/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/gl/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/hu/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/pl/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/es/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/eo/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/it/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/da/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/sk/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/uk/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/de/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/ru/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/ko/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/fi/LC_MESSAGES/ncmpc.mo +%%NLS%%share/locale/sv/LC_MESSAGES/ncmpc.mo diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile index 6858fb1482f..bc49789fee8 100644 --- a/audio/openal-soft/Makefile +++ b/audio/openal-soft/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= openal-soft -PORTVERSION= 1.18.2 -PORTREVISION= 3 +PORTVERSION= 1.19.0 CATEGORIES= audio MASTER_SITES= http://kcat.strangesoft.net/openal-releases/ @@ -27,7 +26,7 @@ CMAKE_ON= ALSOFT_BACKEND_WAVE \ ALSOFT_UTILS LDFLAGS+= -Wl,--as-needed # do not link with librt and libdl -OPTIONS_DEFINE= EXAMPLES CONFIG JACK OSS PORTAUDIO PULSEAUDIO SNDIO +OPTIONS_DEFINE= EXAMPLES CONFIG JACK OSS PORTAUDIO PULSEAUDIO SDL SNDIO OPTIONS_DEFAULT= OSS OPTIONS_SUB= yes @@ -49,13 +48,17 @@ PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PULSEAUDIO_CMAKE_BOOL= ALSOFT_REQUIRE_PULSEAUDIO ALSOFT_BACKEND_PULSEAUDIO PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +SDL_CMAKE_BOOL= ALSOFT_REQUIRE_SDL2 ALSOFT_BACKEND_SDL2 +SDL_USES= localbase +SDL_USE= SDL=sdl2 + SNDIO_CMAKE_BOOL= ALSOFT_REQUIRE_SNDIO ALSOFT_BACKEND_SNDIO SNDIO_IMPLIES= OSS # provide fallback for missing sndio capture support SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio post-patch: @${REINPLACE_CMD} 's|/etc/openal|${ETCDIR}|' \ - ${WRKSRC}/Alc/alcConfig.c + ${WRKSRC}/Alc/alconfig.c post-install-EXAMPLES-on: (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \ diff --git a/audio/openal-soft/distinfo b/audio/openal-soft/distinfo index 61baf087185..a90bd0a2550 100644 --- a/audio/openal-soft/distinfo +++ b/audio/openal-soft/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506260510 -SHA256 (openal-soft-1.18.2.tar.bz2) = 9f8ac1e27fba15a59758a13f0c7f6540a0605b6c3a691def9d420570506d7e82 -SIZE (openal-soft-1.18.2.tar.bz2) = 639420 +TIMESTAMP = 1536318439 +SHA256 (openal-soft-1.19.0.tar.bz2) = f1adf3a6e73e2f9270a0fd00887ea23793968fa787f60dcdec41a3b2f42a0ed6 +SIZE (openal-soft-1.19.0.tar.bz2) = 575163 diff --git a/audio/openal-soft/files/patch-Alc_ALc.c b/audio/openal-soft/files/patch-Alc_ALc.c deleted file mode 100644 index d628605f0a5..00000000000 --- a/audio/openal-soft/files/patch-Alc_ALc.c +++ /dev/null @@ -1,22 +0,0 @@ -Prefer sndio over OSS when it's enabled. - ---- Alc/ALc.c.orig 2018-06-21 02:27:21 UTC -+++ Alc/ALc.c -@@ -69,14 +69,14 @@ static struct BackendInfo BackendList[] = { - #ifdef HAVE_COREAUDIO - { "core", ALCcoreAudioBackendFactory_getFactory }, - #endif --#ifdef HAVE_OSS -- { "oss", ALCossBackendFactory_getFactory }, --#endif - #ifdef HAVE_SOLARIS - { "solaris", ALCsolarisBackendFactory_getFactory }, - #endif - #ifdef HAVE_SNDIO - { "sndio", ALCsndioBackendFactory_getFactory }, -+#endif -+#ifdef HAVE_OSS -+ { "oss", ALCossBackendFactory_getFactory }, - #endif - #ifdef HAVE_QSA - { "qsa", ALCqsaBackendFactory_getFactory }, diff --git a/audio/openal-soft/pkg-plist b/audio/openal-soft/pkg-plist index 744bdf86642..50507ee1463 100644 --- a/audio/openal-soft/pkg-plist +++ b/audio/openal-soft/pkg-plist @@ -1,13 +1,13 @@ -bin/altonegen -bin/bsincgen -bin/makehrtf %%CONFIG%%bin/alsoft-config +bin/altonegen +bin/makehrtf bin/openal-info %%ETCDIR%%/alsoftrc.sample %%ETCDIR%%/hrtf/default-44100.mhr %%ETCDIR%%/hrtf/default-48000.mhr %%ETCDIR%%/presets/3D7.1.ambdec %%ETCDIR%%/presets/hexagon.ambdec +%%ETCDIR%%/presets/itu5.1-nocenter.ambdec %%ETCDIR%%/presets/itu5.1.ambdec %%ETCDIR%%/presets/presets.txt %%ETCDIR%%/presets/rectangle.ambdec @@ -15,19 +15,21 @@ bin/openal-info include/AL/al.h include/AL/alc.h include/AL/alext.h -include/AL/efx.h include/AL/efx-creative.h include/AL/efx-presets.h +include/AL/efx.h lib/cmake/OpenAL/OpenALConfig-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/OpenAL/OpenALConfig.cmake -lib/libopenal.so.1.18.2 -lib/libopenal.so.1 lib/libopenal.so +lib/libopenal.so.1 +lib/libopenal.so.1.19.0 libdata/pkgconfig/openal.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alffplay.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alhrtf.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/allatency.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alloopback.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/almultireverb.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alplay.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alrecord.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alreverb.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alstream.c diff --git a/audio/rhvoice/Makefile b/audio/rhvoice/Makefile new file mode 100644 index 00000000000..f6084669b2f --- /dev/null +++ b/audio/rhvoice/Makefile @@ -0,0 +1,29 @@ +# $FreeBSD$ + +PORTNAME= RHVoice +DISTVERSION= 0.7.1-4 +DISTVERSIONSUFFIX= -g1083ce5 +PORTREVISION= 1 +CATEGORIES= audio + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Speech synthesizer for English, Russian, Georgian, and other languages + +LICENSE= LGPL21+ GPLv3+ # the main code is under LGPL21+, MAGE library is under GPLv3+, voices are licensed for use by individuals only, no commercial use +LICENSE_COMB= multi +LICENSE_FILE_LGPL21= ${SRCDIR}/licenses/lgpl-2.1.txt +LICENSE_FILE_GPLv3= ${SRCDIR}/licenses/gpl-3.0.txt + +LIB_DEPENDS= libao.so:audio/libao \ + libportaudio.so:audio/portaudio \ + libpulse.so:audio/pulseaudio + +USES= pkgconfig scons +USE_GITHUB= yes +GH_ACCOUNT= Olga-Yakovleva +USE_LDCONFIG= yes + +post-install: + ${MV} ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample + +.include diff --git a/audio/rhvoice/distinfo b/audio/rhvoice/distinfo new file mode 100644 index 00000000000..e8ca0182075 --- /dev/null +++ b/audio/rhvoice/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1536598666 +SHA256 (Olga-Yakovleva-RHVoice-0.7.1-4-g1083ce5_GH0.tar.gz) = f01daa2b46e4cb5cb1251d49cd2f1031bd38179e0d0d11c817fc704e5ac2e50f +SIZE (Olga-Yakovleva-RHVoice-0.7.1-4-g1083ce5_GH0.tar.gz) = 141393271 diff --git a/audio/rhvoice/pkg-descr b/audio/rhvoice/pkg-descr new file mode 100644 index 00000000000..2549bb1933d --- /dev/null +++ b/audio/rhvoice/pkg-descr @@ -0,0 +1,9 @@ +RHVoice is a free and open source speech synthesizer. + +It consists of the following components: +* command line tool `rhvoice-client` (needs love) +* speech module for NVDA +* speech module for Windows (SAPI5) +* Android App + +WWW: https://github.com/Olga-Yakovleva/RHVoice diff --git a/audio/rhvoice/pkg-plist b/audio/rhvoice/pkg-plist new file mode 100644 index 00000000000..e6f6705c6b8 --- /dev/null +++ b/audio/rhvoice/pkg-plist @@ -0,0 +1,733 @@ +bin/RHVoice-make-hts-labels +bin/RHVoice-test +bin/RHVoice-transcribe-sentences +bin/sd_rhvoice +@sample %%ETCDIR%%/RHVoice.conf.sample +include/RHVoice.h +include/RHVoice_common.h +lib/libRHVoice.so +lib/libRHVoice.so.3 +lib/libRHVoice.so.3.0.0 +lib/libRHVoice_audio.so +lib/libRHVoice_audio.so.1 +lib/libRHVoice_audio.so.1.0.0 +lib/libRHVoice_core.so +lib/libRHVoice_core.so.1 +lib/libRHVoice_core.so.1.1.0 +%%DATADIR%%/languages/English/accents.dt +%%DATADIR%%/languages/English/cmulex.fst +%%DATADIR%%/languages/English/cmulex.lts +%%DATADIR%%/languages/English/downcase.fst +%%DATADIR%%/languages/English/gpos.fst +%%DATADIR%%/languages/English/key.fst +%%DATADIR%%/languages/English/labelling.xml +%%DATADIR%%/languages/English/language.info +%%DATADIR%%/languages/English/lseq.fst +%%DATADIR%%/languages/English/msg.fst +%%DATADIR%%/languages/English/numbers.fst +%%DATADIR%%/languages/English/phonemes.xml +%%DATADIR%%/languages/English/phrasing.dt +%%DATADIR%%/languages/English/spell.fst +%%DATADIR%%/languages/English/syl.fst +%%DATADIR%%/languages/English/tok.fst +%%DATADIR%%/languages/English/tones.dt +%%DATADIR%%/languages/Esperanto/downcase.fst +%%DATADIR%%/languages/Esperanto/g2p.fst +%%DATADIR%%/languages/Esperanto/gpos.fst +%%DATADIR%%/languages/Esperanto/key.fst +%%DATADIR%%/languages/Esperanto/labelling.xml +%%DATADIR%%/languages/Esperanto/language.info +%%DATADIR%%/languages/Esperanto/msg.fst +%%DATADIR%%/languages/Esperanto/numbers.fst +%%DATADIR%%/languages/Esperanto/phonemes.xml +%%DATADIR%%/languages/Esperanto/phrasing.dt +%%DATADIR%%/languages/Esperanto/spell.fst +%%DATADIR%%/languages/Esperanto/syl.fst +%%DATADIR%%/languages/Esperanto/tok.fst +%%DATADIR%%/languages/Esperanto/untranslit.fst +%%DATADIR%%/languages/Georgian/downcase.fst +%%DATADIR%%/languages/Georgian/english_phone_mapping.fst +%%DATADIR%%/languages/Georgian/g2p.fst +%%DATADIR%%/languages/Georgian/gpos.fst +%%DATADIR%%/languages/Georgian/key.fst +%%DATADIR%%/languages/Georgian/labelling.xml +%%DATADIR%%/languages/Georgian/language.info +%%DATADIR%%/languages/Georgian/msg.fst +%%DATADIR%%/languages/Georgian/numbers.fst +%%DATADIR%%/languages/Georgian/phonemes.xml +%%DATADIR%%/languages/Georgian/phrasing.dt +%%DATADIR%%/languages/Georgian/spell.fst +%%DATADIR%%/languages/Georgian/syl.fst +%%DATADIR%%/languages/Georgian/tok.fst +%%DATADIR%%/languages/Kyrgyz/downcase.fst +%%DATADIR%%/languages/Kyrgyz/english_phone_mapping.fst +%%DATADIR%%/languages/Kyrgyz/g2p.fst +%%DATADIR%%/languages/Kyrgyz/gpos.fst +%%DATADIR%%/languages/Kyrgyz/key.fst +%%DATADIR%%/languages/Kyrgyz/labelling.xml +%%DATADIR%%/languages/Kyrgyz/language.info +%%DATADIR%%/languages/Kyrgyz/lseq.fst +%%DATADIR%%/languages/Kyrgyz/msg.fst +%%DATADIR%%/languages/Kyrgyz/numbers.fst +%%DATADIR%%/languages/Kyrgyz/phonemes.xml +%%DATADIR%%/languages/Kyrgyz/phrasing.dt +%%DATADIR%%/languages/Kyrgyz/spell.fst +%%DATADIR%%/languages/Kyrgyz/syl.fst +%%DATADIR%%/languages/Kyrgyz/tok.fst +%%DATADIR%%/languages/Russian/clitics.fst +%%DATADIR%%/languages/Russian/dict.fst +%%DATADIR%%/languages/Russian/downcase.fst +%%DATADIR%%/languages/Russian/english_phone_mapping.fst +%%DATADIR%%/languages/Russian/g2p.fst +%%DATADIR%%/languages/Russian/gpos.fst +%%DATADIR%%/languages/Russian/key.fst +%%DATADIR%%/languages/Russian/labelling.xml +%%DATADIR%%/languages/Russian/language.info +%%DATADIR%%/languages/Russian/lseq.fst +%%DATADIR%%/languages/Russian/msg.fst +%%DATADIR%%/languages/Russian/numbers.fst +%%DATADIR%%/languages/Russian/phonemes.xml +%%DATADIR%%/languages/Russian/phrasing.dt +%%DATADIR%%/languages/Russian/rulex_dict.fst +%%DATADIR%%/languages/Russian/rulex_rules.fst +%%DATADIR%%/languages/Russian/spell.fst +%%DATADIR%%/languages/Russian/split.fst +%%DATADIR%%/languages/Russian/stress.fsm +%%DATADIR%%/languages/Russian/stress.fst +%%DATADIR%%/languages/Russian/syl.fst +%%DATADIR%%/languages/Russian/tok.fst +%%DATADIR%%/languages/Russian/untranslit.fst +%%DATADIR%%/languages/Tatar/downcase.fst +%%DATADIR%%/languages/Tatar/english_phone_mapping.fst +%%DATADIR%%/languages/Tatar/g2p.fst +%%DATADIR%%/languages/Tatar/g2p_p.fst +%%DATADIR%%/languages/Tatar/gpos.fst +%%DATADIR%%/languages/Tatar/key.fst +%%DATADIR%%/languages/Tatar/labelling.xml +%%DATADIR%%/languages/Tatar/language.info +%%DATADIR%%/languages/Tatar/lseq.fst +%%DATADIR%%/languages/Tatar/msg.fst +%%DATADIR%%/languages/Tatar/numbers.fst +%%DATADIR%%/languages/Tatar/phonemes.xml +%%DATADIR%%/languages/Tatar/phrasing.dt +%%DATADIR%%/languages/Tatar/spell.fst +%%DATADIR%%/languages/Tatar/syl.fst +%%DATADIR%%/languages/Tatar/tok.fst +%%DATADIR%%/languages/Ukrainian/downcase.fst +%%DATADIR%%/languages/Ukrainian/english_phone_mapping.fst +%%DATADIR%%/languages/Ukrainian/g2p.fst +%%DATADIR%%/languages/Ukrainian/gpos.fst +%%DATADIR%%/languages/Ukrainian/key.fst +%%DATADIR%%/languages/Ukrainian/labelling.xml +%%DATADIR%%/languages/Ukrainian/language.info +%%DATADIR%%/languages/Ukrainian/lseq.fst +%%DATADIR%%/languages/Ukrainian/msg.fst +%%DATADIR%%/languages/Ukrainian/numbers.fst +%%DATADIR%%/languages/Ukrainian/phonemes.xml +%%DATADIR%%/languages/Ukrainian/phrasing.dt +%%DATADIR%%/languages/Ukrainian/spell.fst +%%DATADIR%%/languages/Ukrainian/stress.fsm +%%DATADIR%%/languages/Ukrainian/stress.fst +%%DATADIR%%/languages/Ukrainian/syl.fst +%%DATADIR%%/languages/Ukrainian/tok.fst +%%DATADIR%%/languages/Ukrainian/untranslit.fst +%%DATADIR%%/voices/alan/16000/bap.pdf +%%DATADIR%%/voices/alan/16000/bap.win1 +%%DATADIR%%/voices/alan/16000/bap.win2 +%%DATADIR%%/voices/alan/16000/bap.win3 +%%DATADIR%%/voices/alan/16000/bpf.txt +%%DATADIR%%/voices/alan/16000/dur.pdf +%%DATADIR%%/voices/alan/16000/lf0.pdf +%%DATADIR%%/voices/alan/16000/lf0.win1 +%%DATADIR%%/voices/alan/16000/lf0.win2 +%%DATADIR%%/voices/alan/16000/lf0.win3 +%%DATADIR%%/voices/alan/16000/mgc.pdf +%%DATADIR%%/voices/alan/16000/mgc.win1 +%%DATADIR%%/voices/alan/16000/mgc.win2 +%%DATADIR%%/voices/alan/16000/mgc.win3 +%%DATADIR%%/voices/alan/16000/tree-bap.inf +%%DATADIR%%/voices/alan/16000/tree-dur.inf +%%DATADIR%%/voices/alan/16000/tree-lf0.inf +%%DATADIR%%/voices/alan/16000/tree-mgc.inf +%%DATADIR%%/voices/alan/16000/voice.data +%%DATADIR%%/voices/alan/24000/bap.pdf +%%DATADIR%%/voices/alan/24000/bap.win1 +%%DATADIR%%/voices/alan/24000/bap.win2 +%%DATADIR%%/voices/alan/24000/bap.win3 +%%DATADIR%%/voices/alan/24000/bpf.txt +%%DATADIR%%/voices/alan/24000/dur.pdf +%%DATADIR%%/voices/alan/24000/lf0.pdf +%%DATADIR%%/voices/alan/24000/lf0.win1 +%%DATADIR%%/voices/alan/24000/lf0.win2 +%%DATADIR%%/voices/alan/24000/lf0.win3 +%%DATADIR%%/voices/alan/24000/mgc.pdf +%%DATADIR%%/voices/alan/24000/mgc.win1 +%%DATADIR%%/voices/alan/24000/mgc.win2 +%%DATADIR%%/voices/alan/24000/mgc.win3 +%%DATADIR%%/voices/alan/24000/tree-bap.inf +%%DATADIR%%/voices/alan/24000/tree-dur.inf +%%DATADIR%%/voices/alan/24000/tree-lf0.inf +%%DATADIR%%/voices/alan/24000/tree-mgc.inf +%%DATADIR%%/voices/alan/24000/voice.data +%%DATADIR%%/voices/alan/voice.info +%%DATADIR%%/voices/alan/voice.params +%%DATADIR%%/voices/aleksandr/16000/bap.pdf +%%DATADIR%%/voices/aleksandr/16000/bap.win1 +%%DATADIR%%/voices/aleksandr/16000/bap.win2 +%%DATADIR%%/voices/aleksandr/16000/bap.win3 +%%DATADIR%%/voices/aleksandr/16000/bpf.txt +%%DATADIR%%/voices/aleksandr/16000/dur.pdf +%%DATADIR%%/voices/aleksandr/16000/lf0.pdf +%%DATADIR%%/voices/aleksandr/16000/lf0.win1 +%%DATADIR%%/voices/aleksandr/16000/lf0.win2 +%%DATADIR%%/voices/aleksandr/16000/lf0.win3 +%%DATADIR%%/voices/aleksandr/16000/mgc.pdf +%%DATADIR%%/voices/aleksandr/16000/mgc.win1 +%%DATADIR%%/voices/aleksandr/16000/mgc.win2 +%%DATADIR%%/voices/aleksandr/16000/mgc.win3 +%%DATADIR%%/voices/aleksandr/16000/tree-bap.inf +%%DATADIR%%/voices/aleksandr/16000/tree-dur.inf +%%DATADIR%%/voices/aleksandr/16000/tree-lf0.inf +%%DATADIR%%/voices/aleksandr/16000/tree-mgc.inf +%%DATADIR%%/voices/aleksandr/16000/voice.data +%%DATADIR%%/voices/aleksandr/24000/bap.pdf +%%DATADIR%%/voices/aleksandr/24000/bap.win1 +%%DATADIR%%/voices/aleksandr/24000/bap.win2 +%%DATADIR%%/voices/aleksandr/24000/bap.win3 +%%DATADIR%%/voices/aleksandr/24000/bpf.txt +%%DATADIR%%/voices/aleksandr/24000/dur.pdf +%%DATADIR%%/voices/aleksandr/24000/lf0.pdf +%%DATADIR%%/voices/aleksandr/24000/lf0.win1 +%%DATADIR%%/voices/aleksandr/24000/lf0.win2 +%%DATADIR%%/voices/aleksandr/24000/lf0.win3 +%%DATADIR%%/voices/aleksandr/24000/mgc.pdf +%%DATADIR%%/voices/aleksandr/24000/mgc.win1 +%%DATADIR%%/voices/aleksandr/24000/mgc.win2 +%%DATADIR%%/voices/aleksandr/24000/mgc.win3 +%%DATADIR%%/voices/aleksandr/24000/tree-bap.inf +%%DATADIR%%/voices/aleksandr/24000/tree-dur.inf +%%DATADIR%%/voices/aleksandr/24000/tree-lf0.inf +%%DATADIR%%/voices/aleksandr/24000/tree-mgc.inf +%%DATADIR%%/voices/aleksandr/24000/voice.data +%%DATADIR%%/voices/aleksandr/voice.info +%%DATADIR%%/voices/aleksandr/voice.params +%%DATADIR%%/voices/anatol/16000/bap.pdf +%%DATADIR%%/voices/anatol/16000/bap.win1 +%%DATADIR%%/voices/anatol/16000/bap.win2 +%%DATADIR%%/voices/anatol/16000/bap.win3 +%%DATADIR%%/voices/anatol/16000/bpf.txt +%%DATADIR%%/voices/anatol/16000/dur.pdf +%%DATADIR%%/voices/anatol/16000/lf0.pdf +%%DATADIR%%/voices/anatol/16000/lf0.win1 +%%DATADIR%%/voices/anatol/16000/lf0.win2 +%%DATADIR%%/voices/anatol/16000/lf0.win3 +%%DATADIR%%/voices/anatol/16000/mgc.pdf +%%DATADIR%%/voices/anatol/16000/mgc.win1 +%%DATADIR%%/voices/anatol/16000/mgc.win2 +%%DATADIR%%/voices/anatol/16000/mgc.win3 +%%DATADIR%%/voices/anatol/16000/tree-bap.inf +%%DATADIR%%/voices/anatol/16000/tree-dur.inf +%%DATADIR%%/voices/anatol/16000/tree-lf0.inf +%%DATADIR%%/voices/anatol/16000/tree-mgc.inf +%%DATADIR%%/voices/anatol/16000/voice.data +%%DATADIR%%/voices/anatol/24000/bap.pdf +%%DATADIR%%/voices/anatol/24000/bap.win1 +%%DATADIR%%/voices/anatol/24000/bap.win2 +%%DATADIR%%/voices/anatol/24000/bap.win3 +%%DATADIR%%/voices/anatol/24000/bpf.txt +%%DATADIR%%/voices/anatol/24000/dur.pdf +%%DATADIR%%/voices/anatol/24000/lf0.pdf +%%DATADIR%%/voices/anatol/24000/lf0.win1 +%%DATADIR%%/voices/anatol/24000/lf0.win2 +%%DATADIR%%/voices/anatol/24000/lf0.win3 +%%DATADIR%%/voices/anatol/24000/mgc.pdf +%%DATADIR%%/voices/anatol/24000/mgc.win1 +%%DATADIR%%/voices/anatol/24000/mgc.win2 +%%DATADIR%%/voices/anatol/24000/mgc.win3 +%%DATADIR%%/voices/anatol/24000/tree-bap.inf +%%DATADIR%%/voices/anatol/24000/tree-dur.inf +%%DATADIR%%/voices/anatol/24000/tree-lf0.inf +%%DATADIR%%/voices/anatol/24000/tree-mgc.inf +%%DATADIR%%/voices/anatol/24000/voice.data +%%DATADIR%%/voices/anatol/voice.info +%%DATADIR%%/voices/anatol/voice.params +%%DATADIR%%/voices/anna/16000/bap.pdf +%%DATADIR%%/voices/anna/16000/bap.win1 +%%DATADIR%%/voices/anna/16000/bap.win2 +%%DATADIR%%/voices/anna/16000/bap.win3 +%%DATADIR%%/voices/anna/16000/bpf.txt +%%DATADIR%%/voices/anna/16000/dur.pdf +%%DATADIR%%/voices/anna/16000/lf0.pdf +%%DATADIR%%/voices/anna/16000/lf0.win1 +%%DATADIR%%/voices/anna/16000/lf0.win2 +%%DATADIR%%/voices/anna/16000/lf0.win3 +%%DATADIR%%/voices/anna/16000/mgc.pdf +%%DATADIR%%/voices/anna/16000/mgc.win1 +%%DATADIR%%/voices/anna/16000/mgc.win2 +%%DATADIR%%/voices/anna/16000/mgc.win3 +%%DATADIR%%/voices/anna/16000/tree-bap.inf +%%DATADIR%%/voices/anna/16000/tree-dur.inf +%%DATADIR%%/voices/anna/16000/tree-lf0.inf +%%DATADIR%%/voices/anna/16000/tree-mgc.inf +%%DATADIR%%/voices/anna/16000/voice.data +%%DATADIR%%/voices/anna/24000/bap.pdf +%%DATADIR%%/voices/anna/24000/bap.win1 +%%DATADIR%%/voices/anna/24000/bap.win2 +%%DATADIR%%/voices/anna/24000/bap.win3 +%%DATADIR%%/voices/anna/24000/bpf.txt +%%DATADIR%%/voices/anna/24000/dur.pdf +%%DATADIR%%/voices/anna/24000/lf0.pdf +%%DATADIR%%/voices/anna/24000/lf0.win1 +%%DATADIR%%/voices/anna/24000/lf0.win2 +%%DATADIR%%/voices/anna/24000/lf0.win3 +%%DATADIR%%/voices/anna/24000/mgc.pdf +%%DATADIR%%/voices/anna/24000/mgc.win1 +%%DATADIR%%/voices/anna/24000/mgc.win2 +%%DATADIR%%/voices/anna/24000/mgc.win3 +%%DATADIR%%/voices/anna/24000/tree-bap.inf +%%DATADIR%%/voices/anna/24000/tree-dur.inf +%%DATADIR%%/voices/anna/24000/tree-lf0.inf +%%DATADIR%%/voices/anna/24000/tree-mgc.inf +%%DATADIR%%/voices/anna/24000/voice.data +%%DATADIR%%/voices/anna/voice.info +%%DATADIR%%/voices/anna/voice.params +%%DATADIR%%/voices/azamat/16000/bap.pdf +%%DATADIR%%/voices/azamat/16000/bap.win1 +%%DATADIR%%/voices/azamat/16000/bap.win2 +%%DATADIR%%/voices/azamat/16000/bap.win3 +%%DATADIR%%/voices/azamat/16000/bpf.txt +%%DATADIR%%/voices/azamat/16000/dur.pdf +%%DATADIR%%/voices/azamat/16000/lf0.pdf +%%DATADIR%%/voices/azamat/16000/lf0.win1 +%%DATADIR%%/voices/azamat/16000/lf0.win2 +%%DATADIR%%/voices/azamat/16000/lf0.win3 +%%DATADIR%%/voices/azamat/16000/mgc.pdf +%%DATADIR%%/voices/azamat/16000/mgc.win1 +%%DATADIR%%/voices/azamat/16000/mgc.win2 +%%DATADIR%%/voices/azamat/16000/mgc.win3 +%%DATADIR%%/voices/azamat/16000/tree-bap.inf +%%DATADIR%%/voices/azamat/16000/tree-dur.inf +%%DATADIR%%/voices/azamat/16000/tree-lf0.inf +%%DATADIR%%/voices/azamat/16000/tree-mgc.inf +%%DATADIR%%/voices/azamat/16000/voice.data +%%DATADIR%%/voices/azamat/24000/bap.pdf +%%DATADIR%%/voices/azamat/24000/bap.win1 +%%DATADIR%%/voices/azamat/24000/bap.win2 +%%DATADIR%%/voices/azamat/24000/bap.win3 +%%DATADIR%%/voices/azamat/24000/bpf.txt +%%DATADIR%%/voices/azamat/24000/dur.pdf +%%DATADIR%%/voices/azamat/24000/lf0.pdf +%%DATADIR%%/voices/azamat/24000/lf0.win1 +%%DATADIR%%/voices/azamat/24000/lf0.win2 +%%DATADIR%%/voices/azamat/24000/lf0.win3 +%%DATADIR%%/voices/azamat/24000/mgc.pdf +%%DATADIR%%/voices/azamat/24000/mgc.win1 +%%DATADIR%%/voices/azamat/24000/mgc.win2 +%%DATADIR%%/voices/azamat/24000/mgc.win3 +%%DATADIR%%/voices/azamat/24000/tree-bap.inf +%%DATADIR%%/voices/azamat/24000/tree-dur.inf +%%DATADIR%%/voices/azamat/24000/tree-lf0.inf +%%DATADIR%%/voices/azamat/24000/tree-mgc.inf +%%DATADIR%%/voices/azamat/24000/voice.data +%%DATADIR%%/voices/azamat/voice.info +%%DATADIR%%/voices/azamat/voice.params +%%DATADIR%%/voices/bdl/16000/bap.pdf +%%DATADIR%%/voices/bdl/16000/bap.win1 +%%DATADIR%%/voices/bdl/16000/bap.win2 +%%DATADIR%%/voices/bdl/16000/bap.win3 +%%DATADIR%%/voices/bdl/16000/bpf.txt +%%DATADIR%%/voices/bdl/16000/dur.pdf +%%DATADIR%%/voices/bdl/16000/lf0.pdf +%%DATADIR%%/voices/bdl/16000/lf0.win1 +%%DATADIR%%/voices/bdl/16000/lf0.win2 +%%DATADIR%%/voices/bdl/16000/lf0.win3 +%%DATADIR%%/voices/bdl/16000/mgc.pdf +%%DATADIR%%/voices/bdl/16000/mgc.win1 +%%DATADIR%%/voices/bdl/16000/mgc.win2 +%%DATADIR%%/voices/bdl/16000/mgc.win3 +%%DATADIR%%/voices/bdl/16000/tree-bap.inf +%%DATADIR%%/voices/bdl/16000/tree-dur.inf +%%DATADIR%%/voices/bdl/16000/tree-lf0.inf +%%DATADIR%%/voices/bdl/16000/tree-mgc.inf +%%DATADIR%%/voices/bdl/16000/voice.data +%%DATADIR%%/voices/bdl/24000/bap.pdf +%%DATADIR%%/voices/bdl/24000/bap.win1 +%%DATADIR%%/voices/bdl/24000/bap.win2 +%%DATADIR%%/voices/bdl/24000/bap.win3 +%%DATADIR%%/voices/bdl/24000/bpf.txt +%%DATADIR%%/voices/bdl/24000/dur.pdf +%%DATADIR%%/voices/bdl/24000/lf0.pdf +%%DATADIR%%/voices/bdl/24000/lf0.win1 +%%DATADIR%%/voices/bdl/24000/lf0.win2 +%%DATADIR%%/voices/bdl/24000/lf0.win3 +%%DATADIR%%/voices/bdl/24000/mgc.pdf +%%DATADIR%%/voices/bdl/24000/mgc.win1 +%%DATADIR%%/voices/bdl/24000/mgc.win2 +%%DATADIR%%/voices/bdl/24000/mgc.win3 +%%DATADIR%%/voices/bdl/24000/tree-bap.inf +%%DATADIR%%/voices/bdl/24000/tree-dur.inf +%%DATADIR%%/voices/bdl/24000/tree-lf0.inf +%%DATADIR%%/voices/bdl/24000/tree-mgc.inf +%%DATADIR%%/voices/bdl/24000/voice.data +%%DATADIR%%/voices/bdl/voice.info +%%DATADIR%%/voices/bdl/voice.params +%%DATADIR%%/voices/clb/16000/bap.pdf +%%DATADIR%%/voices/clb/16000/bap.win1 +%%DATADIR%%/voices/clb/16000/bap.win2 +%%DATADIR%%/voices/clb/16000/bap.win3 +%%DATADIR%%/voices/clb/16000/bpf.txt +%%DATADIR%%/voices/clb/16000/dur.pdf +%%DATADIR%%/voices/clb/16000/lf0.pdf +%%DATADIR%%/voices/clb/16000/lf0.win1 +%%DATADIR%%/voices/clb/16000/lf0.win2 +%%DATADIR%%/voices/clb/16000/lf0.win3 +%%DATADIR%%/voices/clb/16000/mgc.pdf +%%DATADIR%%/voices/clb/16000/mgc.win1 +%%DATADIR%%/voices/clb/16000/mgc.win2 +%%DATADIR%%/voices/clb/16000/mgc.win3 +%%DATADIR%%/voices/clb/16000/tree-bap.inf +%%DATADIR%%/voices/clb/16000/tree-dur.inf +%%DATADIR%%/voices/clb/16000/tree-lf0.inf +%%DATADIR%%/voices/clb/16000/tree-mgc.inf +%%DATADIR%%/voices/clb/16000/voice.data +%%DATADIR%%/voices/clb/24000/bap.pdf +%%DATADIR%%/voices/clb/24000/bap.win1 +%%DATADIR%%/voices/clb/24000/bap.win2 +%%DATADIR%%/voices/clb/24000/bap.win3 +%%DATADIR%%/voices/clb/24000/bpf.txt +%%DATADIR%%/voices/clb/24000/dur.pdf +%%DATADIR%%/voices/clb/24000/lf0.pdf +%%DATADIR%%/voices/clb/24000/lf0.win1 +%%DATADIR%%/voices/clb/24000/lf0.win2 +%%DATADIR%%/voices/clb/24000/lf0.win3 +%%DATADIR%%/voices/clb/24000/mgc.pdf +%%DATADIR%%/voices/clb/24000/mgc.win1 +%%DATADIR%%/voices/clb/24000/mgc.win2 +%%DATADIR%%/voices/clb/24000/mgc.win3 +%%DATADIR%%/voices/clb/24000/tree-bap.inf +%%DATADIR%%/voices/clb/24000/tree-dur.inf +%%DATADIR%%/voices/clb/24000/tree-lf0.inf +%%DATADIR%%/voices/clb/24000/tree-mgc.inf +%%DATADIR%%/voices/clb/24000/voice.data +%%DATADIR%%/voices/clb/voice.info +%%DATADIR%%/voices/clb/voice.params +%%DATADIR%%/voices/elena/16000/bap.pdf +%%DATADIR%%/voices/elena/16000/bap.win1 +%%DATADIR%%/voices/elena/16000/bap.win2 +%%DATADIR%%/voices/elena/16000/bap.win3 +%%DATADIR%%/voices/elena/16000/bpf.txt +%%DATADIR%%/voices/elena/16000/dur.pdf +%%DATADIR%%/voices/elena/16000/lf0.pdf +%%DATADIR%%/voices/elena/16000/lf0.win1 +%%DATADIR%%/voices/elena/16000/lf0.win2 +%%DATADIR%%/voices/elena/16000/lf0.win3 +%%DATADIR%%/voices/elena/16000/mgc.pdf +%%DATADIR%%/voices/elena/16000/mgc.win1 +%%DATADIR%%/voices/elena/16000/mgc.win2 +%%DATADIR%%/voices/elena/16000/mgc.win3 +%%DATADIR%%/voices/elena/16000/tree-bap.inf +%%DATADIR%%/voices/elena/16000/tree-dur.inf +%%DATADIR%%/voices/elena/16000/tree-lf0.inf +%%DATADIR%%/voices/elena/16000/tree-mgc.inf +%%DATADIR%%/voices/elena/16000/voice.data +%%DATADIR%%/voices/elena/24000/bap.pdf +%%DATADIR%%/voices/elena/24000/bap.win1 +%%DATADIR%%/voices/elena/24000/bap.win2 +%%DATADIR%%/voices/elena/24000/bap.win3 +%%DATADIR%%/voices/elena/24000/bpf.txt +%%DATADIR%%/voices/elena/24000/dur.pdf +%%DATADIR%%/voices/elena/24000/lf0.pdf +%%DATADIR%%/voices/elena/24000/lf0.win1 +%%DATADIR%%/voices/elena/24000/lf0.win2 +%%DATADIR%%/voices/elena/24000/lf0.win3 +%%DATADIR%%/voices/elena/24000/mgc.pdf +%%DATADIR%%/voices/elena/24000/mgc.win1 +%%DATADIR%%/voices/elena/24000/mgc.win2 +%%DATADIR%%/voices/elena/24000/mgc.win3 +%%DATADIR%%/voices/elena/24000/tree-bap.inf +%%DATADIR%%/voices/elena/24000/tree-dur.inf +%%DATADIR%%/voices/elena/24000/tree-lf0.inf +%%DATADIR%%/voices/elena/24000/tree-mgc.inf +%%DATADIR%%/voices/elena/24000/voice.data +%%DATADIR%%/voices/elena/voice.info +%%DATADIR%%/voices/elena/voice.params +%%DATADIR%%/voices/irina/16000/bap.pdf +%%DATADIR%%/voices/irina/16000/bap.win1 +%%DATADIR%%/voices/irina/16000/bap.win2 +%%DATADIR%%/voices/irina/16000/bap.win3 +%%DATADIR%%/voices/irina/16000/bpf.txt +%%DATADIR%%/voices/irina/16000/dur.pdf +%%DATADIR%%/voices/irina/16000/lf0.pdf +%%DATADIR%%/voices/irina/16000/lf0.win1 +%%DATADIR%%/voices/irina/16000/lf0.win2 +%%DATADIR%%/voices/irina/16000/lf0.win3 +%%DATADIR%%/voices/irina/16000/mgc.pdf +%%DATADIR%%/voices/irina/16000/mgc.win1 +%%DATADIR%%/voices/irina/16000/mgc.win2 +%%DATADIR%%/voices/irina/16000/mgc.win3 +%%DATADIR%%/voices/irina/16000/tree-bap.inf +%%DATADIR%%/voices/irina/16000/tree-dur.inf +%%DATADIR%%/voices/irina/16000/tree-lf0.inf +%%DATADIR%%/voices/irina/16000/tree-mgc.inf +%%DATADIR%%/voices/irina/16000/voice.data +%%DATADIR%%/voices/irina/24000/bap.pdf +%%DATADIR%%/voices/irina/24000/bap.win1 +%%DATADIR%%/voices/irina/24000/bap.win2 +%%DATADIR%%/voices/irina/24000/bap.win3 +%%DATADIR%%/voices/irina/24000/bpf.txt +%%DATADIR%%/voices/irina/24000/dur.pdf +%%DATADIR%%/voices/irina/24000/lf0.pdf +%%DATADIR%%/voices/irina/24000/lf0.win1 +%%DATADIR%%/voices/irina/24000/lf0.win2 +%%DATADIR%%/voices/irina/24000/lf0.win3 +%%DATADIR%%/voices/irina/24000/mgc.pdf +%%DATADIR%%/voices/irina/24000/mgc.win1 +%%DATADIR%%/voices/irina/24000/mgc.win2 +%%DATADIR%%/voices/irina/24000/mgc.win3 +%%DATADIR%%/voices/irina/24000/tree-bap.inf +%%DATADIR%%/voices/irina/24000/tree-dur.inf +%%DATADIR%%/voices/irina/24000/tree-lf0.inf +%%DATADIR%%/voices/irina/24000/tree-mgc.inf +%%DATADIR%%/voices/irina/24000/voice.data +%%DATADIR%%/voices/irina/voice.info +%%DATADIR%%/voices/irina/voice.params +%%DATADIR%%/voices/natalia/16000/bap.pdf +%%DATADIR%%/voices/natalia/16000/bap.win1 +%%DATADIR%%/voices/natalia/16000/bap.win2 +%%DATADIR%%/voices/natalia/16000/bap.win3 +%%DATADIR%%/voices/natalia/16000/bpf.txt +%%DATADIR%%/voices/natalia/16000/dur.pdf +%%DATADIR%%/voices/natalia/16000/lf0.pdf +%%DATADIR%%/voices/natalia/16000/lf0.win1 +%%DATADIR%%/voices/natalia/16000/lf0.win2 +%%DATADIR%%/voices/natalia/16000/lf0.win3 +%%DATADIR%%/voices/natalia/16000/mgc.pdf +%%DATADIR%%/voices/natalia/16000/mgc.win1 +%%DATADIR%%/voices/natalia/16000/mgc.win2 +%%DATADIR%%/voices/natalia/16000/mgc.win3 +%%DATADIR%%/voices/natalia/16000/tree-bap.inf +%%DATADIR%%/voices/natalia/16000/tree-dur.inf +%%DATADIR%%/voices/natalia/16000/tree-lf0.inf +%%DATADIR%%/voices/natalia/16000/tree-mgc.inf +%%DATADIR%%/voices/natalia/16000/voice.data +%%DATADIR%%/voices/natalia/24000/bap.pdf +%%DATADIR%%/voices/natalia/24000/bap.win1 +%%DATADIR%%/voices/natalia/24000/bap.win2 +%%DATADIR%%/voices/natalia/24000/bap.win3 +%%DATADIR%%/voices/natalia/24000/bpf.txt +%%DATADIR%%/voices/natalia/24000/dur.pdf +%%DATADIR%%/voices/natalia/24000/lf0.pdf +%%DATADIR%%/voices/natalia/24000/lf0.win1 +%%DATADIR%%/voices/natalia/24000/lf0.win2 +%%DATADIR%%/voices/natalia/24000/lf0.win3 +%%DATADIR%%/voices/natalia/24000/mgc.pdf +%%DATADIR%%/voices/natalia/24000/mgc.win1 +%%DATADIR%%/voices/natalia/24000/mgc.win2 +%%DATADIR%%/voices/natalia/24000/mgc.win3 +%%DATADIR%%/voices/natalia/24000/tree-bap.inf +%%DATADIR%%/voices/natalia/24000/tree-dur.inf +%%DATADIR%%/voices/natalia/24000/tree-lf0.inf +%%DATADIR%%/voices/natalia/24000/tree-mgc.inf +%%DATADIR%%/voices/natalia/24000/voice.data +%%DATADIR%%/voices/natalia/voice.info +%%DATADIR%%/voices/natalia/voice.params +%%DATADIR%%/voices/natia/16000/bap.pdf +%%DATADIR%%/voices/natia/16000/bap.win1 +%%DATADIR%%/voices/natia/16000/bap.win2 +%%DATADIR%%/voices/natia/16000/bap.win3 +%%DATADIR%%/voices/natia/16000/bpf.txt +%%DATADIR%%/voices/natia/16000/dur.pdf +%%DATADIR%%/voices/natia/16000/lf0.pdf +%%DATADIR%%/voices/natia/16000/lf0.win1 +%%DATADIR%%/voices/natia/16000/lf0.win2 +%%DATADIR%%/voices/natia/16000/lf0.win3 +%%DATADIR%%/voices/natia/16000/mgc.pdf +%%DATADIR%%/voices/natia/16000/mgc.win1 +%%DATADIR%%/voices/natia/16000/mgc.win2 +%%DATADIR%%/voices/natia/16000/mgc.win3 +%%DATADIR%%/voices/natia/16000/tree-bap.inf +%%DATADIR%%/voices/natia/16000/tree-dur.inf +%%DATADIR%%/voices/natia/16000/tree-lf0.inf +%%DATADIR%%/voices/natia/16000/tree-mgc.inf +%%DATADIR%%/voices/natia/16000/voice.data +%%DATADIR%%/voices/natia/24000/bap.pdf +%%DATADIR%%/voices/natia/24000/bap.win1 +%%DATADIR%%/voices/natia/24000/bap.win2 +%%DATADIR%%/voices/natia/24000/bap.win3 +%%DATADIR%%/voices/natia/24000/bpf.txt +%%DATADIR%%/voices/natia/24000/dur.pdf +%%DATADIR%%/voices/natia/24000/lf0.pdf +%%DATADIR%%/voices/natia/24000/lf0.win1 +%%DATADIR%%/voices/natia/24000/lf0.win2 +%%DATADIR%%/voices/natia/24000/lf0.win3 +%%DATADIR%%/voices/natia/24000/mgc.pdf +%%DATADIR%%/voices/natia/24000/mgc.win1 +%%DATADIR%%/voices/natia/24000/mgc.win2 +%%DATADIR%%/voices/natia/24000/mgc.win3 +%%DATADIR%%/voices/natia/24000/tree-bap.inf +%%DATADIR%%/voices/natia/24000/tree-dur.inf +%%DATADIR%%/voices/natia/24000/tree-lf0.inf +%%DATADIR%%/voices/natia/24000/tree-mgc.inf +%%DATADIR%%/voices/natia/24000/voice.data +%%DATADIR%%/voices/natia/voice.info +%%DATADIR%%/voices/natia/voice.params +%%DATADIR%%/voices/nazgul/16000/bap.pdf +%%DATADIR%%/voices/nazgul/16000/bap.win1 +%%DATADIR%%/voices/nazgul/16000/bap.win2 +%%DATADIR%%/voices/nazgul/16000/bap.win3 +%%DATADIR%%/voices/nazgul/16000/bpf.txt +%%DATADIR%%/voices/nazgul/16000/dur.pdf +%%DATADIR%%/voices/nazgul/16000/lf0.pdf +%%DATADIR%%/voices/nazgul/16000/lf0.win1 +%%DATADIR%%/voices/nazgul/16000/lf0.win2 +%%DATADIR%%/voices/nazgul/16000/lf0.win3 +%%DATADIR%%/voices/nazgul/16000/mgc.pdf +%%DATADIR%%/voices/nazgul/16000/mgc.win1 +%%DATADIR%%/voices/nazgul/16000/mgc.win2 +%%DATADIR%%/voices/nazgul/16000/mgc.win3 +%%DATADIR%%/voices/nazgul/16000/tree-bap.inf +%%DATADIR%%/voices/nazgul/16000/tree-dur.inf +%%DATADIR%%/voices/nazgul/16000/tree-lf0.inf +%%DATADIR%%/voices/nazgul/16000/tree-mgc.inf +%%DATADIR%%/voices/nazgul/16000/voice.data +%%DATADIR%%/voices/nazgul/24000/bap.pdf +%%DATADIR%%/voices/nazgul/24000/bap.win1 +%%DATADIR%%/voices/nazgul/24000/bap.win2 +%%DATADIR%%/voices/nazgul/24000/bap.win3 +%%DATADIR%%/voices/nazgul/24000/bpf.txt +%%DATADIR%%/voices/nazgul/24000/dur.pdf +%%DATADIR%%/voices/nazgul/24000/lf0.pdf +%%DATADIR%%/voices/nazgul/24000/lf0.win1 +%%DATADIR%%/voices/nazgul/24000/lf0.win2 +%%DATADIR%%/voices/nazgul/24000/lf0.win3 +%%DATADIR%%/voices/nazgul/24000/mgc.pdf +%%DATADIR%%/voices/nazgul/24000/mgc.win1 +%%DATADIR%%/voices/nazgul/24000/mgc.win2 +%%DATADIR%%/voices/nazgul/24000/mgc.win3 +%%DATADIR%%/voices/nazgul/24000/tree-bap.inf +%%DATADIR%%/voices/nazgul/24000/tree-dur.inf +%%DATADIR%%/voices/nazgul/24000/tree-lf0.inf +%%DATADIR%%/voices/nazgul/24000/tree-mgc.inf +%%DATADIR%%/voices/nazgul/24000/voice.data +%%DATADIR%%/voices/nazgul/voice.info +%%DATADIR%%/voices/nazgul/voice.params +%%DATADIR%%/voices/slt/16000/bap.pdf +%%DATADIR%%/voices/slt/16000/bap.win1 +%%DATADIR%%/voices/slt/16000/bap.win2 +%%DATADIR%%/voices/slt/16000/bap.win3 +%%DATADIR%%/voices/slt/16000/bpf.txt +%%DATADIR%%/voices/slt/16000/dur.pdf +%%DATADIR%%/voices/slt/16000/lf0.pdf +%%DATADIR%%/voices/slt/16000/lf0.win1 +%%DATADIR%%/voices/slt/16000/lf0.win2 +%%DATADIR%%/voices/slt/16000/lf0.win3 +%%DATADIR%%/voices/slt/16000/mgc.pdf +%%DATADIR%%/voices/slt/16000/mgc.win1 +%%DATADIR%%/voices/slt/16000/mgc.win2 +%%DATADIR%%/voices/slt/16000/mgc.win3 +%%DATADIR%%/voices/slt/16000/tree-bap.inf +%%DATADIR%%/voices/slt/16000/tree-dur.inf +%%DATADIR%%/voices/slt/16000/tree-lf0.inf +%%DATADIR%%/voices/slt/16000/tree-mgc.inf +%%DATADIR%%/voices/slt/16000/voice.data +%%DATADIR%%/voices/slt/24000/bap.pdf +%%DATADIR%%/voices/slt/24000/bap.win1 +%%DATADIR%%/voices/slt/24000/bap.win2 +%%DATADIR%%/voices/slt/24000/bap.win3 +%%DATADIR%%/voices/slt/24000/bpf.txt +%%DATADIR%%/voices/slt/24000/dur.pdf +%%DATADIR%%/voices/slt/24000/lf0.pdf +%%DATADIR%%/voices/slt/24000/lf0.win1 +%%DATADIR%%/voices/slt/24000/lf0.win2 +%%DATADIR%%/voices/slt/24000/lf0.win3 +%%DATADIR%%/voices/slt/24000/mgc.pdf +%%DATADIR%%/voices/slt/24000/mgc.win1 +%%DATADIR%%/voices/slt/24000/mgc.win2 +%%DATADIR%%/voices/slt/24000/mgc.win3 +%%DATADIR%%/voices/slt/24000/tree-bap.inf +%%DATADIR%%/voices/slt/24000/tree-dur.inf +%%DATADIR%%/voices/slt/24000/tree-lf0.inf +%%DATADIR%%/voices/slt/24000/tree-mgc.inf +%%DATADIR%%/voices/slt/24000/voice.data +%%DATADIR%%/voices/slt/voice.info +%%DATADIR%%/voices/slt/voice.params +%%DATADIR%%/voices/spomenka/16000/bap.pdf +%%DATADIR%%/voices/spomenka/16000/bap.win1 +%%DATADIR%%/voices/spomenka/16000/bap.win2 +%%DATADIR%%/voices/spomenka/16000/bap.win3 +%%DATADIR%%/voices/spomenka/16000/bpf.txt +%%DATADIR%%/voices/spomenka/16000/dur.pdf +%%DATADIR%%/voices/spomenka/16000/lf0.pdf +%%DATADIR%%/voices/spomenka/16000/lf0.win1 +%%DATADIR%%/voices/spomenka/16000/lf0.win2 +%%DATADIR%%/voices/spomenka/16000/lf0.win3 +%%DATADIR%%/voices/spomenka/16000/mgc.pdf +%%DATADIR%%/voices/spomenka/16000/mgc.win1 +%%DATADIR%%/voices/spomenka/16000/mgc.win2 +%%DATADIR%%/voices/spomenka/16000/mgc.win3 +%%DATADIR%%/voices/spomenka/16000/tree-bap.inf +%%DATADIR%%/voices/spomenka/16000/tree-dur.inf +%%DATADIR%%/voices/spomenka/16000/tree-lf0.inf +%%DATADIR%%/voices/spomenka/16000/tree-mgc.inf +%%DATADIR%%/voices/spomenka/16000/voice.data +%%DATADIR%%/voices/spomenka/24000/bap.pdf +%%DATADIR%%/voices/spomenka/24000/bap.win1 +%%DATADIR%%/voices/spomenka/24000/bap.win2 +%%DATADIR%%/voices/spomenka/24000/bap.win3 +%%DATADIR%%/voices/spomenka/24000/bpf.txt +%%DATADIR%%/voices/spomenka/24000/dur.pdf +%%DATADIR%%/voices/spomenka/24000/lf0.pdf +%%DATADIR%%/voices/spomenka/24000/lf0.win1 +%%DATADIR%%/voices/spomenka/24000/lf0.win2 +%%DATADIR%%/voices/spomenka/24000/lf0.win3 +%%DATADIR%%/voices/spomenka/24000/mgc.pdf +%%DATADIR%%/voices/spomenka/24000/mgc.win1 +%%DATADIR%%/voices/spomenka/24000/mgc.win2 +%%DATADIR%%/voices/spomenka/24000/mgc.win3 +%%DATADIR%%/voices/spomenka/24000/tree-bap.inf +%%DATADIR%%/voices/spomenka/24000/tree-dur.inf +%%DATADIR%%/voices/spomenka/24000/tree-lf0.inf +%%DATADIR%%/voices/spomenka/24000/tree-mgc.inf +%%DATADIR%%/voices/spomenka/24000/voice.data +%%DATADIR%%/voices/spomenka/voice.info +%%DATADIR%%/voices/spomenka/voice.params +%%DATADIR%%/voices/talgat/16000/bap.pdf +%%DATADIR%%/voices/talgat/16000/bap.win1 +%%DATADIR%%/voices/talgat/16000/bap.win2 +%%DATADIR%%/voices/talgat/16000/bap.win3 +%%DATADIR%%/voices/talgat/16000/bpf.txt +%%DATADIR%%/voices/talgat/16000/dur.pdf +%%DATADIR%%/voices/talgat/16000/lf0.pdf +%%DATADIR%%/voices/talgat/16000/lf0.win1 +%%DATADIR%%/voices/talgat/16000/lf0.win2 +%%DATADIR%%/voices/talgat/16000/lf0.win3 +%%DATADIR%%/voices/talgat/16000/mgc.pdf +%%DATADIR%%/voices/talgat/16000/mgc.win1 +%%DATADIR%%/voices/talgat/16000/mgc.win2 +%%DATADIR%%/voices/talgat/16000/mgc.win3 +%%DATADIR%%/voices/talgat/16000/tree-bap.inf +%%DATADIR%%/voices/talgat/16000/tree-dur.inf +%%DATADIR%%/voices/talgat/16000/tree-lf0.inf +%%DATADIR%%/voices/talgat/16000/tree-mgc.inf +%%DATADIR%%/voices/talgat/16000/voice.data +%%DATADIR%%/voices/talgat/24000/bap.pdf +%%DATADIR%%/voices/talgat/24000/bap.win1 +%%DATADIR%%/voices/talgat/24000/bap.win2 +%%DATADIR%%/voices/talgat/24000/bap.win3 +%%DATADIR%%/voices/talgat/24000/bpf.txt +%%DATADIR%%/voices/talgat/24000/dur.pdf +%%DATADIR%%/voices/talgat/24000/lf0.pdf +%%DATADIR%%/voices/talgat/24000/lf0.win1 +%%DATADIR%%/voices/talgat/24000/lf0.win2 +%%DATADIR%%/voices/talgat/24000/lf0.win3 +%%DATADIR%%/voices/talgat/24000/mgc.pdf +%%DATADIR%%/voices/talgat/24000/mgc.win1 +%%DATADIR%%/voices/talgat/24000/mgc.win2 +%%DATADIR%%/voices/talgat/24000/mgc.win3 +%%DATADIR%%/voices/talgat/24000/tree-bap.inf +%%DATADIR%%/voices/talgat/24000/tree-dur.inf +%%DATADIR%%/voices/talgat/24000/tree-lf0.inf +%%DATADIR%%/voices/talgat/24000/tree-mgc.inf +%%DATADIR%%/voices/talgat/24000/voice.data +%%DATADIR%%/voices/talgat/voice.info +%%DATADIR%%/voices/talgat/voice.params diff --git a/comms/freedv/Makefile b/comms/freedv/Makefile index bb36f8a92b0..821d5e838a4 100644 --- a/comms/freedv/Makefile +++ b/comms/freedv/Makefile @@ -1,11 +1,9 @@ # $FreeBSD$ PORTNAME= freedv -PORTVERSION= 1.2.2 -PORTREVISION= 1 +DISTVERSION= 1.3.1 CATEGORIES= comms hamradio -MASTER_SITES= https://freedv.com/wp-content/uploads/sites/8/2017/10/ \ - LOCAL/db +MASTER_SITES= https://hobbes1069.fedorapeople.org/freetel/freedv/ MAINTAINER= hamradio@FreeBSD.org COMMENT= Narrow band digital voice diff --git a/comms/freedv/distinfo b/comms/freedv/distinfo index d75f13f54bf..0d01d70db8f 100644 --- a/comms/freedv/distinfo +++ b/comms/freedv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1508683454 -SHA256 (freedv-1.2.2.tar.xz) = 4884d2aaa283b3f091fc5d5594df3b5bb60078210c1bc50ea546901e2965ae1e -SIZE (freedv-1.2.2.tar.xz) = 529904 +TIMESTAMP = 1535511699 +SHA256 (freedv-1.3.1.tar.xz) = 9365459d4c8d478d32d91629f6fdf0cb6bd27cbb71ddc5a09b37e10df03dff65 +SIZE (freedv-1.3.1.tar.xz) = 536864 diff --git a/comms/freedv/files/patch-src__fdmdv2_main.cpp b/comms/freedv/files/patch-src__fdmdv2_main.cpp new file mode 100644 index 00000000000..2b9cfbec7d9 --- /dev/null +++ b/comms/freedv/files/patch-src__fdmdv2_main.cpp @@ -0,0 +1,15 @@ +--- src/fdmdv2_main.cpp.orig 2018-05-29 05:38:34 UTC ++++ src/fdmdv2_main.cpp +@@ -1198,10 +1198,12 @@ void MainFrame::OnTimer(wxTimerEvent &ev + sprintf(ber, "BER: %4.3f", b); wxString ber_string(ber); m_textBER->SetLabel(ber_string); + sprintf(resyncs, "Resyncs: %d", g_resyncs); wxString resyncs_string(resyncs); m_textResyncs->SetLabel(resyncs_string); + ++/* + sprintf(freqoffset, "FrqOff: %3.1f", g_stats.foff); + wxString freqoffset_string(freqoffset); m_textFreqOffset->SetLabel(freqoffset_string); + sprintf(syncmetric, "Sync: %3.2f", g_stats.sync_metric); + wxString syncmetric_string(syncmetric); m_textSyncMetric->SetLabel(syncmetric_string); ++*/ + + if (g_State) { + diff --git a/comms/freedv/pkg-descr b/comms/freedv/pkg-descr index 22db75454e4..329dfdac6b8 100644 --- a/comms/freedv/pkg-descr +++ b/comms/freedv/pkg-descr @@ -6,4 +6,4 @@ is received by an SSB radio, then demodulated and decoded by FreeDV. FreeDV 700(B) rivals SSB in it's low SNR performance. At high SNRs FreeDV 1600 sounds like FM, with no annoying analog HF radio noise. -WWW: http://freedv.org/tiki-index.php +WWW: https://freedv.org/ diff --git a/devel/py-game_sdl2/Makefile b/devel/py-game_sdl2/Makefile index b3011e2f7b6..83b706ea16e 100644 --- a/devel/py-game_sdl2/Makefile +++ b/devel/py-game_sdl2/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= game_sdl2 -PORTVERSION= 7.0.0 +PORTVERSION= 7.1.0 CATEGORIES= devel python MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ \ GENTOO diff --git a/devel/py-game_sdl2/distinfo b/devel/py-game_sdl2/distinfo index c5b6febe96c..190afb83a48 100644 --- a/devel/py-game_sdl2/distinfo +++ b/devel/py-game_sdl2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527821357 -SHA256 (pygame_sdl2-2.1.0-for-renpy-7.0.0.tar.gz) = 7eba0b990d613868daa077943bf89ce542e2945ed005e130cfa85f9819944437 -SIZE (pygame_sdl2-2.1.0-for-renpy-7.0.0.tar.gz) = 2573001 +TIMESTAMP = 1536624238 +SHA256 (pygame_sdl2-2.1.0-for-renpy-7.1.0.tar.gz) = 56136a6e56369d3b8bf95ede11a76f82243a1737ece30fe72189780d5104f2a0 +SIZE (pygame_sdl2-2.1.0-for-renpy-7.1.0.tar.gz) = 2572875 diff --git a/devel/radare2/Makefile b/devel/radare2/Makefile index da2e9f8d6dd..7d6130b96ce 100644 --- a/devel/radare2/Makefile +++ b/devel/radare2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= radare2 -DISTVERSION= 2.8.0 +DISTVERSION= 2.9.0 CATEGORIES= devel MAINTAINER= mizhka@gmail.com diff --git a/devel/radare2/distinfo b/devel/radare2/distinfo index 3654c45217a..12f2a3eafb0 100644 --- a/devel/radare2/distinfo +++ b/devel/radare2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1534010586 -SHA256 (radare-radare2-2.8.0_GH0.tar.gz) = 633c1b59e8935f6157142e7bd134b262f07595263c31c6ca3a194dd987a46360 -SIZE (radare-radare2-2.8.0_GH0.tar.gz) = 6513419 +TIMESTAMP = 1536343869 +SHA256 (radare-radare2-2.9.0_GH0.tar.gz) = 423ced52355daeaa12a6abbd6735f93c1eb19af728ecb359a6074f49abacc8a2 +SIZE (radare-radare2-2.9.0_GH0.tar.gz) = 6529563 diff --git a/devel/radare2/files/patch-libr_debug_p_native_reg.c b/devel/radare2/files/patch-libr_debug_p_native_reg.c deleted file mode 100644 index 64dd7ff3438..00000000000 --- a/devel/radare2/files/patch-libr_debug_p_native_reg.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libr/debug/p/native/reg.c.orig 2018-07-02 11:14:27 UTC -+++ libr/debug/p/native/reg.c -@@ -47,6 +47,8 @@ static char *r_debug_native_reg_profile(RDebug *dbg) { - #include "reg/kfbsd-x86.h" - #elif __x86_64__ || __amd64__ - #include "reg/kfbsd-x64.h" -+#elif __aarch64__ -+#include "reg/kfbsd-arm64.h" - #else - #error "Unsupported BSD architecture" - #endif diff --git a/devel/radare2/files/patch-libr_debug_p_native_reg_kfbsd-arm64.h b/devel/radare2/files/patch-libr_debug_p_native_reg_kfbsd-arm64.h deleted file mode 100644 index ecda2e5a816..00000000000 --- a/devel/radare2/files/patch-libr_debug_p_native_reg_kfbsd-arm64.h +++ /dev/null @@ -1,196 +0,0 @@ ---- libr/debug/p/native/reg/kfbsd-arm64.h.orig 2018-08-10 10:02:02 UTC -+++ libr/debug/p/native/reg/kfbsd-arm64.h -@@ -0,0 +1,193 @@ -+// NGREG 34 -+return strdup ( -+"=PC pc\n" -+"=BP x29\n" -+"=SP sp\n" -+"=SN x8\n" -+"=A0 x0\n" -+"=A1 x1\n" -+"=A2 x2\n" -+"=A3 x3\n" -+"=ZF zf\n" -+"=SF nf\n" -+"=OF vf\n" -+"=CF cf\n" -+"gpr x0 .64 0 0\n" -+"gpr x1 .64 8 0\n" -+"gpr x2 .64 16 0\n" -+"gpr x3 .64 24 0\n" -+"gpr x4 .64 32 0\n" -+"gpr x5 .64 40 0\n" -+"gpr x6 .64 48 0\n" -+"gpr x7 .64 56 0\n" -+"gpr x8 .64 64 0\n" -+"gpr x9 .64 72 0\n" -+"gpr x10 .64 80 0\n" -+"gpr x11 .64 88 0\n" -+"gpr x12 .64 96 0\n" -+"gpr x13 .64 104 0\n" -+"gpr x14 .64 112 0\n" -+"gpr x15 .64 120 0\n" -+"gpr x16 .64 128 0\n" -+"gpr x17 .64 136 0\n" -+"gpr x18 .64 144 0\n" -+"gpr x19 .64 152 0\n" -+"gpr x20 .64 160 0\n" -+"gpr x21 .64 168 0\n" -+"gpr x22 .64 176 0\n" -+"gpr x23 .64 184 0\n" -+"gpr x24 .64 192 0\n" -+"gpr x25 .64 200 0\n" -+"gpr x26 .64 208 0\n" -+"gpr x27 .64 216 0\n" -+"gpr x28 .64 224 0\n" -+"gpr x29 .64 232 0\n" -+"gpr x30 .64 240 0\n" -+"gpr sp .64 248 0\n" -+"gpr pc .64 256 0\n" -+ -+// 8 bit -+ -+"gpr b0 .8 0 0\n" -+"gpr b1 .8 8 0\n" -+"gpr b2 .8 16 0\n" -+"gpr b3 .8 24 0\n" -+"gpr b4 .8 32 0\n" -+"gpr b5 .8 40 0\n" -+"gpr b6 .8 48 0\n" -+"gpr b7 .8 56 0\n" -+"gpr b8 .8 64 0\n" -+"gpr b9 .8 72 0\n" -+"gpr b10 .8 80 0\n" -+"gpr b11 .8 88 0\n" -+"gpr b12 .8 96 0\n" -+"gpr b13 .8 104 0\n" -+"gpr b14 .8 112 0\n" -+"gpr b15 .8 120 0\n" -+"gpr b16 .8 128 0\n" -+"gpr b17 .8 136 0\n" -+"gpr b18 .8 144 0\n" -+"gpr b19 .8 152 0\n" -+"gpr b20 .8 160 0\n" -+"gpr b21 .8 168 0\n" -+"gpr b22 .8 176 0\n" -+"gpr b23 .8 184 0\n" -+"gpr b24 .8 192 0\n" -+"gpr b25 .8 200 0\n" -+"gpr b26 .8 208 0\n" -+"gpr b27 .8 216 0\n" -+"gpr b28 .8 224 0\n" -+"gpr b29 .8 232 0\n" -+"gpr b30 .8 240 0\n" -+"gpr bsp .8 248 0\n" -+ -+// 16 bit -+ -+"gpr h0 .16 0 0\n" -+"gpr h1 .16 8 0\n" -+"gpr h2 .16 16 0\n" -+"gpr h3 .16 24 0\n" -+"gpr h4 .16 32 0\n" -+"gpr h5 .16 40 0\n" -+"gpr h6 .16 48 0\n" -+"gpr h7 .16 56 0\n" -+"gpr h8 .16 64 0\n" -+"gpr h9 .16 72 0\n" -+"gpr h10 .16 80 0\n" -+"gpr h11 .16 88 0\n" -+"gpr h12 .16 96 0\n" -+"gpr h13 .16 104 0\n" -+"gpr h14 .16 112 0\n" -+"gpr h15 .16 120 0\n" -+"gpr h16 .16 128 0\n" -+"gpr h17 .16 136 0\n" -+"gpr h18 .16 144 0\n" -+"gpr h19 .16 152 0\n" -+"gpr h20 .16 160 0\n" -+"gpr h21 .16 168 0\n" -+"gpr h22 .16 176 0\n" -+"gpr h23 .16 184 0\n" -+"gpr h24 .16 192 0\n" -+"gpr h25 .16 200 0\n" -+"gpr h26 .16 208 0\n" -+"gpr h27 .16 216 0\n" -+"gpr h28 .16 224 0\n" -+"gpr h29 .16 232 0\n" -+"gpr h30 .16 240 0\n" -+ -+// 32 bit -+ -+"gpr w0 .32 0 0\n" -+"gpr w1 .32 8 0\n" -+"gpr w2 .32 16 0\n" -+"gpr w3 .32 24 0\n" -+"gpr w4 .32 32 0\n" -+"gpr w5 .32 40 0\n" -+"gpr w6 .32 48 0\n" -+"gpr w7 .32 56 0\n" -+"gpr w8 .32 64 0\n" -+"gpr w9 .32 72 0\n" -+"gpr w10 .32 80 0\n" -+"gpr w11 .32 88 0\n" -+"gpr w12 .32 96 0\n" -+"gpr w13 .32 104 0\n" -+"gpr w14 .32 112 0\n" -+"gpr w15 .32 120 0\n" -+"gpr w16 .32 128 0\n" -+"gpr w17 .32 136 0\n" -+"gpr w18 .32 144 0\n" -+"gpr w19 .32 152 0\n" -+"gpr w20 .32 160 0\n" -+"gpr w21 .32 168 0\n" -+"gpr w22 .32 176 0\n" -+"gpr w23 .32 184 0\n" -+"gpr w24 .32 192 0\n" -+"gpr w25 .32 200 0\n" -+"gpr w26 .32 208 0\n" -+"gpr w27 .32 216 0\n" -+"gpr w28 .32 224 0\n" -+"gpr w29 .32 232 0\n" -+"gpr w30 .32 240 0\n" -+"gpr wsp .32 248 0\n" -+"gpr wzr .32 272 0\n" -+ -+"gpr d0 .64 0 0\n" -+"gpr d1 .64 8 0\n" -+"gpr d2 .64 16 0\n" -+"gpr d3 .64 24 0\n" -+"gpr d4 .64 32 0\n" -+"gpr d5 .64 40 0\n" -+"gpr d6 .64 48 0\n" -+"gpr d7 .64 56 0\n" -+"gpr d8 .64 64 0\n" -+"gpr d9 .64 72 0\n" -+"gpr d10 .64 80 0\n" -+"gpr d11 .64 88 0\n" -+"gpr d12 .64 96 0\n" -+"gpr d13 .64 104 0\n" -+"gpr d14 .64 112 0\n" -+"gpr d15 .64 120 0\n" -+"gpr d16 .64 128 0\n" -+"gpr d17 .64 136 0\n" -+"gpr d18 .64 144 0\n" -+"gpr d19 .64 152 0\n" -+"gpr d20 .64 160 0\n" -+"gpr d21 .64 168 0\n" -+"gpr d22 .64 176 0\n" -+"gpr d23 .64 184 0\n" -+"gpr d24 .64 192 0\n" -+"gpr d25 .64 200 0\n" -+"gpr d26 .64 208 0\n" -+"gpr d27 .64 216 0\n" -+"gpr d28 .64 224 0\n" -+"gpr d29 .64 232 0\n" -+"gpr d30 .64 240 0\n" -+"gpr dsp .64 248 0\n" -+ -+"gpr pstate .64 264 0\n" -+"flg fstate .64 264 0 _____tfiae_____________j__qvczn\n" -+"flg vf .1 264.28 0 overflow\n" -+"flg cf .1 264.29 0 carry\n" -+"flg zf .1 264.30 0 zero\n" -+"flg nf .1 264.31 0 sign\n" -+); diff --git a/devel/radare2/pkg-plist b/devel/radare2/pkg-plist index 842fcd70e2e..4073cce3214 100644 --- a/devel/radare2/pkg-plist +++ b/devel/radare2/pkg-plist @@ -11,11 +11,12 @@ bin/rarun2 bin/rasm2 bin/rax2 include/libr/btree.h -include/libr/r_anal_ex.h +include/libr/r2naked.h include/libr/r_anal.h +include/libr/r_anal_ex.h include/libr/r_asm.h -include/libr/r_bin_dwarf.h include/libr/r_bin.h +include/libr/r_bin_dwarf.h include/libr/r_bind.h include/libr/r_binheap.h include/libr/r_bp.h @@ -52,8 +53,8 @@ include/libr/r_slist.h include/libr/r_socket.h include/libr/r_syscall.h include/libr/r_th.h -include/libr/r_types_base.h include/libr/r_types.h +include/libr/r_types_base.h include/libr/r_userconf.h include/libr/r_util.h include/libr/r_util/r_ascii_table.h @@ -90,8 +91,8 @@ include/libr/r_util/r_sandbox.h include/libr/r_util/r_signal.h include/libr/r_util/r_spaces.h include/libr/r_util/r_stack.h -include/libr/r_util/r_str_util.h include/libr/r_util/r_str.h +include/libr/r_util/r_str_util.h include/libr/r_util/r_strbuf.h include/libr/r_util/r_strpool.h include/libr/r_util/r_sys.h @@ -104,17 +105,16 @@ include/libr/r_util/r_utf8.h include/libr/r_util/r_x509.h include/libr/r_vector.h include/libr/r_version.h -include/libr/r2naked.h include/libr/sdb.h include/libr/sdb/buffer.h -include/libr/sdb/cdb_make.h include/libr/sdb/cdb.h +include/libr/sdb/cdb_make.h include/libr/sdb/config.h include/libr/sdb/dict.h include/libr/sdb/ht.h include/libr/sdb/ls.h -include/libr/sdb/sdb_version.h include/libr/sdb/sdb.h +include/libr/sdb/sdb_version.h include/libr/sdb/sdbht.h include/libr/sdb/types.h include/libr/sflib/common/sfsocketcall.h @@ -280,13 +280,13 @@ man/man7/esil.7.gz %%PORTDOCS%%%%DOCSDIR%%/statis.md %%PORTDOCS%%%%DOCSDIR%%/strings.md %%PORTDOCS%%%%DOCSDIR%%/termux.md -%%PORTDOCS%%%%DOCSDIR%%/types.md %%PORTDOCS%%%%DOCSDIR%%/uncrustify.cfg %%PORTDOCS%%%%DOCSDIR%%/vim %%PORTDOCS%%%%DOCSDIR%%/vim2r2.js %%PORTDOCS%%%%DOCSDIR%%/windbg.md %%PORTDOCS%%%%DOCSDIR%%/windows.md %%PORTDOCS%%%%DOCSDIR%%/yara.md +%%DATADIR%%/%%PORTVERSION%%/cons/Makefile.bak %%DATADIR%%/%%PORTVERSION%%/cons/ayu %%DATADIR%%/%%PORTVERSION%%/cons/basic %%DATADIR%%/%%PORTVERSION%%/cons/behelit @@ -302,6 +302,7 @@ man/man7/esil.7.gz %%DATADIR%%/%%PORTVERSION%%/cons/matrix %%DATADIR%%/%%PORTVERSION%%/cons/monokai %%DATADIR%%/%%PORTVERSION%%/cons/ogray +%%DATADIR%%/%%PORTVERSION%%/cons/onedark %%DATADIR%%/%%PORTVERSION%%/cons/pink %%DATADIR%%/%%PORTVERSION%%/cons/rasta %%DATADIR%%/%%PORTVERSION%%/cons/sepia @@ -310,6 +311,7 @@ man/man7/esil.7.gz %%DATADIR%%/%%PORTVERSION%%/cons/tango %%DATADIR%%/%%PORTVERSION%%/cons/twilight %%DATADIR%%/%%PORTVERSION%%/cons/white +%%DATADIR%%/%%PORTVERSION%%/cons/white2 %%DATADIR%%/%%PORTVERSION%%/cons/xvilka %%DATADIR%%/%%PORTVERSION%%/cons/zenburn %%DATADIR%%/%%PORTVERSION%%/fcnsign/cc-arm-32.sdb @@ -324,6 +326,7 @@ man/man7/esil.7.gz %%DATADIR%%/%%PORTVERSION%%/fcnsign/cc-x86-32.sdb %%DATADIR%%/%%PORTVERSION%%/fcnsign/cc-x86-64.sdb %%DATADIR%%/%%PORTVERSION%%/fcnsign/cc-xtensa-32.sdb +%%DATADIR%%/%%PORTVERSION%%/fcnsign/spec.sdb %%DATADIR%%/%%PORTVERSION%%/fcnsign/types-16.sdb %%DATADIR%%/%%PORTVERSION%%/fcnsign/types-32.sdb %%DATADIR%%/%%PORTVERSION%%/fcnsign/types-64.sdb @@ -380,14 +383,15 @@ man/man7/esil.7.gz %%DATADIR%%/%%PORTVERSION%%/format/dll/ws2_32.sdb %%DATADIR%%/%%PORTVERSION%%/format/dll/wsnmp32.sdb %%DATADIR%%/%%PORTVERSION%%/format/dll/wsock32.sdb -%%DATADIR%%/%%PORTVERSION%%/format/elf_enums %%DATADIR%%/%%PORTVERSION%%/format/elf32 %%DATADIR%%/%%PORTVERSION%%/format/elf64 +%%DATADIR%%/%%PORTVERSION%%/format/elf_enums %%DATADIR%%/%%PORTVERSION%%/format/mz %%DATADIR%%/%%PORTVERSION%%/format/pe32 %%DATADIR%%/%%PORTVERSION%%/format/trx %%DATADIR%%/%%PORTVERSION%%/format/zip %%DATADIR%%/%%PORTVERSION%%/hud/main +%%DATADIR%%/%%PORTVERSION%%/magic/OpenBSD %%DATADIR%%/%%PORTVERSION%%/magic/archive %%DATADIR%%/%%PORTVERSION%%/magic/cafebabe %%DATADIR%%/%%PORTVERSION%%/magic/code @@ -412,7 +416,6 @@ man/man7/esil.7.gz %%DATADIR%%/%%PORTVERSION%%/magic/mime %%DATADIR%%/%%PORTVERSION%%/magic/netbsd %%DATADIR%%/%%PORTVERSION%%/magic/network -%%DATADIR%%/%%PORTVERSION%%/magic/OpenBSD %%DATADIR%%/%%PORTVERSION%%/magic/pdf %%DATADIR%%/%%PORTVERSION%%/magic/perl %%DATADIR%%/%%PORTVERSION%%/magic/python @@ -427,6 +430,7 @@ man/man7/esil.7.gz %%DATADIR%%/%%PORTVERSION%%/magic/zfs %%DATADIR%%/%%PORTVERSION%%/opcodes/6502.sdb %%DATADIR%%/%%PORTVERSION%%/opcodes/8051.sdb +%%DATADIR%%/%%PORTVERSION%%/opcodes/LH5801.sdb %%DATADIR%%/%%PORTVERSION%%/opcodes/arc.sdb %%DATADIR%%/%%PORTVERSION%%/opcodes/arm.sdb %%DATADIR%%/%%PORTVERSION%%/opcodes/avr.sdb @@ -434,7 +438,6 @@ man/man7/esil.7.gz %%DATADIR%%/%%PORTVERSION%%/opcodes/i4004.sdb %%DATADIR%%/%%PORTVERSION%%/opcodes/i8080.sdb %%DATADIR%%/%%PORTVERSION%%/opcodes/java.sdb -%%DATADIR%%/%%PORTVERSION%%/opcodes/LH5801.sdb %%DATADIR%%/%%PORTVERSION%%/opcodes/lm32.sdb %%DATADIR%%/%%PORTVERSION%%/opcodes/m68k.sdb %%DATADIR%%/%%PORTVERSION%%/opcodes/malbolge.sdb @@ -471,6 +474,7 @@ man/man7/esil.7.gz %%DATADIR%%/%%PORTVERSION%%/syscall/netbsd-x86-32.sdb %%DATADIR%%/%%PORTVERSION%%/syscall/openbsd-x86-32.sdb %%DATADIR%%/%%PORTVERSION%%/syscall/openbsd-x86-64.sdb +%%DATADIR%%/%%PORTVERSION%%/syscall/s110-arm-16.sdb %%DATADIR%%/%%PORTVERSION%%/syscall/windows-x86-32.sdb %%DATADIR%%/%%PORTVERSION%%/syscall/windows-x86-64.sdb %%DATADIR%%/%%PORTVERSION%%/www/console.html @@ -480,10 +484,10 @@ man/man7/esil.7.gz %%DATADIR%%/%%PORTVERSION%%/www/d3/packages.js %%DATADIR%%/%%PORTVERSION%%/www/d3/style.css %%DATADIR%%/%%PORTVERSION%%/www/enyo/disassembler_old.js -%%DATADIR%%/%%PORTVERSION%%/www/enyo/enyo_app.js %%DATADIR%%/%%PORTVERSION%%/www/enyo/enyo.css %%DATADIR%%/%%PORTVERSION%%/www/enyo/enyo/lib/onyx/images/gradient-invert.png %%DATADIR%%/%%PORTVERSION%%/www/enyo/enyo/lib/onyx/images/gradient.png +%%DATADIR%%/%%PORTVERSION%%/www/enyo/enyo_app.js %%DATADIR%%/%%PORTVERSION%%/www/enyo/gradient-invert.png %%DATADIR%%/%%PORTVERSION%%/www/enyo/gradient.png %%DATADIR%%/%%PORTVERSION%%/www/enyo/icon.png @@ -505,11 +509,11 @@ man/man7/esil.7.gz %%DATADIR%%/%%PORTVERSION%%/www/f/index.html %%DATADIR%%/%%PORTVERSION%%/www/f/r2.js %%DATADIR%%/%%PORTVERSION%%/www/favicon.ico +%%DATADIR%%/%%PORTVERSION%%/www/graph/img/arrow.gif %%DATADIR%%/%%PORTVERSION%%/www/graph/img/arrow_d.gif %%DATADIR%%/%%PORTVERSION%%/www/graph/img/arrow_l.gif %%DATADIR%%/%%PORTVERSION%%/www/graph/img/arrow_r.gif %%DATADIR%%/%%PORTVERSION%%/www/graph/img/arrow_u.gif -%%DATADIR%%/%%PORTVERSION%%/www/graph/img/arrow.gif %%DATADIR%%/%%PORTVERSION%%/www/graph/index.html %%DATADIR%%/%%PORTVERSION%%/www/graph/index.js %%DATADIR%%/%%PORTVERSION%%/www/graph/js-graph-it.css @@ -530,10 +534,9 @@ man/man7/esil.7.gz %%DATADIR%%/%%PORTVERSION%%/www/m/legacy.js %%DATADIR%%/%%PORTVERSION%%/www/m/r2.js %%DATADIR%%/%%PORTVERSION%%/www/m/stylesheet.css +%%DATADIR%%/%%PORTVERSION%%/www/m/vendors/FileSaver.min.js %%DATADIR%%/%%PORTVERSION%%/www/m/vendors/dialog-polyfill.css %%DATADIR%%/%%PORTVERSION%%/www/m/vendors/dialog-polyfill.js -%%DATADIR%%/%%PORTVERSION%%/www/m/vendors/FileSaver.min.js -%%DATADIR%%/%%PORTVERSION%%/www/m/vendors/fonts/fonts.css %%DATADIR%%/%%PORTVERSION%%/www/m/vendors/fonts/MaterialIcons-Regular.woff %%DATADIR%%/%%PORTVERSION%%/www/m/vendors/fonts/Roboto-italic-400.woff %%DATADIR%%/%%PORTVERSION%%/www/m/vendors/fonts/Roboto-italic-700.woff @@ -543,11 +546,12 @@ man/man7/esil.7.gz %%DATADIR%%/%%PORTVERSION%%/www/m/vendors/fonts/Roboto-normal-500.woff %%DATADIR%%/%%PORTVERSION%%/www/m/vendors/fonts/Roboto-normal-700.woff %%DATADIR%%/%%PORTVERSION%%/www/m/vendors/fonts/Roboto-normal-900.woff -%%DATADIR%%/%%PORTVERSION%%/www/m/vendors/images/sort_asc_disabled.png +%%DATADIR%%/%%PORTVERSION%%/www/m/vendors/fonts/fonts.css %%DATADIR%%/%%PORTVERSION%%/www/m/vendors/images/sort_asc.png +%%DATADIR%%/%%PORTVERSION%%/www/m/vendors/images/sort_asc_disabled.png %%DATADIR%%/%%PORTVERSION%%/www/m/vendors/images/sort_both.png -%%DATADIR%%/%%PORTVERSION%%/www/m/vendors/images/sort_desc_disabled.png %%DATADIR%%/%%PORTVERSION%%/www/m/vendors/images/sort_desc.png +%%DATADIR%%/%%PORTVERSION%%/www/m/vendors/images/sort_desc_disabled.png %%DATADIR%%/%%PORTVERSION%%/www/m/vendors/jquery.dataTables.min.css %%DATADIR%%/%%PORTVERSION%%/www/m/vendors/jquery.dataTables.min.js %%DATADIR%%/%%PORTVERSION%%/www/m/vendors/jquery.min.js diff --git a/finance/alkimia/Makefile b/finance/alkimia/Makefile index 124ea44e5fe..34182617688 100644 --- a/finance/alkimia/Makefile +++ b/finance/alkimia/Makefile @@ -54,7 +54,6 @@ MPIR_DESC= MPIR (multiple precision arithmetic) support MPIR_LIB_DEPENDS= libmpir.so:math/mpir .if ${SLAVE} == qt4 -TEST_USES= qt:4 qt:5 TEST_USE= QT=qtestlib .else TEST_USE= QT=testlib diff --git a/finance/alkimia/pkg-descr b/finance/alkimia/pkg-descr index 7206a4631ab..24650e6b758 100644 --- a/finance/alkimia/pkg-descr +++ b/finance/alkimia/pkg-descr @@ -4,4 +4,4 @@ applications for KDE. Currently, it supports a common class to represent monetary values with arbitrary precision. -WWW: http://community.kde.org/Alkimia/libalkimia +WWW: https://community.kde.org/Alkimia/libalkimia diff --git a/games/renpy/Makefile b/games/renpy/Makefile index fb4adefd07b..f3d22ebacac 100644 --- a/games/renpy/Makefile +++ b/games/renpy/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= renpy -PORTVERSION?= 7.0.0 +PORTVERSION?= 7.1.0 DISTVERSIONSUFFIX=-sdk PORTREVISION?= 0 CATEGORIES= games devel diff --git a/games/renpy/distinfo b/games/renpy/distinfo index 348e2a709d4..4234257aa5b 100644 --- a/games/renpy/distinfo +++ b/games/renpy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527821217 -SHA256 (renpy-7.0.0-sdk.tar.bz2) = 548561684b4e800c5aa349f9fae0371789c462dc3ede4ffd60ef45d3df1cc384 -SIZE (renpy-7.0.0-sdk.tar.bz2) = 92106485 +TIMESTAMP = 1536624118 +SHA256 (renpy-7.1.0-sdk.tar.bz2) = 1ea30273e3c7eaf7f3c974b622a21618a8e96143d181178cb321bf9878d89b27 +SIZE (renpy-7.1.0-sdk.tar.bz2) = 92329790 diff --git a/games/renpy/files/patch-system-fribidi b/games/renpy/files/patch-system-fribidi new file mode 100644 index 00000000000..0232db72887 --- /dev/null +++ b/games/renpy/files/patch-system-fribidi @@ -0,0 +1,57 @@ +Partially revert 4a9efc0cab7d as module/fribidi-src/ is missing from source archive. + +gen/_renpybidi.c:564:10: fatal error: 'fribidi.h' file not found +#include "fribidi.h" + ^ + +--- module/renpybidicore.c.orig 2018-07-11 04:11:19 UTC ++++ module/renpybidicore.c +@@ -1,5 +1,5 @@ + #include +-#include ++#include + #include + + #ifndef alloca +--- module/setup.py.orig 2018-07-11 04:29:32 UTC ++++ module/setup.py +@@ -92,6 +92,7 @@ has_avresample = library("avresample", optional=True) + has_swresample = library("swresample", optional=True) + has_swscale = library("swscale", optional=True) + library("freetype") ++has_fribidi = include("fribidi.h", directory="fribidi", optional=True) and library("fribidi", optional=True) + library("z") + has_libglew = library("GLEW", optional=True) + has_libglew32 = library("glew32", optional=True) +@@ -105,6 +106,16 @@ else: + sdl = [ 'SDL2' ] + png = 'png' + ++ ++if has_fribidi and (not android) and (not ios): ++ try: ++ # Some versions of fribidi require glib, and it doesn't hurt to include it in ++ # our path. ++ glib_flags = subprocess.check_output(["pkg-config", "--cflags", "glib-2.0"]) ++ setuplib.extra_compile_args.extend(glib_flags.split()) ++ except: ++ pass ++ + steam_sdk = os.environ.get("RENPY_STEAM_SDK", None) + steam_platform = os.environ.get("RENPY_STEAM_PLATFORM", "") + +@@ -134,11 +145,12 @@ renpybidicore.c + """.split() + cython( + "_renpybidi", +- FRIBIDI_SOURCES, +- includes=[ ++ has_fribidi and [ i for i in FRIBIDI_SOURCES if 'fribidi-src' not in i ] or FRIBIDI_SOURCES, ++ includes=has_fribidi and [] or [ + BASE + "/fribidi-src/", + BASE + "/fribidi-src/lib/", + ], ++ libs=has_fribidi and ['fribidi'] or [], + define_macros=[ + ("FRIBIDI_ENTRY", ""), + ("HAVE_CONFIG_H", "1"), diff --git a/graphics/partio/Makefile b/graphics/partio/Makefile index 23d67f1d9f5..314ab7e7fab 100644 --- a/graphics/partio/Makefile +++ b/graphics/partio/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= partio -PORTVERSION= 1.1.0.20150221 -PORTREVISION= 3 +PORTVERSION= 1.5.5 +DISTVERSIONPREFIX= v CATEGORIES= graphics math MAINTAINER= ports@FreeBSD.org @@ -10,17 +10,20 @@ COMMENT= C++ library for manipulating animation particle formats LICENSE= BSD3CLAUSE -USES= cmake:outsource -USE_XORG= xmu -USE_GL= gl glut +USES= cmake:outsource gl shebangfix +SHEBANG_FILES= src/tools/partedit.py src/tools/partjson.py +USE_GL= gl glu glut +USE_LDCONFIG= yes +USE_XORG= xi USE_GITHUB= yes GH_ACCOUNT= wdas -GH_TAGNAME= 1fd6747 -OPTIONS_DEFINE= DOCS PYTHON +OPTIONS_DEFINE= DOCS PYTHON # XXX: should probably use DOXYGEN OPTIONS_DEFAULT= PYTHON +PYTHON_BROKEN_OFF= does not build without Python support + DOCS_BUILD_DEPENDS= doxygen:devel/doxygen PYTHON_USES= python PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 @@ -29,9 +32,9 @@ BINARY_ALIAS= swig=swig3.0 PORTDOCS= * post-patch: - @${REINPLACE_CMD} -e 's|python -c|${PYTHON_CMD} -c|; \ - s|lib64/python$${PYTHON_VERSION}/site-packages|${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}|' \ - ${WRKSRC}/src/py/CMakeLists.txt + @${REINPLACE_CMD} -e 's|python -c|${PYTHON_CMD} -c|' \ + ${WRKSRC}/src/py/CMakeLists.txt \ + ${WRKSRC}/src/tools/CMakeLists.txt @${REINPLACE_CMD} -e '/install(TARGETS/d' \ ${WRKSRC}/src/tests/CMakeLists.txt @@ -44,6 +47,6 @@ post-patch-DOCS-off: ${WRKSRC}/CMakeLists.txt post-build-DOCS-on: - @(cd ${BUILD_WRKSRC}; ${MAKE_CMD} doc) + @${MAKE_CMD} -C ${BUILD_WRKSRC} doc .include diff --git a/graphics/partio/distinfo b/graphics/partio/distinfo index 69441b32cff..e7fb0d108c2 100644 --- a/graphics/partio/distinfo +++ b/graphics/partio/distinfo @@ -1,2 +1,3 @@ -SHA256 (wdas-partio-1.1.0.20150221-1fd6747_GH0.tar.gz) = da7fc1ed5582521ba7514ec8a38e68f15d8e83ae974668a4b8a9ee80b78c360e -SIZE (wdas-partio-1.1.0.20150221-1fd6747_GH0.tar.gz) = 264017 +TIMESTAMP = 1534366535 +SHA256 (wdas-partio-v1.5.5_GH0.tar.gz) = 25352a6af0ccc20794a8c85715d5a6645c3f8ddcb6bbaaf20136670b5abd4727 +SIZE (wdas-partio-v1.5.5_GH0.tar.gz) = 291801 diff --git a/graphics/partio/pkg-descr b/graphics/partio/pkg-descr index 919edb51ebf..be54afe4982 100644 --- a/graphics/partio/pkg-descr +++ b/graphics/partio/pkg-descr @@ -1,6 +1,8 @@ -Partio is a library for reading/writing/processing particle files for a wide -range of tools and file formats. It acts as an abstraction for the -commonalities in particle models (i.e. accessing many attributes associated -with an index or entity). +Partio is an open source C++ library for reading, writing, and manipulating +a variety of standard particle formats (GEO, BGEO, PTC, PDB, PDA). It acts +as an abstraction for the commonalities in particle models (i.e., accessing +many attributes associated with an index or entity). -WWW: http://www.partio.us +Partio has a Python API and a collection of simple command-line tools. + +WWW: http://www.partio.us/ diff --git a/graphics/partio/pkg-plist b/graphics/partio/pkg-plist index bf39bb0a7ad..90e4c383f0a 100644 --- a/graphics/partio/pkg-plist +++ b/graphics/partio/pkg-plist @@ -1,10 +1,17 @@ bin/partattr -bin/partconv +bin/partconvert +bin/partedit bin/partinfo +bin/partjson bin/partview include/Partio.h include/PartioAttribute.h include/PartioIterator.h -lib/libpartio.a +include/PartioSe.h +include/PartioVec3.h +lib/libpartio.so %%PYTHON_SITELIBDIR%%/_partio.so +%%PYTHON_SITELIBDIR%%/partedit.py %%PYTHON_SITELIBDIR%%/partio.py +%%PYTHON_SITELIBDIR%%/partjson.py +share/swig/partio.i diff --git a/graphics/piglit/Makefile b/graphics/piglit/Makefile index 2a1c8cbd86d..e9d7f6cf245 100644 --- a/graphics/piglit/Makefile +++ b/graphics/piglit/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= piglit -PORTVERSION= 20170922 -PORTREVISION= 3 +PORTVERSION= 20180910 CATEGORIES= graphics MAINTAINER= x11@FreeBSD.org @@ -28,7 +27,7 @@ RUN_DEPENDS= ${PYNUMPY} \ USE_GITHUB= yes GH_ACCOUNT= dumbbell GH_PROJECT= piglit -GH_TAGNAME= 60996b829c85f3df192bc6228108c0a8eaa38afd +GH_TAGNAME= a0db4427446ab50882a721ae3084fa26cc9e751a USES= cmake:outsource compiler:c11 pkgconfig python:2.7 shebangfix USE_GL= egl gbm gl glu diff --git a/graphics/piglit/distinfo b/graphics/piglit/distinfo index d182fa9ab59..5b6e4e55c7b 100644 --- a/graphics/piglit/distinfo +++ b/graphics/piglit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1506092254 -SHA256 (dumbbell-piglit-20170922-60996b829c85f3df192bc6228108c0a8eaa38afd_GH0.tar.gz) = e2d862b5aebb2847283ad12657cf39afcb9e0fbe3edcd348988639348e991b13 -SIZE (dumbbell-piglit-20170922-60996b829c85f3df192bc6228108c0a8eaa38afd_GH0.tar.gz) = 24048349 +TIMESTAMP = 1536577804 +SHA256 (dumbbell-piglit-20180910-a0db4427446ab50882a721ae3084fa26cc9e751a_GH0.tar.gz) = 68dd9a924438dd0a7b12d2f003340c7726523c333b6da86ee6ee33f99d4840da +SIZE (dumbbell-piglit-20180910-a0db4427446ab50882a721ae3084fa26cc9e751a_GH0.tar.gz) = 24171368 diff --git a/graphics/piglit/files/patch-CMakeLists.txt b/graphics/piglit/files/patch-CMakeLists.txt index 5f5e68c16b5..e4839f9a88c 100644 --- a/graphics/piglit/files/patch-CMakeLists.txt +++ b/graphics/piglit/files/patch-CMakeLists.txt @@ -5,16 +5,7 @@ ENDIF() -set(Python_ADDITIONAL_VERSIONS -- 3.6 3.5 3.4 3.3 2.7) +- 3.7 3.6 3.5 3.4 2.7) find_package(PythonInterp REQUIRED) find_package(PythonSix 1.5.2 REQUIRED) find_package(PythonNumpy 1.7.0 REQUIRED) -@@ -382,7 +380,7 @@ endif() - - check_c_source_compiles( - " -- #define _POSIX_C_SOURCE 199309L -+ #define _POSIX_C_SOURCE 200112L - #include - int main() { return clock_gettime(CLOCK_MONOTONIC, NULL); } - " diff --git a/graphics/piglit/files/pkg-message.in b/graphics/piglit/files/pkg-message.in index 650e55cf61b..adddf3931bb 100644 --- a/graphics/piglit/files/pkg-message.in +++ b/graphics/piglit/files/pkg-message.in @@ -4,7 +4,7 @@ default maxvnodes: sysctl kern.maxvnodes=$(($(sysctl -n kern.maxvnodes) * 2)) Instructions to use Piglit are available in: - %%DOCSDIR%%/README + %%DOCSDIR%%/README.md The same documentation is also available online: http://cgit.freedesktop.org/piglit/tree/README diff --git a/graphics/piglit/pkg-plist b/graphics/piglit/pkg-plist index 2e27224be51..642b5de5ce8 100644 --- a/graphics/piglit/pkg-plist +++ b/graphics/piglit/pkg-plist @@ -1,6 +1,6 @@ bin/piglit %%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/RELEASE @dir %%DATADIR%%/generated_tests/modules @dir %%DATADIR%%/generated_tests/templates/gen_builtin_packing_tests @@ -23,28 +23,32 @@ bin/piglit @dir %%DATADIR%%/generated_tests/templates/gen_vp_tex @dir %%DATADIR%%/generated_tests/templates/gen_vs_in_fp64 @dir %%DATADIR%%/generated_tests/templates/interpolation-qualifier-built-in-variable -@dir %%DATADIR%%/tests/bugs @dir %%DATADIR%%/tests/cl/api @dir %%DATADIR%%/tests/cl/custom @dir %%DATADIR%%/tests/cl/interop -@dir %%DATADIR%%/tests/egl/spec/egl-1.4 @dir %%DATADIR%%/tests/egl/spec/egl_chromium_sync_control @dir %%DATADIR%%/tests/egl/spec/egl_ext_client_extensions +@dir %%DATADIR%%/tests/egl/spec/egl_ext_device_drm @dir %%DATADIR%%/tests/egl/spec/egl_ext_device_enumeration @dir %%DATADIR%%/tests/egl/spec/egl_ext_device_query +@dir %%DATADIR%%/tests/egl/spec/egl_ext_image_dma_buf_import_modifiers +@dir %%DATADIR%%/tests/egl/spec/egl_ext_platform_device @dir %%DATADIR%%/tests/egl/spec/egl_khr_create_context @dir %%DATADIR%%/tests/egl/spec/egl_khr_fence_sync @dir %%DATADIR%%/tests/egl/spec/egl_khr_get_all_proc_addresses @dir %%DATADIR%%/tests/egl/spec/egl_khr_gl_image @dir %%DATADIR%%/tests/egl/spec/egl_khr_surfaceless_context +@dir %%DATADIR%%/tests/egl/spec/egl_mesa_device_software @dir %%DATADIR%%/tests/egl/spec/egl_mesa_platform_surfaceless +@dir %%DATADIR%%/tests/egl/spec/egl-1.4 @dir %%DATADIR%%/tests/fbo @dir %%DATADIR%%/tests/general -@dir %%DATADIR%%/tests/glean @dir %%DATADIR%%/tests/glx @dir %%DATADIR%%/tests/hiz @dir %%DATADIR%%/tests/perf @dir %%DATADIR%%/tests/security +@dir %%DATADIR%%/tests/spec/amd_depth_clamp_separate +@dir %%DATADIR%%/tests/spec/amd_framebuffer_multisample_advanced @dir %%DATADIR%%/tests/spec/amd_performance_monitor @dir %%DATADIR%%/tests/spec/amd_pinned_memory @dir %%DATADIR%%/tests/spec/amd_seamless_cubemap_per_texture @@ -89,11 +93,13 @@ bin/piglit @dir %%DATADIR%%/tests/spec/arb_occlusion_query2 @dir %%DATADIR%%/tests/spec/arb_pipeline_statistics_query @dir %%DATADIR%%/tests/spec/arb_point_parameters +@dir %%DATADIR%%/tests/spec/arb_point_sprite @dir %%DATADIR%%/tests/spec/arb_post_depth_coverage @dir %%DATADIR%%/tests/spec/arb_program_interface_query @dir %%DATADIR%%/tests/spec/arb_provoking_vertex @dir %%DATADIR%%/tests/spec/arb_query_buffer_object @dir %%DATADIR%%/tests/spec/arb_robustness +@dir %%DATADIR%%/tests/spec/arb_sample_locations @dir %%DATADIR%%/tests/spec/arb_sample_shading/execution @dir %%DATADIR%%/tests/spec/arb_sampler_objects @dir %%DATADIR%%/tests/spec/arb_seamless_cube_map @@ -107,6 +113,7 @@ bin/piglit @dir %%DATADIR%%/tests/spec/arb_texture_buffer_object @dir %%DATADIR%%/tests/spec/arb_texture_buffer_range @dir %%DATADIR%%/tests/spec/arb_texture_compression +@dir %%DATADIR%%/tests/spec/arb_texture_cube_map @dir %%DATADIR%%/tests/spec/arb_texture_float @dir %%DATADIR%%/tests/spec/arb_texture_multisample @dir %%DATADIR%%/tests/spec/arb_texture_stencil8 @@ -114,9 +121,9 @@ bin/piglit @dir %%DATADIR%%/tests/spec/arb_texture_storage_multisample @dir %%DATADIR%%/tests/spec/arb_texture_view @dir %%DATADIR%%/tests/spec/arb_timer_query +@dir %%DATADIR%%/tests/spec/arb_transform_feedback_overflow_query @dir %%DATADIR%%/tests/spec/arb_transform_feedback2 @dir %%DATADIR%%/tests/spec/arb_transform_feedback3 -@dir %%DATADIR%%/tests/spec/arb_transform_feedback_overflow_query @dir %%DATADIR%%/tests/spec/arb_vertex_array_bgra @dir %%DATADIR%%/tests/spec/arb_vertex_array_object @dir %%DATADIR%%/tests/spec/arb_vertex_buffer_object @@ -125,19 +132,29 @@ bin/piglit @dir %%DATADIR%%/tests/spec/arb_viewport_array @dir %%DATADIR%%/tests/spec/ati_draw_buffers @dir %%DATADIR%%/tests/spec/ati_envmap_bumpmap +@dir %%DATADIR%%/tests/spec/ati_fragment_shader @dir %%DATADIR%%/tests/spec/ext_depth_bounds_test +@dir %%DATADIR%%/tests/spec/ext_disjoint_timer_query @dir %%DATADIR%%/tests/spec/ext_fog_coord @dir %%DATADIR%%/tests/spec/ext_frag_depth @dir %%DATADIR%%/tests/spec/ext_framebuffer_blit @dir %%DATADIR%%/tests/spec/ext_framebuffer_multisample @dir %%DATADIR%%/tests/spec/ext_framebuffer_multisample_blit_scaled +@dir %%DATADIR%%/tests/spec/ext_framebuffer_object @dir %%DATADIR%%/tests/spec/ext_image_dma_buf_import @dir %%DATADIR%%/tests/spec/ext_memory_object +@dir %%DATADIR%%/tests/spec/ext_memory_object_fd +@dir %%DATADIR%%/tests/spec/ext_occlusion_query_boolean @dir %%DATADIR%%/tests/spec/ext_packed_depth_stencil @dir %%DATADIR%%/tests/spec/ext_packed_float @dir %%DATADIR%%/tests/spec/ext_polygon_offset_clamp +@dir %%DATADIR%%/tests/spec/ext_render_snorm +@dir %%DATADIR%%/tests/spec/ext_semaphore +@dir %%DATADIR%%/tests/spec/ext_semaphore_fd +@dir %%DATADIR%%/tests/spec/ext_texture_env_combine @dir %%DATADIR%%/tests/spec/ext_texture_format_bgra8888 @dir %%DATADIR%%/tests/spec/ext_texture_integer +@dir %%DATADIR%%/tests/spec/ext_texture_norm16 @dir %%DATADIR%%/tests/spec/ext_texture_swizzle @dir %%DATADIR%%/tests/spec/ext_timer_query @dir %%DATADIR%%/tests/spec/ext_transform_feedback @@ -154,6 +171,7 @@ bin/piglit @dir %%DATADIR%%/tests/spec/gl-3.0/api @dir %%DATADIR%%/tests/spec/gl-3.2/layered-rendering @dir %%DATADIR%%/tests/spec/gl-3.3 +@dir %%DATADIR%%/tests/spec/gl-4.3 @dir %%DATADIR%%/tests/spec/gl-4.4 @dir %%DATADIR%%/tests/spec/gl-4.5 @dir %%DATADIR%%/tests/spec/gles-2.0 @@ -165,17 +183,21 @@ bin/piglit @dir %%DATADIR%%/tests/spec/glx_ext_import_context @dir %%DATADIR%%/tests/spec/glx_mesa_query_renderer @dir %%DATADIR%%/tests/spec/glx_oml_sync_control +@dir %%DATADIR%%/tests/spec/intel_blackhole_render @dir %%DATADIR%%/tests/spec/intel_conservative_rasterization @dir %%DATADIR%%/tests/spec/khr_debug @dir %%DATADIR%%/tests/spec/mesa_pack_invert @dir %%DATADIR%%/tests/spec/nv_conditional_render +@dir %%DATADIR%%/tests/spec/nv_fog_distance @dir %%DATADIR%%/tests/spec/nv_image_formats @dir %%DATADIR%%/tests/spec/nv_texture_barrier +@dir %%DATADIR%%/tests/spec/nv_texture_env_combine4 @dir %%DATADIR%%/tests/spec/oes_compressed_paletted_texture @dir %%DATADIR%%/tests/spec/oes_draw_elements_base_vertex @dir %%DATADIR%%/tests/spec/oes_draw_texture @dir %%DATADIR%%/tests/spec/oes_fixed_point @dir %%DATADIR%%/tests/spec/oes_matrix_get +@dir %%DATADIR%%/tests/spec/oes_required_internalformat @dir %%DATADIR%%/tests/spec/oes_texture_float @dir %%DATADIR%%/tests/texturing/shaders @dir %%DATADIR%%/tests/wgl diff --git a/lang/yabasic/Makefile b/lang/yabasic/Makefile index 38ef4a8e715..e36a889be5f 100644 --- a/lang/yabasic/Makefile +++ b/lang/yabasic/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= yabasic -PORTVERSION= 2.79.0 +PORTVERSION= 2.80.0 PORTEPOCH= 1 CATEGORIES= lang MASTER_SITES= http://www.yabasic.de/download/ diff --git a/lang/yabasic/distinfo b/lang/yabasic/distinfo index 8fbffc3a4b7..b548aae449b 100644 --- a/lang/yabasic/distinfo +++ b/lang/yabasic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525561287 -SHA256 (yabasic-2.79.0.tar.gz) = 9e37669e7ef0297c0961568c1e44624e3c90971e4a04ff2a42d1415816f1f7b6 -SIZE (yabasic-2.79.0.tar.gz) = 1137789 +TIMESTAMP = 1536662240 +SHA256 (yabasic-2.80.0.tar.gz) = 30afc80d93b9e0d54577d601fc5bbd6fac05d2d5a8aba88f115f37f08269ac36 +SIZE (yabasic-2.80.0.tar.gz) = 1169963 diff --git a/math/maxima/Makefile b/math/maxima/Makefile index 8271f128bf9..0c6d8151c07 100644 --- a/math/maxima/Makefile +++ b/math/maxima/Makefile @@ -35,26 +35,16 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} PORTDATA= * OPTIONS_SINGLE= LISP -OPTIONS_SINGLE_LISP= CLISP CMUCL SBCL +OPTIONS_SINGLE_LISP= CMUCL SBCL OPTIONS_DEFAULT= SBCL -CLISP_DESC= Build with Clisp CMUCL_DESC= Build with CMU Common Lisp SBCL_DESC= Build with Steel Bank Common Lisp .include # Lisp to build with. Define only ONE of these! -.if ${PORT_OPTIONS:MCLISP} -LISPSELECT= --enable-clisp -LISPPORT= clisp:lang/clisp -BINDIRECTORY= binary-clisp -LISPBINARY= lisp.run -PLIST_SUB+= LISPBINARY="" -MAXIMABINARY= maxima.mem -.endif - .if ${PORT_OPTIONS:MCMUCL} LISPSELECT= --enable-cmucl LISPPORT= lisp:lang/cmucl diff --git a/multimedia/plexmediaserver-plexpass/Makefile b/multimedia/plexmediaserver-plexpass/Makefile index 797ac392971..00c191593bf 100644 --- a/multimedia/plexmediaserver-plexpass/Makefile +++ b/multimedia/plexmediaserver-plexpass/Makefile @@ -1,8 +1,8 @@ # Created by: KalleDK # $FreeBSD$ -PORTVERSION= 1.13.6.5339 -DISTVERSIONSUFFIX=115f087d6 +PORTVERSION= 1.13.7.5369 +DISTVERSIONSUFFIX=93c9f1259 PORTREVISION= 0 PKGNAMESUFFIX= -plexpass diff --git a/multimedia/plexmediaserver-plexpass/distinfo b/multimedia/plexmediaserver-plexpass/distinfo index 94cf475bad3..d918ca59462 100644 --- a/multimedia/plexmediaserver-plexpass/distinfo +++ b/multimedia/plexmediaserver-plexpass/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535033431 -SHA256 (PlexMediaServer-1.13.6.5339-115f087d6-freebsd-amd64.tar.bz2) = b29b464160f298e1d35bf977eb0458b330bd729c294c8ec4f5a9375a61f1001b -SIZE (PlexMediaServer-1.13.6.5339-115f087d6-freebsd-amd64.tar.bz2) = 87076420 +TIMESTAMP = 1536681524 +SHA256 (PlexMediaServer-1.13.7.5369-93c9f1259-freebsd-amd64.tar.bz2) = e5c042dc3e4d45e286e3ba3a69dba43f5373faca4879d91f6bc195c7e953cd81 +SIZE (PlexMediaServer-1.13.7.5369-93c9f1259-freebsd-amd64.tar.bz2) = 87133914 diff --git a/science/getdp/Makefile b/science/getdp/Makefile index 60965c557bd..1fc64356b95 100644 --- a/science/getdp/Makefile +++ b/science/getdp/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= getdp -PORTVERSION= 3.0.1 +PORTVERSION= 3.0.2 CATEGORIES= science MASTER_SITES= http://www.geuz.org/getdp/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source diff --git a/science/getdp/distinfo b/science/getdp/distinfo index 69c8d29f50c..43b8a783fec 100644 --- a/science/getdp/distinfo +++ b/science/getdp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536532455 -SHA256 (getdp-3.0.1-source.tgz) = a7d7acf5ef5ce2b1c59cd8b06e2c1460ad6fdc6ae3772dfdbb60931d4413ce44 -SIZE (getdp-3.0.1-source.tgz) = 1990730 +TIMESTAMP = 1536677308 +SHA256 (getdp-3.0.2-source.tgz) = 8947f962416d64523838a7c387a1b7743223b3c664629af2504856327e37c98f +SIZE (getdp-3.0.2-source.tgz) = 1990932 diff --git a/security/libntlm/Makefile b/security/libntlm/Makefile index b495c5715eb..833ba01d9ba 100644 --- a/security/libntlm/Makefile +++ b/security/libntlm/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libntlm -PORTVERSION= 1.4 +PORTVERSION= 1.5 CATEGORIES= security MASTER_SITES= http://www.nongnu.org/libntlm/releases/ diff --git a/security/libntlm/distinfo b/security/libntlm/distinfo index 89fcd3e91ce..3e75b1d7a87 100644 --- a/security/libntlm/distinfo +++ b/security/libntlm/distinfo @@ -1,2 +1,3 @@ -SHA256 (libntlm-1.4.tar.gz) = 8415d75e31d3135dc7062787eaf4119b984d50f86f0d004b964cdc18a3182589 -SIZE (libntlm-1.4.tar.gz) = 568414 +TIMESTAMP = 1536654715 +SHA256 (libntlm-1.5.tar.gz) = 53d799f696a93b01fe877ccdef2326ed990c0b9f66e380bceaf7bd9cdcd99bbd +SIZE (libntlm-1.5.tar.gz) = 658935 diff --git a/security/libntlm/pkg-plist b/security/libntlm/pkg-plist index cabf9935694..bd00f4bafab 100644 --- a/security/libntlm/pkg-plist +++ b/security/libntlm/pkg-plist @@ -2,5 +2,5 @@ include/ntlm.h lib/libntlm.a lib/libntlm.so lib/libntlm.so.0 -lib/libntlm.so.0.0.19 +lib/libntlm.so.0.0.20 libdata/pkgconfig/libntlm.pc diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 0371f1c8d20..a9a3f492c94 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zsh -DISTVERSION= 5.6 +DISTVERSION= 5.6.1 CATEGORIES= shells MASTER_SITES= http://www.zsh.org/pub/ \ SF \ diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo index 1a4af8aa4a9..ae410781f3c 100644 --- a/shells/zsh/distinfo +++ b/shells/zsh/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1536051733 -SHA256 (zsh-5.6.tar.xz) = 746b1fcb11e8d129d1454f9ca551448c8145b6bcb157116c12407c518880e6d6 -SIZE (zsh-5.6.tar.xz) = 3080856 -SHA256 (zsh-5.6-doc.tar.xz) = 96e641b3311f67904f067b2bd353d875c609843677522b0e2a7cc7efd6edcbd9 -SIZE (zsh-5.6-doc.tar.xz) = 3198156 +TIMESTAMP = 1536651786 +SHA256 (zsh-5.6.1.tar.xz) = 9566753f317d31b808b6b63a5622c71f25d473a6b5fea5c35ab1c7ed96fbb3e8 +SIZE (zsh-5.6.1.tar.xz) = 3076732 +SHA256 (zsh-5.6.1-doc.tar.xz) = b64a290c0176d8844d0bd7349b59078536f798cfc7f4eab175595dd75ae04896 +SIZE (zsh-5.6.1-doc.tar.xz) = 3199032 diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist index a92a70dca72..aff54e4a265 100644 --- a/shells/zsh/pkg-plist +++ b/shells/zsh/pkg-plist @@ -283,6 +283,7 @@ bin/zsh-%%ZSH_VER%% %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_cpupower %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_cryptsetup %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_dkms +%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_e2label %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_ethtool %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_fuse_arguments %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Linux/_fuse_values diff --git a/sysutils/android-file-transfer/Makefile b/sysutils/android-file-transfer/Makefile index e65c9dabe8f..f93d0d3c1e0 100644 --- a/sysutils/android-file-transfer/Makefile +++ b/sysutils/android-file-transfer/Makefile @@ -2,8 +2,8 @@ PORTNAME= android-file-transfer DISTVERSIONPREFIX= v -DISTVERSION= 3.4 -PORTREVISION?= 1 +DISTVERSION= 3.5 +PORTREVISION?= 0 CATEGORIES= sysutils MAINTAINER= jbeich@FreeBSD.org diff --git a/sysutils/android-file-transfer/distinfo b/sysutils/android-file-transfer/distinfo index 3d884f6baf5..bd540500b81 100644 --- a/sysutils/android-file-transfer/distinfo +++ b/sysutils/android-file-transfer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1530624318 -SHA256 (whoozle-android-file-transfer-linux-v3.4_GH0.tar.gz) = 3b911e454fb3287a56b2359fcc7d767d150a7df950fb994d58c4c9c9987f1a3d -SIZE (whoozle-android-file-transfer-linux-v3.4_GH0.tar.gz) = 554071 +TIMESTAMP = 1536599812 +SHA256 (whoozle-android-file-transfer-linux-v3.5_GH0.tar.gz) = ea7897f08da96ecc29160cd3db83a26b591fa2d64db25b9f80d6cace628dece9 +SIZE (whoozle-android-file-transfer-linux-v3.5_GH0.tar.gz) = 779997 diff --git a/www/ddgr/Makefile b/www/ddgr/Makefile index 4e881723931..02807942df6 100644 --- a/www/ddgr/Makefile +++ b/www/ddgr/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ddgr -PORTVERSION= 1.4 +PORTVERSION= 1.5 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/ddgr/distinfo b/www/ddgr/distinfo index 3fe46a55283..3fa91127d8b 100644 --- a/www/ddgr/distinfo +++ b/www/ddgr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523535664 -SHA256 (jarun-ddgr-v1.4_GH0.tar.gz) = 045063b4d7262992a7ea3cd9fe9715a199318828de82073f54c42631d3ef41b7 -SIZE (jarun-ddgr-v1.4_GH0.tar.gz) = 40983 +TIMESTAMP = 1536668192 +SHA256 (jarun-ddgr-v1.5_GH0.tar.gz) = b442f707a2c2ead42233d3bf3a9bf919e32ab9860e20d9d39f860840c13c0392 +SIZE (jarun-ddgr-v1.5_GH0.tar.gz) = 41411 diff --git a/www/moodle31/Makefile b/www/moodle31/Makefile index 35ca3bcefdf..b56849d40e2 100644 --- a/www/moodle31/Makefile +++ b/www/moodle31/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= moodle -PORTVERSION= 3.1.13 +PORTVERSION= 3.1.14 CATEGORIES= www MASTER_SITES= SF/moodle/Moodle/stable31/ PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} diff --git a/www/moodle31/distinfo b/www/moodle31/distinfo index 45db856333f..f7d41595164 100644 --- a/www/moodle31/distinfo +++ b/www/moodle31/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531119290 -SHA256 (moodle-3.1.13.tgz) = c81396685149f9f121b8bc27424d7c745c6c8f9793aec79349c6b96a74ea81e2 -SIZE (moodle-3.1.13.tgz) = 38042777 +TIMESTAMP = 1536664980 +SHA256 (moodle-3.1.14.tgz) = dfe83507c6e188975803ecde243962d9f2b99790bc8c885a122253993d160cba +SIZE (moodle-3.1.14.tgz) = 38045267 diff --git a/www/moodle33/Makefile b/www/moodle33/Makefile index fe8c31983c4..ce14aefb1ca 100644 --- a/www/moodle33/Makefile +++ b/www/moodle33/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= moodle -PORTVERSION= 3.3.7 +PORTVERSION= 3.3.8 CATEGORIES= www MASTER_SITES= SF/moodle/Moodle/stable33/ PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} diff --git a/www/moodle33/distinfo b/www/moodle33/distinfo index 175bf0d6dc3..2a81fc58b9c 100644 --- a/www/moodle33/distinfo +++ b/www/moodle33/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531118443 -SHA256 (moodle-3.3.7.tgz) = 225dc120e5015dc18e2febd729759721e4ce49736a92cb4695a3618923bc3474 -SIZE (moodle-3.3.7.tgz) = 44868352 +TIMESTAMP = 1536664846 +SHA256 (moodle-3.3.8.tgz) = 3be64f137eec853bf3e5a3424cb1364330704a4aab9757ca7e57123f8330ec61 +SIZE (moodle-3.3.8.tgz) = 45067185 diff --git a/www/moodle34/Makefile b/www/moodle34/Makefile index 5cc69d2f053..7320b0e5865 100644 --- a/www/moodle34/Makefile +++ b/www/moodle34/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= moodle -PORTVERSION= 3.4.4 +PORTVERSION= 3.4.5 CATEGORIES= www MASTER_SITES= SF/moodle/Moodle/stable34/ PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX} diff --git a/www/moodle34/distinfo b/www/moodle34/distinfo index f63b72006b4..9a10cb6bc3d 100644 --- a/www/moodle34/distinfo +++ b/www/moodle34/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531117477 -SHA256 (moodle-3.4.4.tgz) = 9e15f3996f85c3295b4bb391f09bf63d426dcd981847ec3c2d6c11bfae5a6d84 -SIZE (moodle-3.4.4.tgz) = 45538017 +TIMESTAMP = 1536664860 +SHA256 (moodle-3.4.5.tgz) = 86795a24593a3d01050a21f2d96067f3d0e4a7a558480431b2e21e6b4c830396 +SIZE (moodle-3.4.5.tgz) = 45763211 diff --git a/www/moodle35/Makefile b/www/moodle35/Makefile index d769caa70a6..c36f752eab7 100644 --- a/www/moodle35/Makefile +++ b/www/moodle35/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= moodle -PORTVERSION= 3.5.1 +PORTVERSION= 3.5.2 CATEGORIES= www MASTER_SITES= SF/moodle/Moodle/stable35/ PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX} diff --git a/www/moodle35/distinfo b/www/moodle35/distinfo index 5c5663ddaec..c431a5c9add 100644 --- a/www/moodle35/distinfo +++ b/www/moodle35/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531109732 -SHA256 (moodle-3.5.1.tgz) = 3020d8aba5001e8e344bd65432e0caae325813ebb0ed7452c9edd4f7b0ec41e4 -SIZE (moodle-3.5.1.tgz) = 46387467 +TIMESTAMP = 1536664658 +SHA256 (moodle-3.5.2.tgz) = a9474a00d66e7bef7f55300d14acc85e4f99cb5918f749666055185951278aa5 +SIZE (moodle-3.5.2.tgz) = 46446558 diff --git a/www/mybb/Makefile b/www/mybb/Makefile index 8488e198ad1..5ff1cbb1fe2 100644 --- a/www/mybb/Makefile +++ b/www/mybb/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mybb -DISTVERSION= 1.8.17 +DISTVERSION= 1.8.18 CATEGORIES= www MAINTAINER= joneum@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= PHP-based bulletin board / discussion forum system LICENSE= GPLv3 USE_GITHUB= yes -GH_TAGNAME= ${PORTNAME}_1817 +GH_TAGNAME= ${PORTNAME}_1818 USES= cpe mysql php:web NO_BUILD= yes diff --git a/www/mybb/distinfo b/www/mybb/distinfo index 33d5293a33e..78544dac117 100644 --- a/www/mybb/distinfo +++ b/www/mybb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531783974 -SHA256 (mybb-mybb-1.8.17-mybb_1817_GH0.tar.gz) = bc2acd050624039fbed046da46283cef90fbb5f2b6da4c3d968dee8630a44442 -SIZE (mybb-mybb-1.8.17-mybb_1817_GH0.tar.gz) = 1871356 +TIMESTAMP = 1536659723 +SHA256 (mybb-mybb-1.8.18-mybb_1818_GH0.tar.gz) = b5bfe41c7b089d8657fb87052d882fdb85aa57c333b07af5fe5c2a7d961a483f +SIZE (mybb-mybb-1.8.18-mybb_1818_GH0.tar.gz) = 1875886 diff --git a/www/mybb/pkg-plist b/www/mybb/pkg-plist index cc3bdd3e609..6520dc9ebe0 100644 --- a/www/mybb/pkg-plist +++ b/www/mybb/pkg-plist @@ -644,6 +644,7 @@ %%WWWDIR%%/install/resources/upgrade42.php %%WWWDIR%%/install/resources/upgrade43.php %%WWWDIR%%/install/resources/upgrade44.php +%%WWWDIR%%/install/resources/upgrade45.php %%WWWDIR%%/install/resources/upgrade5.php %%WWWDIR%%/install/resources/upgrade6.php %%WWWDIR%%/install/resources/upgrade7.php diff --git a/www/p5-HTML-TokeParser-Simple/Makefile b/www/p5-HTML-TokeParser-Simple/Makefile index 4cc8b68fb12..5bd82ed08f8 100644 --- a/www/p5-HTML-TokeParser-Simple/Makefile +++ b/www/p5-HTML-TokeParser-Simple/Makefile @@ -11,11 +11,15 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Subclass of HTML::TokeParser with easy-to-remember method calls +LICENSE= ART10 GPLv1+ +LICENSE_COMB= dual + BUILD_DEPENDS= p5-HTML-Parser>=0:www/p5-HTML-Parser \ p5-Sub-Override>=0:devel/p5-Sub-Override RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 USE_PERL5= configure +NO_ARCH= yes .include diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile index 59d6dfa2871..3d2d298617e 100644 --- a/x11-wm/e16/Makefile +++ b/x11-wm/e16/Makefile @@ -30,7 +30,7 @@ PANGO_CONFIGURE_ENABLE= pango DOCS_CONFIGURE_ON= --enable-docs=yes DOCS_CONFIGURE_OFF= --enable-docs=no -USES= gmake iconv libtool gnome perl5 pkgconfig shebangfix +USES= autoreconf gmake iconv libtool gnome perl5 pkgconfig shebangfix USE_XORG= ice sm xorgproto x11 xbitmaps \ xcomposite xdamage xext xfixes xft xinerama xrandr xrender \ @@ -45,6 +45,7 @@ CONFIGURE_ARGS= --disable-dependency-tracking \ post-patch: ${REINPLACE_CMD} -e 's|$$(USER)|${SHAREOWN}:${SHAREGRP}|g' \ ${WRKSRC}/themes/Makefile.am ${WRKSRC}/themes/Makefile.in + ${REINPLACE_CMD} -e '/dl, dlopen/d' ${WRKSRC}/configure.ac post-patch-DOCS-off: ${REINPLACE_CMD} -e '/^SUBDIRS/s|docs ||' \ diff --git a/x11/sddm/Makefile b/x11/sddm/Makefile index 4afbef34126..9df805e30fa 100644 --- a/x11/sddm/Makefile +++ b/x11/sddm/Makefile @@ -3,11 +3,21 @@ PORTNAME= sddm PORTVERSION= 0.17.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= kde@FreeBSD.org COMMENT= QML based login manager +# The source code is GPLv2+, but the provided themes are: +# - CC-BY 3.0 (default greeter theme, maldives) +# - CC-BY 4.0 (maya) +# - Apache20 (font included with maya) +LICENSE= GPLv2+ CC-BY-3.0 CC-BY-4.0 APACHE20 +LICENSE_COMB= multi +LICENSE_FILE_GPLv2+= ${WRKSRC}/LICENSE +LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LICENSE.CC-BY-3.0 + RUN_DEPENDS= dbus-run-session:devel/dbus USES= cmake:outsource kde:5 qt:5 @@ -29,6 +39,10 @@ GROUPS= sddm USE_GITHUB= yes +# There are multiple patches that apply to Display.cpp, +# fixing CVE-2018-14345 and backported from 0.18. +EXTRA_PATCHES= ${PATCHDIR}/git-patch-147cec38d ${PATCHDIR}/git-patch-b02b00559 + post-patch: @${REINPLACE_CMD} -e 's#/etc/X11#${LOCALBASE}/etc/X11#' \ -e 's#/usr/bin/#${LOCALBASE}/bin/#g' \ diff --git a/x11/sddm/files/git-patch-147cec38d b/x11/sddm/files/git-patch-147cec38d new file mode 100644 index 00000000000..91c44e24519 --- /dev/null +++ b/x11/sddm/files/git-patch-147cec38d @@ -0,0 +1,28 @@ +diff --git a/src/daemon/Display.cpp b/src/daemon/Display.cpp +index 5abfc9a..57d7ecb 100644 +--- src/daemon/Display.cpp ++++ src/daemon/Display.cpp +@@ -339,7 +339,9 @@ namespace SDDM { + } else { + //we only want to unlock the session if we can lock in, so we want to go via PAM auth, but not start a new session + //by not setting the session and the helper will emit authentication and then quit +- connect(m_auth, &Auth::authentication, this, [=](){ ++ connect(m_auth, &Auth::authentication, this, [=](const QString &, bool success){ ++ if(!success) ++ return; + qDebug() << "activating existing seat"; + OrgFreedesktopLogin1ManagerInterface manager(Logind::serviceName(), Logind::managerPath(), QDBusConnection::systemBus()); + manager.UnlockSession(existingSessionId); +diff --git a/src/helper/backend/PamBackend.cpp b/src/helper/backend/PamBackend.cpp +index 69cbd2c..5467282 100644 +--- src/helper/backend/PamBackend.cpp ++++ src/helper/backend/PamBackend.cpp +@@ -219,8 +219,6 @@ namespace SDDM { + + if (user == QStringLiteral("sddm") && m_greeter) + service = QStringLiteral("sddm-greeter"); +- else if (m_app->session()->path().isEmpty()) +- service = QStringLiteral("sddm-check"); + else if (m_autologin) + service = QStringLiteral("sddm-autologin"); + result = m_pam->start(service, user); diff --git a/x11/sddm/files/git-patch-b02b00559 b/x11/sddm/files/git-patch-b02b00559 new file mode 100644 index 00000000000..d934c4f0399 --- /dev/null +++ b/x11/sddm/files/git-patch-b02b00559 @@ -0,0 +1,70 @@ +diff --git a/src/daemon/Display.cpp b/src/daemon/Display.cpp +index 57d7ecb..c2ea728 100644 +--- src/daemon/Display.cpp ++++ src/daemon/Display.cpp +@@ -280,7 +280,7 @@ namespace SDDM { + return; + } + +- QString existingSessionId; ++ m_reuseSessionId = QString(); + + if (Logind::isAvailable() && mainConfig.Users.ReuseSession.get()) { + OrgFreedesktopLogin1ManagerInterface manager(Logind::serviceName(), Logind::managerPath(), QDBusConnection::systemBus()); +@@ -291,7 +291,7 @@ namespace SDDM { + if (s.userName == user) { + OrgFreedesktopLogin1SessionInterface session(Logind::serviceName(), s.sessionPath.path(), QDBusConnection::systemBus()); + if (session.service() == QLatin1String("sddm")) { +- existingSessionId = s.sessionId; ++ m_reuseSessionId = s.sessionId; + break; + } + } +@@ -334,19 +334,8 @@ namespace SDDM { + m_auth->insertEnvironment(env); + + m_auth->setUser(user); +- if (existingSessionId.isNull()) { ++ if (m_reuseSessionId.isNull()) { + m_auth->setSession(session.exec()); +- } else { +- //we only want to unlock the session if we can lock in, so we want to go via PAM auth, but not start a new session +- //by not setting the session and the helper will emit authentication and then quit +- connect(m_auth, &Auth::authentication, this, [=](const QString &, bool success){ +- if(!success) +- return; +- qDebug() << "activating existing seat"; +- OrgFreedesktopLogin1ManagerInterface manager(Logind::serviceName(), Logind::managerPath(), QDBusConnection::systemBus()); +- manager.UnlockSession(existingSessionId); +- manager.ActivateSession(existingSessionId); +- }); + } + m_auth->start(); + } +@@ -355,7 +344,13 @@ namespace SDDM { + if (success) { + qDebug() << "Authenticated successfully"; + +- m_auth->setCookie(qobject_cast(m_displayServer)->cookie()); ++ if (!m_reuseSessionId.isNull()) { ++ OrgFreedesktopLogin1ManagerInterface manager(Logind::serviceName(), Logind::managerPath(), QDBusConnection::systemBus()); ++ manager.UnlockSession(m_reuseSessionId); ++ manager.ActivateSession(m_reuseSessionId); ++ } else { ++ m_auth->setCookie(qobject_cast(m_displayServer)->cookie()); ++ } + + // save last user and last session + if (mainConfig.Users.RememberLastUser.get()) +diff --git a/src/daemon/Display.h b/src/daemon/Display.h +index 09d3cf9..a6a06b2 100644 +--- src/daemon/Display.h ++++ src/daemon/Display.h +@@ -85,6 +85,7 @@ namespace SDDM { + + QString m_passPhrase; + QString m_sessionName; ++ QString m_reuseSessionId; + + Auth *m_auth { nullptr }; + DisplayServer *m_displayServer { nullptr }; diff --git a/x11/sddm/pkg-message b/x11/sddm/pkg-message new file mode 100644 index 00000000000..902e8dc954a --- /dev/null +++ b/x11/sddm/pkg-message @@ -0,0 +1,2 @@ +SDDM does not support login.conf(5), and no special restrictions +or settings from login.conf are enforced or applied.