summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authorrecht <recht@pkgsrc.org>2004-09-01 07:56:36 +0000
committerrecht <recht@pkgsrc.org>2004-09-01 07:56:36 +0000
commit02fda9949eed296a8869d41493b6ee026f7ffca8 (patch)
treecfcb86d55ebc7c184e66788da579dadf8fd29c57 /fonts
parente06f9541d28c57b179301e8ee275b575e4a841bc (diff)
downloadpkgsrc-02fda9949eed296a8869d41493b6ee026f7ffca8.tar.gz
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 (limited to 'fonts')
-rw-r--r--fonts/xorg-fontsTruetype/MESSAGE7
-rw-r--r--fonts/xorg-fontsTruetype/Makefile5
2 files changed, 9 insertions, 3 deletions
diff --git a/fonts/xorg-fontsTruetype/MESSAGE b/fonts/xorg-fontsTruetype/MESSAGE
new file mode 100644
index 00000000000..2c9382b9f1a
--- /dev/null
+++ b/fonts/xorg-fontsTruetype/MESSAGE
@@ -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 --git a/fonts/xorg-fontsTruetype/Makefile b/fonts/xorg-fontsTruetype/Makefile
index 7eb40a628eb..01825520f0a 100644
--- a/fonts/xorg-fontsTruetype/Makefile
+++ b/fonts/xorg-fontsTruetype/Makefile
@@ -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= xorg-clients>=${XORG_VER}:../../x11/xorg-clients
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