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-libs | |
| 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-libs')
| -rw-r--r-- | x11/xorg-libs/Makefile | 3 |
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 |