From sa2c@sa2c.net  Wed Apr 18 09:52:16 2007
Return-Path: <sa2c@sa2c.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E718B16A40D
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <sa2c@sa2c.net>
Reply-To: NIIMI Satoshi <sa2c@sa2c.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: editors/emacs* editors/xemacs* japanese/emacs*: add emacs-22.* to CONFLICTS
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         111814
>Category:       ports
>Synopsis:       editors/emacs* editors/xemacs* japanese/emacs*: add emacs-22.* to CONFLICTS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    nobutaka
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 18 10:00:09 GMT 2007
>Closed-Date:    Sat Jun 02 04:25:50 GMT 2007
>Last-Modified:  Sat Jun 02 04:25:50 GMT 2007
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->nobutaka 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Apr 18 10:00:29 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111814 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/111814: commit references a PR
Date: Thu,  3 May 2007 17:15:53 +0000 (UTC)

 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
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/111814: commit references a PR
Date: Fri,  4 May 2007 03:55:16 +0000 (UTC)

 nobutaka    2007-05-04 03:55:10 UTC
 
   FreeBSD ports repository
 
   Modified files:
     editors/xemacs-devel-mule Makefile 
   Log:
   Add emacs-22.* to CONFLICTS.
   
   PR:             ports/111814
   Submitted by:   NIIMI Satoshi <sa2c@sa2c.net>
   Approved by:    anray (maintainer)
   
   Revision  Changes    Path
   1.57      +1 -1      ports/editors/xemacs-devel-mule/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/111814: commit references a PR
Date: Sat,  2 Jun 2007 04:17:46 +0000 (UTC)

 nobutaka    2007-06-02 04:17:41 UTC
 
   FreeBSD ports repository
 
   Modified files:
     japanese/emacs-emcws Makefile 
     japanese/emacs20-emcws Makefile 
   Log:
   Add emacs-22.* to CONFLICTS.
   
   PR:            ports/111814
   Submitted by:  NIIMI Satoshi <sa2c@sa2c.net>
   Approved by:   NAKAJI Hiroyuki <nakaji@jp.freebsd.org> (maintainer)
   
   Revision  Changes    Path
   1.39      +1 -1      ports/japanese/emacs-emcws/Makefile
   1.26      +1 -1      ports/japanese/emacs20-emcws/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: nobutaka 
State-Changed-When: Sat Jun 2 04:24:45 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111814 
>Unformatted:
