CVS commit: pkgsrc/emulators/xnp2

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Mar 11 17:59:56 UTC 2022

Modified Files:
        pkgsrc/emulators/xnp2: Makefile

Log Message:
xnp2: Use SDL2

There is no conflict between SDL_mixer and SDL2_mixer anymore.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/emulators/xnp2/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/xnp2/Makefile
diff -u pkgsrc/emulators/xnp2/Makefile:1.35 pkgsrc/emulators/xnp2/Makefile:1.36
--- pkgsrc/emulators/xnp2/Makefile:1.35 Wed Dec  8 16:04:20 2021
+++ pkgsrc/emulators/xnp2/Makefile      Fri Mar 11 17:59:56 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2021/12/08 16:04:20 adam Exp $
+# $NetBSD: Makefile,v 1.36 2022/03/11 17:59:56 ryoon Exp $
 
 DISTNAME=              xnp2-0.86
-PKGREVISION=           12
+PKGREVISION=           13
 CATEGORIES=            emulators
 MASTER_SITES=          http://www.nonakap.org/np2/release/
 EXTRACT_SUFX=          .tar.bz2
@@ -18,9 +18,7 @@ CONFIGURE_DIRS=               x11
 GNU_CONFIGURE=         yes
 
 CONFIGURE_ARGS+=       --enable-build-all
-# XXX audio/SDL2_mixer requires multimedia/smpeg2 but it conflicts with
-#     multimedia/smpeg which is required by audio/SDL_mixer
-CONFIGURE_ARGS+=       --disable-sdl2
+CONFIGURE_ARGS+=       --enable-sdl2
 
 # Workaround for glib2-2.68.0 c++ fallout.
 CXXFLAGS+=             -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66
@@ -37,7 +35,7 @@ post-install:
 
 BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.6.0
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../audio/SDL_mixer/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"