Index: head/net/avahi-app/Makefile
===================================================================
--- head/net/avahi-app/Makefile	(revision 477423)
+++ head/net/avahi-app/Makefile	(revision 477424)
@@ -1,163 +1,163 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	avahi
 PORTVERSION=	0.7
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	net dns
 MASTER_SITES=	http://www.avahi.org/download/
 PKGNAMESUFFIX?=	-app
 
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	Service discovery on a local network
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 AVAHI_SLAVE?=	no
 
 .if ${AVAHI_SLAVE} != header
 LIB_DEPENDS?=	libexpat.so:textproc/expat2 \
 		libdaemon.so:devel/libdaemon \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libdbus-1.so:devel/dbus \
 		libgdbm.so:databases/gdbm
 
 USERS?=		${PORTNAME}
 GROUPS?=	${USERS}
 
 USES+=		alias gettext gmake libtool pathfix pkgconfig
 USE_GNOME+=	glib20 intltool introspection
 USE_GNOME_SUBR=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--with-distro=freebsd \
 		--with-dbus-system-socket=unix:path=/var/run/dbus/system_bus_socket \
 		--disable-monodoc \
 		--disable-doxygen-doc \
 		--disable-doxygen-dot \
 		--disable-qt3 \
 		--localstatedir=/var \
 		--enable-compat-howl
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_KQUEUE
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 INSTALL_TARGET=	install-strip
 
 .if ${AVAHI_SLAVE} == no
 CONFLICTS=	howl-[0-9]*
 
 DAEMON_CONFIG_FILES=	hosts avahi-daemon.conf
 .endif
 .endif # !avahi-header
 
 .include <bsd.port.options.mk>
 
 .if ${AVAHI_SLAVE} != header
 .if ${AVAHI_SLAVE} == autoipd
 CONFIGURE_ARGS+=--enable-autoipd
 .else
 CONFIGURE_ARGS+=--disable-autoipd
 .endif
 .if ${AVAHI_SLAVE} == gtk
 CONFIGURE_ARGS+=--enable-gtk
 .else
 CONFIGURE_ARGS+=--disable-gtk
 .endif
 .if ${AVAHI_SLAVE} == gtk3
 CONFIGURE_ARGS+=--enable-gtk3
 .else
 CONFIGURE_ARGS+=--disable-gtk3
 .endif
 .if ${AVAHI_SLAVE} == libdns
 CONFIGURE_ARGS+=--enable-compat-libdns_sd
 .else
 CONFIGURE_ARGS+=--disable-compat-libdns_sd
 .endif
 .if ${AVAHI_SLAVE} == python
 CONFIGURE_ARGS+=--enable-python
 .else
 CONFIGURE_ARGS+=--disable-python
 .endif
 .if ${AVAHI_SLAVE} == qt4
 CONFIGURE_ARGS+=--enable-qt4 \
 		--disable-expat \
 		--disable-gdbm
 .else
 CONFIGURE_ARGS+=--disable-qt4
 .endif
 .if ${AVAHI_SLAVE} == sharp
 CONFIGURE_ARGS+=--enable-mono
 .else
 CONFIGURE_ARGS+=--disable-mono
 .endif
 CONFIGURE_ARGS+=--disable-stack-protector
 
 post-patch: avahi-post-patch
 
 avahi-post-patch:
 	@${REINPLACE_CMD} -e 's|avahi_runtime_dir="/run"|avahi_runtime_dir="/var/run"|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \
 		${WRKSRC}/man/*.*
 	@${RM} ${WRKSRC}/man/*.bak
 	@${REINPLACE_CMD} -e 's|-ldl||g ; s|netdev|network|g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/avahi-client/Makefile.in \
 		${WRKSRC}/avahi-daemon/Makefile.in
 	@${REINPLACE_CMD} -e 's|have_inotify=yes|have_inotify=no|' \
 		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
 		${REINPLACE_CMD} -e 's|(LIBINTL)|(INTLLIBS)|g ; \
 		s|(LIBICONV)|(LTLIBICONV)|g'
 	@${REINPLACE_CMD} -e 's|%%RC_SUBR%%|/etc/rc.subr| ; \
 		s|%%GNOME_SUBR%%|${GNOME_SUBR}|' \
 		${WRKSRC}/initscript/freebsd/avahi-dnsconfd.sh.in \
 		${WRKSRC}/initscript/freebsd/avahi-daemon.sh.in
 	@${REINPLACE_CMD} -e 's|dbus_connection_disconnect|dbus_connection_close|g' \
 		${WRKSRC}/avahi-client/client.c \
 		${WRKSRC}/avahi-daemon/dbus-protocol.c
 	@${REINPLACE_CMD} -e 's|^_||g' \
 		${WRKSRC}/avahi-ui/*.desktop.in.in
 	@${REINPLACE_CMD} -e 's|am: install-avahiincludeHEADERS|am:|g' \
 			${WRKSRC}/avahi-ui/Makefile.in
 
 post-build: avahi-post-build
 
 avahi-post-build:
 .for f in ${AVAHI_PKGCONFIG}
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${f}
 .endfor
 
 pre-su-install: avahi-pre-su-install
 
 avahi-pre-su-install:
 .if ${AVAHI_SLAVE}=="no"
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/avahi
 	@${TOUCH} -f ${STAGEDIR}${PREFIX}/lib/avahi/.keep
 .endif
 
 post-install: avahi-post-install
 
 avahi-post-install:
 .if defined(MANPAGES)
 .for f in ${MANPAGES}
 	${INSTALL_DATA} ${WRKSRC}/man/${f} ${STAGEDIR}${PREFIX}/man/man${f:E}/${f}
 .endfor
 .endif
 .for f in ${AVAHI_PKGCONFIG}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 .endfor
 .for f in ${DAEMON_CONFIG_FILES}
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/avahi
 	${INSTALL_DATA} ${WRKSRC}/avahi-daemon/${f} \
 		${STAGEDIR}${PREFIX}/etc/avahi/${f}.sample
 .endfor
 .if ${AVAHI_SLAVE}==no
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/system-services
 	${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \
 		${STAGEDIR}${PREFIX}/share/dbus-1/system-services
 .endif
 .endif # ! avahi-header
 
 .include <bsd.port.mk>
Index: head/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
===================================================================
--- head/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in	(revision 477423)
+++ head/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in	(revision 477424)
@@ -1,33 +1,27 @@
 --- initscript/freebsd/avahi-daemon.sh.in.orig	2017-07-10 10:14:59 UTC
 +++ initscript/freebsd/avahi-daemon.sh.in
-@@ -4,23 +4,28 @@
- #
- # PROVIDE: avahi_daemon
- # REQUIRE: DAEMON dbus
-+# BEFORE: mountd
- # KEYWORD: FreeBSD
- #
+@@ -9,18 +9,22 @@
  # Avahi's mDNSResponder, a Zeroconf (Bonjour) service advertisement daemon.
  #
  
 -avahi_daemon_enable=${avahi_daemon_enable-"NO"}
  avahi_daemon_flags=${avahi_daemon_flags-"-D"}
  
  . /etc/rc.subr
 +. %%GNOME_SUBR%%
 +
 +avahi_daemon_enable=${avahi_daemon_enable-${gnome_enable}}
  
  name=avahi_daemon
 -rcvar=`set_rcvar`
 +rcvar=avahi_daemon_enable
  
  start_cmd=avahi_daemon_start
  stop_cmd=avahi_daemon_stop
  
  avahi_daemon_bin=@sbindir@/avahi-daemon
 +command=${avahi_daemon_bin}
 +pidfile="/var/run/avahi-daemon/pid"
  
  avahi_daemon_start() {
      checkyesno avahi_daemon_enable && echo "Starting avahi-daemon." && \