diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index d26231e41838..9914a245e923 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -1,155 +1,155 @@
 PORTNAME=	avahi
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION?=	2	# don't delete, reset to 0, check slave ports
 CATEGORIES?=	net dns
 MASTER_SITES=	http://www.avahi.org/download/
 PKGNAMESUFFIX?=	-app
 
 MAINTAINER?=	desktop@FreeBSD.org
 COMMENT?=	Service discovery on a local network
 WWW=		https://www.avahi.org/
 
 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 \
 		libevent.so:devel/libevent
 
 USERS?=		${PORTNAME}
 GROUPS?=	${USERS}
 
 USES+=		alias cpe gettext gmake gnome libtool pathfix pkgconfig
 USE_GNOME+=	glib20 intltool introspection:build
 USE_GNOME_SUBR=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS?=--with-distro=freebsd \
 		--with-dbus-system-socket=unix:path=/var/run/dbus/system_bus_socket \
 		--enable-introspection=yes \
 		--disable-static \
 		--disable-monodoc \
 		--disable-doxygen-doc \
 		--disable-doxygen-dot \
 		--disable-qt3 \
 		--disable-qt4 \
 		--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
 
 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
 # We disable man pages, because bssh.1 is not generated (no xmltoman port)
 CONFIGURE_ARGS+=--enable-gtk \
 		--disable-manpages
 .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} == qt5
 CONFIGURE_ARGS+=--enable-qt5 \
 		--disable-expat \
 		--disable-gdbm
 .else
 CONFIGURE_ARGS+=--disable-qt5
 .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
 	@${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
 	@${REINPLACE_CMD} -e 's|%%GNOME_SUBR%%|${GNOME_SUBR}|' \
 		${WRKSRC}/initscript/freebsd/avahi-dnsconfd.sh.in \
 		${WRKSRC}/initscript/freebsd/avahi-daemon.sh.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) && ${AVAHI_SLAVE} != gtk
 .for f in ${MANPAGES}
 	${INSTALL_DATA} ${WRKSRC}/man/${f} ${STAGEDIR}${PREFIX}/share/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} ${WRKSRC}/avahi-daemon/org.freedesktop.Avahi.service \
 		${STAGEDIR}${PREFIX}/share/dbus-1/system-services
 .endif
 .endif # ! avahi-header
 
 .include <bsd.port.mk>
diff --git a/net/avahi-autoipd/Makefile b/net/avahi-autoipd/Makefile
index ed1db22d2cfd..222132295dfa 100644
--- a/net/avahi-autoipd/Makefile
+++ b/net/avahi-autoipd/Makefile
@@ -1,24 +1,24 @@
-PORTREVISION=	1
+PORTREVISION=	2	# don't delete, reset to 0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-autoipd
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	IPv4LL network address configuration daemon
 
 LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
 		libdaemon.so:devel/libdaemon
 
 USERS=		avahi-autoipd
 GROUPS=		${USERS}
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-autoipd
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 AVAHI_SLAVE=	autoipd
 
 MANPAGES=	avahi-autoipd.8
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-gtk/Makefile b/net/avahi-gtk/Makefile
index c163b1f74122..34973e75c8bf 100644
--- a/net/avahi-gtk/Makefile
+++ b/net/avahi-gtk/Makefile
@@ -1,38 +1,38 @@
-PORTREVISION=	1
+PORTREVISION=	2	# don't delete, reset to 0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-gtk
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gtk+ tools and bindings to the Avahi mDNS system
 
 LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgdbm.so:databases/gdbm \
 		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	avahi-header>=0.6:net/avahi-header
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-ui
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 AVAHI_SLAVE=	gtk
 AVAHI_PKGCONFIG=avahi-ui.pc
 
 USE_GNOME+=	atk cairo gdkpixbuf2 gtk20 pango
 
 do-build:
 	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-common
 	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-client
 	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-glib
 	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-ui libavahi-ui.la
 
 do-install:
 	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-libLTLIBRARIES)
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-ui.so.0
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-gtk3/Makefile b/net/avahi-gtk3/Makefile
index e421ad0df382..216d07386218 100644
--- a/net/avahi-gtk3/Makefile
+++ b/net/avahi-gtk3/Makefile
@@ -1,39 +1,39 @@
-PORTREVISION=	2
+PORTREVISION=	2	# don't delete, reset to 0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-gtk3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gtk+ 3 library to the Avahi mDNS system
 
 LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
 		libgdbm.so:databases/gdbm \
 		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	avahi-header>=0.8:net/avahi-header
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-ui
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 AVAHI_SLAVE=	gtk3
 AVAHI_PKGCONFIG=avahi-ui-gtk3.pc
 
 USE_GNOME+=	cairo gdkpixbuf2 gtk30
 
 do-build:
 	${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-common
 	${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-client
 	${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-glib
 	${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-ui libavahi-ui-gtk3.la
 	${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-discover-standalone
 
 do-install:
 	@(cd ${WRKSRC}/avahi-discover-standalone; ${MAKE_CMD} ${MAKE_ARGS} install-binPROGRAMS install-interfacesDATA)
 #	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-libLTLIBRARIES)
 	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-binPROGRAMS install-desktopDATA install-exec-local)
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-ui-gtk3.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-header/Makefile b/net/avahi-header/Makefile
index 3f7a70e73974..dcdcb559e777 100644
--- a/net/avahi-header/Makefile
+++ b/net/avahi-header/Makefile
@@ -1,25 +1,25 @@
-PORTREVISION=	0
+PORTREVISION=	2	# don't delete, reset to 0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-header
 
 COMMENT=	Install an avahi-gtk* header to avoid conflict
 
 CONFLICTS=	avahi-gtk-0.7.[0-2]*
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-ui
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 AVAHI_SLAVE=	header
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/include/avahi-ui
 	${INSTALL_DATA} ${BUILD_WRKSRC}/avahi-ui.h \
 		${STAGEDIR}/${PREFIX}/include/avahi-ui/
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-libdns/Makefile b/net/avahi-libdns/Makefile
index c7394954da61..cf77a43aa7ca 100644
--- a/net/avahi-libdns/Makefile
+++ b/net/avahi-libdns/Makefile
@@ -1,21 +1,21 @@
-PORTREVISION=	0
+PORTREVISION=	2	# don't delete, reset to 0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-libdns
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	mDNSResponder compatibility from Avahi
 
 LIB_DEPENDS=	libavahi-common.so:net/avahi-app
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-compat-libdns_sd
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 AVAHI_SLAVE=	libdns
 AVAHI_PKGCONFIG=avahi-compat-libdns_sd.pc
 
 CONFLICTS=	mDNSResponder
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-qt5/Makefile b/net/avahi-qt5/Makefile
index dc6bea621a02..2c500beb5442 100644
--- a/net/avahi-qt5/Makefile
+++ b/net/avahi-qt5/Makefile
@@ -1,21 +1,21 @@
-PORTREVISION=	0
+PORTREVISION=	2	# don't delete, reset to 0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-qt5
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Qt 5 bindings to the Avahi mDNS system
 
 LIB_DEPENDS=	libavahi-common.so:net/avahi-app
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-qt
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 AVAHI_SLAVE=	qt5
 USES=		compiler:c++11-lang qt:5
 USE_QT=		core buildtools:build
 AVAHI_PKGCONFIG=avahi-qt5.pc
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-sharp/Makefile b/net/avahi-sharp/Makefile
index 5e56caca9cd7..605b9ce7ba0a 100644
--- a/net/avahi-sharp/Makefile
+++ b/net/avahi-sharp/Makefile
@@ -1,27 +1,27 @@
-PORTREVISION=	2
+PORTREVISION=	2	# don't delete, reset to 0
 CATEGORIES=	net dns
 PKGNAMESUFFIX=	-sharp
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mono bindings for Avahi service discovery
 
 LIB_DEPENDS=	libavahi-core.so:net/avahi-app
 
 USES=		mono
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-sharp
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 AVAHI_SLAVE=	sharp
 AVAHI_PKGCONFIG=avahi-sharp.pc
 
 post-patch:
 	@${REINPLACE_CMD} 's|@CLIENT_DLNAME@|libavahi-client.so|g; \
 		s|@COMMON_DLNAME@|libavahi-common.so|g; \
 		s|@GLIB_DLNAME@|libavahi-glib.so|g' \
 		${BUILD_WRKSRC}/avahi-sharp.dll.config.in
 	@${CP} ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config.in ${WRKSRC}/avahi-sharp/avahi-sharp.dll.config
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index 6466fc5d6036..d61b339b3767 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -1,49 +1,49 @@
-PORTREVISION=	4
+PORTREVISION=	4	# don't delete, reset to 0
 CATEGORIES=	net gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	# empty
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python interface to the Avahi mDNS system
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR}
 LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR} \
 		avahi-gtk3>=0.7:net/avahi-gtk3
 
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-python
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 AVAHI_SLAVE=	python
 
 USE_GNOME=	pygobject3 gtk30
 USES=		python
 USE_PYTHON=	flavors py3kplist
 MANPAGES=	avahi-bookmarks.1
 
 NO_ARCH=	yes
 
 # See https://github.com/lathiat/avahi/issues/277
 post-extract:
 	${CP} ${FILESDIR}/build-db ${WRKSRC}/service-type-database
 
 do-build:
 	@${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}
 	@${DO_MAKE_BUILD} -C ${WRKSRC}/service-type-database
 
 do-install:
 	@(cd ${BUILD_WRKSRC}; ${MAKE_CMD} ${MAKE_ARGS} install-strip)
 	@(cd ${WRKSRC}/service-type-database; ${MAKE_CMD} ${MAKE_ARGS} install)
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S,${PREFIX}/,,})
 
 .include "${MASTERDIR}/Makefile"