Authentication-Results: name.execsw.org; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=qDgHQAKE; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=23lVPjm6 Received: by mail.netbsd.org (Postfix, from userid 605) id AF82584EDB; Tue, 14 May 2024 17:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1715708356; bh=szpbvugnTt4kCJHaO/qPEAWKdFvFE/l+OT/O9bzLXUw=; h=Date:From:Subject:To:Reply-To:List-Id:List-Unsubscribe; b=qDgHQAKEtxZRRq9AXs53slOHGD+lh1QrbWxyM+5PVofBY5qNzayWVadK9uW209w9t /GWiRJzko1wdwnocu6iPJVXbh8JV8trAST4Py+evAuKeO98guYAf6wspmyChBoKRn2 fvtxx6JZ/V+ZXqhZnsXd1f3CMH3zxUe3QYm6mAk0= Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A0CE384ED7 for ; Tue, 14 May 2024 17:39:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Authentication-Results: mail.netbsd.org (amavisd-new); dkim=pass (1024-bit key) header.d=netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id P7dkFkiS1rsA for ; Tue, 14 May 2024 17:39:15 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id F343184E8D for ; Tue, 14 May 2024 17:39:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1715708355; bh=szpbvugnTt4kCJHaO/qPEAWKdFvFE/l+OT/O9bzLXUw=; h=Date:From:Subject:To:Reply-To; b=23lVPjm6MrgzPtChOdy24fYnQdwmZhzpseynZxjdNZgSYv+nfYhWmgiOVr1hCuBh+ JTKibl2stYAULe0kMDYgoKhv9nE001x2OJGk4GPfNdt9t9sT/exAxJNZuNbDO5i8Dr ISnN9BrRs76tHT7IaVttp0X8vpvXVwr/eb/Kn1N8= Received: by cvs.NetBSD.org (Postfix, from userid 500) id E40B8FA2C; Tue, 14 May 2024 17:39:14 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1715708354161080" MIME-Version: 1.0 Date: Tue, 14 May 2024 17:39:14 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/multimedia/x264 To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20240514173914.E40B8FA2C@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1715708354161080 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1715708354161080 Content-Disposition: inline Content-Length: 806 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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-.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. --_----------=_1715708354161080--