From e8ef9bd63f0232b879d00f70c384ca382f0e5651 Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Mon, 31 Jan 2005 00:10:12 +0000
Subject: xemacs and gnuserv have many common files in PLIST.  Make them
 conflict.

Bump PKGREVISIONs.
---
 editors/gnuserv/Makefile        | 5 ++++-
 editors/xemacs-current/Makefile | 6 ++++--
 editors/xemacs/Makefile         | 4 ++--
 editors/xemacs/Makefile.common  | 4 +++-
 4 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'editors')

diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile
index e89d3690590..56718e95be4 100644
--- a/editors/gnuserv/Makefile
+++ b/editors/gnuserv/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/11/27 00:01:42 epg Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/31 00:10:12 minskim Exp $
 
 DISTNAME=	gnuserv-3.12.7
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${HOMEPAGE}/src/
 
@@ -8,6 +9,8 @@ MAINTAINER=	epg@NetBSD.org
 HOMEPAGE=	http://meltin.net/hacks/emacs/
 COMMENT=	Improved version of emacsserver for GNU Emacs
 
+CONFLICTS+=	xemacs-[0-9]*
+
 GNU_CONFIGURE=	YES
 USE_X11=	YES
 
diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index 74a5c83f5d7..8ce0bed1bdb 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2005/01/22 13:03:06 magick Exp $
+# $NetBSD: Makefile,v 1.45 2005/01/31 00:10:12 minskim Exp $
 
 DISTNAME=	xemacs-21.5.18
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=xemacs-21.5/}
 
@@ -9,6 +9,8 @@ MAINTAINER=	magick@NetBSD.org
 HOMEPAGE=	http://www.xemacs.org/
 COMMENT=	*BETA* XEmacs text editor version 21.5.18
 
+CONFLICTS+=	gnuclient-[0-9]*
+
 USE_BUILDLINK3=	YES
 USE_X11=	YES
 
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 2fb257fa86f..7fc61c512f3 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2004/12/28 23:18:19 reed Exp $
+# $NetBSD: Makefile,v 1.74 2005/01/31 00:10:12 minskim Exp $
 
-PKGREVISION=	2
+PKGREVISION=	3
 
 .include "../../editors/xemacs/Makefile.common"
 
diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common
index c38fda6b1a4..28db1db1af5 100644
--- a/editors/xemacs/Makefile.common
+++ b/editors/xemacs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/11/25 21:34:59 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/01/31 00:10:12 minskim Exp $
 
 DISTNAME=	xemacs-21.4.15
 CATEGORIES=	editors
@@ -8,6 +8,8 @@ DISTFILES=	${EXTRACT_ONLY} ${EXTRA_FILES}
 HOMEPAGE=	http://www.xemacs.org/
 COMMENT=	XEmacs text editor version 21
 
+CONFLICTS+=	gnuclient-[0-9]*
+
 NOT_FOR_PLATFORM=	*-*-mips*	# fails purespace dumping
 
 USE_BUILDLINK3=	YES
-- 
cgit v1.2.3