pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11/imake CONFLICTS with xorg-imake.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f52d65fb5684
branches:  trunk
changeset: 478744:f52d65fb5684
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Thu Jul 29 05:37:36 2004 +0000

description:
CONFLICTS with xorg-imake.

diffstat:

 x11/imake/Makefile |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r 72bcfd9c1eb9 -r f52d65fb5684 x11/imake/Makefile
--- a/x11/imake/Makefile        Thu Jul 29 05:19:45 2004 +0000
+++ b/x11/imake/Makefile        Thu Jul 29 05:37:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/07/21 21:42:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2004/07/29 05:37:36 xtraeme Exp $
 
 DISTNAME=      ${DISTFILES}
 PKGNAME=       imake-${XF_VER}
@@ -12,6 +12,8 @@
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 
+CONFLICTS=     xorg-imake-[0-9]*
+
 USE_BUILDLINK3=                yes
 USE_DIRS+=             XFree86-1.0
 INSTALL_TARGET=                install install.man



Home | Main Index | Thread Index | Old Index