CVS commit: pkgsrc/audio/mpg123

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Oct 27 08:53:58 UTC 2020

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

Log Message:
mpg123: Simplify option selection.

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


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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/options.mk
diff -u pkgsrc/audio/mpg123/options.mk:1.6 pkgsrc/audio/mpg123/options.mk:1.7
--- pkgsrc/audio/mpg123/options.mk:1.6  Sat Aug  1 23:44:06 2020
+++ pkgsrc/audio/mpg123/options.mk      Tue Oct 27 08:53:57 2020
@@ -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
-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
+# 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 mpg123-with-fpu
+.elif ${MACHINE_ARCH} == "powerpc"
+PKG_OPTIONS_GROUP.fpu+=                mpg123-altivec
 PKG_SUGGESTED_OPTIONS+=                mpg123-altivec
 .else
-PKG_OPTIONS_GROUP.fpu=         mpg123-with-fpu
+# 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
 .endif
 
 .include "../../mk/bsd.options.mk"