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@. --- misc/XFree86-docs/Makefile | 4 +--- misc/xorg-docs/Makefile | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'misc') diff --git a/misc/XFree86-docs/Makefile b/misc/XFree86-docs/Makefile index 8cdcbe1e20f..0c3f82fb9a8 100644 --- a/misc/XFree86-docs/Makefile +++ b/misc/XFree86-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/07/29 05:48:38 xtraeme Exp $ +# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:32 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-docs-${XF_VER} @@ -12,8 +12,6 @@ COMMENT= XFree86 Documentation DEPENDS= imake>=4.4.0:../../x11/imake -CONFLICTS= xorg-docs-[0-9]* - USE_LANGUAGES= # empty NO_BUILDLINK= # defined NO_XFREE86_TARGETS= # defined diff --git a/misc/xorg-docs/Makefile b/misc/xorg-docs/Makefile index ce187f06395..3336fdfcb66 100644 --- a/misc/xorg-docs/Makefile +++ b/misc/xorg-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 05:03:15 xtraeme Exp $ +# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:32 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-docs-${XORG_VER} @@ -12,8 +12,6 @@ COMMENT= X.org Documentation BUILD_DEPENDS= xorg-imake>=${XORG_VER}:../../x11/xorg-imake -CONFLICTS= XFree86-docs-[0-9]* - USE_LANGUAGES= # empty NO_BUILDLINK= # defined NO_XFREE86_TARGETS= # defined -- cgit v1.2.3