On Sat, Dec 03, 2022 at 08:12:59PM +0000, Klemens Nanni wrote:
> No upstream activity in years, I don't see py3 bits anywhere, so I
> suggest we retire bindings for the EOL python 2.
>
> Merge -main and -python into a single audio/snack package.
> Tested with
> # pkg_add py-snack
> $ make package
> $ cp /usr/ports/packages/amd64/ftp/snack-2.2.10p7.tgz .
> $ doas env TRUSTED_PKG_PATH=. pkg_add -u
> py-snack-2.2.10p2+snack-2.2.10p6->snack-2.2.10p7: ok
> Read shared items: ok
>
> This gets rid of the last lang/python/2.7,-tkinter consumer, which could
> be removed next.
>
> Feedback? Objection? OK?
Now with cvs add'ed files.
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/snack/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 11 Mar 2022 18:20:30 -0000 1.17
+++ Makefile 3 Dec 2022 19:56:26 -0000
@@ -1,14 +1,11 @@
-COMMENT-main = Tcl/Tk snack sound toolkit
-COMMENT-python = Python bindings for Tcl/Tk snack sound toolkit
+COMMENT = Tcl/Tk snack sound toolkit
-MODPY_EGG_VERSION = 2.2.10
-DISTNAME = snack${MODPY_EGG_VERSION}
-PKGNAME-main = snack-${MODPY_EGG_VERSION}
-PKGNAME-python = py-snack-${MODPY_EGG_VERSION}
+V = 2.2.10
+DISTNAME = snack${V}
+PKGNAME = snack-${V}
CATEGORIES = audio
-REVISION-main = 6
-REVISION-python =2
+REVISION = 7
HOMEPAGE = http://www.speech.kth.se/snack
MASTER_SITES = ${HOMEPAGE}/dist/
@@ -17,20 +14,15 @@ MAINTAINER = Sebastian Reitenbach <sebas
# BSD/GPLv2
PERMIT_PACKAGE = Yes
-WANTLIB-main += c sndio ossaudio ogg vorbis vorbisenc
-WANTLIB-main += X11 Xext Xft Xss m fontconfig
+WANTLIB += c sndio ossaudio ogg vorbis vorbisenc
+WANTLIB += X11 Xext Xft Xss m fontconfig
-LIB_DEPENDS-main = audio/libvorbis
+LIB_DEPENDS = audio/libvorbis
-MULTI_PACKAGES = -main -python
-
-MODULES = lang/python x11/tk
-MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
+MODULES = x11/tk
BUILD_DEPENDS = ${MODTK_BUILD_DEPENDS}
-RUN_DEPENDS-main = ${MODTK_RUN_DEPENDS}
-RUN_DEPENDS-python = ${BASE_PKGPATH} \
- lang/python/${MODPY_VERSION},-tkinter
+RUN_DEPENDS = ${MODTK_RUN_DEPENDS}
SEPARATE_BUILD = Yes
CONFIGURE_SCRIPT = unix/configure
@@ -43,8 +35,6 @@ MAKE_FLAGS += SNACK_INSTALL_PATH=${MODT
TEST_TARGET = test
-MODPY_ADJ_FILES = demos/python/*.py
-
pre-configure:
cp ${FILESDIR}/jkAudIO_sndio.c ${WRKSRC}/unix/
${MODTCL_WISH_ADJ} ${WRKSRC}/demos/tcl/compose.tcl \
@@ -54,10 +44,7 @@ pre-configure:
${WRKSRC}/demos/tcl/mapChan.tcl
post-install:
- cd ${WRKSRC}/python && \
- ${MODPY_BIN} ${MODPY_SETUP} ${MODPY_DISTUTILS_INSTALL}
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snack/tcl
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snack/python
${INSTALL_DATA} ${WRKSRC}/demos/tcl/*.plg
${PREFIX}/share/examples/snack/tcl/
${INSTALL_DATA} ${WRKSRC}/demos/tcl/*.scr
${PREFIX}/share/examples/snack/tcl/
${INSTALL_DATA} ${WRKSRC}/demos/tcl/*.phn
${PREFIX}/share/examples/snack/tcl/
@@ -66,9 +53,6 @@ post-install:
${INSTALL_SCRIPT} ${WRKSRC}/demos/tcl/*.tcl
${PREFIX}/share/examples/snack/tcl/
rm ${PREFIX}/share/examples/snack/tcl/wrap.tcl \
${PREFIX}/share/examples/snack/tcl/SphereTest.tcl
- ${INSTALL_SCRIPT} ${WRKSRC}/demos/python/*.py
${PREFIX}/share/examples/snack/python/
- ${INSTALL_DATA} ${WRKSRC}/demos/python/*wav
${PREFIX}/share/examples/snack/python/
- ${INSTALL_DATA} ${WRKSRC}/demos/python/*txt
${PREFIX}/share/examples/snack/python/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snack
${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/snack
Index: pkg/DESCR
===================================================================
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR 3 Dec 2022 19:53:15 -0000
@@ -0,0 +1,7 @@
+The Snack Sound Toolkit is designed to be used with a scripting language
+such as Tcl/Tk or Python. Snack has commands for basic sound handling,
+such as playback, recording, file and socket I/O. Snack also provides
+primitives for sound visualization, e.g. waveforms and spectrograms. It
+was developed mainly to handle digital recordings of speech, but is just
+as useful for general audio. Snack has also successfully been applied
+to other one-dimensional signals.
Index: pkg/DESCR-main
===================================================================
RCS file: pkg/DESCR-main
diff -N pkg/DESCR-main
--- pkg/DESCR-main 12 Mar 2011 08:53:52 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-The Snack Sound Toolkit is designed to be used with a scripting language
-such as Tcl/Tk or Python. Snack has commands for basic sound handling,
-such as playback, recording, file and socket I/O. Snack also provides
-primitives for sound visualization, e.g. waveforms and spectrograms. It
-was developed mainly to handle digital recordings of speech, but is just
-as useful for general audio. Snack has also successfully been applied
-to other one-dimensional signals.
Index: pkg/DESCR-python
===================================================================
RCS file: pkg/DESCR-python
diff -N pkg/DESCR-python
--- pkg/DESCR-python 12 Mar 2011 08:53:52 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-The Snack Sound Toolkit is designed to be used with a scripting language
-such as Tcl/Tk or Python. This package contains the python bindings for
-snack.
Index: pkg/PLIST
===================================================================
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST 3 Dec 2022 20:00:13 -0000
@@ -0,0 +1,71 @@
+@conflict py-snack-*
+@pkgpath audio/snack,-python
+@pkgpath audio/snack,-main
+lib/libsnackstub2.2.a
+lib/tcl/snack/
+lib/tcl/snack/libsnack.so
+lib/tcl/snack/libsnackogg.so
+lib/tcl/snack/libsound.so
+lib/tcl/snack/pkgIndex.tcl
+lib/tcl/snack/snack.tcl
+share/doc/snack/
+share/doc/snack/AddSubCmd.html
+share/doc/snack/Callback.html
+share/doc/snack/CreateFilter.html
+share/doc/snack/FileFormat.html
+share/doc/snack/SampConv.html
+share/doc/snack/SnackLib.html
+share/doc/snack/SoundData.html
+share/doc/snack/SoundObj.html
+share/doc/snack/SoundProp.html
+share/doc/snack/SoundSamp.html
+share/doc/snack/SphereFile.txt
+share/doc/snack/tcl-man.html
+share/examples/snack/
+share/examples/snack/tcl/
+share/examples/snack/tcl/CSLwithAB.tcl
+share/examples/snack/tcl/MinSect.tcl
+share/examples/snack/tcl/MinSpeg.tcl
+share/examples/snack/tcl/MinWave.tcl
+share/examples/snack/tcl/Section.tcl
+share/examples/snack/tcl/Spectrogram.tcl
+share/examples/snack/tcl/Waveform.tcl
+share/examples/snack/tcl/aserver.tcl
+share/examples/snack/tcl/compose.tcl
+share/examples/snack/tcl/cool.tcl
+share/examples/snack/tcl/cutter.plg
+share/examples/snack/tcl/dataplot.plg
+share/examples/snack/tcl/dbrec.scr
+share/examples/snack/tcl/dbrec.tcl
+share/examples/snack/tcl/echo.tcl
+share/examples/snack/tcl/ex1.phn
+share/examples/snack/tcl/ex1.wav
+share/examples/snack/tcl/ex2.phn
+share/examples/snack/tcl/ex2.wav
+share/examples/snack/tcl/formant.tcl
+share/examples/snack/tcl/fourChan.tcl
+share/examples/snack/tcl/generator.plg
+share/examples/snack/tcl/generator.tcl
+share/examples/snack/tcl/generator2.tcl
+share/examples/snack/tcl/levelmeter.tcl
+share/examples/snack/tcl/mapChan.tcl
+share/examples/snack/tcl/mixer.tcl
+share/examples/snack/tcl/mixplay.tcl
+share/examples/snack/tcl/notescale.tcl
+share/examples/snack/tcl/oggstream.tcl
+share/examples/snack/tcl/phonetogram.tcl
+share/examples/snack/tcl/pitch.plg
+share/examples/snack/tcl/pitch.tcl
+share/examples/snack/tcl/play.tcl
+share/examples/snack/tcl/playlist.tcl
+share/examples/snack/tcl/polarspec.tcl
+share/examples/snack/tcl/record.tcl
+share/examples/snack/tcl/recrplay.tcl
+share/examples/snack/tcl/rplay.tcl
+share/examples/snack/tcl/snamp.tcl
+share/examples/snack/tcl/spectrum.tcl
+share/examples/snack/tcl/tcl-demos.txt
+share/examples/snack/tcl/tomAmp.tcl
+share/examples/snack/tcl/vowelspace.tcl
+share/examples/snack/tcl/widget.tcl
+share/examples/snack/tcl/xs.tcl
Index: pkg/PLIST-main
===================================================================
RCS file: pkg/PLIST-main
diff -N pkg/PLIST-main
--- pkg/PLIST-main 11 Mar 2022 18:20:31 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,68 +0,0 @@
-lib/libsnackstub2.2.a
-lib/tcl/snack/
-lib/tcl/snack/libsnack.so
-lib/tcl/snack/libsnackogg.so
-lib/tcl/snack/libsound.so
-lib/tcl/snack/pkgIndex.tcl
-lib/tcl/snack/snack.tcl
-share/doc/snack/
-share/doc/snack/AddSubCmd.html
-share/doc/snack/Callback.html
-share/doc/snack/CreateFilter.html
-share/doc/snack/FileFormat.html
-share/doc/snack/SampConv.html
-share/doc/snack/SnackLib.html
-share/doc/snack/SoundData.html
-share/doc/snack/SoundObj.html
-share/doc/snack/SoundProp.html
-share/doc/snack/SoundSamp.html
-share/doc/snack/SphereFile.txt
-share/doc/snack/tcl-man.html
-share/examples/snack/
-share/examples/snack/tcl/
-share/examples/snack/tcl/CSLwithAB.tcl
-share/examples/snack/tcl/MinSect.tcl
-share/examples/snack/tcl/MinSpeg.tcl
-share/examples/snack/tcl/MinWave.tcl
-share/examples/snack/tcl/Section.tcl
-share/examples/snack/tcl/Spectrogram.tcl
-share/examples/snack/tcl/Waveform.tcl
-share/examples/snack/tcl/aserver.tcl
-share/examples/snack/tcl/compose.tcl
-share/examples/snack/tcl/cool.tcl
-share/examples/snack/tcl/cutter.plg
-share/examples/snack/tcl/dataplot.plg
-share/examples/snack/tcl/dbrec.scr
-share/examples/snack/tcl/dbrec.tcl
-share/examples/snack/tcl/echo.tcl
-share/examples/snack/tcl/ex1.phn
-share/examples/snack/tcl/ex1.wav
-share/examples/snack/tcl/ex2.phn
-share/examples/snack/tcl/ex2.wav
-share/examples/snack/tcl/formant.tcl
-share/examples/snack/tcl/fourChan.tcl
-share/examples/snack/tcl/generator.plg
-share/examples/snack/tcl/generator.tcl
-share/examples/snack/tcl/generator2.tcl
-share/examples/snack/tcl/levelmeter.tcl
-share/examples/snack/tcl/mapChan.tcl
-share/examples/snack/tcl/mixer.tcl
-share/examples/snack/tcl/mixplay.tcl
-share/examples/snack/tcl/notescale.tcl
-share/examples/snack/tcl/oggstream.tcl
-share/examples/snack/tcl/phonetogram.tcl
-share/examples/snack/tcl/pitch.plg
-share/examples/snack/tcl/pitch.tcl
-share/examples/snack/tcl/play.tcl
-share/examples/snack/tcl/playlist.tcl
-share/examples/snack/tcl/polarspec.tcl
-share/examples/snack/tcl/record.tcl
-share/examples/snack/tcl/recrplay.tcl
-share/examples/snack/tcl/rplay.tcl
-share/examples/snack/tcl/snamp.tcl
-share/examples/snack/tcl/spectrum.tcl
-share/examples/snack/tcl/tcl-demos.txt
-share/examples/snack/tcl/tomAmp.tcl
-share/examples/snack/tcl/vowelspace.tcl
-share/examples/snack/tcl/widget.tcl
-share/examples/snack/tcl/xs.tcl
Index: pkg/PLIST-python
===================================================================
RCS file: pkg/PLIST-python
diff -N pkg/PLIST-python
--- pkg/PLIST-python 11 Mar 2022 18:20:31 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-lib/python${MODPY_VERSION}/site-packages/tkSnack-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
-lib/python${MODPY_VERSION}/site-packages/tkSnack.py
-lib/python${MODPY_VERSION}/site-packages/tkSnack.pyc
-share/doc/snack/python-man.html
-share/examples/snack/python/
-share/examples/snack/python/MinSect.py
-share/examples/snack/python/MinSpeg.py
-share/examples/snack/python/MinWave.py
-share/examples/snack/python/dataCmd.py
-share/examples/snack/python/echo.py
-share/examples/snack/python/ex1.wav
-share/examples/snack/python/generator.py
-share/examples/snack/python/mixplay.py
-share/examples/snack/python/notescale.py
-share/examples/snack/python/oggplay.py
-share/examples/snack/python/playnotes.py
-share/examples/snack/python/polarspec.py
-share/examples/snack/python/python-demos.txt
-share/examples/snack/python/spectrogram.py
-share/examples/snack/python/sphere.py
-share/examples/snack/python/tkSnack.py
-share/examples/snack/python/widget.py
