From 69c871c44879613395742f6172695959b5e30dae Mon Sep 17 00:00:00 2001 From: xtraeme Date: Thu, 29 Jul 2004 06:36:32 +0000 Subject: 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@. --- x11/xorg-libs/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'x11/xorg-libs') 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 -- cgit v1.2.3