diff options
| author | miwi <miwi@FreeBSD.org> | 2008-08-13 17:01:35 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-08-13 17:01:35 +0800 |
| commit | 1cba652f3bf926741ac89f2beafe32a7dc05a36e (patch) | |
| tree | f9eb8c12c32acbc91534ce366f7419fb1b4c2942 /x11 | |
| parent | 05c262ec6dc08ca02aadad52c711366528feacb5 (diff) | |
| download | freebsd-ports-gnome-1cba652f3bf926741ac89f2beafe32a7dc05a36e.tar.gz freebsd-ports-gnome-1cba652f3bf926741ac89f2beafe32a7dc05a36e.tar.zst freebsd-ports-gnome-1cba652f3bf926741ac89f2beafe32a7dc05a36e.zip | |
- Fix dependecy list, resolve dependency conflict
net/avahi will be read as net/avahi-app for core library. Also,
with net/avahi-libdns installed, hardwrited dependency for mDNSReponder
lead to conflicts, but KDE 4.1 can use avahi-loibdns instead.
PR: 126494
Submitted by: Dima Panov <fluffy@fluffy.khv.ru>
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kdelibs4/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index f88a7539237f..ea2987d6ebf0 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -23,12 +23,11 @@ LIB_DEPENDS= searchclient:${PORTSDIR}/deskutils/strigi \ aspell:${PORTSDIR}/textproc/aspell \ jasper:${PORTSDIR}/graphics/jasper \ pcre:${PORTSDIR}/devel/pcre \ - avahi-core:${PORTSDIR}/net/avahi \ + avahi-core:${PORTSDIR}/net/avahi-app \ enchant.1:${PORTSDIR}/textproc/enchant \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg \ - dns_sd:${PORTSDIR}/net/mDNSResponder \ idn:${PORTSDIR}/dns/libidn \ hal.1:${PORTSDIR}/sysutils/hal \ smbclient.0:${PORTSDIR}/net/samba-libsmbclient \ @@ -40,6 +39,13 @@ RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicol # XXX: hebrew/hspell? # XXX: gssapi/kerberos special handling? +.if exists(${LOCALBASE}/include/avahi-compat-libdns_sd/dns_sd.h) || defined(WITH_LIBDNS) +LIB_DEPENDS+= avahi-qt4:${PORTSDIR}/net/avahi-qt4 \ + dns_sd:${PORTSDIR}/net/avahi-libdns +.else +LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder +.endif + CONFLICTS= qt4-phonon-4* LATEST_LINK= ${PORTNAME}4 |