CVS commit: pkgsrc/emulators/retroarch

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri May 31 18:11:52 UTC 2019

Modified Files:
        pkgsrc/emulators/retroarch: Makefile options.mk

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

bump PKGREVISION for options change


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/emulators/retroarch/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/emulators/retroarch/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/retroarch/Makefile
diff -u pkgsrc/emulators/retroarch/Makefile:1.25 pkgsrc/emulators/retroarch/Makefile:1.26
--- pkgsrc/emulators/retroarch/Makefile:1.25    Mon May 20 12:42:40 2019
+++ pkgsrc/emulators/retroarch/Makefile Fri May 31 18:11:51 2019
@@ -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

Index: pkgsrc/emulators/retroarch/options.mk
diff -u pkgsrc/emulators/retroarch/options.mk:1.11 pkgsrc/emulators/retroarch/options.mk:1.12
--- pkgsrc/emulators/retroarch/options.mk:1.11  Sun May 19 23:13:03 2019
+++ pkgsrc/emulators/retroarch/options.mk       Fri May 31 18:11:51 2019
@@ -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+=             alsa jack opena
 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