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

26 files changed, 27 insertions, 83 deletions

diff --git a/fonts/XFree86-fonts100dpi/Makefile b/fonts/XFree86-fonts100dpi/Makefile
index dd310c2ef55..2c68a686015 100644
--- a/fonts/XFree86-fonts100dpi/Makefile
+++ b/fonts/XFree86-fonts100dpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:32 xtraeme Exp $
 
 DISTNAME=	XFree86-4.4.0-src-4
 PKGNAME=	XFree86-fonts100dpi-${XF_VER}
@@ -13,8 +13,6 @@ COMMENT=	XFree86 bitmap 100dpi fonts
 NO_XFREE86_TARGETS=	# defined
 WRKSRC=			${WRKDIR}/xc/fonts/bdf/100dpi
 
-CONFLICTS=	xorg-fonts100dpi-[0-9]*
-
 .include "../../fonts/XFree86-fontsEncodings/Makefile.common"
 .include "../../meta-pkgs/XFree86/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/XFree86-fonts75dpi/Makefile b/fonts/XFree86-fonts75dpi/Makefile
index e1813de4922..a5a39d894f5 100644
--- a/fonts/XFree86-fonts75dpi/Makefile
+++ b/fonts/XFree86-fonts75dpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=	XFree86-4.4.0-src-4
 PKGNAME=	XFree86-fonts75dpi-${XF_VER}
@@ -13,8 +13,6 @@ COMMENT=	XFree86 bitmap 75dpi fonts
 NO_XFREE86_TARGETS=	# defined
 WRKSRC=			${WRKDIR}/xc/fonts/bdf/75dpi
 
-CONFLICTS=	xorg-fonts75dpi-[0-9]*
-
 .include "../../fonts/XFree86-fontsEncodings/Makefile.common"
 .include "../../meta-pkgs/XFree86/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/XFree86-fontsCyrillic/Makefile b/fonts/XFree86-fontsCyrillic/Makefile
index aa57e5da467..ea944ad3030 100644
--- a/fonts/XFree86-fontsCyrillic/Makefile
+++ b/fonts/XFree86-fontsCyrillic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=	XFree86-4.4.0-src-4	
 PKGNAME=	XFree86-fontsCyrillic-${XF_VER}
@@ -13,8 +13,6 @@ COMMENT=	XFree86 Cyrillic fonts
 NO_XFREE86_TARGETS=	# defined
 WRKSRC=			${WRKDIR}/xc/fonts/bdf/cyrillic
 
-CONFLICTS=	xorg-fontsCyrillic-[0-9]*
-
 .include "../../fonts/XFree86-fontsEncodings/Makefile.common"
 .include "../../meta-pkgs/XFree86/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/XFree86-fontsEncodings/Makefile b/fonts/XFree86-fontsEncodings/Makefile
index de912fe0b68..75bf75b4d8d 100644
--- a/fonts/XFree86-fontsEncodings/Makefile
+++ b/fonts/XFree86-fontsEncodings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=	XFree86-4.4.0-src-4
 PKGNAME=	XFree86-fontsEncodings-${XF_VER}
@@ -12,8 +12,6 @@ COMMENT=	XFree86 Encoding fonts
 
 DEPENDS=	XFree86-clients>=4.4.0:../../x11/XFree86-clients
 
-CONFLICTS=	xorg-fontsEncodings-[0-9]*
-
 NO_XFREE86_TARGETS=	# defined
 CHECK_X11_TYPE=		# defined
 WRKSRC=			${WRKDIR}/xc/fonts/encodings
diff --git a/fonts/XFree86-fontsMisc/Makefile b/fonts/XFree86-fontsMisc/Makefile
index ac135179493..5317c3f8d75 100644
--- a/fonts/XFree86-fontsMisc/Makefile
+++ b/fonts/XFree86-fontsMisc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	XFree86-fontsMisc-${XF_VER}
@@ -10,8 +10,6 @@ MAINTAINER=	xfree86@blef.org
 HOMEPAGE=	http://www.xfree86.org/
 COMMENT=	XFree86 default bitmap fonts
 
-CONFLICTS=	xorg-fontsMisc-[0-9]*
-
 NO_XFREE86_TARGETS=	# defined
 FONTS_MISC=		# defined
 WRKSRC=			${WRKDIR}/xc/fonts/bdf/misc
diff --git a/fonts/XFree86-fontsScalable/Makefile b/fonts/XFree86-fontsScalable/Makefile
index 9c1f686e0e9..f926de2683c 100644
--- a/fonts/XFree86-fontsScalable/Makefile
+++ b/fonts/XFree86-fontsScalable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	XFree86-fontsScalable-${XF_VER}
@@ -12,9 +12,6 @@ COMMENT=	XFree86 scalable fonts
 
 DEPENDS+=	XFree86-fontsEncodings>=4.4.0:../XFree86-fontsEncodings
 
-CONFLICTS=	xorg-fontsTruetype-[0-9]*
-CONFLICTS+=	xorg-fontsType1-[0-9]*
-
 NO_BUILD=		yes
 NO_BUILDLINK=		# defined
 USE_LANGUAGES=		# empty
diff --git a/fonts/XFree86-fontserver/Makefile b/fonts/XFree86-fontserver/Makefile
index aabfbca614c..3b731f6f2ff 100644
--- a/fonts/XFree86-fontserver/Makefile
+++ b/fonts/XFree86-fontserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	XFree86-fontserver-${XF_VER}
@@ -11,8 +11,6 @@ MAINTAINER=	xfree86@blef.org
 HOMEPAGE=	http://www.xfree86.org/
 COMMENT=	XFree86 font server
 
-CONFLICTS=	xorg-fontserver-[0-9]*
-
 USE_X11=		yes
 USE_BUILDLINK3=		yes
 DISTINFO_FILE=		${.CURDIR}/../../x11/XFree86-libs/distinfo
diff --git a/fonts/xorg-fonts100dpi/Makefile b/fonts/xorg-fonts100dpi/Makefile
index c775f6d586c..34c7906f607 100644
--- a/fonts/xorg-fonts100dpi/Makefile
+++ b/fonts/xorg-fonts100dpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:55:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=	X11R6.7.0-src1
 PKGNAME=	xorg-fonts100dpi-${XORG_VER}
@@ -12,9 +12,6 @@ COMMENT=	X.org 100dpi bitmap fonts
 BUILD_DEPENDS=	xorg-clients>=6.7.0:../../x11/xorg-clients
 DEPENDS+=	xorg-fontsEncodings>=6.7.0:../../x11/xorgs-fontsEncodings
 
-CONFLICTS=	XFree86-fonts100dpi-[0-9]*
-
-NO_XFREE86_TARGETS=	# defined
 CHECK_X11_TYPE=		# defined
 XBUILD_DIRS=		fonts/encodings fonts/bdf/100dpi
 XINSTALL_DIRS=		fonts/bdf/100dpi
diff --git a/fonts/xorg-fonts75dpi/Makefile b/fonts/xorg-fonts75dpi/Makefile
index 1d814535724..3f1395d0d15 100644
--- a/fonts/xorg-fonts75dpi/Makefile
+++ b/fonts/xorg-fonts75dpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:56:29 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=	X11R6.7.0-src1
 PKGNAME=	xorg-fonts75dpi-${XORG_VER}
@@ -12,9 +12,6 @@ COMMENT=	X.org 75dpi bitmap fonts
 BUILD_DEPENDS=	xorg-clients>=6.7.0:../../x11/xorg-clients
 DEPENDS+=	xorg-fontsEncodings>=6.7.0:../../x11/xorgs-fontsEncodings
 
-CONFLICTS=	XFree86-fonts75dpi-[0-9]*
-
-NO_XFREE86_TARGETS=	# defined
 CHECK_X11_TYPE=		# defined
 XBUILD_DIRS=		fonts/encodings fonts/bdf/75dpi
 XINSTALL_DIRS=		fonts/bdf/75dpi
diff --git a/fonts/xorg-fontsCyrillic/Makefile b/fonts/xorg-fontsCyrillic/Makefile
index 904658de2c9..502aae45d5a 100644
--- a/fonts/xorg-fontsCyrillic/Makefile
+++ b/fonts/xorg-fontsCyrillic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:57:12 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=	X11R6.7.0-src1
 PKGNAME=	xorg-fontsCyrillic-${XORG_VER}
@@ -12,9 +12,6 @@ COMMENT=	X.org Cyrillic bitmap fonts
 BUILD_DEPENDS=	xorg-clients>=6.7.0:../../x11/xorg-clients
 DEPENDS+=	xorg-fontsEncodings>=6.7.0:../../x11/xorgs-fontsEncodings
 
-CONFLICTS=	XFree86-fontsCyrillic-[0-9]*
-
-NO_XFREE86_TARGETS=	# defined
 CHECK_X11_TYPE=		# defined
 XBUILD_DIRS=		fonts/encodings fonts/bdf/cyrillic
 XINSTALL_DIRS=		fonts/bdf/cyrillic
diff --git a/fonts/xorg-fontsEncodings/Makefile b/fonts/xorg-fontsEncodings/Makefile
index bce4793e798..48a66dbf45c 100644
--- a/fonts/xorg-fontsEncodings/Makefile
+++ b/fonts/xorg-fontsEncodings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:57:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=	X11R6.7.0-src1
 PKGNAME=	xorg-fontsEncodings-${XORG_VER}
@@ -11,9 +11,6 @@ COMMENT=	X.org Encoding fonts
 
 BUILD_DEPENDS=	xorg-clients>=6.7.0:../../x11/xorg-clients
 
-CONFLICTS=	XFree86-fontsEncodings-[0-9]*
-
-NO_XFREE86_TARGETS=	# defined
 CHECK_X11_TYPE=		# defined
 XBUILD_DIRS=		fonts/encodings
 
diff --git a/fonts/xorg-fontsMisc/Makefile b/fonts/xorg-fontsMisc/Makefile
index 66172846324..70ffe28098b 100644
--- a/fonts/xorg-fontsMisc/Makefile
+++ b/fonts/xorg-fontsMisc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:58:31 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=	X11R6.7.0-src1
 PKGNAME=	xorg-fontsMisc-${XORG_VER}
@@ -12,9 +12,6 @@ COMMENT=	X.org miscellaneous bitmap fonts
 BUILD_DEPENDS=	xorg-clients>=6.7.0:../../x11/xorg-clients
 DEPENDS+=	xorg-fontsEncodings>=6.7.0:../../x11/xorgs-fontsEncodings
 
-CONFLICTS=	XFree86-fontsMisc-[0-9]*
-
-NO_XFREE86_TARGETS=	# defined
 CHECK_X11_TYPE=		# defined
 XBUILD_DIRS=		fonts/encodings fonts/bdf/misc
 XINSTALL_DIRS=		fonts/bdf/misc
diff --git a/fonts/xorg-fontsTruetype/Makefile b/fonts/xorg-fontsTruetype/Makefile
index 1e431fd0be8..8fe3f455be7 100644
--- a/fonts/xorg-fontsTruetype/Makefile
+++ b/fonts/xorg-fontsTruetype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:59:30 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=	X11R6.7.0-src1
 PKGNAME=	xorg-fontsTruetype-${XORG_VER}
@@ -14,9 +14,7 @@ BUILD_DEPENDS+=	fontconfig-[0-9]*:../../fonts/fontconfig
 DEPENDS+=	xorg-fontsEncodings>=6.7.0:../../x11/xorgs-fontsEncodings
 
 CONFLICTS=	vera-ttf-[0-9]*
-CONFLICTS+=	XFree86-fontsScalable-[0-9]*
 
-NO_XFREE86_TARGETS=	# defined
 CHECK_X11_TYPE=		# defined
 XBUILD_DIRS=		fonts/encodings fonts/scaled/TTF
 XINSTALL_DIRS=		fonts/scaled/TTF
diff --git a/fonts/xorg-fontsType1/Makefile b/fonts/xorg-fontsType1/Makefile
index ba7f7454915..8cdf613052e 100644
--- a/fonts/xorg-fontsType1/Makefile
+++ b/fonts/xorg-fontsType1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 05:00:09 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=	X11R6.7.0-src1
 PKGNAME=	xorg-fontsType1-${XORG_VER}
@@ -12,9 +12,6 @@ COMMENT=	X.org Type1 fonts
 BUILD_DEPENDS=	xorg-clients>=6.7.0:../../x11/xorg-clients
 DEPENDS+=	xorg-fontsEncodings>=6.7.0:../../x11/xorgs-fontsEncodings
 
-CONFLICTS=	XFree86-fontsScalable-[0-9]*
-
-NO_XFREE86_TARGETS=	# defined
 CHECK_X11_TYPE=		# defined
 XBUILD_DIRS=		fonts/encodings fonts/scaled/Type1
 XINSTALL_DIRS=		fonts/scaled/Type1
diff --git a/fonts/xorg-fontserver/Makefile b/fonts/xorg-fontserver/Makefile
index 0bf761efbe0..9b9748e6dfa 100644
--- a/fonts/xorg-fontserver/Makefile
+++ b/fonts/xorg-fontserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 05:00:46 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-fontserver-${XORG_VER}
@@ -11,8 +11,6 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.x.org/
 COMMENT=	X.org font server
 
-CONFLICTS=	XFree86-fontserver-[0-9]*
-
 USE_X11=		yes
 USE_BUILDLINK3=		yes
 DISTINFO_FILE=		${.CURDIR}/../../x11/xorg-libs/distinfo
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common
index a9afb3ab0bb..b85711ac5bd 100644
--- a/meta-pkgs/xorg/Makefile.common
+++ b/meta-pkgs/xorg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2004/07/29 04:48:32 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/07/29 06:36:34 xtraeme Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will 
 #   be built in.
@@ -103,10 +103,9 @@ PKG_FAIL_REASON+=       "X11_TYPE=xorg is mandatory."
 
 NO_MTREE=		# defined
 
-X11ROOT_PREFIX?=	X11R6
+X11ROOT_PREFIX?=	xorg
 WRKSRC?=		${WRKDIR}/xc
 X11ROOT?=		${PREFIX}/${X11ROOT_PREFIX}
-X11BASE=		${X11ROOT}
 PREPEND_PATH=		${X11ROOT}/bin # Make sure we have this in PATH :)
 
 PLIST_SUBST+=		X11ROOT_PREFIX=${X11ROOT_PREFIX}
diff --git a/misc/XFree86-docs/Makefile b/misc/XFree86-docs/Makefile
index 8cdcbe1e20f..0c3f82fb9a8 100644
--- a/misc/XFree86-docs/Makefile
+++ b/misc/XFree86-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/07/29 05:48:38 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:32 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-docs-${XF_VER}
@@ -12,8 +12,6 @@ COMMENT=		XFree86 Documentation
 
 DEPENDS=		imake>=4.4.0:../../x11/imake
 
-CONFLICTS=		xorg-docs-[0-9]*
-
 USE_LANGUAGES=		# empty
 NO_BUILDLINK=		# defined
 NO_XFREE86_TARGETS=	# defined
diff --git a/misc/xorg-docs/Makefile b/misc/xorg-docs/Makefile
index ce187f06395..3336fdfcb66 100644
--- a/misc/xorg-docs/Makefile
+++ b/misc/xorg-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 05:03:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:32 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-docs-${XORG_VER}
@@ -12,8 +12,6 @@ COMMENT=		X.org Documentation
 
 BUILD_DEPENDS=		xorg-imake>=${XORG_VER}:../../x11/xorg-imake
 
-CONFLICTS=		XFree86-docs-[0-9]*
-
 USE_LANGUAGES=		# empty
 NO_BUILDLINK=		# defined
 NO_XFREE86_TARGETS=	# defined
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