summaryrefslogtreecommitdiff
path: root/x11/XFree86-libs/Makefile
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-07-29 05:39:19 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-07-29 05:39:19 +0000
commite1e9aed2841c85e85a12274ca912057d0ff97c4c (patch)
tree8dbbc4ad0fde2f972417285f1816f98c55730920 /x11/XFree86-libs/Makefile
parenteca3299e6683518a5a94d449a5dd7e7a328552b2 (diff)
downloadpkgsrc-e1e9aed2841c85e85a12274ca912057d0ff97c4c.tar.gz
CONFLICTS with xorg-libs.
Diffstat (limited to 'x11/XFree86-libs/Makefile')
-rw-r--r--x11/XFree86-libs/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/x11/XFree86-libs/Makefile b/x11/XFree86-libs/Makefile
index 8bffa2a79b3..f2fd982286c 100644
--- a/x11/XFree86-libs/Makefile
+++ b/x11/XFree86-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/07/21 23:55:19 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2004/07/29 05:39:19 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-libs-${XF_VER}
@@ -15,6 +15,7 @@ COMMENT= XFree86 Libraries
CONFLICTS+= xextensions-[0-9]*
CONFLICTS+= libX11-[0-9]*
CONFLICTS+= libXau-[0-9]*
+CONFLICTS+= xorg-libs-[0-9]*
BUILD_DEPENDS= imake>=4.4.0:../../x11/imake