summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/mpg123-jack/PLIST4
-rw-r--r--audio/mpg123-nas/PLIST4
-rw-r--r--audio/mpg123-oss/PLIST4
-rw-r--r--audio/mpg123-pulse/PLIST4
-rw-r--r--audio/mpg123-sun/PLIST4
-rw-r--r--audio/mpg123/Makefile19
-rw-r--r--audio/mpg123/Makefile.common28
-rw-r--r--audio/mpg123/PLIST10
-rw-r--r--audio/mpg123/distinfo14
-rw-r--r--audio/mpg123/files/decode_i586_.s320
-rw-r--r--audio/mpg123/patches/patch-Makefile.in20
-rw-r--r--audio/mpg123/patches/patch-aa15
-rw-r--r--audio/mpg123/patches/patch-af29
-rw-r--r--audio/mpg123/patches/patch-configure20
14 files changed, 73 insertions, 422 deletions
diff --git a/audio/mpg123-jack/PLIST b/audio/mpg123-jack/PLIST
index 65a72aa6cb8..51d2d36ba5f 100644
--- a/audio/mpg123-jack/PLIST
+++ b/audio/mpg123-jack/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2021/04/17 09:17:45 nia Exp $
-lib/mpg123/output_jack.la
+@comment $NetBSD: PLIST,v 1.2 2021/05/25 10:44:22 thor Exp $
+lib/mpg123/output_jack.so
diff --git a/audio/mpg123-nas/PLIST b/audio/mpg123-nas/PLIST
index 7c1b91d58bb..7677b817f8a 100644
--- a/audio/mpg123-nas/PLIST
+++ b/audio/mpg123-nas/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.4 2021/04/17 09:20:47 nia Exp $
-lib/mpg123/output_nas.la
+@comment $NetBSD: PLIST,v 1.5 2021/05/25 10:44:22 thor Exp $
+lib/mpg123/output_nas.so
diff --git a/audio/mpg123-oss/PLIST b/audio/mpg123-oss/PLIST
index 98c57978f6e..64d1f75dc17 100644
--- a/audio/mpg123-oss/PLIST
+++ b/audio/mpg123-oss/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2010/03/14 14:19:19 martin Exp $
-lib/mpg123/output_oss.la
+@comment $NetBSD: PLIST,v 1.2 2021/05/25 10:44:22 thor Exp $
+lib/mpg123/output_oss.so
diff --git a/audio/mpg123-pulse/PLIST b/audio/mpg123-pulse/PLIST
index e49bc969a56..be2240be35e 100644
--- a/audio/mpg123-pulse/PLIST
+++ b/audio/mpg123-pulse/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2010/03/14 16:28:02 martin Exp $
-lib/mpg123/output_pulse.la
+@comment $NetBSD: PLIST,v 1.2 2021/05/25 10:44:22 thor Exp $
+lib/mpg123/output_pulse.so
diff --git a/audio/mpg123-sun/PLIST b/audio/mpg123-sun/PLIST
index b76feedbafe..54b6a806057 100644
--- a/audio/mpg123-sun/PLIST
+++ b/audio/mpg123-sun/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2010/03/14 14:19:20 martin Exp $
-lib/mpg123/output_sun.la
+@comment $NetBSD: PLIST,v 1.2 2021/05/25 10:44:23 thor Exp $
+lib/mpg123/output_sun.so
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index cb9f0db93f4..e4529ad2b13 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.60 2021/01/03 15:06:00 adam Exp $
+# $NetBSD: Makefile,v 1.61 2021/05/25 10:44:22 thor Exp $
PKGNAME= ${DISTNAME:C/[^[:alnum:]]*//}
COMMENT= MPEG layer 1, 2, and 3 audio player
-PKGCONFIG_OVERRIDE+= libmpg123.pc.in
-
-MAKE_ENV+= MPG123_PROGRAM=mpg123
-MAKE_ENV+= EXTRA_INSTALL_TARGETS="install-exec-am install-data-am"
+PKGCONFIG_OVERRIDE+= libmpg123.pc.in libout123.pc.in libsyn123.pc.in
MPG123_BUILDING_BASE= # empty
.include "../../mk/bsd.prefs.mk"
-PLIST_VARS+= coreaudio oss sun
+PLIST_VARS+= coreaudio oss sun alsa
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "SunOS"
MPG123_DEFAULT_MODULE= sun
@@ -20,9 +17,17 @@ PLIST.sun= yes
.elif ${OPSYS} == "Darwin"
MPG123_DEFAULT_MODULE= coreaudio
PLIST.coreaudio= yes
+.elif ${OPSYS} == "Linux"
+MPG123_DEFAULT_MODULE= alsa,oss
+PLIST.alsa= yes
+PLIST.oss= yes
+.include "../../audio/alsa-lib/buildlink3.mk"
.else
MPG123_DEFAULT_MODULE= oss
PLIST.oss= yes
+.endif
+
+.if ${PLIST.oss} == "yes"
.include "../../mk/oss.buildlink3.mk"
LIBS+= ${LIBOSSAUDIO}
CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
@@ -36,4 +41,4 @@ CPPFLAGS+= -DDEVOSSSOUND="\"${DEVOSSSOUND}\""
.include "../../mk/bsd.pkg.mk"
# now we can set the default module
-MPG123_MODULE= ${MPG123_DEFAULT_MODULE}
+MPG123_MODULE= ${MPG123_DEFAULT_MODULE}
diff --git a/audio/mpg123/Makefile.common b/audio/mpg123/Makefile.common
index 46e666febfb..30a26ce6490 100644
--- a/audio/mpg123/Makefile.common
+++ b/audio/mpg123/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.57 2021/03/25 23:53:13 thor Exp $
+# $NetBSD: Makefile.common,v 1.58 2021/05/25 10:44:22 thor Exp $
#
# used by audio/mpg123-nas/Makefile
# used by audio/mpg123-oss/Makefile
# used by audio/mpg123-pulse/Makefile
# used by audio/mpg123-sun/Makefile
-DISTNAME= mpg123-1.26.5
+DISTNAME= mpg123-1.27.2
PKGNAME?= ${DISTNAME:C/[[:alnum:]]*/&-${MPG123_MODULE}/}
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpg123/}
@@ -20,9 +20,14 @@ USE_LANGUAGES= c99
USE_LIBTOOL?= yes
USE_TOOLS+= pkg-config gmake
GNU_CONFIGURE?= yes
-CONFIGURE_ARGS+= --enable-modules=yes
-CONFIGURE_ENV+= BUILD_${MPG123_MODULE:tu}=yes
-CONFIGURE_ENV+= MPG123_MODULE=${MPG123_MODULE:Q}
+CONFIGURE_ARGS+= --enable-modules=yes --with-audio=${MPG123_MODULE}
+
+# To be removed on update > 1.27.2.
+SUBST_CLASSES+= modules
+SUBST_STAGE.modules= pre-configure
+SUBST_MESSAGE.modules= Avoid static module files with pkgsrc libtool.
+SUBST_FILES.modules= Makefile.in
+SUBST_SED.modules= -e 's:\(output_.\+_la_CFLAGS = \)@:\1-shared @:'
DISTINFO_FILE= ${.CURDIR}/../../audio/mpg123/distinfo
@@ -33,11 +38,16 @@ INSTALLATION_DIRS+= lib/mpg123
LIBS+= -lmpg123
BUILD_TARGET= src/libout123/modules/output_${MPG123_MODULE}.la
PATCHDIR= ${.CURDIR}/../../audio/mpg123/patches
+.include "../../mk/bsd.prefs.mk"
+. if ${OPSYS} == "Darwin"
+SOEXT= dylib
+. else
+SOEXT= so
+. endif
do-install:
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/src/libout123/modules/output_${MPG123_MODULE}.la \
- ${DESTDIR}${PREFIX}/lib/mpg123
+ mkdir -p ${DESTDIR}${PREFIX}/lib/mpg123
+ install ${WRKSRC}/src/libout123/modules/.libs/output_${MPG123_MODULE}.${SOEXT} \
+ ${DESTDIR}${PREFIX}/lib/mpg123
.endif
-#.include "../../devel/libltdl/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
diff --git a/audio/mpg123/PLIST b/audio/mpg123/PLIST
index 086d47653c3..a88bedeb65f 100644
--- a/audio/mpg123/PLIST
+++ b/audio/mpg123/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2020/06/02 08:06:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2021/05/25 10:44:22 thor Exp $
bin/mpg123
bin/mpg123-id3dump
bin/mpg123-strip
@@ -10,9 +10,11 @@ include/syn123.h
lib/libmpg123.la
lib/libout123.la
lib/libsyn123.la
-${PLIST.coreaudio}lib/mpg123/output_coreaudio.la
-${PLIST.oss}lib/mpg123/output_oss.la
-${PLIST.sun}lib/mpg123/output_sun.la
+${PLIST.alsa}lib/mpg123/output_alsa.so
+${PLIST.coreaudio}lib/mpg123/output_coreaudio.so
+lib/mpg123/output_dummy.so
+${PLIST.oss}lib/mpg123/output_oss.so
+${PLIST.sun}lib/mpg123/output_sun.so
lib/pkgconfig/libmpg123.pc
lib/pkgconfig/libout123.pc
lib/pkgconfig/libsyn123.pc
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index c41446b15d3..65bd8c1fa71 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.56 2021/03/25 23:53:13 thor Exp $
+$NetBSD: distinfo,v 1.57 2021/05/25 10:44:22 thor Exp $
-SHA1 (mpg123-1.26.5.tar.bz2) = c4ed8d5b0c5400c28198e32b1175c8dac898e569
-RMD160 (mpg123-1.26.5.tar.bz2) = 5b433e97f34d2ce5f347bc952671601aaea034bc
-SHA512 (mpg123-1.26.5.tar.bz2) = 0c2b3174c834e4bd459a3324b825d9bf9341a3486c0af815773b00cb007578cb718522ac4e983c7ad7e3bb5df9fdd342a03cb51345c41f68971145196ac04b7a
-Size (mpg123-1.26.5.tar.bz2) = 1051356 bytes
-SHA1 (patch-Makefile.in) = e1b529e9468994e25c2567df7e64a2905b0cf529
-SHA1 (patch-aa) = 4b2761219dd8fb92079d7f96872e56beb702696a
+SHA1 (mpg123-1.27.2.tar.bz2) = 058acbcb4b20609ef52a843cc95f45a0cdd7286a
+RMD160 (mpg123-1.27.2.tar.bz2) = ac103d7f9642283cd71239524fbdc5492eeead9c
+SHA512 (mpg123-1.27.2.tar.bz2) = b1c7de0c1b1d14cce3b3ba72e7454b7ce392443a3eaace0431381f1871e2fda1470b8efd07176057f8bf76d88f14c2b7ffae470ba34a3271c7e779277b86d6c0
+Size (mpg123-1.27.2.tar.bz2) = 1067102 bytes
SHA1 (patch-ad) = f07b637c3fc1d3ea0426013fc25bca8e3aecba56
-SHA1 (patch-af) = ba9ccddda15f0e711675b1bbad72b082b34b15f5
+SHA1 (patch-configure) = 1c6256cf420974193f71fec7d4e2b4686923ab53
diff --git a/audio/mpg123/files/decode_i586_.s b/audio/mpg123/files/decode_i586_.s
deleted file mode 100644
index a9b2dc7421d..00000000000
--- a/audio/mpg123/files/decode_i586_.s
+++ /dev/null
@@ -1,320 +0,0 @@
-/
-/ synth_1to1 works the same way as the c version of this
-/ file. only two types of changes have been made:
-/ - reordered floating point instructions to
-/ prevent pipline stalls
-/ - made WRITE_SAMPLE use integer instead of
-/ (slower) floating point
-/ all kinds of x86 processors should benefit from these
-/ modifications.
-/
-/ useful sources of information on optimizing x86 code include:
-/
-/ Intel Architecture Optimization Manual
-/ http://www.intel.com/design/pentium/manuals/242816.htm
-/
-/ Cyrix 6x86 Instruction Set Summary
-/ ftp://ftp.cyrix.com/6x86/6x-dbch6.pdf
-/
-/ AMD-K5 Processor Software Development
-/ http://www.amd.com/products/cpg/techdocs/appnotes/20007e.pdf
-/
-/ Stefan Bieschewski <stb@acm.org>
-/
-/ $Id: decode_i586_.s,v 1.2 2005/05/31 22:13:24 rillig Exp $
-/
-.bss
- .comm buffs,4352
-.data
- .align 2
-bo:
- .long 1
-.text
- .align 3
-.LC0:
- .long 0x0,0x40dfffc0
- .align 3
-.LC1:
- .long 0x0,0xc0e00000
-.text
- .align 3
-.globl _synth_1to1_pent
-_synth_1to1_pent:
- subl $12,%esp
- pushl %ebp
- pushl %edi
- pushl %esi
- pushl %ebx
- movl 32(%esp),%eax
- movl 40(%esp),%esi
- xorl %edi,%edi
- movl bo,%ebp
- cmpl %edi,36(%esp)
- jne .L48
- decl %ebp
- andl $15,%ebp
- movl %ebp,bo
- movl $buffs,%ecx
- jmp .L49
-.L48:
- addl $2,%esi
- movl $buffs+2176,%ecx
-.L49:
- testl $1,%ebp
- je .L50
- movl %ecx,%ebx
- movl %ebp,16(%esp)
- pushl %eax
- movl 20(%esp),%edx
- leal (%ebx,%edx,4),%eax
- pushl %eax
- movl 24(%esp),%eax
- incl %eax
- andl $15,%eax
- leal 1088(,%eax,4),%eax
- addl %ebx,%eax
- jmp .L74
-.L50:
- leal 1088(%ecx),%ebx
- leal 1(%ebp),%edx
- movl %edx,16(%esp)
- pushl %eax
- leal 1092(%ecx,%ebp,4),%eax
- pushl %eax
- leal (%ecx,%ebp,4),%eax
-.L74:
- pushl %eax
- call _dct64
- addl $12,%esp
- movl 16(%esp),%edx
- leal 0(,%edx,4),%edx
- movl $_decwin+64,%eax
- movl %eax,%ecx
- subl %edx,%ecx
- movl $16,%ebp
-.L55:
- flds (%ecx)
- fmuls (%ebx)
- flds 4(%ecx)
- fmuls 4(%ebx)
- fxch %st(1)
- flds 8(%ecx)
- fmuls 8(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 12(%ecx)
- fmuls 12(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 16(%ecx)
- fmuls 16(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 20(%ecx)
- fmuls 20(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 24(%ecx)
- fmuls 24(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 28(%ecx)
- fmuls 28(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 32(%ecx)
- fmuls 32(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 36(%ecx)
- fmuls 36(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 40(%ecx)
- fmuls 40(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 44(%ecx)
- fmuls 44(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 48(%ecx)
- fmuls 48(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 52(%ecx)
- fmuls 52(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 56(%ecx)
- fmuls 56(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds 60(%ecx)
- fmuls 60(%ebx)
- fxch %st(2)
- subl $4,%esp
- faddp %st,%st(1)
- fxch %st(1)
- fsubrp %st,%st(1)
- fistpl (%esp)
- popl %eax
- cmpl $32767,%eax
- jg 1f
- cmpl $-32768,%eax
- jl 2f
- movw %ax,(%esi)
- jmp 4f
-1: movw $32767,(%esi)
- jmp 3f
-2: movw $-32768,(%esi)
-3: incl %edi
-4:
-.L54:
- addl $64,%ebx
- subl $-128,%ecx
- addl $4,%esi
- decl %ebp
- jnz .L55
- flds (%ecx)
- fmuls (%ebx)
- flds 8(%ecx)
- fmuls 8(%ebx)
- flds 16(%ecx)
- fmuls 16(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 24(%ecx)
- fmuls 24(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 32(%ecx)
- fmuls 32(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 40(%ecx)
- fmuls 40(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 48(%ecx)
- fmuls 48(%ebx)
- fxch %st(2)
- faddp %st,%st(1)
- flds 56(%ecx)
- fmuls 56(%ebx)
- fxch %st(2)
- subl $4,%esp
- faddp %st,%st(1)
- fxch %st(1)
- faddp %st,%st(1)
- fistpl (%esp)
- popl %eax
- cmpl $32767,%eax
- jg 1f
- cmpl $-32768,%eax
- jl 2f
- movw %ax,(%esi)
- jmp 4f
-1: movw $32767,(%esi)
- jmp 3f
-2: movw $-32768,(%esi)
-3: incl %edi
-4:
-.L62:
- addl $-64,%ebx
- addl $4,%esi
- movl 16(%esp),%edx
- leal -128(%ecx,%edx,8),%ecx
- movl $15,%ebp
-.L68:
- flds -4(%ecx)
- fchs
- fmuls (%ebx)
- flds -8(%ecx)
- fmuls 4(%ebx)
- fxch %st(1)
- flds -12(%ecx)
- fmuls 8(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -16(%ecx)
- fmuls 12(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -20(%ecx)
- fmuls 16(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -24(%ecx)
- fmuls 20(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -28(%ecx)
- fmuls 24(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -32(%ecx)
- fmuls 28(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -36(%ecx)
- fmuls 32(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -40(%ecx)
- fmuls 36(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -44(%ecx)
- fmuls 40(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -48(%ecx)
- fmuls 44(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -52(%ecx)
- fmuls 48(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -56(%ecx)
- fmuls 52(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds -60(%ecx)
- fmuls 56(%ebx)
- fxch %st(2)
- fsubrp %st,%st(1)
- flds (%ecx)
- fmuls 60(%ebx)
- fxch %st(2)
- subl $4,%esp
- fsubrp %st,%st(1)
- fxch %st(1)
- fsubrp %st,%st(1)
- fistpl (%esp)
- popl %eax
- cmpl $32767,%eax
- jg 1f
- cmpl $-32768,%eax
- jl 2f
- movw %ax,(%esi)
- jmp 4f
-1: movw $32767,(%esi)
- jmp 3f
-2: movw $-32768,(%esi)
-3: incl %edi
-4:
-.L67:
- addl $-64,%ebx
- addl $-128,%ecx
- addl $4,%esi
- decl %ebp
- jnz .L68
- movl %edi,%eax
- popl %ebx
- popl %esi
- popl %edi
- popl %ebp
- addl $12,%esp
- ret
diff --git a/audio/mpg123/patches/patch-Makefile.in b/audio/mpg123/patches/patch-Makefile.in
deleted file mode 100644
index 98d18b9dd14..00000000000
--- a/audio/mpg123/patches/patch-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.2 2017/07/14 05:46:47 maya Exp $
-
-Keep .la files for PLISTs.
-
---- Makefile.in.orig 2017-07-11 09:37:31.000000000 +0000
-+++ Makefile.in
-@@ -4072,13 +4072,6 @@ uninstall-man: uninstall-man1
- @USE_YASM_FOR_AVX_TRUE@ @echo "pic_object='`basename $<`'" >>$@
- @USE_YASM_FOR_AVX_TRUE@ @echo "non_pic_object='`basename $<`'" >>$@
-
--# Get rid of .la files, at least _after_ install.
--@HAVE_MODULES_TRUE@install-exec-hook:
--@HAVE_MODULES_TRUE@ cd $(DESTDIR)$(pkglibdir) && rm -f @output_modules_la@
--# The above breaks uninstall of module .so files?
--@HAVE_MODULES_TRUE@uninstall-hook:
--@HAVE_MODULES_TRUE@ for m in @output_modules_la@; do eval $$(grep dlname= src/libout123/modules/$$m) && rm -f $(DESTDIR)$(pkglibdir)/$$dlname; done
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa
deleted file mode 100644
index de4769397ba..00000000000
--- a/audio/mpg123/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.31 2016/12/18 22:58:34 adam Exp $
-
-Handle modules by pkgsrc.
-
---- configure.orig 2016-09-26 21:21:39.000000000 +0000
-+++ configure
-@@ -17124,7 +17124,7 @@ fi
-
-
- # The full list of supported modules to check, first come, first serve.
--check_modules="alsa tinyalsa oss coreaudio sndio sun win32 win32_wasapi os2 esd jack portaudio pulse sdl nas arts openal dummy"
-+check_modules="${MPG123_MODULE}"
- # Only check qsa before all else on QNX.
- # It would mask ALSA otherwise.
- case $host in
diff --git a/audio/mpg123/patches/patch-af b/audio/mpg123/patches/patch-af
deleted file mode 100644
index b442f0e5d1c..00000000000
--- a/audio/mpg123/patches/patch-af
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-af,v 1.3 2016/12/18 22:58:34 adam Exp $
-
---- src/libout123/xfermem.c.orig 2016-09-26 21:20:25.000000000 +0000
-+++ src/libout123/xfermem.c
-@@ -36,6 +36,13 @@ void xfermem_init (txfermem **xf, size_t
-
- #ifdef HAVE_MMAP
- # ifdef MAP_ANON
-+
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104030000)
-+ if(madvise((void *)xf, (regsize - sizeof(txfermem)),
-+ MADV_SEQUENTIAL) < 0)
-+ fprintf(stderr,"madvise failed, continuing anyway...\n");
-+#endif
-+
- if ((*xf = (txfermem *) mmap(0, regsize, PROT_READ | PROT_WRITE,
- MAP_ANON | MAP_SHARED, -1, 0)) == (txfermem *) -1) {
- perror ("mmap()");
-@@ -93,6 +100,10 @@ void xfermem_done (txfermem *xf)
- Casting to (void*) should silence compilers in case of funny
- prototype for munmap(). */
- munmap ( (void*)xf, xf->size + xf->metasize + sizeof(txfermem));
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104030000)
-+ if(madvise((void *)xf, (xf->size + xf->metasize), MADV_FREE) < 0)
-+ fprintf(stderr,"madvise failed, continuing anyways..\n");
-+#endif
- #else
- if (shmdt((void *) xf) == -1) {
- perror ("shmdt()");
diff --git a/audio/mpg123/patches/patch-configure b/audio/mpg123/patches/patch-configure
new file mode 100644
index 00000000000..2e3deb98687
--- /dev/null
+++ b/audio/mpg123/patches/patch-configure
@@ -0,0 +1,20 @@
+$NetBSD: patch-configure,v 1.1 2021/05/25 10:44:22 thor Exp $
+
+Workaround for pkgsrc's libtool to not build static libs when not
+requested. This patch should vanish on updating to > 1.27.2.
+
+--- configure.orig 2021-05-23 00:04:28.468168350 +0000
++++ configure
+@@ -5902,9 +5902,9 @@ else
+ enable_static=no
+ fi
+
+-
+-
+-
++if test "$enable_static" = no; then
++ LT_LDFLAGS="$LT_LDFLAGS -shared"
++fi
+
+
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 00:31:23 +0000