pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel Add CONFLICTS for sdl12-compat.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/14ec0131472e
branches:  trunk
changeset: 376082:14ec0131472e
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Apr 02 07:17:55 2022 +0000

description:
Add CONFLICTS for sdl12-compat.

diffstat:

 devel/SDL/Makefile          |  4 +++-
 devel/sdl12-compat/Makefile |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 02b8d02210ed -r 14ec0131472e devel/SDL/Makefile
--- a/devel/SDL/Makefile        Sat Apr 02 07:12:20 2022 +0000
+++ b/devel/SDL/Makefile        Sat Apr 02 07:17:55 2022 +0000
@@ -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 @@
 GNU_CONFIGURE=         yes
 PTHREAD_OPTS+=         require
 
+CONFLICTS+=            sdl12-compat-[0-9]*
+
 CPPFLAGS+=             -DPREFIX="\"${PREFIX}\""
 CPPFLAGS+=             -DX11BASE="\"${X11BASE}\""
 
diff -r 02b8d02210ed -r 14ec0131472e devel/sdl12-compat/Makefile
--- a/devel/sdl12-compat/Makefile       Sat Apr 02 07:12:20 2022 +0000
+++ b/devel/sdl12-compat/Makefile       Sat Apr 02 07:17:55 2022 +0000
@@ -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 @@
 
 USE_CMAKE=     yes
 
+CONFLICTS+=    SDL-[0-9]*
+
 PKGCONFIG_OVERRIDE+=   sdl12_compat.pc.in
 
 post-install:



Home | Main Index | Thread Index | Old Index