From owner-cvs-ports@FreeBSD.ORG  Fri May  6 08:56:31 2005
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 401D716A4CE; Fri,  6 May 2005 08:56:31 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 175AB43D70; Fri,  6 May 2005 08:56:31 +0000 (GMT)
	(envelope-from jylefort@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 j468uUFt050994;
	Fri, 6 May 2005 08:56:30 GMT
	(envelope-from jylefort@repoman.freebsd.org)
Received: (from jylefort@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j468uU1o050993;
	Fri, 6 May 2005 08:56:30 GMT
	(envelope-from jylefort)
Message-Id: <200505060856.j468uU1o050993@repoman.freebsd.org>
From: Jean-Yves Lefort <jylefort@FreeBSD.org>
Date: Fri, 6 May 2005 08:56:30 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/editors/emacs Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 May 2005 08:56:31 -0000

jylefort    2005-05-06 08:56:30 UTC

  FreeBSD ports repository

  Modified files:
    editors/emacs        Makefile 
  Log:
  Add CONFLICTS variable, since this port conflicts with other
  emacs/xemacs ports.
  
  Approved by:    nobutaka (maintainer)
  
  Revision  Changes    Path
  1.60      +4 -0      ports/editors/emacs/Makefile