From owner-cvs-all@FreeBSD.ORG  Fri Mar 11 00:44:44 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id BB01B16A4CE; Fri, 11 Mar 2005 00:44:44 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 95AF043D49; Fri, 11 Mar 2005 00:44:44 +0000 (GMT)
	(envelope-from ahze@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2B0iiDj044892;
	Fri, 11 Mar 2005 00:44:44 GMT
	(envelope-from ahze@repoman.freebsd.org)
Received: (from ahze@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2B0iiCo044891;
	Fri, 11 Mar 2005 00:44:44 GMT
	(envelope-from ahze)
Message-Id: <200503110044.j2B0iiCo044891@repoman.freebsd.org>
From: Michael Johnson <ahze@FreeBSD.org>
Date: Fri, 11 Mar 2005 00:44:44 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/multimedia/mplex Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Mar 2005 00:44:44 -0000

ahze        2005-03-11 00:44:44 UTC

  FreeBSD ports repository

  Modified files:
    multimedia/mplex     Makefile 
  Log:
  - Add CONFLICTS= mjpegtools-*
  
  PR:             ports/76709
  Submitted by:   Ulrich Spoerlein <q@uni.de>
  
  Revision  Changes    Path
  1.14      +2 -0      ports/multimedia/mplex/Makefile