[pkgsrc/trunk]: pkgsrc/fonts/xorg-fontsTruetype Remove the confict with vera-...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5d51c7009218
branches:  trunk
changeset: 480184:5d51c7009218
user:      recht <recht%pkgsrc.org@localhost>
date:      Wed Sep 01 07:56:36 2004 +0000

description:
Remove the confict with vera-ttf since, even though this package installs
the same fonts, they're installed in a different location. This allows
the gnome meta-package to be installed with x.org's X11.
Bump PKGREVISION to 1.

ok'd by xtraeme

diffstat:

 fonts/xorg-fontsTruetype/MESSAGE  |  7 +++++++
 fonts/xorg-fontsTruetype/Makefile |  5 ++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 16815c839340 -r 5d51c7009218 fonts/xorg-fontsTruetype/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/xorg-fontsTruetype/MESSAGE  Wed Sep 01 07:56:36 2004 +0000
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2004/09/01 07:56:36 recht Exp $
+
+Please note this package also includes the Bitstream Vera TrueType fonts
+(fonts/vera-ttf).
+
+===========================================================================
diff -r 16815c839340 -r 5d51c7009218 fonts/xorg-fontsTruetype/Makefile
--- a/fonts/xorg-fontsTruetype/Makefile Wed Sep 01 02:21:29 2004 +0000
+++ b/fonts/xorg-fontsTruetype/Makefile Wed Sep 01 07:56:36 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/07/30 23:25:08 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/09/01 07:56:36 recht Exp $
 
 DISTNAME=      X11R6.7.0-src1
 PKGNAME=       xorg-fontsTruetype-${XORG_VER}
+PKGREVISION=   1
 CATEGORIES=    fonts x11
 MASTER_SITES=  ${MASTER_SITE_XORG}
 
@@ -13,8 +14,6 @@
 BUILD_DEPENDS+=        fontconfig-[0-9]*:../../fonts/fontconfig
 DEPENDS+=      xorg-fontsEncodings>=${XORG_VER}:../../fonts/xorg-fontsEncodings
 
-CONFLICTS=     vera-ttf-[0-9]*
-
 XBUILD_DIRS=   fonts/encodings fonts/scaled/TTF
 XINSTALL_DIRS= fonts/scaled/TTF