summaryrefslogtreecommitdiff
path: root/x11/xorg-libs
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-07-29 06:36:32 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-07-29 06:36:32 +0000
commit1f5e4b2c289103e9f263ee926404cb870e9fe7b1 (patch)
tree6e4eadfeefda4ef4c7226ca902410714de716947 /x11/xorg-libs
parent09652f2f052bd3694beed2c6b134dcef0b3042cb (diff)
downloadpkgsrc-1f5e4b2c289103e9f263ee926404cb870e9fe7b1.tar.gz
xorg packages now will be installed into ${PREFIX}/xorg by default,
so we don't have to conflict between XFree86 and xorg. Suggested by grant@.
Diffstat (limited to 'x11/xorg-libs')
-rw-r--r--x11/xorg-libs/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index 77cb89b3478..eb297105ca9 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:34 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-libs-${XORG_VER}
@@ -14,7 +14,6 @@ COMMENT= X.org Libraries
CONFLICTS+= xextensions-[0-9]*
CONFLICTS+= libX11-[0-9]*
CONFLICTS+= libXau-[0-9]*
-CONFLICTS+= XFree86-libs-[0-9]*
BUILD_DEPENDS= xorg-imake>=6.7.0:../../x11/xorg-imake