summaryrefslogtreecommitdiff
path: root/x11/imake
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-07-29 06:36:32 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-07-29 06:36:32 +0000
commit69c871c44879613395742f6172695959b5e30dae (patch)
tree6e4eadfeefda4ef4c7226ca902410714de716947 /x11/imake
parentfb9e5350b4f9427f6335c69dd0be411d6aae71c7 (diff)
downloadpkgsrc-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 'x11/imake')
-rw-r--r--x11/imake/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/x11/imake/Makefile b/x11/imake/Makefile
index 9dfa09e7029..08085ee8c53 100644
--- a/x11/imake/Makefile
+++ b/x11/imake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/07/29 05:37:36 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= imake-${XF_VER}
@@ -12,8 +12,6 @@ COMMENT= Imake and other utilities from XFree86
PKG_INSTALLATION_TYPES= overwrite pkgviews
-CONFLICTS= xorg-imake-[0-9]*
-
USE_BUILDLINK3= yes
USE_DIRS+= XFree86-1.0
INSTALL_TARGET= install install.man