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 /misc | |
| 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 'misc')
| -rw-r--r-- | misc/XFree86-docs/Makefile | 4 | ||||
| -rw-r--r-- | misc/xorg-docs/Makefile | 4 |
2 files changed, 2 insertions, 6 deletions
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 |