svn commit: r424199 - head/net/netatalk3

[Joe Marcus Clarke]

Author: marcus
Date: Tue Oct 18 18:30:24 2016
New Revision: 424199
URL: https://svnweb.freebsd.org/changeset/ports/424199

Log:
  * Properly expand %%ZEROCONF%% in the rc.d script
  * While here, ensure zeroconf support is disabled at configure time if neither Avahi or mDNSResponder
    has been chosen
  
  PR:		213597

Modified:
  head/net/netatalk3/Makefile

Modified: head/net/netatalk3/Makefile
==============================================================================
--- head/net/netatalk3/Makefile	Tue Oct 18 18:19:09 2016	(r424198)
+++ head/net/netatalk3/Makefile	Tue Oct 18 18:30:24 2016	(r424199)
@@ -3,7 +3,7 @@
 
 PORTNAME=	netatalk
 PORTVERSION=	3.1.10
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
@@ -48,14 +48,15 @@ KERBEROS5_CONFIGURE_ON=	--enable-krbV-ua
 KERBEROS_CONFIGURE_WITH=kerberos
 KERBEROS_LIB_DEPENDS=libgpg-error.so:security/libgpg-error
 PAM_CONFIGURE_WITH=pam
-ZEROCONF_CONFIGURE_OFF=	--disable-zeroconf
 AVAHI_CONFIGURE_ON=	--enable-zeroconf=${LOCALBASE}
 AVAHI_CFLAGS=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 AVAHI_LIB_DEPENDS=		libavahi-client.so:net/avahi-app
+AVAHI_SUB_LIST=		ZEROCONF="avahi_daemon"
 MDNSRESPONDER_CONFIGURE_ON=	--enable-zeroconf=${LOCALBASE}
 MDNSRESPONDER_CONFIGURE_ENV=	ac_cv_lib_avahi_client_avahi_client_new=no
 MDNSRESPONDER_CFLAGS=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 MDNSRESPONDER_LIB_DEPENDS=		libdns_sd.so:net/mDNSResponder
+MDNSRESPONDER_SUB_LIST=	ZEROCONF="mdnsd"
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
 LDAP_CFLAGS=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 LDAP_USE=	OPENLDAP=yes
@@ -76,6 +77,11 @@ CONFLICTS=	bigloo-2.* cap-6.0.* tct-1.* 
 
 .include <bsd.port.pre.mk>
 
+.if ${PORT_OPTIONS:MAVAHI}=="" && ${PORT_OPTIONS:MMDNSRESPONDER}==""
+SUB_LIST+=	ZEROCONF=""
+CONFIGURE_ARGS+=--disable-zeroconf
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \
 		s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \