[pkgsrc/trunk]: pkgsrc/editors xemacs and gnuserv have many common files in P...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4d08e6cd8a9d
branches:  trunk
changeset: 488415:4d08e6cd8a9d
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Mon Jan 31 00:10:12 2005 +0000

description:
xemacs and gnuserv have many common files in PLIST.  Make them
conflict.

Bump PKGREVISIONs.

diffstat:

 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(-)

diffs (73 lines):

diff -r 93df154b067d -r 4d08e6cd8a9d editors/gnuserv/Makefile
--- a/editors/gnuserv/Makefile  Sun Jan 30 23:49:58 2005 +0000
+++ b/editors/gnuserv/Makefile  Mon Jan 31 00:10:12 2005 +0000
@@ -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 @@
 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 -r 93df154b067d -r 4d08e6cd8a9d editors/xemacs-current/Makefile
--- a/editors/xemacs-current/Makefile   Sun Jan 30 23:49:58 2005 +0000
+++ b/editors/xemacs-current/Makefile   Mon Jan 31 00:10:12 2005 +0000
@@ -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 @@
 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 -r 93df154b067d -r 4d08e6cd8a9d editors/xemacs/Makefile
--- a/editors/xemacs/Makefile   Sun Jan 30 23:49:58 2005 +0000
+++ b/editors/xemacs/Makefile   Mon Jan 31 00:10:12 2005 +0000
@@ -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 -r 93df154b067d -r 4d08e6cd8a9d editors/xemacs/Makefile.common
--- a/editors/xemacs/Makefile.common    Sun Jan 30 23:49:58 2005 +0000
+++ b/editors/xemacs/Makefile.common    Mon Jan 31 00:10:12 2005 +0000
@@ -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 @@
 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