On 2023/09/26 13:05, Klemens Nanni wrote: > On Mon, Sep 25, 2023 at 11:35:38AM +0100, Stuart Henderson wrote: > > On 2023/09/22 17:12, Daniel Dickman wrote: > > > We discussed this back in Jan and then nothing happened. > > > > > > ok on the diff below to switch from python2 to python3? > > > > > > This is one of the last 2 consumers of python2,-tkinter (the other > > > consumer being security/oletools for which I've sent a python3 diff to > > > rpointel@). > > > > Or we could simply remove the python bindings from audio/snack, nothing > > is using them (and because upstream is py2-only, we're unlikely to find > > anything new using then that will work with what's in this proposal). > > Seems a little cleaner than pages of py3 compat patches.. > > Even better! >
Here's a diff for that. OK? Index: devel/quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.1544 diff -u -p -r1.1544 Makefile --- devel/quirks/Makefile 11 Oct 2023 13:34:52 -0000 1.1544 +++ devel/quirks/Makefile 11 Oct 2023 18:50:39 -0000 @@ -3,7 +3,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-6.160 +PKGNAME = quirks-6.161 PKG_ARCH = * MAINTAINER = Marc Espie <[email protected]> Index: devel/quirks/files/Quirks.pm =================================================================== RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.1556 diff -u -p -r1.1556 Quirks.pm --- devel/quirks/files/Quirks.pm 11 Oct 2023 13:34:52 -0000 1.1556 +++ devel/quirks/files/Quirks.pm 11 Oct 2023 18:50:39 -0000 @@ -1856,6 +1856,8 @@ setup_obsolete_reason( 3 => 'freetype', 3 => 'freetype-doc', 6 => 'ipcheck', +# 7.5 + 31 => 'py-snack', ); # though it's not yet used, these should be pkgnames, so that eventually Index: audio/snack/Makefile =================================================================== RCS file: /cvs/ports/audio/snack/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- audio/snack/Makefile 5 Sep 2023 16:13:42 -0000 1.18 +++ audio/snack/Makefile 11 Oct 2023 18:50:39 -0000 @@ -1,16 +1,13 @@ COMMENT-main = Tcl/Tk snack sound toolkit -COMMENT-python = Python bindings for 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} CATEGORIES = audio -REVISION-main = 6 -REVISION-python =2 +REVISION-main = 8 -HOMEPAGE = http://www.speech.kth.se/snack +HOMEPAGE = https://www.speech.kth.se/snack/ SITES = ${HOMEPAGE}/dist/ MAINTAINER = Sebastian Reitenbach <[email protected]> @@ -22,15 +19,12 @@ WANTLIB-main += X11 Xext Xft Xss m font LIB_DEPENDS-main = audio/libvorbis -MULTI_PACKAGES = -main -python +MULTI_PACKAGES = -main -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 SEPARATE_BUILD = Yes CONFIGURE_SCRIPT = unix/configure @@ -39,12 +33,10 @@ CONFIGURE_ARGS = --with-tcl=${MODTCL_LIB --with-tk=${MODTK_LIBDIR} \ --with-ogg-include=${LOCALBASE}/include \ --with-ogg-lib=${LOCALBASE}/lib -MAKE_FLAGS += SNACK_INSTALL_PATH=${MODTCL_TCLDIR} +MAKE_FLAGS += SNACK_INSTALL_PATH=${MODTCL_TCLDIR} 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 +46,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 +55,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: audio/snack/pkg/DESCR-python =================================================================== RCS file: audio/snack/pkg/DESCR-python diff -N audio/snack/pkg/DESCR-python --- audio/snack/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: audio/snack/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/audio/snack/pkg/PLIST-main,v retrieving revision 1.2 diff -u -p -r1.2 PLIST-main --- audio/snack/pkg/PLIST-main 11 Mar 2022 18:20:31 -0000 1.2 +++ audio/snack/pkg/PLIST-main 11 Oct 2023 18:50:39 -0000 @@ -1,8 +1,8 @@ -lib/libsnackstub2.2.a +@static-lib lib/libsnackstub2.2.a lib/tcl/snack/ -lib/tcl/snack/libsnack.so -lib/tcl/snack/libsnackogg.so -lib/tcl/snack/libsound.so +@so lib/tcl/snack/libsnack.so +@so lib/tcl/snack/libsnackogg.so +@so lib/tcl/snack/libsound.so lib/tcl/snack/pkgIndex.tcl lib/tcl/snack/snack.tcl share/doc/snack/ @@ -17,6 +17,7 @@ share/doc/snack/SoundObj.html share/doc/snack/SoundProp.html share/doc/snack/SoundSamp.html share/doc/snack/SphereFile.txt +@comment share/doc/snack/python-man.html share/doc/snack/tcl-man.html share/examples/snack/ share/examples/snack/tcl/ Index: audio/snack/pkg/PLIST-python =================================================================== RCS file: audio/snack/pkg/PLIST-python diff -N audio/snack/pkg/PLIST-python --- audio/snack/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
