Skip to content

Commit 421958e

Browse files
0-wiz-00-wiz-0
committed
*: switch from sox to sox_ng
1 parent 7e4a536 commit 421958e

18 files changed

Lines changed: 74 additions & 53 deletions

File tree

‎audio/cplay/MESSAGE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
===========================================================================
2-
$NetBSD: MESSAGE,v 1.1.1.1 2005/11/08 15:56:40 tonio Exp $
2+
$NetBSD: MESSAGE,v 1.2 2026/07/04 06:25:03 wiz Exp $
33

44
In order to make this package actually useful, you should install at least
55
one of the following audio players:
@@ -10,5 +10,5 @@ audio/mpg321
1010
audio/madplay
1111
audio/mikmod
1212
audio/xmp
13-
audio/sox
13+
audio/sox_ng
1414
===========================================================================

‎audio/juke/MESSAGE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
===========================================================================
2-
$NetBSD: MESSAGE,v 1.1.1.1 2003/03/06 22:30:57 salo Exp $
2+
$NetBSD: MESSAGE,v 1.2 2026/07/04 06:25:03 wiz Exp $
33

44
You may wish to install at least some players from pkgsrc to use with juke
55
(if you don't have them installed already). You can try the following
@@ -12,7 +12,7 @@ packages:
1212
ULT 669 files
1313
audio/mpg123 Command-line player for mpeg layer 1, 2 and 3 audio
1414
audio/sidplay tools for playing sidtunes
15-
audio/sox SOund eXchange - universal sound sample translator
15+
audio/sox_ng SOund eXchange - universal sound sample translator
1616
audio/vorbis-tools Ogg Vorbis encoder and player
1717
audio/xmp Player for many different Amiga and PC module formats
1818

‎audio/juke/Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# $NetBSD: Makefile,v 1.21 2023/12/30 01:13:18 zafer Exp $
2-
#
1+
# $NetBSD: Makefile,v 1.22 2026/07/04 06:25:03 wiz Exp $
32

43
DISTNAME= juke-0.7
54
PKGREVISION= 5
@@ -14,6 +13,8 @@ LICENSE= gnu-gpl-v2
1413
GNU_CONFIGURE= YES
1514
FAKE_NCURSES= yes
1615

16+
CFLAGS+= -Wno-implicit-function-declaration
17+
1718
EGDIR= ${PREFIX}/share/examples/juke
1819

1920
CONF_FILES= ${EGDIR}/juke.conf.default ${PKG_SYSCONFDIR}/juke.conf

‎audio/juke/distinfo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: distinfo,v 1.7 2021/10/26 09:59:03 nia Exp $
1+
$NetBSD: distinfo,v 1.8 2026/07/04 06:25:03 wiz Exp $
22

33
BLAKE2s (juke-0.7.tar.gz) = 1885f7aa47c1aed75d5ac60f809e580277198313d773154bec314e2459775524
44
SHA512 (juke-0.7.tar.gz) = 279f4c8f90b97c245de24da5cdb87b4a8b263d07f1da82be4ef9e23b51fbef34f6dead4c0d754136f2bb7534a9023c6c5dc8f24178ec98dfd531913b2b706e95
@@ -7,5 +7,5 @@ SHA1 (patch-aa) = e835b1fe8f00d8c5581a87d55407b9979bb73710
77
SHA1 (patch-ab) = e4a089f7307e6a029b7e0c6b5b862326e160f6d5
88
SHA1 (patch-ac) = f1c7233cd88ebdbc8df1a5ec5955b6506fd73634
99
SHA1 (patch-ad) = 3080321b954c2fa1ae83c6e945214c62f0f34e72
10-
SHA1 (patch-ae) = fe4a70293f762a17503c5782163181e873b52186
10+
SHA1 (patch-ae) = ddbba03df23e2b9a639b2f5f695afafcbb7303f1
1111
SHA1 (patch-af) = ec5e9602ffcef4b8e01c00a260b65612e1d9f89a

‎audio/juke/patches/patch-ae‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
$NetBSD: patch-ae,v 1.1 2004/01/28 11:15:35 agc Exp $
1+
$NetBSD: patch-ae,v 1.2 2026/07/04 06:25:03 wiz Exp $
22

3-
--- configure 2004/01/28 11:10:31 1.1
4-
+++ configure 2004/01/28 11:10:56
5-
@@ -586,12 +586,12 @@
3+
--- configure.orig 2001-02-11 19:49:24.000000000 +0000
4+
+++ configure
5+
@@ -586,12 +586,12 @@ echo "$ac_t""$target" 1>&6
66
target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
77
echo "$ac_t""$target" 1>&6
88

@@ -21,3 +21,21 @@ $NetBSD: patch-ae,v 1.1 2004/01/28 11:15:35 agc Exp $
2121

2222
CFLAGS="$CFLAGS -Wall -O2 -pipe -fomit-frame-pointer"
2323

24+
@@ -989,7 +989,7 @@ cat > conftest.$ac_ext << EOF
25+
#line 990 "configure"
26+
#include "confdefs.h"
27+
28+
-main(){return(0);}
29+
+int main(){return(0);}
30+
EOF
31+
if { (eval echo configure:995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
32+
ac_cv_prog_cc_works=yes
33+
@@ -1637,7 +1637,7 @@ else
34+
* If this system has a BSD-style setpgrp, which takes arguments, exit
35+
* successfully.
36+
*/
37+
-main()
38+
+int main()
39+
{
40+
if (setpgrp(1,1) == -1)
41+
exit(0);

‎audio/mp3to/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# $NetBSD: Makefile,v 1.13 2012/10/02 23:47:59 asau Exp $
1+
# $NetBSD: Makefile,v 1.14 2026/07/04 06:25:03 wiz Exp $
22

33
DISTNAME= mp3to
44
PKGNAME= ${DISTNAME}-1.0.1
5-
PKGREVISION= 1
5+
PKGREVISION= 2
66
CATEGORIES= audio
77
MASTER_SITES= ${MASTER_SITE_LOCAL}
88
EXTRACT_SUFX= .gz
@@ -14,7 +14,7 @@ NO_SRC_ON_FTP= already in MASTER_SITE_LOCAL
1414

1515
DEPENDS+= mpg123-[0-9]*:../../audio/mpg123
1616
DEPENDS+= gmp3info>=0.8.2:../../audio/gmp3info
17-
DEPENDS+= sox>=12.17.1:../../audio/sox
17+
DEPENDS+= sox_ng>=12.17.1:../../audio/sox_ng
1818

1919
REPLACE_SH= mp3to
2020

‎audio/shntool/Makefile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
# $NetBSD: Makefile,v 1.9 2026/02/08 10:52:58 wiz Exp $
1+
# $NetBSD: Makefile,v 1.10 2026/07/04 06:25:04 wiz Exp $
22

33
DISTNAME= shntool-3.0.10
4+
PKGREVISION= 1
45
CATEGORIES= audio archivers
56
#MASTER_SITES= http://www.etree.org/shnutils/shntool/source/
67

@@ -9,11 +10,11 @@ MAINTAINER= pkgsrc-users@NetBSD.org
910
COMMENT= Lossless audio compressor wrapper tool
1011
LICENSE= gnu-gpl-v2
1112

12-
GNU_CONFIGURE= YES
13-
1413
# could also support: "WV" (is this not wav?), OFR, LPAC and APE.
1514
DEPENDS+= shorten>=3.6.0:../../audio/shorten
1615
DEPENDS+= flac>=1.1.0:../../audio/flac
17-
DEPENDS+= sox>=12.17.4:../../audio/sox
16+
DEPENDS+= sox_ng>=12.17.4:../../audio/sox_ng
17+
18+
GNU_CONFIGURE= yes
1819

1920
.include "../../mk/bsd.pkg.mk"

‎audio/terminatorx/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# $NetBSD: Makefile,v 1.116 2026/06/11 07:16:45 wiz Exp $
1+
# $NetBSD: Makefile,v 1.117 2026/07/04 06:25:04 wiz Exp $
22

33
DISTNAME= terminatorX-4.2.0
44
PKGNAME= ${DISTNAME:S/X/x/1}
5-
PKGREVISION= 26
5+
PKGREVISION= 27
66
CATEGORIES= audio
77
MASTER_SITES= https://terminatorx.org/dist/
88

@@ -52,7 +52,7 @@ SUBST_SED.prefix+= -e "s|/usr/share/ladspa|${PREFIX}/share/ladspa|g"
5252
.include "../../audio/libvorbis/buildlink3.mk"
5353
.include "../../audio/libmad/buildlink3.mk"
5454
.include "../../audio/mpg123/buildlink3.mk"
55-
.include "../../audio/sox/buildlink3.mk"
55+
.include "../../audio/sox_ng/buildlink3.mk"
5656
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
5757
.include "../../textproc/liblrdf/buildlink3.mk"
5858
.include "../../textproc/libxml2/buildlink3.mk"

‎audio/xmradio/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# $NetBSD: Makefile,v 1.35 2026/02/20 12:17:03 wiz Exp $
1+
# $NetBSD: Makefile,v 1.36 2026/07/04 06:25:04 wiz Exp $
22

33
DISTNAME= xmradio-1.2
4-
PKGREVISION= 5
4+
PKGREVISION= 6
55
CATEGORIES= audio
66
#MASTER_SITES= http://core.de/~coto/radio/
77

@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
1010
COMMENT= Radio application for Brooktree 848 compatible TV cards
1111
LICENSE= 2-clause-bsd
1212

13-
DEPENDS+= sox>=12.16:../../audio/sox
13+
DEPENDS+= sox_ng>=12.16:../../audio/sox_ng
1414

1515
ONLY_FOR_PLATFORM= NetBSD-*.*-* DragonFly-*-*
1616

‎chat/centerim/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# $NetBSD: Makefile,v 1.88 2026/05/14 16:40:29 ryoon Exp $
1+
# $NetBSD: Makefile,v 1.89 2026/07/04 06:25:04 wiz Exp $
22

33
DISTNAME= centerim-4.22.10
4-
PKGREVISION= 53
4+
PKGREVISION= 54
55
CATEGORIES= chat
66
#MASTER_SITES= https://transacid.de/centerim/releases/
77

@@ -21,20 +21,20 @@ LIBS+= ${LDFLAGS}
2121
# Fails with C++14 default language.
2222
FORCE_CXX_STD= c++03
2323

24+
CFLAGS+= -Wno-implicit-function-declaration
25+
2426
REPLACE_PERL= misc/cimextracthistory.pl
2527
REPLACE_PERL+= misc/cimconv
2628
REPLACE_PYTHON+= misc/CenterIMLog2HTML.py
2729
REPLACE_AWK+= misc/cimformathistory
2830

29-
INCOMPAT_CURSES+= NetBSD-[0-5].*-* # see PR 29060
30-
3131
.include "options.mk"
3232
.include "../../mk/bsd.prefs.mk"
3333

3434
.if ${OPSYS} == "NetBSD"
3535
CPPFLAGS+= -DAUDIO_PLAYER="\"/usr/bin/audioplay\""
3636
.else
37-
DEPENDS+= sox>=12.17.4:../../audio/sox
37+
DEPENDS+= sox_ng>=12.17.4:../../audio/sox_ng
3838
CPPFLAGS+= -DAUDIO_PLAYER="\"${LOCALBASE}/bin/play\""
3939
.endif
4040

0 commit comments

Comments
 (0)