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 /x11 | |
| parent | 6b21656446d7730e56f80acfdfd09c5e80ed960e (diff) | |
| download | ports-d4bba750489d6bc7896a7706e7026e145eb821aa.tar.gz ports-d4bba750489d6bc7896a7706e7026e145eb821aa.zip | |
Notes
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kdelibs3/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdelibs4/Makefile | 4 |
2 files changed, 4 insertions, 4 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 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 |