From owner-cvs-all@FreeBSD.ORG  Thu May  3 17:15:48 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 18C1316A402;
	Thu,  3 May 2007 17:15:48 +0000 (UTC)
	(envelope-from nobutaka@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id E3CDE13C465;
	Thu,  3 May 2007 17:15:47 +0000 (UTC)
	(envelope-from nobutaka@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l43HFl3B002063;
	Thu, 3 May 2007 17:15:47 GMT
	(envelope-from nobutaka@repoman.freebsd.org)
Received: (from nobutaka@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l43HFliQ002062;
	Thu, 3 May 2007 17:15:47 GMT (envelope-from nobutaka)
Message-Id: <200705031715.l43HFliQ002062@repoman.freebsd.org>
From: MANTANI Nobutaka <nobutaka@FreeBSD.org>
Date: Thu, 3 May 2007 17:15:47 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/editors/emacs Makefile ports/editors/emacs19
 Makefile ports/editors/xemacs Makefile ports/editors/xemacs-devel
 Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
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, 03 May 2007 17:15:48 -0000

nobutaka    2007-05-03 17:15:47 UTC

  FreeBSD ports repository

  Modified files:
    editors/emacs        Makefile 
    editors/emacs19      Makefile 
    editors/xemacs       Makefile 
    editors/xemacs-devel Makefile 
  Log:
  Add emacs-22.* to CONFLICTS.
  
  PR:             ports/111814
  Submitted by:   NIIMI Satoshi <sa2c@sa2c.net>
  
  Revision  Changes    Path
  1.68      +1 -1      ports/editors/emacs/Makefile
  1.61      +1 -1      ports/editors/emacs19/Makefile
  1.108     +1 -1      ports/editors/xemacs-devel/Makefile
  1.104     +1 -1      ports/editors/xemacs/Makefile