From d4bba750489d6bc7896a7706e7026e145eb821aa Mon Sep 17 00:00:00 2001 From: Michael Nottebrock Date: Thu, 4 Aug 2005 19:58:57 +0000 Subject: There was a file move between KDE modules again after all, unfortunately we discovered it late. Register appropriate CONFLICTS and put some instructions in UPDATING. Approved by: portmgr (linimon) --- x11/kdelibs3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'x11/kdelibs3') diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 232fcdc87730..f1ca19e1e777 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -36,9 +36,9 @@ RUN_DEPENDS= iceauth:${X_CLIENTS_PORT} \ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} .if ${PKGNAMESUFFIX} == -nocups -CONFLICTS+= kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdepim-3.2* +CONFLICTS+= kdeadmin-3.* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdepim-3.2* .else -CONFLICTS+= kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdelibs-nocups-[0-9]* kdepim-3.2* +CONFLICTS+= kdeadmin-3.* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdelibs-nocups-[0-9]* kdepim-3.2* LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base .endif -- cgit v1.2.3