From fluffy@fluffy.khv.ru  Wed Aug 13 08:23:32 2008
Return-Path: <fluffy@fluffy.khv.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1434E1065670
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 13 Aug 2008 08:23:32 +0000 (UTC)
	(envelope-from fluffy@fluffy.khv.ru)
Received: from Fluffy.Khv.RU (ael-to-khstu-gw.ael.ru [62.76.207.6])
	by mx1.freebsd.org (Postfix) with ESMTP id 3049D8FC1B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 13 Aug 2008 08:23:30 +0000 (UTC)
	(envelope-from fluffy@fluffy.khv.ru)
Received: from Fluffy.Khv.RU (localhost [127.0.0.1])
	by Fluffy.Khv.RU (8.14.2/8.14.2/Fluffy/5.4) with ESMTP id m7D8HiSp068042
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 13 Aug 2008 19:17:44 +1100 (VLAST)
	(envelope-from fluffy@fluffy.khv.ru)
Message-Id: <1218615464.35676@Fluffy.Khv.RU>
Date: Wed, 13 Aug 2008 19:17:44 +1100
From: "Dima Panov" <fluffy@fluffy.khv.ru>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: Fix dependecy list, resolve dependency conflict
X-Send-Pr-Version: gtk-send-pr 0.4.9 
X-GNATS-Notify:

>Number:         126494
>Category:       ports
>Synopsis:       Fix dependecy list, resolve dependency conflict
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 13 08:30:01 UTC 2008
>Closed-Date:    Wed Aug 13 09:02:18 UTC 2008
>Last-Modified:  Wed Aug 13 09:10:01 UTC 2008
>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@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:
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Wed Aug 13 09:02:18 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126494 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/126494: commit references a PR
Date: Wed, 13 Aug 2008 09:01:47 +0000 (UTC)

 miwi        2008-08-13 09:01:35 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11/kdelibs4         Makefile 
   Log:
   -  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>
   
   Revision  Changes    Path
   1.228     +8 -2      ports/x11/kdelibs4/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
