CVS commit: pkgsrc/audio/mpg123

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Aug  1 23:44:06 UTC 2020

Modified Files:
        pkgsrc/audio/mpg123: Makefile options.mk

Log Message:
Don't set PKG_SUGGESTED_OPTIONS=mpg123-with-fpu on softfloat arm.

Fixes PR/54779.
Bump PKGREVISION to rebuild arm binaries.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/audio/mpg123/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/mpg123/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/mpg123/Makefile
diff -u pkgsrc/audio/mpg123/Makefile:1.58 pkgsrc/audio/mpg123/Makefile:1.59
--- pkgsrc/audio/mpg123/Makefile:1.58   Sat Jul 27 15:14:40 2019
+++ pkgsrc/audio/mpg123/Makefile        Sat Aug  1 23:44:06 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2019/07/27 15:14:40 nia Exp $
+# $NetBSD: Makefile,v 1.59 2020/08/01 23:44:06 tsutsui Exp $
 
 PKGNAME=       ${DISTNAME:C/[^[:alnum:]]*//}
+PKGREVISION=   1
 COMMENT=       MPEG layer 1, 2, and 3 audio player
 
 PKGCONFIG_OVERRIDE+=   libmpg123.pc.in

Index: pkgsrc/audio/mpg123/options.mk
diff -u pkgsrc/audio/mpg123/options.mk:1.5 pkgsrc/audio/mpg123/options.mk:1.6
--- pkgsrc/audio/mpg123/options.mk:1.5  Sat Jul 14 17:12:56 2018
+++ pkgsrc/audio/mpg123/options.mk      Sat Aug  1 23:44:06 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2018/07/14 17:12:56 tsutsui Exp $
+# $NetBSD: options.mk,v 1.6 2020/08/01 23:44:06 tsutsui Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.mpg123
 PKG_OPTIONS_OPTIONAL_GROUPS=   fpu
@@ -17,7 +17,7 @@ PKG_SUGGESTED_OPTIONS+=               mpg123-x86-dith
 PKG_OPTIONS_GROUP.fpu=         mpg123-with-fpu
 PKG_SUGGESTED_OPTIONS+=                mpg123-with-fpu
 .  endif
-.elif (${MACHINE_ARCH} == "arm") || (${MACHINE_ARCH} == "arm32")
+.elif !empty(MACHINE_ARCH:M*arm*) && empty(MACHINE_ARCH:M*hf*)
 PKG_OPTIONS_GROUP.fpu=         mpg123-with-fpu 
 .elif (${MACHINE_ARCH} == "aarch64")
 PKG_OPTIONS_GROUP.fpu=         mpg123-neon64 mpg123-aarch64