[pkgsrc/trunk]: pkgsrc/emulators/retroarch retroarch: undo hack to workaround...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6cc665ac2e57
branches:  trunk
changeset: 396439:6cc665ac2e57
user:      maya <maya%pkgsrc.org@localhost>
date:      Fri May 31 18:11:51 2019 +0000

description:
retroarch: undo hack to workaround netbsd base xsrc issue.
Original issue is fixed.

bump PKGREVISION for options change

diffstat:

 emulators/retroarch/Makefile   |  4 ++--
 emulators/retroarch/options.mk |  9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diffs (40 lines):

diff -r f628e0c662cc -r 6cc665ac2e57 emulators/retroarch/Makefile
--- a/emulators/retroarch/Makefile      Fri May 31 17:37:42 2019 +0000
+++ b/emulators/retroarch/Makefile      Fri May 31 18:11:51 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2019/05/20 12:42:40 nia Exp $
+# $NetBSD: Makefile,v 1.26 2019/05/31 18:11:51 maya Exp $
 
 PKGNAME=       retroarch-${RETROARCH_VERSION}
 DISTNAME=      RetroArch-${RETROARCH_VERSION}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libretro/RetroArch/releases/download/v${RETROARCH_VERSION}/}
 EXTRACT_SUFX=  .tar.xz
diff -r f628e0c662cc -r 6cc665ac2e57 emulators/retroarch/options.mk
--- a/emulators/retroarch/options.mk    Fri May 31 17:37:42 2019 +0000
+++ b/emulators/retroarch/options.mk    Fri May 31 18:11:51 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2019/05/19 23:13:03 nia Exp $
+# $NetBSD: options.mk,v 1.12 2019/05/31 18:11:51 maya Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -12,15 +12,10 @@
 PKG_SUPPORTED_OPTIONS+=                udev
 .endif
 
-PKG_SUGGESTED_OPTIONS+=                sdl2 freetype
+PKG_SUGGESTED_OPTIONS+=                sdl2 freetype x11
 PKG_SUGGESTED_OPTIONS.Linux+=  alsa libdrm pulseaudio mbedtls udev
 PKG_SUGGESTED_OPTIONS.NetBSD+= mbedtls
 
-.if ${OPSYS} != "NetBSD" || ${X11_TYPE} == "modular"
-# XXX figure out why the builtin x server crashes on exit
-PKG_SUGGESTED_OPTIONS+=                x11
-.endif
-
 PKG_OPTIONS_OPTIONAL_GROUPS+=  gl
 PKG_OPTIONS_GROUP.gl+=         opengl