ports/126494: Fix dependecy list, resolve dependency conflict

[Dima Panov]

>Number:         126494
>Category:       ports
>Synopsis:       Fix dependecy list, resolve dependency conflict
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 13 08:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Dima Panov
>Release:        FreeBSD 8.0-800042-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 8.0-800042-CURRENT #0: Wed Aug 13 09:33:26 VLAST 2008
    root at Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot



>Description:


x11/kdelibs4 has wrong dependency - 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



>How-To-Repeat:


install net/avahi and try to compile kdelibs4


>Fix:


--- kdelibs4.diff begins here ---
Index: x11/kdelibs4/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/kdelibs4/Makefile,v
retrieving revision 1.227
diff -u -r1.227 Makefile
--- x11/kdelibs4/Makefile	9 Aug 2008 16:52:27 -0000	1.227
+++ x11/kdelibs4/Makefile	13 Aug 2008 08:11:21 -0000
@@ -23,12 +23,11 @@
 		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 @@
 # 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
 
--- kdelibs4.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: