diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2004-07-29 06:36:32 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2004-07-29 06:36:32 +0000 |
commit | 69c871c44879613395742f6172695959b5e30dae (patch) | |
tree | 6e4eadfeefda4ef4c7226ca902410714de716947 /x11/xorg-server | |
parent | fb9e5350b4f9427f6335c69dd0be411d6aae71c7 (diff) | |
download | pkgsrc-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-server')
-rw-r--r-- | x11/xorg-server/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile index 3876a5b6f29..6e8b9dcc074 100644 --- a/x11/xorg-server/Makefile +++ b/x11/xorg-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/07/29 05:19:45 xtraeme Exp $ +# $NetBSD: Makefile,v 1.3 2004/07/29 06:36:34 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-server-${XORG_VER} @@ -10,8 +10,6 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org X server and related programs -CONFLICTS+= XFree86-server-[0-9]* - USE_X11= yes USE_BUILDLINK3= yes CHECK_X11_TYPE= # defined |