summaryrefslogtreecommitdiff
path: root/x11/kdelibs3
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2005-08-04 19:58:57 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2005-08-04 19:58:57 +0000
commitd4bba750489d6bc7896a7706e7026e145eb821aa (patch)
tree62ef385fc19d0664944aae26fcec4b69b97accc4 /x11/kdelibs3
parentAdd some more entries to the apache -- http smuggling vulnerability. (diff)
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)
Diffstat (limited to 'x11/kdelibs3')
-rw-r--r--x11/kdelibs3/Makefile4
1 files changed, 2 insertions, 2 deletions
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