[pkgsrc/trunk]: pkgsrc/audio/mpg123 mpg123: Simplify option selection.

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5d320644aaac
branches:  trunk
changeset: 441132:5d320644aaac
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Oct 27 08:53:57 2020 +0000

description:
mpg123: Simplify option selection.

Don't use a version check that will break as soon as we make a NetBSD 10.

diffstat:

 audio/mpg123/options.mk |  37 +++++++++++++++++--------------------
 1 files changed, 17 insertions(+), 20 deletions(-)

diffs (54 lines):

diff -r aea583a8664a -r 5d320644aaac audio/mpg123/options.mk
--- a/audio/mpg123/options.mk   Tue Oct 27 07:01:25 2020 +0000
+++ b/audio/mpg123/options.mk   Tue Oct 27 08:53:57 2020 +0000
@@ -1,33 +1,30 @@
-# $NetBSD: options.mk,v 1.6 2020/08/01 23:44:06 tsutsui Exp $
+# $NetBSD: options.mk,v 1.7 2020/10/27 08:53:57 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.mpg123
 PKG_OPTIONS_OPTIONAL_GROUPS=   fpu
 PKG_SUPPORTED_OPTIONS=         mpg123-fifo
 PKG_SUGGESTED_OPTIONS+=                mpg123-fifo
+PKG_OPTIONS_GROUP.fpu=         mpg123-with-fpu
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if (${MACHINE_ARCH} == "i386")
-.  if empty(MACHINE_PLATFORM:MDarwin-11.*-i386) && \
-      empty(MACHINE_PLATFORM:MSunOS-*) && \
-      empty(MACHINE_PLATFORM:MNetBSD-[89]*-i386)
-PKG_OPTIONS_GROUP.fpu=         mpg123-x86-dither mpg123-with-fpu
-PKG_SUGGESTED_OPTIONS+=                mpg123-x86-dither
-.  else
-PKG_OPTIONS_GROUP.fpu=         mpg123-with-fpu
+# x86-dither causes text relocations and doesn't work with the Sun linker
+# Don't enable it by default.
+.if ${MACHINE_ARCH} == "i386"
+PKG_OPTIONS_GROUP.fpu+=                mpg123-x86-dither
+.endif
+
+.if ${MACHINE_ARCH} == "aarch64"
+PKG_OPTIONS_GROUP.fpu+=                mpg123-neon64 mpg123-aarch64
+PKG_SUGGESTED_OPTIONS+=                mpg123-aarch64
+.elif ${MACHINE_ARCH} == "powerpc"
+PKG_OPTIONS_GROUP.fpu+=                mpg123-altivec
+PKG_SUGGESTED_OPTIONS+=                mpg123-altivec
+.else
+# Avoid using floating point on softfloat ARM.
+.  if !(!empty(MACHINE_ARCH:M*arm*) && empty(MACHINE_ARCH:M*hf*))
 PKG_SUGGESTED_OPTIONS+=                mpg123-with-fpu
 .  endif
-.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
-PKG_SUGGESTED_OPTIONS+=                mpg123-aarch64
-.elif (${MACHINE_ARCH} == "powerpc")
-PKG_OPTIONS_GROUP.fpu=         mpg123-altivec mpg123-with-fpu
-PKG_SUGGESTED_OPTIONS+=                mpg123-altivec
-.else
-PKG_OPTIONS_GROUP.fpu=         mpg123-with-fpu
-PKG_SUGGESTED_OPTIONS+=                mpg123-with-fpu
 .endif
 
 .include "../../mk/bsd.options.mk"