CVS commit: pkgsrc/games

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Sep 20 15:05:01 UTC 2019

Modified Files:
        pkgsrc/games/cataclysm-dda: Makefile
        pkgsrc/games/cataclysm-dda-sdl: Makefile
        pkgsrc/games/stone-soup: Makefile
        pkgsrc/games/stone-soup-sdl: Makefile

Log Message:
games: Normalize some roguelikes with separate curses and SDL versions.

Add CONFLICTS.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/cataclysm-dda/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/cataclysm-dda-sdl/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/stone-soup/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/stone-soup-sdl/Makefile

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

Modified files:

Index: pkgsrc/games/cataclysm-dda/Makefile
diff -u pkgsrc/games/cataclysm-dda/Makefile:1.1 pkgsrc/games/cataclysm-dda/Makefile:1.2
--- pkgsrc/games/cataclysm-dda/Makefile:1.1     Wed Aug  7 18:05:25 2019
+++ pkgsrc/games/cataclysm-dda/Makefile Fri Sep 20 15:05:01 2019
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2019/08/07 18:05:25 nia Exp $
+# $NetBSD: Makefile,v 1.2 2019/09/20 15:05:01 nia Exp $
 
 .include "Makefile.common"
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-COMMENT=       Turn-based survival game set in a post-apocalyptic world
+COMMENT=       Post-apocalyptic turn-based survival game (text-only version)
+
+CONFLICTS+=    cataclysm-dda-sdl-[0-9]*
 
 BUILD_TARGET=  cataclysm localization
 

Index: pkgsrc/games/cataclysm-dda-sdl/Makefile
diff -u pkgsrc/games/cataclysm-dda-sdl/Makefile:1.1 pkgsrc/games/cataclysm-dda-sdl/Makefile:1.2
--- pkgsrc/games/cataclysm-dda-sdl/Makefile:1.1 Wed Aug  7 18:05:25 2019
+++ pkgsrc/games/cataclysm-dda-sdl/Makefile     Fri Sep 20 15:05:01 2019
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2019/08/07 18:05:25 nia Exp $
+# $NetBSD: Makefile,v 1.2 2019/09/20 15:05:01 nia Exp $
 
 .include "../../games/cataclysm-dda/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-dda/-dda-sdl/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-COMMENT=       Turn-based survival game (tileset version)
+COMMENT=       Post-apocalyptic turn-based survival game (tileset version)
+
+CONFLICTS+=    cataclysm-dda-sdl-[0-9]*
 
 BUILD_TARGET=  cataclysm-tiles localization
 

Index: pkgsrc/games/stone-soup/Makefile
diff -u pkgsrc/games/stone-soup/Makefile:1.2 pkgsrc/games/stone-soup/Makefile:1.3
--- pkgsrc/games/stone-soup/Makefile:1.2        Sun Aug 11 13:21:04 2019
+++ pkgsrc/games/stone-soup/Makefile    Fri Sep 20 15:05:01 2019
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2019/08/11 13:21:04 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2019/09/20 15:05:01 nia Exp $
 
 PKGREVISION= 1
 .include "Makefile.common"
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-COMMENT=       Dungeon Crawl Stone Soup - roguelike adventure (text version)
+COMMENT=       Dungeon Crawl Stone Soup - roguelike adventure (text-only version)
+
+CONFLICTS+=    stone-soup-sdl-[0-9]*
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/stone-soup-sdl/Makefile
diff -u pkgsrc/games/stone-soup-sdl/Makefile:1.4 pkgsrc/games/stone-soup-sdl/Makefile:1.5
--- pkgsrc/games/stone-soup-sdl/Makefile:1.4    Sun Sep 15 14:49:24 2019
+++ pkgsrc/games/stone-soup-sdl/Makefile        Fri Sep 20 15:05:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/09/15 14:49:24 nia Exp $
+# $NetBSD: Makefile,v 1.5 2019/09/20 15:05:01 nia Exp $
 
 PKGREVISION= 1
 .include "../../games/stone-soup/Makefile.common"
@@ -8,6 +8,8 @@ PKGNAME=        ${DISTNAME:S/_/-/:S/-soup/-soup
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Dungeon Crawl Stone Soup - roguelike adventure (tileset version)
 
+CONFLICTS+=    stone-soup-[0-9]*
+
 MAKE_FLAGS+=   TILES=YesPlease
 MAKE_FLAGS+=   SOUND=YesPlease
 MAKE_FLAGS+=   COPY_FONTS=YesPlease