Date: Wed, 18 Apr 2007 18:52:11 +0900 (JST) From: NIIMI Satoshi <sa2c@sa2c.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/111814: editors/emacs* editors/xemacs* japanese/emacs*: add emacs-22.* to CONFLICTS Message-ID: <20070418095211.83E5745E6@berkeley.l.sa2c.net> Resent-Message-ID: <200704181000.l3IA09T0070368@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070418095211.83E5745E6>