CVS commit: pkgsrc/multimedia/x264

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue May 14 17:39:14 UTC 2024

Modified Files:
        pkgsrc/multimedia/x264: Makefile

Log Message:
x264: Add CONFLICTS/SUPERSEDES for x264-devel.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/x264/Makefile

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

Modified files:

Index: pkgsrc/multimedia/x264/Makefile
diff -u pkgsrc/multimedia/x264/Makefile:1.3 pkgsrc/multimedia/x264/Makefile:1.4
--- pkgsrc/multimedia/x264/Makefile:1.3 Fri Feb 23 19:41:25 2024
+++ pkgsrc/multimedia/x264/Makefile     Tue May 14 17:39:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2024/02/23 19:41:25 adam Exp $
+# $NetBSD: Makefile,v 1.4 2024/05/14 17:39:14 jperkin Exp $
 
 # Download https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2
 # Rename to x264-<last-commit-date>.tar.bz2 and upload to MASTER_SITE_LOCAL.
@@ -15,6 +15,9 @@ LICENSE=      gnu-gpl-v2
 
 WRKSRC=                ${WRKDIR}/x264-stable
 
+CONFLICTS+=    x264-devel-[0-9]*
+SUPERSEDES+=   x264-devel-[0-9]*
+
 .include "../../mk/bsd.prefs.mk"
 
 # Assembler code still needs to be disabled on at least SunOS.