From owner-svn-ports-all@freebsd.org Tue Oct 18 18:30:25 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 924FDC17595; Tue, 18 Oct 2016 18:30:25 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49171811; Tue, 18 Oct 2016 18:30:25 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9IIUOIl020081; Tue, 18 Oct 2016 18:30:24 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9IIUOT1020080; Tue, 18 Oct 2016 18:30:24 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201610181830.u9IIUOT1020080@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Tue, 18 Oct 2016 18:30:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424199 - head/net/netatalk3 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Oct 2016 18:30:25 -0000 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 +.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 ; \