From 1ab2ea6dee55c1cf18371241a3bdb843507243d2 Mon Sep 17 00:00:00 2001 From: shaun Date: Fri, 14 Jul 2006 23:51:10 +0000 Subject: Remove CONFLICTS, as the port {pre,post}fixes a major version number to all potentially conflicting files and directories. PR: ports/100286 Submitted by: Ed Schouten (maintainer) Approved by: ahze (mentor, implicit) --- x11-wm/ion-3/Makefile | 2 -- x11-wm/ion-3ds/Makefile | 2 -- 2 files changed, 4 deletions(-) (limited to 'x11-wm') diff --git a/x11-wm/ion-3/Makefile b/x11-wm/ion-3/Makefile index 23452cb0a43f..f5282c9b8507 100644 --- a/x11-wm/ion-3/Makefile +++ b/x11-wm/ion-3/Makefile @@ -16,8 +16,6 @@ COMMENT= The development version of the Ion window manager BUILD_DEPENDS= ${LOCALBASE}/include/lua.hpp:${PORTSDIR}/lang/lua RUN_DEPENDS= run-mailcap:${PORTSDIR}/misc/mime-support -CONFLICTS= ion-2002* pwm-[0-9]* ion-2* - USE_X_PREFIX= yes USE_GETTEXT= yes USE_GMAKE= yes diff --git a/x11-wm/ion-3ds/Makefile b/x11-wm/ion-3ds/Makefile index 23452cb0a43f..f5282c9b8507 100644 --- a/x11-wm/ion-3ds/Makefile +++ b/x11-wm/ion-3ds/Makefile @@ -16,8 +16,6 @@ COMMENT= The development version of the Ion window manager BUILD_DEPENDS= ${LOCALBASE}/include/lua.hpp:${PORTSDIR}/lang/lua RUN_DEPENDS= run-mailcap:${PORTSDIR}/misc/mime-support -CONFLICTS= ion-2002* pwm-[0-9]* ion-2* - USE_X_PREFIX= yes USE_GETTEXT= yes USE_GMAKE= yes -- cgit