aboutsummaryrefslogtreecommitdiff
path: root/x11-servers/XFree86-4-FontServer
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2004-06-11 05:49:03 +0000
committerEric Anholt <anholt@FreeBSD.org>2004-06-11 05:49:03 +0000
commitbb5c7b42bf2e0415b0ffaba968ba7222b072a16d (patch)
tree32b5c73a0a7c247f134ab5feb1d9f9a251c011d0 /x11-servers/XFree86-4-FontServer
parentfbd1414e8586dec332df83ec90be80f3c25532fe (diff)
downloadports-bb5c7b42bf2e0415b0ffaba968ba7222b072a16d.tar.gz
ports-bb5c7b42bf2e0415b0ffaba968ba7222b072a16d.zip
Register new conflicts on xorg-fontserver.
Notes
Notes: svn path=/head/; revision=111252
Diffstat (limited to 'x11-servers/XFree86-4-FontServer')
-rw-r--r--x11-servers/XFree86-4-FontServer/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index 58c422cfceb1..a37a0d8e31f4 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -19,6 +19,8 @@ DISTFILES= X430src-1.tgz \
MAINTAINER= x11@FreeBSD.org
COMMENT= XFree86-4 font server
+CONFLICTS= xorg-fontserver-*
+
MAN1= xfs.1
XBUILD_DIRS= programs/xfs
XINCLUDE_DIRS= lib/xtrans programs/Xserver