CONFLICTS with XFree86*

7 files changed, 22 insertions, 7 deletions

diff --git a/fonts/XFree86-fonts100dpi/Makefile b/fonts/XFree86-fonts100dpi/Makefile
index 5ed3ed470a0..dd310c2ef55 100644
--- a/fonts/XFree86-fonts100dpi/Makefile
+++ b/fonts/XFree86-fonts100dpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/28 22:06:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/29 05:54:11 xtraeme Exp $
 
 DISTNAME=	XFree86-4.4.0-src-4
 PKGNAME=	XFree86-fonts100dpi-${XF_VER}
@@ -13,6 +13,8 @@ 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 2d18c7dc553..e1813de4922 100644
--- a/fonts/XFree86-fonts75dpi/Makefile
+++ b/fonts/XFree86-fonts75dpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/28 22:06:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/29 05:54:11 xtraeme Exp $
 
 DISTNAME=	XFree86-4.4.0-src-4
 PKGNAME=	XFree86-fonts75dpi-${XF_VER}
@@ -13,6 +13,8 @@ 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 3fa517fc087..aa57e5da467 100644
--- a/fonts/XFree86-fontsCyrillic/Makefile
+++ b/fonts/XFree86-fontsCyrillic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/28 22:06:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/29 05:54:11 xtraeme Exp $
 
 DISTNAME=	XFree86-4.4.0-src-4	
 PKGNAME=	XFree86-fontsCyrillic-${XF_VER}
@@ -13,6 +13,8 @@ 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 fb5e9f3925d..de912fe0b68 100644
--- a/fonts/XFree86-fontsEncodings/Makefile
+++ b/fonts/XFree86-fontsEncodings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/03/29 00:30:16 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/29 05:54:11 xtraeme Exp $
 
 DISTNAME=	XFree86-4.4.0-src-4
 PKGNAME=	XFree86-fontsEncodings-${XF_VER}
@@ -12,6 +12,8 @@ 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 403e02e2bd2..ac135179493 100644
--- a/fonts/XFree86-fontsMisc/Makefile
+++ b/fonts/XFree86-fontsMisc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/28 22:06:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/29 05:54:11 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	XFree86-fontsMisc-${XF_VER}
@@ -10,6 +10,8 @@ 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 2dd43017873..9c1f686e0e9 100644
--- a/fonts/XFree86-fontsScalable/Makefile
+++ b/fonts/XFree86-fontsScalable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/03/29 00:30:16 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/29 05:54:11 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	XFree86-fontsScalable-${XF_VER}
@@ -12,6 +12,9 @@ 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 3517f5ffd98..aabfbca614c 100644
--- a/fonts/XFree86-fontserver/Makefile
+++ b/fonts/XFree86-fontserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/03/28 22:06:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/29 05:54:11 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	XFree86-fontserver-${XF_VER}
@@ -11,6 +11,8 @@ 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