diff options
| author | lofi <lofi@FreeBSD.org> | 2005-08-05 03:58:57 +0800 |
|---|---|---|
| committer | lofi <lofi@FreeBSD.org> | 2005-08-05 03:58:57 +0800 |
| commit | 00517e935bce7639bd26e36fd8467329b52ada51 (patch) | |
| tree | 3da650db6d5fcbb8eacedaacf59d7e31db797235 /x11/kdelibs3 | |
| parent | f96a7101e5da05370414f853049bcee802ce94a5 (diff) | |
| download | freebsd-ports-gnome-00517e935bce7639bd26e36fd8467329b52ada51.tar.gz freebsd-ports-gnome-00517e935bce7639bd26e36fd8467329b52ada51.tar.zst freebsd-ports-gnome-00517e935bce7639bd26e36fd8467329b52ada51.zip | |
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/Makefile | 4 |
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 |