[pkgsrc/trunk]: pkgsrc/fonts CONFLICTS with XFree86*

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b81a7bb97e93
branches:  trunk
changeset: 478749:b81a7bb97e93
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Thu Jul 29 05:54:11 2004 +0000

description:
CONFLICTS with XFree86*

diffstat:

 fonts/XFree86-fonts100dpi/Makefile    |  4 +++-
 fonts/XFree86-fonts75dpi/Makefile     |  4 +++-
 fonts/XFree86-fontsCyrillic/Makefile  |  4 +++-
 fonts/XFree86-fontsEncodings/Makefile |  4 +++-
 fonts/XFree86-fontsMisc/Makefile      |  4 +++-
 fonts/XFree86-fontsScalable/Makefile  |  5 ++++-
 fonts/XFree86-fontserver/Makefile     |  4 +++-
 7 files changed, 22 insertions(+), 7 deletions(-)

diffs (127 lines):

diff -r 6abf11dbb602 -r b81a7bb97e93 fonts/XFree86-fonts100dpi/Makefile
--- a/fonts/XFree86-fonts100dpi/Makefile        Thu Jul 29 05:48:38 2004 +0000
+++ b/fonts/XFree86-fonts100dpi/Makefile        Thu Jul 29 05:54:11 2004 +0000
@@ -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 @@
 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 -r 6abf11dbb602 -r b81a7bb97e93 fonts/XFree86-fonts75dpi/Makefile
--- a/fonts/XFree86-fonts75dpi/Makefile Thu Jul 29 05:48:38 2004 +0000
+++ b/fonts/XFree86-fonts75dpi/Makefile Thu Jul 29 05:54:11 2004 +0000
@@ -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 @@
 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 -r 6abf11dbb602 -r b81a7bb97e93 fonts/XFree86-fontsCyrillic/Makefile
--- a/fonts/XFree86-fontsCyrillic/Makefile      Thu Jul 29 05:48:38 2004 +0000
+++ b/fonts/XFree86-fontsCyrillic/Makefile      Thu Jul 29 05:54:11 2004 +0000
@@ -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 @@
 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 -r 6abf11dbb602 -r b81a7bb97e93 fonts/XFree86-fontsEncodings/Makefile
--- a/fonts/XFree86-fontsEncodings/Makefile     Thu Jul 29 05:48:38 2004 +0000
+++ b/fonts/XFree86-fontsEncodings/Makefile     Thu Jul 29 05:54:11 2004 +0000
@@ -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 @@
 
 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 -r 6abf11dbb602 -r b81a7bb97e93 fonts/XFree86-fontsMisc/Makefile
--- a/fonts/XFree86-fontsMisc/Makefile  Thu Jul 29 05:48:38 2004 +0000
+++ b/fonts/XFree86-fontsMisc/Makefile  Thu Jul 29 05:54:11 2004 +0000
@@ -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 @@
 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 -r 6abf11dbb602 -r b81a7bb97e93 fonts/XFree86-fontsScalable/Makefile
--- a/fonts/XFree86-fontsScalable/Makefile      Thu Jul 29 05:48:38 2004 +0000
+++ b/fonts/XFree86-fontsScalable/Makefile      Thu Jul 29 05:54:11 2004 +0000
@@ -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 @@
 
 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 -r 6abf11dbb602 -r b81a7bb97e93 fonts/XFree86-fontserver/Makefile
--- a/fonts/XFree86-fontserver/Makefile Thu Jul 29 05:48:38 2004 +0000
+++ b/fonts/XFree86-fontserver/Makefile Thu Jul 29 05:54:11 2004 +0000
@@ -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 @@
 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