[pkgsrc/trunk]: pkgsrc/devel/SDL2 SDL2: don't assume ARM is rpi

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/376b25c75269
branches:  trunk
changeset: 434012:376b25c75269
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Jun 09 19:36:52 2020 +0000

description:
SDL2: don't assume ARM is rpi

diffstat:

 devel/SDL2/Makefile   |   4 ++--
 devel/SDL2/options.mk |  16 ++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diffs (52 lines):

diff -r d077283b3ea9 -r 376b25c75269 devel/SDL2/Makefile
--- a/devel/SDL2/Makefile       Tue Jun 09 18:23:10 2020 +0000
+++ b/devel/SDL2/Makefile       Tue Jun 09 19:36:52 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2020/04/16 04:12:39 nia Exp $
+# $NetBSD: Makefile,v 1.51 2020/06/09 19:36:52 nia Exp $
 
 DISTNAME=      SDL2-2.0.12
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  https://www.libsdl.org/release/
 
diff -r d077283b3ea9 -r 376b25c75269 devel/SDL2/options.mk
--- a/devel/SDL2/options.mk     Tue Jun 09 18:23:10 2020 +0000
+++ b/devel/SDL2/options.mk     Tue Jun 09 19:36:52 2020 +0000
@@ -1,13 +1,18 @@
-# $NetBSD: options.mk,v 1.17 2020/03/30 10:18:48 nia Exp $
+# $NetBSD: options.mk,v 1.18 2020/06/09 19:36:52 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.SDL2
 PKG_OPTIONS_REQUIRED_GROUPS=   gl
 PKG_SUPPORTED_OPTIONS=         alsa dbus nas jack pulseaudio wayland x11
 PKG_SUGGESTED_OPTIONS.Linux=   alsa
 PKG_OPTIONS_GROUP.gl=          opengl
+PKG_SUGGESTED_OPTIONS+=                opengl
 
 .include "../../mk/bsd.fast.prefs.mk"
 
+.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mearm*)
+PKG_OPTIONS_GROUP.gl+= rpi
+.endif
+
 .if ${OPSYS} != "Darwin"
 PKG_SUGGESTED_OPTIONS+=        x11
 .endif
@@ -18,15 +23,6 @@
 PKG_SUGGESTED_OPTIONS+=        wayland
 .endif
 
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if !empty(MACHINE_ARCH:M*arm*)
-PKG_OPTIONS_GROUP.gl+= rpi
-PKG_SUGGESTED_OPTIONS+=        rpi
-.else
-PKG_SUGGESTED_OPTIONS+=        opengl
-.endif
-
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Malsa)