Date: Mon, 5 Jun 2006 18:30:45 -0500 (CDT) From: Kirk Strauser <kirk@strauser.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Kirk Strauser <kirk@strauser.com> Subject: ports/98566: Add libdns compatibility knob to net/avahi Message-ID: <20060605233045.7FC7495DAF@kanga.honeypot.net> Resent-Message-ID: <200606060030.k560UH85072372@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98566 >Category: ports >Synopsis: Add libdns compatibility knob to net/avahi >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jun 06 00:30:17 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Kirk Strauser >Release: FreeBSD 6.1-STABLE i386 >Organization: The Strauser Group >Environment: System: FreeBSD kanga.honeypot.net 6.1-STABLE FreeBSD 6.1-STABLE #0: Tue May 9 16:35:50 CDT 2006 root@kanga.honeypot.net:/usr/obj/usr/src/sys/KANGA i386 >Description: The net/avahi port is a replacement for net/mDNSResponder, but doesn't include the libdns compatibility library that some applications may be linked against. The patch below adds a configuration option to install libdns_sd.so and related files. >How-To-Repeat: Replace net/mDNSResponder with net/avahi. Boggle as most of your KDE applications now refuse to start. >Fix: --- avahi.patch begins here --- Binary files avahi-old/.Makefile.swp and avahi/.Makefile.swp differ diff -urN avahi-old/Makefile avahi/Makefile --- avahi-old/Makefile Mon Jun 5 18:26:07 2006 +++ avahi/Makefile Mon Jun 5 18:26:36 2006 @@ -33,8 +33,7 @@ --disable-doxygen-doc \ --disable-doxygen-dot \ --localstatedir=/var \ - --enable-compat-howl \ - --disable-compat-libdns_sd + --enable-compat-howl CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ @@ -50,6 +49,7 @@ MAN8= avahi-daemon.8 avahi-dnsconfd.8 avahi-dnsconfd.action.8 OPTIONS= GTK2 "Build a GTK+ 2 browser utility" off +OPTIONS+= LIBDNS "Build libdns for mDNSResponder compatibility" off .endif .include <bsd.port.pre.mk> @@ -57,6 +57,14 @@ .if !defined(AVAHI_SLAVE) .if ${OSVERSION} < 500000 IGNORE= does not work on FreeBSD 4.X +.endif + +.if defined(WITH_LIBDNS) +CONFIGURE_ARGS+=--enable-compat-libdns_sd +PLIST_SUB+= LIBDNS="" +.else +CONFIGURE_ARGS+=--disable-compat-libdns_sd +PLIST_SUB+= LIBDNS="@comment " .endif .if defined(WITH_GTK2) diff -urN avahi-old/pkg-plist avahi/pkg-plist --- avahi-old/pkg-plist Mon May 1 10:39:54 2006 +++ avahi/pkg-plist Mon Jun 5 18:19:19 2006 @@ -51,6 +51,7 @@ include/avahi-compat-howl/salt/signal.h include/avahi-compat-howl/salt/socket.h include/avahi-compat-howl/salt/time.h +%%LIBDNS%%include/avahi-compat-libdns_sd/dns_sd.h include/avahi-core/core.h include/avahi-core/log.h include/avahi-core/lookup.h @@ -74,12 +75,17 @@ lib/libavahi-glib.la lib/libavahi-glib.so lib/libavahi-glib.so.1 +%%LIBDNS%%lib/libdns_sd.a +%%LIBDNS%%lib/libdns_sd.la +%%LIBDNS%%lib/libdns_sd.so +%%LIBDNS%%lib/libdns_sd.so.1 lib/libhowl.a lib/libhowl.la lib/libhowl.so lib/libhowl.so.0 libdata/pkgconfig/avahi-client.pc libdata/pkgconfig/avahi-compat-howl.pc +%%LIBDNS%%libdata/pkgconfig/avahi-compat-libdns_sd.pc libdata/pkgconfig/avahi-core.pc libdata/pkgconfig/avahi-glib.pc sbin/avahi-daemon @@ -99,6 +105,7 @@ @dirrm %%DATADIR%%/introspection %%GTK%%@dirrm %%DATADIR%%/interfaces @dirrm %%DATADIR%% +%%LIBDNS%%@dirrm include/avahi-compat-libdns_sd @dirrm include/avahi-glib @dirrm include/avahi-core @dirrm include/avahi-compat-howl/salt --- avahi.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060605233045.7FC7495DAF>