CVS commit: pkgsrc/devel

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Apr  2 07:17:55 UTC 2022

Modified Files:
        pkgsrc/devel/SDL: Makefile
        pkgsrc/devel/sdl12-compat: Makefile

Log Message:
Add CONFLICTS for sdl12-compat.


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 pkgsrc/devel/SDL/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/sdl12-compat/Makefile

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

Modified files:

Index: pkgsrc/devel/SDL/Makefile
diff -u pkgsrc/devel/SDL/Makefile:1.145 pkgsrc/devel/SDL/Makefile:1.146
--- pkgsrc/devel/SDL/Makefile:1.145     Mon Mar 28 10:52:57 2022
+++ pkgsrc/devel/SDL/Makefile   Sat Apr  2 07:17:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.145 2022/03/28 10:52:57 tnn Exp $
+# $NetBSD: Makefile,v 1.146 2022/04/02 07:17:55 nia Exp $
 
 DISTNAME=      SDL-1.2.15
 PKGREVISION=   37
@@ -16,6 +16,8 @@ USE_TOOLS+=           gmake pkg-config
 GNU_CONFIGURE=         yes
 PTHREAD_OPTS+=         require
 
+CONFLICTS+=            sdl12-compat-[0-9]*
+
 CPPFLAGS+=             -DPREFIX="\"${PREFIX}\""
 CPPFLAGS+=             -DX11BASE="\"${X11BASE}\""
 

Index: pkgsrc/devel/sdl12-compat/Makefile
diff -u pkgsrc/devel/sdl12-compat/Makefile:1.1 pkgsrc/devel/sdl12-compat/Makefile:1.2
--- pkgsrc/devel/sdl12-compat/Makefile:1.1      Fri Apr  1 10:43:05 2022
+++ pkgsrc/devel/sdl12-compat/Makefile  Sat Apr  2 07:17:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/04/01 10:43:05 nia Exp $
+# $NetBSD: Makefile,v 1.2 2022/04/02 07:17:55 nia Exp $
 
 DISTNAME=      sdl12-compat-1.2.52
 CATEGORIES=    devel
@@ -12,6 +12,8 @@ LICENSE=      zlib
 
 USE_CMAKE=     yes
 
+CONFLICTS+=    SDL-[0-9]*
+
 PKGCONFIG_OVERRIDE+=   sdl12_compat.pc.in
 
 post-install: