summaryrefslogtreecommitdiff
path: root/x11/xorg-clients
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
commit69c871c44879613395742f6172695959b5e30dae (patch)
tree6e4eadfeefda4ef4c7226ca902410714de716947 /x11/xorg-clients
parentfb9e5350b4f9427f6335c69dd0be411d6aae71c7 (diff)
downloadpkgsrc-69c871c44879613395742f6172695959b5e30dae.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-clients')
-rw-r--r--x11/xorg-clients/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index b78bd96948d..ced9e5152a3 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:52:04 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:34 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-clients-${XORG_VER}
@@ -11,8 +11,6 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.x.org/
COMMENT= X.org client programs and related files
-CONFLICTS+= XFree86-clients-[0-9]*
-
USE_X11= yes
USE_BUILDLINK3= yes
CHECK_X11_TYPE= # defined