ports/183601: net/netatalk3 no longer needs to disable mDNSResponder support

[Bradley T. Hughes]

>Number:         183601
>Category:       ports
>Synopsis:       net/netatalk3 no longer needs to disable mDNSResponder support
>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:   Sat Nov 02 22:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Bradley T. Hughes
>Release:        10.0-BETA2
>Organization:
>Environment:
FreeBSD freebsd10.local 10.0-BETA2 FreeBSD 10.0-BETA2 #0 r257166: Sat Oct 26 19:23:22 UTC 2013     root at snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
The net/netatalk3 port has a patch that explicitly disables detection of the dns_sd.h header installed by net/mDNSResponder. This appears to have been disabled sometime last year in response to a PR, but the problem does not appear to exist anymore. The current Avahi dependency pulls in a great number of dependencies that are undesirable (at least for me).

Attached is a patch to allow selecting net/mDNSResponder as an optional dependency when building net/netatalk3. Avahi remains the default.
>How-To-Repeat:

>Fix:
See attached :)

Patch attached with submission follows:

diff -ur /usr/ports/net/netatalk3/Makefile netatalk3/Makefile
--- /usr/ports/net/netatalk3/Makefile	2013-09-21 00:10:23.000000000 +0200
+++ netatalk3/Makefile	2013-11-02 23:17:57.390860610 +0100
@@ -3,6 +3,7 @@
 
 PORTNAME=	netatalk
 PORTVERSION=	3.0.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
@@ -33,10 +34,13 @@
 			--with-libevent-header=${LOCALBASE}/include \
 			--with-libevent-lib=${LOCALBASE}/lib/event2
 
-OPTIONS_DEFINE=PAM KRB5 ZEROCONF LDAP SENDFILE KERBEROS DTRACE DBUS
-OPTIONS_DEFAULT=ZEROCONF KERBEROS DBUS
+OPTIONS_DEFINE=PAM KRB5 LDAP SENDFILE KERBEROS DTRACE DBUS
+OPTIONS_DEFAULT=KERBEROS DBUS
+OPTIONS_SINGLE=	ZEROCONF
+OPTIONS_SINGLE_ZEROCONF=NOZEROCONF AVAHI MDNSRESPONDER
+OPTIONS_DEFAULT+=AVAHI
 
-ZEROCONF_DESC=	Enable Zeroconf (Bonjour) support
+NOZEROCONF_DESC=Disable Zeroconf(Bonjour) support
 KRB5_DESC=	Enable Kerberos V UAM
 DTRACE_DESC=	Enable DTrace support
 SENDFILE_DESC=	Enable Sendfile support
@@ -79,14 +83,23 @@
 PLIST_SUB+=		NETATALKPAM="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MZEROCONF}
+.if ${PORT_OPTIONS:MNOZEROCONF}
+CONFIGURE_ARGS+=	--disable-zerconf
+SUB_LIST+=		ZEROCONF=""
+.endif
+
+.if ${PORT_OPTIONS:MAVAHI}
 CONFIGURE_ARGS+=	--enable-zeroconf=${LOCALBASE}
 CFLAGS+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 LIB_DEPENDS+=		avahi-client:${PORTSDIR}/net/avahi-app
 SUB_LIST+=		ZEROCONF="avahi_daemon"
-.else
-CONFIGURE_ARGS+=	--disable-zerconf
-SUB_LIST+=		ZEROCONF=""
+.endif
+
+.if ${PORT_OPTIONS:MMDNSRESPONDER}
+CONFIGURE_ARGS+=	--enable-zeroconf=${LOCALBASE}
+CFLAGS+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
+LIB_DEPENDS+=		dns_sd:${PORTSDIR}/net/mDNSResponder
+SUB_LIST+=		ZEROCONF="mdnsd"
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
diff -ur /usr/ports/net/netatalk3/files/patch-configure netatalk3/files/patch-configure
--- /usr/ports/net/netatalk3/files/patch-configure	2012-07-14 16:29:18.000000000 +0200
+++ netatalk3/files/patch-configure	2013-10-31 13:22:08.909975764 +0100
@@ -1,14 +1,5 @@
 --- configure.orig	2012-04-26 10:27:12.000000000 -0400
 +++ configure	2012-07-08 21:21:38.000000000 -0400
-@@ -16127,7 +16127,7 @@ fi
- 		fi
- 
-         # mDNS support using mDNSResponder
--        ac_fn_c_check_header_mongrel "$LINENO" "dns_sd.h" "ac_cv_header_dns_sd_h" "$ac_includes_default"
-+        ac_fn_c_check_header_mongrel "$LINENO" "xxxdns_sd.hxxx" "ac_cv_header_dns_sd_h" "$ac_includes_default"
- if test "x$ac_cv_header_dns_sd_h" = xyes; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DNSServiceRegister in -ldns_sd" >&5
- $as_echo_n "checking for DNSServiceRegister in -ldns_sd... " >&6; }
 @@ -18150,7 +18150,7 @@ if test "x$bdb_required" = "xyes"; then
      trybdbdir=""
      dobdbsearch=yes


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