From eca3299e6683518a5a94d449a5dd7e7a328552b2 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme@pkgsrc.org>
Date: Thu, 29 Jul 2004 05:37:36 +0000
Subject: CONFLICTS with xorg-imake.

---
 x11/imake/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'x11')

diff --git a/x11/imake/Makefile b/x11/imake/Makefile
index 5ac7695e0b9..9dfa09e7029 100644
--- a/x11/imake/Makefile
+++ b/x11/imake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/07/21 21:42:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2004/07/29 05:37:36 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	imake-${XF_VER}
@@ -12,6 +12,8 @@ COMMENT=	Imake and other utilities from XFree86
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 
+CONFLICTS=	xorg-imake-[0-9]*
+
 USE_BUILDLINK3=		yes
 USE_DIRS+=		XFree86-1.0
 INSTALL_TARGET=		install install.man
-- 
cgit v1.2.3