diff options
| author | lofi <lofi@FreeBSD.org> | 2005-03-26 09:27:13 +0800 |
|---|---|---|
| committer | lofi <lofi@FreeBSD.org> | 2005-03-26 09:27:13 +0800 |
| commit | f7f9cbb30ac11a1e8da8c056a99edd407606161e (patch) | |
| tree | aa14e77ea7871df00eb81af8065a8e04e1d1c494 | |
| parent | 6a886dbc8a6679b93457723408940ed68b41988b (diff) | |
| download | freebsd-ports-gnome-f7f9cbb30ac11a1e8da8c056a99edd407606161e.tar.gz freebsd-ports-gnome-f7f9cbb30ac11a1e8da8c056a99edd407606161e.tar.zst freebsd-ports-gnome-f7f9cbb30ac11a1e8da8c056a99edd407606161e.zip | |
Add CONFLICTS with kdeartwork 3.2.x and kdeartwork 3.3.x (plastik widget
style and window decoration).
Approved by: portmgr (marcus)
| -rw-r--r-- | x11/kde4-baseapps/Makefile | 2 | ||||
| -rw-r--r-- | x11/kde4-runtime/Makefile | 2 | ||||
| -rw-r--r-- | x11/kde4-workspace/Makefile | 2 | ||||
| -rw-r--r-- | x11/kdebase3/Makefile | 2 | ||||
| -rw-r--r-- | x11/kdebase4-runtime/Makefile | 2 | ||||
| -rw-r--r-- | x11/kdebase4-workspace/Makefile | 2 | ||||
| -rw-r--r-- | x11/kdebase4/Makefile | 2 | ||||
| -rw-r--r-- | x11/kdelibs3/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdelibs4/Makefile | 4 |
9 files changed, 11 insertions, 11 deletions
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 5b2a36ee762e..63a08d81dd56 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb:${PORTSDIR}/devel/libusb -CONFLICTS= kdelibs-3.[0-3]* kdeutils-3.[0-2]* +CONFLICTS= kdeartwork-3.[2-3]* kdelibs-3.[0-3]* kdeutils-3.[0-2]* USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 5b2a36ee762e..63a08d81dd56 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb:${PORTSDIR}/devel/libusb -CONFLICTS= kdelibs-3.[0-3]* kdeutils-3.[0-2]* +CONFLICTS= kdeartwork-3.[2-3]* kdelibs-3.[0-3]* kdeutils-3.[0-2]* USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 5b2a36ee762e..63a08d81dd56 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb:${PORTSDIR}/devel/libusb -CONFLICTS= kdelibs-3.[0-3]* kdeutils-3.[0-2]* +CONFLICTS= kdeartwork-3.[2-3]* kdelibs-3.[0-3]* kdeutils-3.[0-2]* USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 5b2a36ee762e..63a08d81dd56 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb:${PORTSDIR}/devel/libusb -CONFLICTS= kdelibs-3.[0-3]* kdeutils-3.[0-2]* +CONFLICTS= kdeartwork-3.[2-3]* kdelibs-3.[0-3]* kdeutils-3.[0-2]* USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 5b2a36ee762e..63a08d81dd56 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb:${PORTSDIR}/devel/libusb -CONFLICTS= kdelibs-3.[0-3]* kdeutils-3.[0-2]* +CONFLICTS= kdeartwork-3.[2-3]* kdelibs-3.[0-3]* kdeutils-3.[0-2]* USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 5b2a36ee762e..63a08d81dd56 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb:${PORTSDIR}/devel/libusb -CONFLICTS= kdelibs-3.[0-3]* kdeutils-3.[0-2]* +CONFLICTS= kdeartwork-3.[2-3]* kdelibs-3.[0-3]* kdeutils-3.[0-2]* USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 5b2a36ee762e..63a08d81dd56 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ smbclient:${PORTSDIR}/net/samba-libsmbclient \ usb:${PORTSDIR}/devel/libusb -CONFLICTS= kdelibs-3.[0-3]* kdeutils-3.[0-2]* +CONFLICTS= kdeartwork-3.[2-3]* kdelibs-3.[0-3]* kdeutils-3.[0-2]* USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 861698aab3b9..36e2fb9ceb5a 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -35,9 +35,9 @@ RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} .if ${PKGNAMESUFFIX} == -nocups -CONFLICTS+= kdeartwork-3.2* kdebase-3.[0-3]* kdepim-3.2* +CONFLICTS+= kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdepim-3.2* .else -CONFLICTS+= kdeartwork-3.2* kdebase-3.[0-3]* kdelibs-nocups-[0-9]* kdepim-3.2* +CONFLICTS+= 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 861698aab3b9..36e2fb9ceb5a 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -35,9 +35,9 @@ RUN_DEPENDS= ${FONTSCALE}:${X_FONTS_TTF_PORT} \ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} .if ${PKGNAMESUFFIX} == -nocups -CONFLICTS+= kdeartwork-3.2* kdebase-3.[0-3]* kdepim-3.2* +CONFLICTS+= kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdepim-3.2* .else -CONFLICTS+= kdeartwork-3.2* kdebase-3.[0-3]* kdelibs-nocups-[0-9]* kdepim-3.2* +CONFLICTS+= kdeartwork-3.[2-3]* kdebase-3.[0-3]* kdelibs-nocups-[0-9]* kdepim-3.2* LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base .endif |