diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2005-08-04 19:58:57 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2005-08-04 19:58:57 +0000 |
| commit | d4bba750489d6bc7896a7706e7026e145eb821aa (patch) | |
| tree | 62ef385fc19d0664944aae26fcec4b69b97accc4 | |
| parent | Add 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)
| -rw-r--r-- | UPDATING | 31 | ||||
| -rw-r--r-- | x11/kdelibs3/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdelibs4/Makefile | 4 |
3 files changed, 35 insertions, 4 deletions
@@ -6,6 +6,37 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20050804: + AFFECTS: users of sysutils/kdeadmin3 + AUTHOR: kde@FreeBSD.org + + One data file has been moved from kdeadmin to kdelibs between + KDE 3.4.1 and KDE 3.4.2. This means that + + *********if you currently have the kdeadmin port installed********* + + you will have to take some precautions to update your KDE + installation. + + We recommend sticking to the following procedure. This procedure requires you + to have sysutils/portupgrade installed and to be the superuser (or using sudo). + + 1.) Delete installed packages which conflict with the updated KDE + ports. + + pkg_deinstall -f kdeadmin-\[0-9\]* + + 2.) Now update the remaining KDE ports. + + portupgrade -O arts\* kde\* \*kde-i18n\* + + or, if you want to update KDE along with other updated ports: + + portupgrade -a + + 3.) Reinstall the KDE ports you deleted in step 1. + + portinstall -O kdeadmin 20050728: AFFECTS: users of sysutils/sge and sysutils/sgeee 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 diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 232fcdc87730..f1ca19e1e777 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/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 |