CVS commit: pkgsrc/emulators

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Aug 14 13:08:57 UTC 2018

Modified Files:
        pkgsrc/emulators/libretro-desmume: Makefile
        pkgsrc/emulators/libretro-mupen64plus: options.mk

Log Message:
Use "${MACHINE_ARCH} ==" for x86_64 and i386 instead of the :M pattern.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/libretro-desmume/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/libretro-mupen64plus/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/emulators/libretro-desmume/Makefile
diff -u pkgsrc/emulators/libretro-desmume/Makefile:1.1 pkgsrc/emulators/libretro-desmume/Makefile:1.2
--- pkgsrc/emulators/libretro-desmume/Makefile:1.1      Sat Aug 11 12:57:23 2018
+++ pkgsrc/emulators/libretro-desmume/Makefile  Tue Aug 14 13:08:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/08/11 12:57:23 nia Exp $
+# $NetBSD: Makefile,v 1.2 2018/08/14 13:08:57 nia Exp $
 
 DISTNAME=      libretro-desmume-20180807
 CATEGORIES=    emulators
@@ -25,7 +25,7 @@ CXXFLAGS+=            -DUSE_POSIX_MEMALIGN -D__RET
 CXXFLAGS+=             -DARM
 MAKE_FLAGS+=           DESMUME_JIT=0
 MAKE_FLAGS+=           DESMUME_JIT_ARM=1
-.elif !empty(MACHINE_ARCH:M*x86_64*) || !empty(MACHINE_ARCH:M*i386*)
+.elif ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
 MAKE_FLAGS+=           DESMUME_JIT=1
 .else
 MAKE_FLAGS+=           DESMUME_JIT=0

Index: pkgsrc/emulators/libretro-mupen64plus/options.mk
diff -u pkgsrc/emulators/libretro-mupen64plus/options.mk:1.6 pkgsrc/emulators/libretro-mupen64plus/options.mk:1.7
--- pkgsrc/emulators/libretro-mupen64plus/options.mk:1.6        Sat Aug 11 21:03:17 2018
+++ pkgsrc/emulators/libretro-mupen64plus/options.mk    Tue Aug 14 13:08:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2018/08/11 21:03:17 nia Exp $
+# $NetBSD: options.mk,v 1.7 2018/08/14 13:08:57 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.libretro-mupen64plus
 PKG_OPTIONS_REQUIRED_GROUPS=   graphics
@@ -11,11 +11,11 @@ PKG_OPTIONS_GROUP.graphics+=        rpi
 PKG_SUPPORTED_OPTIONS+=                dynarec
 PKG_SUGGESTED_OPTIONS+=                rpi dynarec
 MUPEN64_DYNAREC_ARCH=          arm
-.elif !empty(MACHINE_ARCH:Mi386)
+.elif ${MACHINE_ARCH} == "i386"
 PKG_SUPPORTED_OPTIONS+=                dynarec
 PKG_SUGGESTED_OPTIONS+=                dynarec opengl
 MUPEN64_DYNAREC_ARCH=          x86
-.elif !empty(MACHINE_ARCH:Mx86_64)
+.elif ${MACHINE_ARCH} == "x86_64"
 PKG_SUPPORTED_OPTIONS+=                dynarec
 PKG_SUGGESTED_OPTIONS+=                dynarec opengl
 MUPEN64_DYNAREC_ARCH=          x86_64