From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 18 10:00:10 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 661F416A413 for ; Wed, 18 Apr 2007 10:00:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 37F8A13C4BA for ; Wed, 18 Apr 2007 10:00:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l3IA0AqL070372 for ; Wed, 18 Apr 2007 10:00:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l3IA09T0070368; Wed, 18 Apr 2007 10:00:10 GMT (envelope-from gnats) Resent-Date: Wed, 18 Apr 2007 10:00:10 GMT Resent-Message-Id: <200704181000.l3IA09T0070368@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, NIIMI Satoshi Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E718B16A40D for ; Wed, 18 Apr 2007 09:52:15 +0000 (UTC) (envelope-from sa2c@sa2c.net) Received: from py-out-1112.google.com (py-out-1112.google.com [64.233.166.183]) by mx1.freebsd.org (Postfix) with ESMTP id B1D8F13C487 for ; Wed, 18 Apr 2007 09:52:15 +0000 (UTC) (envelope-from sa2c@sa2c.net) Received: by py-out-1112.google.com with SMTP id f31so79956pyh for ; Wed, 18 Apr 2007 02:52:15 -0700 (PDT) Received: by 10.35.43.10 with SMTP id v10mr608962pyj.1176889935327; Wed, 18 Apr 2007 02:52:15 -0700 (PDT) Received: from berkeley.l.sa2c.net ( [125.198.18.21]) by mx.google.com with ESMTP id w29sm612864pyg.2007.04.18.02.52.13; Wed, 18 Apr 2007 02:52:14 -0700 (PDT) Received: by berkeley.l.sa2c.net (Postfix, from userid 3104) id 83E5745E6; Wed, 18 Apr 2007 18:52:11 +0900 (JST) Message-Id: <20070418095211.83E5745E6@berkeley.l.sa2c.net> Date: Wed, 18 Apr 2007 18:52:11 +0900 (JST) From: NIIMI Satoshi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/111814: editors/emacs* editors/xemacs* japanese/emacs*: add emacs-22.* to CONFLICTS X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: NIIMI Satoshi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Apr 2007 10:00:10 -0000 >Number: 111814 >Category: ports >Synopsis: editors/emacs* editors/xemacs* japanese/emacs*: add emacs-22.* to CONFLICTS >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Apr 18 10:00:09 GMT 2007 >Closed-Date: >Last-Modified: >Originator: NIIMI Satoshi >Release: FreeBSD 6.2-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD berkeley.l.sa2c.net 6.2-RELEASE-p3 FreeBSD 6.2-RELEASE-p3 #0: Wed Mar 21 12:02:59 JST 2007 root@berkeley.l.sa2c.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Emacs ports conflict editors/emacs-devel, but does not contain emacs-22.* in CONFLICTS. This PR also fixes ports/108853. >How-To-Repeat: >Fix: * add emacs-22.* to CONFLICTS. --- emacs.diff begins here --- Index: editors/emacs/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/emacs/Makefile,v retrieving revision 1.67 diff -u -r1.67 Makefile --- editors/emacs/Makefile 12 Nov 2006 02:50:07 -0000 1.67 +++ editors/emacs/Makefile 18 Apr 2007 09:34:12 -0000 @@ -15,7 +15,7 @@ MAINTAINER= nobutaka@FreeBSD.org COMMENT= GNU editing macros -CONFLICTS= emacs-19.* \ +CONFLICTS= emacs-19.* emacs-22.* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* Index: editors/emacs19/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/emacs19/Makefile,v retrieving revision 1.60 diff -u -r1.60 Makefile --- editors/emacs19/Makefile 16 Dec 2005 08:09:19 -0000 1.60 +++ editors/emacs19/Makefile 18 Apr 2007 09:34:32 -0000 @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GNU editing macros -CONFLICTS= emacs-21.* \ +CONFLICTS= emacs-21.* emacs-22.* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* Index: editors/xemacs/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/xemacs/Makefile,v retrieving revision 1.103 diff -u -r1.103 Makefile --- editors/xemacs/Makefile 11 Mar 2007 14:41:27 -0000 1.103 +++ editors/xemacs/Makefile 18 Apr 2007 09:35:02 -0000 @@ -17,7 +17,7 @@ MAINTAINER?= ports@FreeBSD.org COMMENT?= This port tracks the stable version of the XEmacs text editor -CONFLICTS= emacs-19.* emacs-21.* \ +CONFLICTS= emacs-19.* emacs-21.* emacs-22.* \ xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* Index: editors/xemacs-devel/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/xemacs-devel/Makefile,v retrieving revision 1.107 diff -u -r1.107 Makefile --- editors/xemacs-devel/Makefile 16 May 2006 14:31:26 -0000 1.107 +++ editors/xemacs-devel/Makefile 18 Apr 2007 09:34:53 -0000 @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= This port tracks the development (GAMMA) version of the XEmacs text editor -CONFLICTS= emacs-19.* emacs-21.* \ +CONFLICTS= emacs-19.* emacs-21.* emacs-22.* \ xemacs-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* Index: editors/xemacs-devel-mule/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/xemacs-devel-mule/Makefile,v retrieving revision 1.56 diff -u -r1.56 Makefile --- editors/xemacs-devel-mule/Makefile 10 Feb 2007 20:24:09 -0000 1.56 +++ editors/xemacs-devel-mule/Makefile 18 Apr 2007 09:34:45 -0000 @@ -28,7 +28,7 @@ MAINTAINER?= anray@FreeBSD.org COMMENT?= XEmacs(beta version) text editor with mule(Only the executables) -CONFLICTS= emacs-19.* emacs-21.* \ +CONFLICTS= emacs-19.* emacs-21.* emacs-22.* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* Index: japanese/emacs-emcws/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/emacs-emcws/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- japanese/emacs-emcws/Makefile 27 Dec 2006 14:06:00 -0000 1.37 +++ japanese/emacs-emcws/Makefile 18 Apr 2007 09:40:15 -0000 @@ -28,7 +28,7 @@ BUILD_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs RUN_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs -CONFLICTS= emacs-19.* emacs-20.* \ +CONFLICTS= emacs-19.* emacs-20.* emacs-22.* \ ja-emcws-20.* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* Index: japanese/emacs20-emcws/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/emacs20-emcws/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- japanese/emacs20-emcws/Makefile 27 Dec 2006 14:06:04 -0000 1.24 +++ japanese/emacs20-emcws/Makefile 18 Apr 2007 09:40:21 -0000 @@ -25,7 +25,7 @@ BUILD_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20 RUN_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20 -CONFLICTS= emacs-19.* emacs-21.* \ +CONFLICTS= emacs-19.* emacs-21.* emacs-22.* \ ja-emcws-21.* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* --- emacs.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: