From owner-cvs-all@FreeBSD.ORG  Thu May  5 00:39:18 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 03C7416A4D5; Thu,  5 May 2005 00:39:18 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id CD2C643D58; Thu,  5 May 2005 00:39:17 +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 j44NwHMV094235;
	Wed, 4 May 2005 23:58:18 GMT
	(envelope-from ahze@repoman.freebsd.org)
Received: (from ahze@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j44NwHXM094234;
	Wed, 4 May 2005 23:58:17 GMT
	(envelope-from ahze)
Message-Id: <200505042358.j44NwHXM094234@repoman.freebsd.org>
From: Michael Johnson <ahze@FreeBSD.org>
Date: Wed, 4 May 2005 23:58:17 +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/totem 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: Thu, 05 May 2005 00:39:19 -0000

ahze        2005-05-04 23:58:17 UTC

  FreeBSD ports repository

  Modified files:
    multimedia/totem     Makefile 
  Log:
  - Fix CONFLICTS in totem so slave port totem-gstreamer conflicts with totem
    and not itself.
  
  Revision  Changes    Path
  1.56      +1 -1      ports/multimedia/totem/Makefile