aboutsummaryrefslogtreecommitdiff
path: root/x11/xproto
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2004-07-26 18:32:46 +0000
committerEric Anholt <anholt@FreeBSD.org>2004-07-26 18:32:46 +0000
commitcf80d22f0c2870eb5efba6e1e5529ec9958bd51f (patch)
tree80753c1ca698256a05918ac0ebf81cfa69560399 /x11/xproto
parent4faf15b65ec18d699f4433982d62f380d97bcdaf (diff)
downloadports-cf80d22f0c2870eb5efba6e1e5529ec9958bd51f.tar.gz
ports-cf80d22f0c2870eb5efba6e1e5529ec9958bd51f.zip
Register missing CONFLICTS, mostly on xorg-libraries-*
Reported by: Kent Stewart <kstewart@owt.com>
Notes
Notes: svn path=/head/; revision=114790
Diffstat (limited to 'x11/xproto')
-rw-r--r--x11/xproto/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index e0b6750460c0..830af89f5f24 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://pdx.freedesktop.org/~xlibs/release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X11 protocol headers
-CONFLICTS= XFree86-libraries-*
+CONFLICTS= XFree86-libraries-* xorg-libraries-*
USE_BZIP2= yes
PREFIX?= ${X11BASE}