From f34a0e9e1cc522f5e7721c0c10b49a960b8ae70e Mon Sep 17 00:00:00 2001 From: Oliver Lehmann Date: Wed, 24 Jan 2007 07:53:31 +0000 Subject: xfce4-panel 4.4 is conflicting with old 4.2 xfce4-systray since it xfce4-systray is included in xfce4-panel 4.4 CONFLICTS added Noted by: thompsa --- x11-wm/xfce4-panel/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'x11-wm') diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile index 5f4918658c99..7f1b9fc2573a 100644 --- a/x11-wm/xfce4-panel/Makefile +++ b/x11-wm/xfce4-panel/Makefile @@ -14,6 +14,7 @@ DIST_SUBDIR= xfce4 MAINTAINER= oliver@FreeBSD.org COMMENT= XFce 4 panel module +CONFLICTS= xfce4-systray-* GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_BZIP2= yes -- cgit v1.2.3