From 1d7604642cf5032afc3b10d18dfe74e95aa9c643 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme>
Date: Thu, 29 Jul 2004 06:36:32 +0000
Subject: xorg packages now will be installed into ${PREFIX}/xorg by default,
 so we don't have to conflict between XFree86 and xorg.

Suggested by grant@.
---
 x11/imake/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'x11/imake')

diff --git a/x11/imake/Makefile b/x11/imake/Makefile
index 9dfa09e7029..08085ee8c53 100644
--- a/x11/imake/Makefile
+++ b/x11/imake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/07/29 05:37:36 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	imake-${XF_VER}
@@ -12,8 +12,6 @@ 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