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@.

8 files changed, 8 insertions, 22 deletions

diff --git a/x11/XFree86-clients/Makefile b/x11/XFree86-clients/Makefile
index 562b00fa532..58fee0135ec 100644
--- a/x11/XFree86-clients/Makefile
+++ b/x11/XFree86-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/07/29 05:41:12 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-clients-${XF_VER}
@@ -11,8 +11,6 @@ MAINTAINER=		xfree86@blef.org
 HOMEPAGE=		http://www.xfree86.org/
 COMMENT=		XFree86 client programs and related files
 
-CONFLICTS=		xorg-clients-[0-9]*
-
 USE_X11=		yes
 USE_BUILDLINK3=		yes
 CHECK_X11_TYPE=		# defined
diff --git a/x11/XFree86-libs/Makefile b/x11/XFree86-libs/Makefile
index f2fd982286c..60b74475e26 100644
--- a/x11/XFree86-libs/Makefile
+++ b/x11/XFree86-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/07/29 05:39:19 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-libs-${XF_VER}
@@ -15,7 +15,6 @@ COMMENT=		XFree86 Libraries
 CONFLICTS+=		xextensions-[0-9]*
 CONFLICTS+=		libX11-[0-9]*
 CONFLICTS+=		libXau-[0-9]*
-CONFLICTS+=		xorg-libs-[0-9]*
 
 BUILD_DEPENDS=		imake>=4.4.0:../../x11/imake
 
diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile
index 87875ec86fa..e4d6459afa6 100644
--- a/x11/XFree86-server/Makefile
+++ b/x11/XFree86-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/07/29 05:44:48 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-server-${XF_VER}
@@ -11,8 +11,6 @@ MAINTAINER=		xfree86@blef.org
 HOMEPAGE=		http://www.xfree86.org/
 COMMENT=		XFree86 X server and related programs
 
-CONFLICTS=		xorg-server-[0-9]*
-
 USE_X11=		yes
 USE_BUILDLINK3=		yes
 CHECK_X11_TYPE=		# defined
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
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index b78bd96948d..ced9e5152a3 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:52:04 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:34 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-clients-${XORG_VER}
@@ -11,8 +11,6 @@ MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://www.x.org/
 COMMENT=		X.org client programs and related files
 
-CONFLICTS+=		XFree86-clients-[0-9]*
-
 USE_X11=		yes
 USE_BUILDLINK3=		yes
 CHECK_X11_TYPE=		# defined
diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile
index 9986487072c..8429ddf9c6a 100644
--- a/x11/xorg-imake/Makefile
+++ b/x11/xorg-imake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:34 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-imake-${XORG_VER}
@@ -12,8 +12,6 @@ COMMENT=	Imake and other utilities from X.org
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 
-CONFLICTS+=	imake-[0-9]*
-
 USE_BUILDLINK3=		yes
 INSTALL_TARGET=		install install.man
 NO_XORG_TARGETS=	# defined
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index 77cb89b3478..eb297105ca9 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:34 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-libs-${XORG_VER}
@@ -14,7 +14,6 @@ COMMENT=		X.org Libraries
 CONFLICTS+=		xextensions-[0-9]*
 CONFLICTS+=		libX11-[0-9]*
 CONFLICTS+=		libXau-[0-9]*
-CONFLICTS+=		XFree86-libs-[0-9]*
 
 BUILD_DEPENDS=		xorg-imake>=6.7.0:../../x11/xorg-imake
 
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index 3876a5b6f29..6e8b9dcc074 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/07/29 05:19:45 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/07/29 06:36:34 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-server-${XORG_VER}
@@ -10,8 +10,6 @@ MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://www.x.org/
 COMMENT=		X.org X server and related programs
 
-CONFLICTS+=		XFree86-server-[0-9]*
-
 USE_X11=		yes
 USE_BUILDLINK3=		yes
 CHECK_X11_TYPE=		# defined