@@ -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

@@ -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_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