On Sat, Dec 03, 2022 at 10:15:16PM +0000, Klemens Nanni wrote:
> 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.
No feedback so far.
Simpler diff leaving the MULTI_PACKAGES -main bits behind, then -python
can be removed with a quirk.
OK?
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 11 Dec 2022 13:02:28 -0000
@@ -1,14 +1,11 @@
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}
+V = 2.2.10
+DISTNAME = snack${V}
+PKGNAME-main = snack-${V}
CATEGORIES = audio
-REVISION-main = 6
-REVISION-python =2
+REVISION-main = 7
HOMEPAGE = http://www.speech.kth.se/snack
MASTER_SITES = ${HOMEPAGE}/dist/
@@ -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: 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-main
===================================================================
RCS file: /cvs/ports/audio/snack/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main 11 Mar 2022 18:20:31 -0000 1.2
+++ pkg/PLIST-main 11 Dec 2022 13:02:40 -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: 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
