pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/XFree86-docs CONFLICTS with xorg-docs.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6abf11dbb602
branches:  trunk
changeset: 478748:6abf11dbb602
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Thu Jul 29 05:48:38 2004 +0000

description:
CONFLICTS with xorg-docs.

diffstat:

 misc/XFree86-docs/Makefile |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r f003ed6a9069 -r 6abf11dbb602 misc/XFree86-docs/Makefile
--- a/misc/XFree86-docs/Makefile        Thu Jul 29 05:44:48 2004 +0000
+++ b/misc/XFree86-docs/Makefile        Thu Jul 29 05:48:38 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/28 22:06:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/29 05:48:38 xtraeme Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               XFree86-docs-${XF_VER}
@@ -12,6 +12,8 @@
 
 DEPENDS=               imake>=4.4.0:../../x11/imake
 
+CONFLICTS=             xorg-docs-[0-9]*
+
 USE_LANGUAGES=         # empty
 NO_BUILDLINK=          # defined
 NO_XFREE86_TARGETS=    # defined



Home | Main Index | Thread Index | Old Index