Index: net/avahi/Makefile
===================================================================
--- net/avahi/Makefile	(révision 558234)
+++ net/avahi/Makefile	(copie de travail)
@@ -3,27 +3,27 @@
 #   $MCom: ports/net/avahi/Makefile,v 1.30 2011/03/13 17:23:19 kwm Exp $
 
 PORTNAME=	avahi
-PORTVERSION=	0.7
-PORTREVISION?=	1
+PORTVERSION=	0.8
 CATEGORIES?=	net dns
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	"meta-port" for the Avahi service discovery suite
 
-RUN_DEPENDS=	avahi-app>=0.7:net/avahi-app
+RUN_DEPENDS=	avahi-app>=0.8:net/avahi-app
 
 USES=		metaport
 
-OPTIONS_DEFINE=	AUTOIPD GTK MONO QT5
-OPTIONS_DEFAULT=AUTOIPD GTK
+OPTIONS_DEFINE=	AUTOIPD GTK2 GTK3 MONO QT5 PYTHON
+OPTIONS_DEFAULT=AUTOIPD GTK3
 AUTOIPD_DESC=	IPv4LL network address configuration daemon
-GTK_DESC=	Gtk+ tools and bindings
 LIBDNS_DESC=	Apple's mDNSResponder compatibility library
 
 AUTOIPD_RUN_DEPENDS=	avahi-autoipd:net/avahi-autoipd
-GTK_RUN_DEPENDS=	avahi-discover-standalone:net/avahi-gtk
+GTK2_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/avahi-ui.pc:net/avahi-gtk
+GTK3_RUN_DEPENDS=	avahi-discover-standalone:net/avahi-gtk3
 #LIBDNS_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:net/avahi-libdns
 MONO_RUN_DEPENDS=	${LOCALBASE}/lib/mono/avahi-sharp/avahi-sharp.dll:net/avahi-sharp
 QT5_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/avahi-qt5.pc:net/avahi-qt5
+PYTHON_RUN_DEPENDS=	avahi-bookmarks:net/py-avahi
 
 .include <bsd.port.mk>
Index: net/avahi-app/Makefile
===================================================================
--- net/avahi-app/Makefile	(révision 558234)
+++ net/avahi-app/Makefile	(copie de travail)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	avahi
-PORTVERSION=	0.7
-PORTREVISION?=	3
+PORTVERSION=	0.8
 CATEGORIES?=	net dns
 MASTER_SITES=	http://www.avahi.org/download/
 PKGNAMESUFFIX?=	-app
@@ -21,18 +20,21 @@
 		libdaemon.so:devel/libdaemon \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libdbus-1.so:devel/dbus \
-		libgdbm.so:databases/gdbm
+		libgdbm.so:databases/gdbm \
+		libevent.so:devel/libevent
 
 USERS?=		${PORTNAME}
 GROUPS?=	${USERS}
 
 USES+=		alias gettext gmake gnome libtool pathfix pkgconfig
-USE_GNOME+=	glib20 intltool introspection
+USE_GNOME+=	glib20 intltool introspection:build
 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 \
+		--enable-introspection=yes \
+		--disable-static \
 		--disable-monodoc \
 		--disable-doxygen-doc \
 		--disable-doxygen-dot \
@@ -60,7 +62,9 @@
 CONFIGURE_ARGS+=--disable-autoipd
 .endif
 .if ${AVAHI_SLAVE} == gtk
-CONFIGURE_ARGS+=--enable-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
@@ -105,20 +109,9 @@
 		${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}|' \
+	@${REINPLACE_CMD} -e '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
 
@@ -139,7 +132,7 @@
 post-install: avahi-post-install
 
 avahi-post-install:
-.if defined(MANPAGES)
+.if defined(MANPAGES) && ${AVAHI_SLAVE} != gtk
 .for f in ${MANPAGES}
 	${INSTALL_DATA} ${WRKSRC}/man/${f} ${STAGEDIR}${PREFIX}/man/man${f:E}/${f}
 .endfor
@@ -154,7 +147,7 @@
 .endfor
 .if ${AVAHI_SLAVE}==no
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/system-services
-	${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \
+	${INSTALL_DATA} ${WRKSRC}/avahi-daemon/org.freedesktop.Avahi.service \
 		${STAGEDIR}${PREFIX}/share/dbus-1/system-services
 .endif
 .endif # ! avahi-header
Index: net/avahi-app/distinfo
===================================================================
--- net/avahi-app/distinfo	(révision 558234)
+++ net/avahi-app/distinfo	(copie de travail)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534080439
-SHA256 (avahi-0.7.tar.gz) = 57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
-SIZE (avahi-0.7.tar.gz) = 1333400
+TIMESTAMP = 1602717130
+SHA256 (avahi-0.8.tar.gz) = 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
+SIZE (avahi-0.8.tar.gz) = 1591458
Index: net/avahi-app/files/Makefile.am
===================================================================
--- net/avahi-app/files/Makefile.am	(révision 558234)
+++ net/avahi-app/files/Makefile.am	(nonexistent)
@@ -1,43 +0,0 @@
---- Makefile.am.orig	2017-07-10 12:14:59.083371116 +0200
-+++ Makefile.am	2018-12-22 21:00:37.193294000 +0100
-@@ -43,6 +43,7 @@
- 	avahi-gobject.pc.in \
- 	avahi-qt3.pc.in \
- 	avahi-qt4.pc.in \
-+	avahi-qt5.pc.in \
- 	avahi-sharp.pc.in \
- 	avahi-ui-sharp.pc.in \
- 	avahi-compat-libdns_sd.pc.in \
-@@ -101,7 +102,11 @@
- DX_INPUT += \
- 	$(srcdir)/avahi-qt/qt-watch.h
- endif
-+if HAVE_QT5
-+DX_INPUT += \
-+	$(srcdir)/avahi-qt/qt-watch.h
- endif
-+endif
- 
- if HAVE_GLIB
- DX_INPUT += \
-@@ -155,6 +160,8 @@
- %.pc: %.pc.in
- 	$(AM_V_GEN)sed -e 's,@prefix\@,$(prefix),g' \
- 	    -e 's,@libdir\@,$(libdir),g' \
-+	    -e 's,@PTHREAD_CFLAGS\@,$(PTHREAD_CFLAGS),g' \
-+	    -e 's,@PTHREAD_LIBS\@,$(PTHREAD_LIBS),g' \
- 	    -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' \
- 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
- 
-@@ -214,6 +221,11 @@
- if HAVE_QT4
- pkgconfig_DATA += avahi-qt4.pc
- CLEANFILES += avahi-qt4.pc
-+endif
-+
-+if HAVE_QT5
-+pkgconfig_DATA += avahi-qt5.pc
-+CLEANFILES += avahi-qt5.pc
- endif
- 
- CLEANFILES += avahi.devhelp

Property changes on: net/avahi-app/files/Makefile.am
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-1
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: net/avahi-app/files/acinclude.m4
===================================================================
--- net/avahi-app/files/acinclude.m4	(révision 558234)
+++ net/avahi-app/files/acinclude.m4	(nonexistent)
@@ -1,7 +0,0 @@
---- acinclude.m4.orig	2017-07-10 12:14:59.083371116 +0200
-+++ acinclude.m4	2018-12-22 20:56:34.849629000 +0100
-@@ -1 +1,2 @@
--sinclude(common/doxygen.m4)
-\ No newline at end of file
-+sinclude(common/doxygen.m4)
-+sincldue(common/qt5-pie.m4)

Property changes on: net/avahi-app/files/acinclude.m4
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-1
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: net/avahi-app/files/avahi-qt_Makefile.am
===================================================================
--- net/avahi-app/files/avahi-qt_Makefile.am	(révision 558234)
+++ net/avahi-app/files/avahi-qt_Makefile.am	(nonexistent)
@@ -1,43 +0,0 @@
---- avahi-qt/Makefile.am.orig	2017-07-10 12:14:59.119370306 +0200
-+++ avahi-qt/Makefile.am	2018-12-22 21:02:56.006641000 +0100
-@@ -39,7 +39,7 @@
- 	$(AM_V_GEN)$(MOC_QT3) $^ > $@
- 
- libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_CFLAGS)
--libavahi_qt3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT3_LIBS)
-+libavahi_qt3_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT3_LIBS)
- libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO)
- endif
- 
-@@ -61,8 +61,30 @@
- 	$(AM_V_GEN)$(MOC_QT4) $^ > $@
- 
- libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS)
--libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)
-+libavahi_qt4_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT4_LIBS)
- libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT4_VERSION_INFO)
-+endif
-+
-+if HAVE_QT5
-+
-+avahiqt5includedir=$(includedir)/avahi-qt5
-+avahiqt5include_HEADERS = \
-+	qt-watch.h
-+
-+lib_LTLIBRARIES += \
-+	libavahi-qt5.la
-+
-+BUILT_SOURCES += qt-watch.moc5
-+
-+libavahi_qt5_la_SOURCES = \
-+	qt-watch.cpp
-+
-+qt-watch.moc5: qt-watch.cpp
-+	$(AM_V_GEN)$(MOC_QT5) $^ > $@
-+
-+libavahi_qt5_la_CPPFLAGS = $(AM_CFLAGS) --std=gnu++11 $(QT5_CFLAGS) -DQT5 $(VISIBILITY_HIDDEN_CFLAGS)
-+libavahi_qt5_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT5_LIBS)
-+libavahi_qt5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT5_VERSION_INFO)
- endif
- 
- CLEANFILES = $(BUILT_SOURCES)

Property changes on: net/avahi-app/files/avahi-qt_Makefile.am
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-1
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: net/avahi-app/files/build-db
===================================================================
--- net/avahi-app/files/build-db	(nonexistent)
+++ net/avahi-app/files/build-db	(copie de travail)
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+# -*-python-*-
+# This file is part of avahi.
+#
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+try:
+    import anydbm as dbm
+except ImportError:
+    import dbm
+
+import sys
+
+if len(sys.argv) > 1:
+    infn = sys.argv[1]
+else:
+    infn = "service-types"
+
+if len(sys.argv) > 2:
+    outfn = sys.argv[2]
+else:
+    outfn = infn + ".db"
+
+db = dbm.open(outfn, "n")
+
+for ln in open(infn, "r"):
+    ln = ln.strip(" \r\n\t")
+    
+    if ln == "" or ln.startswith("#"):
+        continue
+
+    t, n = ln.split(":", 1)
+
+    db[t.strip()] = n.strip()
+
+db.close()

Property changes on: net/avahi-app/files/build-db
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: net/avahi-app/files/configure.ac
===================================================================
--- net/avahi-app/files/configure.ac	(révision 558234)
+++ net/avahi-app/files/configure.ac	(nonexistent)
@@ -1,59 +0,0 @@
---- configure.ac.orig	2018-12-22 21:11:52.861640000 +0100
-+++ configure.ac	2018-12-22 21:11:58.730593000 +0100
-@@ -34,6 +34,7 @@
- AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:5:0])
- AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:2:0])
- AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:2:0])
-+AC_SUBST(LIBAVAHI_QT5_VERSION_INFO, [1:2:0])
- AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [1:4:1])
- 
- # Do not touch these, since they we took this version-info from upstream HOWL/Bonjour
-@@ -526,6 +527,32 @@
- AM_CONDITIONAL(HAVE_QT4, test "x$HAVE_QT4" = "xyes")
- 
- #
-+# Check for Qt 5
-+#
-+AC_ARG_ENABLE(qt5,
-+        AS_HELP_STRING([--disable-qt5],[Disable building of Qt5Core mainloop integration]),
-+        [case "${enableval}" in
-+                yes) HAVE_QT5=yes ;;
-+                no)  HAVE_QT5=no ;;
-+                *) AC_MSG_ERROR(bad value ${enableval} for --enable-qt5) ;;
-+        esac],
-+        [HAVE_QT5=yes])
-+
-+if test "x$HAVE_QT5" = "xyes" ; then
-+        PKG_CHECK_MODULES( QT5, [ Qt5Core >= 5.0.0 ])
-+        AC_AVAHI_QT_ADD_PIC_IF_NEEDED
-+        AC_SUBST(QT5_CFLAGS)
-+        AC_SUBST(QT5_LIBS)
-+        QT5_PREFIX="`$PKG_CONFIG --variable=host_bins Qt5Core`"
-+        AC_PATH_PROGS(MOC_QT5, [moc-qt5 moc], no, [$QT5_PREFIX])
-+        if test "$MOC_QT5" = no; then
-+            AC_MSG_ERROR([Could not find QT5 moc])
-+        fi
-+        AC_SUBST(MOC_QT5)
-+fi
-+AM_CONDITIONAL(HAVE_QT5, test "x$HAVE_QT5" = "xyes")
-+
-+#
- # Check for GTK+ 2.0
- #
- AC_ARG_ENABLE(gtk,
-@@ -1158,6 +1185,7 @@
-     Enable python-dbus:                        ${HAVE_PYTHON_DBUS}
-     Enable QT3:                                ${HAVE_QT3}
-     Enable QT4:                                ${HAVE_QT4}
-+    Enable QT5:                                ${HAVE_QT5}
-     Enable Mono:                               ${HAVE_MONO}
-     Enable Monodoc:                            ${HAVE_MONODOC}
-     Distribution/OS:                           ${with_distro}
-@@ -1227,6 +1255,7 @@
-     Building avahi-discover-standalone: ${HAVE_GTK2OR3}
-     Building libavahi-qt3:              ${HAVE_QT3}
-     Building libavahi-qt4:              ${HAVE_QT4}
-+    Building libavahi-qt5:              ${HAVE_QT5}
-     Building avahi-sharp:               ${HAVE_MONO}
-     Building avahi-compat-libdns_sd:    ${ENABLE_COMPAT_LIBDNS_SD}
-     Building avahi-compat-howl:         ${ENABLE_COMPAT_HOWL}

Property changes on: net/avahi-app/files/configure.ac
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-1
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: net/avahi-app/files/org.freedesktop.Avahi.service
===================================================================
--- net/avahi-app/files/org.freedesktop.Avahi.service	(révision 558234)
+++ net/avahi-app/files/org.freedesktop.Avahi.service	(nonexistent)
@@ -1,24 +0,0 @@
-# This file is part of avahi.
-#
-# avahi is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# avahi is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
-# License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with avahi; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA.
-
-[D-BUS Service]
-Name=org.freedesktop.Avahi
-#SystemdService=avahi-daemon.service
-
-# This service should not be bus activated if systemd isn't running,
-# so that activation won't conflict with the init script startup.
-Exec=/usr/bin/false

Property changes on: net/avahi-app/files/org.freedesktop.Avahi.service
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: net/avahi-app/files/patch-avahi-daemon_main.c
===================================================================
--- net/avahi-app/files/patch-avahi-daemon_main.c	(révision 558234)
+++ net/avahi-app/files/patch-avahi-daemon_main.c	(nonexistent)
@@ -1,14 +0,0 @@
---- avahi-daemon/main.c.orig	2010-11-18 03:00:26 UTC
-+++ avahi-daemon/main.c
-@@ -320,6 +320,11 @@ static void update_browse_domains(void) 
-         return;
-     }
- 
-+    if (!resolv_conf_search_domains) {
-+	    avahi_server_set_browse_domains(avahi_server, NULL);
-+	    return;
-+    }
-+
-     l = avahi_string_list_copy(config.server_config.browse_domains);
- 
-     for (p = resolv_conf_search_domains, n = 0; *p && n < BROWSE_DOMAINS_MAX; p++, n++) {

Property changes on: net/avahi-app/files/patch-avahi-daemon_main.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: net/avahi-app/files/patch-avahi-qt_Makefile.in
===================================================================
--- net/avahi-app/files/patch-avahi-qt_Makefile.in	(révision 558234)
+++ net/avahi-app/files/patch-avahi-qt_Makefile.in	(copie de travail)
@@ -1,170 +1,33 @@
---- avahi-qt/Makefile.in.orig	2018-12-22 21:39:31.709598000 +0100
-+++ avahi-qt/Makefile.in	2018-12-22 21:41:01.331208000 +0100
-@@ -1,7 +1,7 @@
--# Makefile.in generated by automake 1.15 from Makefile.am.
-+# Makefile.in generated by automake 1.16.1 from Makefile.am.
- # @configure_input@
- 
--# Copyright (C) 1994-2014 Free Software Foundation, Inc.
-+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
- 
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -114,6 +114,10 @@
- @HAVE_QT4_TRUE@	libavahi-qt4.la
- 
- @HAVE_QT4_TRUE@am__append_4 = qt-watch.moc4
-+@HAVE_QT5_TRUE@am__append_5 = \
-+@HAVE_QT5_TRUE@	libavahi-qt5.la
-+
-+@HAVE_QT5_TRUE@am__append_6 = qt-watch.moc5
- subdir = avahi-qt
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/common/acx_pthread.m4 \
-@@ -127,13 +131,14 @@
- 	$(top_srcdir)/common/ltversion.m4 \
- 	$(top_srcdir)/common/lt~obsolete.m4 \
- 	$(top_srcdir)/common/nls.m4 $(top_srcdir)/common/python.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \
--	$(top_srcdir)/configure.ac
-+	$(top_srcdir)/common/qt5-pie.m4 $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/common/doxygen.m4 $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am \
- 	$(am__avahiqt3include_HEADERS_DIST) \
--	$(am__avahiqt4include_HEADERS_DIST) $(am__DIST_COMMON)
-+	$(am__avahiqt4include_HEADERS_DIST) \
-+	$(am__avahiqt5include_HEADERS_DIST) $(am__DIST_COMMON)
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-@@ -167,12 +172,11 @@
-   }
- am__installdirs = "$(DESTDIR)$(libdir)" \
- 	"$(DESTDIR)$(avahiqt3includedir)" \
--	"$(DESTDIR)$(avahiqt4includedir)"
-+	"$(DESTDIR)$(avahiqt4includedir)" \
-+	"$(DESTDIR)$(avahiqt5includedir)"
+--- avahi-qt/Makefile.in.orig	2020-02-18 07:03:16 UTC
++++ avahi-qt/Makefile.in
+@@ -182,7 +182,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
--@HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES =  \
+ @HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES =  \
 -@HAVE_QT3_TRUE@	../avahi-common/libavahi-common.la \
--@HAVE_QT3_TRUE@	$(am__DEPENDENCIES_1)
-+@HAVE_QT3_TRUE@libavahi_qt3_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
++@HAVE_QT3_TRUE@	-lavahi-common \
+ @HAVE_QT3_TRUE@	$(am__DEPENDENCIES_1)
  am__libavahi_qt3_la_SOURCES_DIST = qt-watch.cpp
  @HAVE_QT3_TRUE@am_libavahi_qt3_la_OBJECTS =  \
- @HAVE_QT3_TRUE@	libavahi_qt3_la-qt-watch.lo
-@@ -186,9 +190,7 @@
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(libavahi_qt3_la_LDFLAGS) \
+@@ -198,7 +198,7 @@ libavahi_qt3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX
  	$(LDFLAGS) -o $@
  @HAVE_QT3_TRUE@am_libavahi_qt3_la_rpath = -rpath $(libdir)
--@HAVE_QT4_TRUE@libavahi_qt4_la_DEPENDENCIES =  \
+ @HAVE_QT4_TRUE@libavahi_qt4_la_DEPENDENCIES =  \
 -@HAVE_QT4_TRUE@	../avahi-common/libavahi-common.la \
--@HAVE_QT4_TRUE@	$(am__DEPENDENCIES_1)
-+@HAVE_QT4_TRUE@libavahi_qt4_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
++@HAVE_QT4_TRUE@	-lavahi-common \
+ @HAVE_QT4_TRUE@	$(am__DEPENDENCIES_1)
  am__libavahi_qt4_la_SOURCES_DIST = qt-watch.cpp
  @HAVE_QT4_TRUE@am_libavahi_qt4_la_OBJECTS =  \
- @HAVE_QT4_TRUE@	libavahi_qt4_la-qt-watch.lo
-@@ -198,6 +200,16 @@
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(libavahi_qt4_la_LDFLAGS) \
+@@ -210,7 +210,7 @@ libavahi_qt4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX
  	$(LDFLAGS) -o $@
  @HAVE_QT4_TRUE@am_libavahi_qt4_la_rpath = -rpath $(libdir)
-+@HAVE_QT5_TRUE@libavahi_qt5_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am__libavahi_qt5_la_SOURCES_DIST = qt-watch.cpp
-+@HAVE_QT5_TRUE@am_libavahi_qt5_la_OBJECTS =  \
-+@HAVE_QT5_TRUE@	libavahi_qt5_la-qt-watch.lo
-+libavahi_qt5_la_OBJECTS = $(am_libavahi_qt5_la_OBJECTS)
-+libavahi_qt5_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS) $(libavahi_qt5_la_LDFLAGS) \
-+	$(LDFLAGS) -o $@
-+@HAVE_QT5_TRUE@am_libavahi_qt5_la_rpath = -rpath $(libdir)
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
-@@ -212,7 +224,10 @@
- am__v_at_1 = 
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
--am__depfiles_maybe = depfiles
-+am__maybe_remake_depfiles = depfiles
-+am__depfiles_remade = ./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo \
-+	./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo \
-+	./$(DEPDIR)/libavahi_qt5_la-qt-watch.Plo
- am__mv = mv -f
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-@@ -232,9 +247,11 @@
- am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
- am__v_CXXLD_0 = @echo "  CXXLD   " $@;
- am__v_CXXLD_1 = 
--SOURCES = $(libavahi_qt3_la_SOURCES) $(libavahi_qt4_la_SOURCES)
-+SOURCES = $(libavahi_qt3_la_SOURCES) $(libavahi_qt4_la_SOURCES) \
-+	$(libavahi_qt5_la_SOURCES)
- DIST_SOURCES = $(am__libavahi_qt3_la_SOURCES_DIST) \
--	$(am__libavahi_qt4_la_SOURCES_DIST)
-+	$(am__libavahi_qt4_la_SOURCES_DIST) \
-+	$(am__libavahi_qt5_la_SOURCES_DIST)
- am__can_run_installinfo = \
-   case $$AM_UPDATE_INFO_DIR in \
-     n|no|NO) false;; \
-@@ -242,7 +259,9 @@
-   esac
- am__avahiqt3include_HEADERS_DIST = qt-watch.h
- am__avahiqt4include_HEADERS_DIST = qt-watch.h
--HEADERS = $(avahiqt3include_HEADERS) $(avahiqt4include_HEADERS)
-+am__avahiqt5include_HEADERS_DIST = qt-watch.h
-+HEADERS = $(avahiqt3include_HEADERS) $(avahiqt4include_HEADERS) \
-+	$(avahiqt5include_HEADERS)
- am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
- # Read a list of newline-separated strings from the standard input,
- # and print each of them once, without duplicates.  Input order is
-@@ -379,6 +398,7 @@
- LIBAVAHI_GOBJECT_VERSION_INFO = @LIBAVAHI_GOBJECT_VERSION_INFO@
- LIBAVAHI_QT3_VERSION_INFO = @LIBAVAHI_QT3_VERSION_INFO@
- LIBAVAHI_QT4_VERSION_INFO = @LIBAVAHI_QT4_VERSION_INFO@
-+LIBAVAHI_QT5_VERSION_INFO = @LIBAVAHI_QT5_VERSION_INFO@
- LIBAVAHI_UI_VERSION_INFO = @LIBAVAHI_UI_VERSION_INFO@
- LIBDAEMON_CFLAGS = @LIBDAEMON_CFLAGS@
- LIBDAEMON_LIBS = @LIBDAEMON_LIBS@
-@@ -397,6 +417,7 @@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOC_QT3 = @MOC_QT3@
- MOC_QT4 = @MOC_QT4@
-+MOC_QT5 = @MOC_QT5@
- MONODOCER = @MONODOCER@
- MONODOC_CFLAGS = @MONODOC_CFLAGS@
- MONODOC_DIR = @MONODOC_DIR@
-@@ -439,6 +460,8 @@
- QT3_LIBS = @QT3_LIBS@
- QT4_CFLAGS = @QT4_CFLAGS@
- QT4_LIBS = @QT4_LIBS@
-+QT5_CFLAGS = @QT5_CFLAGS@
-+QT5_LIBS = @QT5_LIBS@
- RANLIB = @RANLIB@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
-@@ -509,7 +532,6 @@
- psdir = @psdir@
- pyexecdir = @pyexecdir@
- pythondir = @pythondir@
--runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-@@ -520,8 +542,8 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CFLAGS = -I$(top_srcdir)
--lib_LTLIBRARIES = $(am__append_1) $(am__append_3)
--BUILT_SOURCES = $(am__append_2) $(am__append_4)
-+lib_LTLIBRARIES = $(am__append_1) $(am__append_3) $(am__append_5)
-+BUILT_SOURCES = $(am__append_2) $(am__append_4) $(am__append_6)
- @HAVE_QT3_TRUE@avahiqt3includedir = $(includedir)/avahi-qt3
- @HAVE_QT3_TRUE@avahiqt3include_HEADERS = \
- @HAVE_QT3_TRUE@	qt-watch.h
-@@ -530,7 +552,7 @@
+ @HAVE_QT5_TRUE@libavahi_qt5_la_DEPENDENCIES =  \
+-@HAVE_QT5_TRUE@	../avahi-common/libavahi-common.la \
++@HAVE_QT5_TRUE@	-lavahi-common \
+ @HAVE_QT5_TRUE@	$(am__DEPENDENCIES_1)
+ am__libavahi_qt5_la_SOURCES_DIST = qt-watch.cpp
+ @HAVE_QT5_TRUE@am_libavahi_qt5_la_OBJECTS =  \
+@@ -552,7 +552,7 @@ BUILT_SOURCES = $(am__append_2) $(am__append_4) $(am__
  @HAVE_QT3_TRUE@	qt-watch.cpp
  
  @HAVE_QT3_TRUE@libavahi_qt3_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_CFLAGS)
@@ -173,7 +36,7 @@
  @HAVE_QT3_TRUE@libavahi_qt3_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_QT3_VERSION_INFO)
  @HAVE_QT4_TRUE@avahiqt4includedir = $(includedir)/avahi-qt4
  @HAVE_QT4_TRUE@avahiqt4include_HEADERS = \
-@@ -540,8 +562,18 @@
+@@ -562,7 +562,7 @@ BUILT_SOURCES = $(am__append_2) $(am__append_4) $(am__
  @HAVE_QT4_TRUE@	qt-watch.cpp
  
  @HAVE_QT4_TRUE@libavahi_qt4_la_CPPFLAGS = $(AM_CFLAGS) $(QT4_CFLAGS) -DQT4 $(VISIBILITY_HIDDEN_CFLAGS)
@@ -180,204 +43,14 @@
 -@HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT4_LIBS)
 +@HAVE_QT4_TRUE@libavahi_qt4_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT4_LIBS)
  @HAVE_QT4_TRUE@libavahi_qt4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT4_VERSION_INFO)
-+@HAVE_QT5_TRUE@avahiqt5includedir = $(includedir)/avahi-qt5
-+@HAVE_QT5_TRUE@avahiqt5include_HEADERS = \
-+@HAVE_QT5_TRUE@	qt-watch.h
-+
-+@HAVE_QT5_TRUE@libavahi_qt5_la_SOURCES = \
-+@HAVE_QT5_TRUE@	qt-watch.cpp
-+
-+@HAVE_QT5_TRUE@libavahi_qt5_la_CPPFLAGS = $(AM_CFLAGS) --std=gnu++11 $(QT5_CFLAGS) -DQT5 $(VISIBILITY_HIDDEN_CFLAGS)
+ @HAVE_QT5_TRUE@avahiqt5includedir = $(includedir)/avahi-qt5
+ @HAVE_QT5_TRUE@avahiqt5include_HEADERS = \
+@@ -572,7 +572,7 @@ BUILT_SOURCES = $(am__append_2) $(am__append_4) $(am__
+ @HAVE_QT5_TRUE@	qt-watch.cpp
+ 
+ @HAVE_QT5_TRUE@libavahi_qt5_la_CPPFLAGS = $(AM_CFLAGS) --std=gnu++11 $(QT5_CFLAGS) -DQT5 $(VISIBILITY_HIDDEN_CFLAGS)
+-@HAVE_QT5_TRUE@libavahi_qt5_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la $(QT5_LIBS)
 +@HAVE_QT5_TRUE@libavahi_qt5_la_LIBADD = $(AM_LDADD) -lavahi-common $(QT5_LIBS)
-+@HAVE_QT5_TRUE@libavahi_qt5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT5_VERSION_INFO)
+ @HAVE_QT5_TRUE@libavahi_qt5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_QT5_VERSION_INFO)
  CLEANFILES = $(BUILT_SOURCES)
  all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
-@@ -565,8 +597,8 @@
- 	  *config.status*) \
- 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- 	  *) \
--	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
--	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
- 	esac;
- 
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-@@ -619,15 +651,25 @@
- libavahi-qt4.la: $(libavahi_qt4_la_OBJECTS) $(libavahi_qt4_la_DEPENDENCIES) $(EXTRA_libavahi_qt4_la_DEPENDENCIES) 
- 	$(AM_V_CXXLD)$(libavahi_qt4_la_LINK) $(am_libavahi_qt4_la_rpath) $(libavahi_qt4_la_OBJECTS) $(libavahi_qt4_la_LIBADD) $(LIBS)
- 
-+libavahi-qt5.la: $(libavahi_qt5_la_OBJECTS) $(libavahi_qt5_la_DEPENDENCIES) $(EXTRA_libavahi_qt5_la_DEPENDENCIES) 
-+	$(AM_V_CXXLD)$(libavahi_qt5_la_LINK) $(am_libavahi_qt5_la_rpath) $(libavahi_qt5_la_OBJECTS) $(libavahi_qt5_la_LIBADD) $(LIBS)
-+
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
- 
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo@am__quote@ # am--include-marker
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo@am__quote@ # am--include-marker
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_qt5_la-qt-watch.Plo@am__quote@ # am--include-marker
- 
-+$(am__depfiles_remade):
-+	@$(MKDIR_P) $(@D)
-+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-+
-+am--depfiles: $(am__depfiles_remade)
-+
- .cpp.o:
- @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@@ -663,6 +705,13 @@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libavahi_qt4_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libavahi_qt4_la-qt-watch.lo `test -f 'qt-watch.cpp' || echo '$(srcdir)/'`qt-watch.cpp
- 
-+libavahi_qt5_la-qt-watch.lo: qt-watch.cpp
-+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libavahi_qt5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libavahi_qt5_la-qt-watch.lo -MD -MP -MF $(DEPDIR)/libavahi_qt5_la-qt-watch.Tpo -c -o libavahi_qt5_la-qt-watch.lo `test -f 'qt-watch.cpp' || echo '$(srcdir)/'`qt-watch.cpp
-+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libavahi_qt5_la-qt-watch.Tpo $(DEPDIR)/libavahi_qt5_la-qt-watch.Plo
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='qt-watch.cpp' object='libavahi_qt5_la-qt-watch.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libavahi_qt5_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libavahi_qt5_la-qt-watch.lo `test -f 'qt-watch.cpp' || echo '$(srcdir)/'`qt-watch.cpp
-+
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
-@@ -710,7 +759,28 @@
- 	@list='$(avahiqt4include_HEADERS)'; test -n "$(avahiqt4includedir)" || list=; \
- 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- 	dir='$(DESTDIR)$(avahiqt4includedir)'; $(am__uninstall_files_from_dir)
-+install-avahiqt5includeHEADERS: $(avahiqt5include_HEADERS)
-+	@$(NORMAL_INSTALL)
-+	@list='$(avahiqt5include_HEADERS)'; test -n "$(avahiqt5includedir)" || list=; \
-+	if test -n "$$list"; then \
-+	  echo " $(MKDIR_P) '$(DESTDIR)$(avahiqt5includedir)'"; \
-+	  $(MKDIR_P) "$(DESTDIR)$(avahiqt5includedir)" || exit 1; \
-+	fi; \
-+	for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  echo "$$d$$p"; \
-+	done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(avahiqt5includedir)'"; \
-+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(avahiqt5includedir)" || exit $$?; \
-+	done
- 
-+uninstall-avahiqt5includeHEADERS:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(avahiqt5include_HEADERS)'; test -n "$(avahiqt5includedir)" || list=; \
-+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+	dir='$(DESTDIR)$(avahiqt5includedir)'; $(am__uninstall_files_from_dir)
-+
- ID: $(am__tagged_files)
- 	$(am__define_uniq_tagged_files); mkid -fID $$unique
- tags: tags-am
-@@ -763,7 +833,10 @@
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
--distdir: $(DISTFILES)
-+distdir: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-+
-+distdir-am: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- 	list='$(DISTFILES)'; \
-@@ -798,7 +871,7 @@
- 	$(MAKE) $(AM_MAKEFLAGS) check-am
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- installdirs:
--	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(avahiqt3includedir)" "$(DESTDIR)$(avahiqt4includedir)"; do \
-+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(avahiqt3includedir)" "$(DESTDIR)$(avahiqt4includedir)" "$(DESTDIR)$(avahiqt5includedir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: $(BUILT_SOURCES)
-@@ -840,7 +913,9 @@
- 	mostlyclean-am
- 
- distclean: distclean-am
--	-rm -rf ./$(DEPDIR)
-+		-rm -f ./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo
-+	-rm -f ./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo
-+	-rm -f ./$(DEPDIR)/libavahi_qt5_la-qt-watch.Plo
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
- 	distclean-tags
-@@ -858,7 +933,7 @@
- info-am:
- 
- install-data-am: install-avahiqt3includeHEADERS \
--	install-avahiqt4includeHEADERS
-+	install-avahiqt4includeHEADERS install-avahiqt5includeHEADERS
- 
- install-dvi: install-dvi-am
- 
-@@ -887,7 +962,9 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--	-rm -rf ./$(DEPDIR)
-+		-rm -f ./$(DEPDIR)/libavahi_qt3_la-qt-watch.Plo
-+	-rm -f ./$(DEPDIR)/libavahi_qt4_la-qt-watch.Plo
-+	-rm -f ./$(DEPDIR)/libavahi_qt5_la-qt-watch.Plo
- 	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
-@@ -905,26 +982,29 @@
- ps-am:
- 
- uninstall-am: uninstall-avahiqt3includeHEADERS \
--	uninstall-avahiqt4includeHEADERS uninstall-libLTLIBRARIES
-+	uninstall-avahiqt4includeHEADERS \
-+	uninstall-avahiqt5includeHEADERS uninstall-libLTLIBRARIES
- 
- .MAKE: all check install install-am install-strip
- 
--.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
--	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
--	ctags-am distclean distclean-compile distclean-generic \
-+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
-+	clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \
-+	ctags ctags-am distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am \
- 	install-avahiqt3includeHEADERS install-avahiqt4includeHEADERS \
--	install-data install-data-am install-dvi install-dvi-am \
--	install-exec install-exec-am install-html install-html-am \
--	install-info install-info-am install-libLTLIBRARIES \
--	install-man install-pdf install-pdf-am install-ps \
--	install-ps-am install-strip installcheck installcheck-am \
--	installdirs maintainer-clean maintainer-clean-generic \
--	mostlyclean mostlyclean-compile mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
--	uninstall-am uninstall-avahiqt3includeHEADERS \
--	uninstall-avahiqt4includeHEADERS uninstall-libLTLIBRARIES
-+	install-avahiqt5includeHEADERS install-data install-data-am \
-+	install-dvi install-dvi-am install-exec install-exec-am \
-+	install-html install-html-am install-info install-info-am \
-+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags tags-am uninstall uninstall-am \
-+	uninstall-avahiqt3includeHEADERS \
-+	uninstall-avahiqt4includeHEADERS \
-+	uninstall-avahiqt5includeHEADERS uninstall-libLTLIBRARIES
- 
- .PRECIOUS: Makefile
- 
-@@ -934,6 +1014,9 @@
- 
- @HAVE_QT4_TRUE@qt-watch.moc4: qt-watch.cpp
- @HAVE_QT4_TRUE@	$(AM_V_GEN)$(MOC_QT4) $^ > $@
-+
-+@HAVE_QT5_TRUE@qt-watch.moc5: qt-watch.cpp
-+@HAVE_QT5_TRUE@	$(AM_V_GEN)$(MOC_QT5) $^ > $@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
Index: net/avahi-app/files/patch-avahi-qt_qt-watch.cpp
===================================================================
--- net/avahi-app/files/patch-avahi-qt_qt-watch.cpp	(révision 558234)
+++ net/avahi-app/files/patch-avahi-qt_qt-watch.cpp	(nonexistent)
@@ -1,48 +0,0 @@
---- avahi-qt/qt-watch.cpp.orig	2017-07-10 12:14:59.119370306 +0200
-+++ avahi-qt/qt-watch.cpp	2018-12-22 20:56:34.850048000 +0100
-@@ -18,10 +18,10 @@
- ***/
- 
- #include <sys/time.h>
--#ifdef QT4
--#include <Qt/qsocketnotifier.h>
--#include <Qt/qobject.h>
--#include <Qt/qtimer.h>
-+#if defined(QT5) || defined(QT4)
-+#include <QSocketNotifier>
-+#include <QObject>
-+#include <QTimer>
- #else
- #include <qsocketnotifier.h>
- #include <qobject.h>
-@@ -114,7 +114,7 @@
-     m_callback(callback), m_userdata(userdata)
- {
-     connect(&m_timer, SIGNAL(timeout()), this, SLOT(timeout()));
--#ifdef QT4
-+#if defined(QT5) || defined(QT4)
-     m_timer.setSingleShot(true);
- #endif
-     update(tv);
-@@ -125,7 +125,7 @@
-     m_timer.stop();
-     if (tv) {
-     AvahiUsec u = avahi_age(tv)/1000;
--#ifdef QT4
-+#if defined(QT5) || defined(QT4)
-     m_timer.start( (u>0) ? 0 : -u);
- #else
-     m_timer.start( (u>0) ? 0 : -u,true);
-@@ -191,8 +191,10 @@
-     return &qt_poll;
- }
- 
--#ifdef QT4
-+#if defined(QT5)
-+#include "qt-watch.moc5"
-+#elif defined(QT4)
- #include "qt-watch.moc4"
--#else
-+#elif defined(QT3)
- #include "qt-watch.moc3"
- #endif

Property changes on: net/avahi-app/files/patch-avahi-qt_qt-watch.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: net/avahi-app/files/patch-common_qt5-pie.m4
===================================================================
--- net/avahi-app/files/patch-common_qt5-pie.m4	(révision 558234)
+++ net/avahi-app/files/patch-common_qt5-pie.m4	(nonexistent)
@@ -1,30 +0,0 @@
---- common/qt5-pie.m4.orig	2018-12-22 20:56:34.850352000 +0100
-+++ common/qt5-pie.m4	2018-12-22 20:56:34.850515000 +0100
-@@ -0,0 +1,27 @@
-+AC_DEFUN([AC_AVAHI_QT_ADD_PIC_IF_NEEDED],
-+[
-+    AC_LANG_PUSH([C++])
-+	save_CPPFLAGS="$CPPFLAGS"
-+	CPPFLAGS="$CPPFLAGS $QT5_CFLAGS"
-+	AC_MSG_CHECKING([whether Qt works without -fPIC])
-+	AC_PREPROC_IFELSE(
-+		[AC_LANG_SOURCE([[#include <QtCore>]])],
-+		[AC_MSG_RESULT(yes)],
-+		[
-+			AC_MSG_RESULT(no)
-+			AC_MSG_CHECKING([whether Qt works with -fPIC])
-+			CPPFLAGS="$CPPFLAGS -fPIC"
-+			AC_PREPROC_IFELSE(
-+				[AC_LANG_SOURCE([[#include <QtCore>]])],
-+				[
-+					AC_MSG_RESULT(yes)
-+					QT5_CFLAGS="$QT5_CFLAGS -fPIC"
-+				],
-+				[
-+					AC_MSG_RESULT(no)
-+					AC_MSG_ERROR(Couldn't compile Qt without -fPIC nor with -fPIC)
-+				])
-+		])
-+	CPPFLAGS="$save_CPPFLAGS"
-+    AC_LANG_POP([C++])
-+])

Property changes on: net/avahi-app/files/patch-common_qt5-pie.m4
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: net/avahi-app/files/patch-configure
===================================================================
--- net/avahi-app/files/patch-configure	(révision 558234)
+++ net/avahi-app/files/patch-configure	(nonexistent)
@@ -1,324 +0,0 @@
---- configure.orig	2018-12-22 21:11:56.328592000 +0100
-+++ configure	2018-12-22 21:12:12.121977000 +0100
-@@ -763,6 +763,11 @@
- HAVE_GTK_TRUE
- GTK20_LIBS
- GTK20_CFLAGS
-+HAVE_QT5_FALSE
-+HAVE_QT5_TRUE
-+MOC_QT5
-+QT5_LIBS
-+QT5_CFLAGS
- HAVE_QT4_FALSE
- HAVE_QT4_TRUE
- MOC_QT4
-@@ -948,6 +953,7 @@
- LIBAVAHI_COMPAT_HOWL_VERSION_INFO
- LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO
- LIBAVAHI_UI_VERSION_INFO
-+LIBAVAHI_QT5_VERSION_INFO
- LIBAVAHI_QT4_VERSION_INFO
- LIBAVAHI_QT3_VERSION_INFO
- LIBAVAHI_GOBJECT_VERSION_INFO
-@@ -1042,6 +1048,7 @@
- enable_introspection
- enable_qt3
- enable_qt4
-+enable_qt5
- enable_gtk
- enable_gtk3
- enable_dbus
-@@ -1105,6 +1112,8 @@
- QT3_LIBS
- QT4_CFLAGS
- QT4_LIBS
-+QT5_CFLAGS
-+QT5_LIBS
- GTK20_CFLAGS
- GTK20_LIBS
- GTK30_CFLAGS
-@@ -1757,6 +1766,7 @@
-                           Enable introspection for this build
-   --disable-qt3           Disable building of Qt3 mainloop integration
-   --disable-qt4           Disable building of Qt4Core mainloop integration
-+  --disable-qt5           Disable building of Qt5Core mainloop integration
-   --disable-gtk           Disable use of GTK+ 2
-   --disable-gtk3          Disable use of GTK+ 3
-   --disable-dbus          Disable use of D-Bus
-@@ -1854,6 +1864,8 @@
-   QT3_LIBS    linker flags for QT3, overriding pkg-config
-   QT4_CFLAGS  C compiler flags for QT4, overriding pkg-config
-   QT4_LIBS    linker flags for QT4, overriding pkg-config
-+  QT5_CFLAGS  C compiler flags for QT5, overriding pkg-config
-+  QT5_LIBS    linker flags for QT5, overriding pkg-config
-   GTK20_CFLAGS
-               C compiler flags for GTK20, overriding pkg-config
-   GTK20_LIBS  linker flags for GTK20, overriding pkg-config
-@@ -3597,6 +3609,8 @@
- 
- LIBAVAHI_QT4_VERSION_INFO=1:2:0
- 
-+LIBAVAHI_QT5_VERSION_INFO=1:2:0
-+
- LIBAVAHI_UI_VERSION_INFO=1:4:1
- 
- 
-@@ -21586,6 +21600,231 @@
- 
- 
- #
-+# Check for Qt 5
-+#
-+# Check whether --enable-qt5 was given.
-+if test "${enable_qt5+set}" = set; then :
-+  enableval=$enable_qt5; case "${enableval}" in
-+                yes) HAVE_QT5=yes ;;
-+                no)  HAVE_QT5=no ;;
-+                *) as_fn_error $? "bad value ${enableval} for --enable-qt5" "$LINENO" 5 ;;
-+        esac
-+else
-+  HAVE_QT5=yes
-+fi
-+
-+
-+if test "x$HAVE_QT5" = "xyes" ; then
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT5" >&5
-+$as_echo_n "checking for QT5... " >&6; }
-+
-+if test -n "$QT5_CFLAGS"; then
-+    pkg_cv_QT5_CFLAGS="$QT5_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" Qt5Core >= 5.0.0 \""; } >&5
-+  ($PKG_CONFIG --exists --print-errors " Qt5Core >= 5.0.0 ") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_QT5_CFLAGS=`$PKG_CONFIG --cflags " Qt5Core >= 5.0.0 " 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$QT5_LIBS"; then
-+    pkg_cv_QT5_LIBS="$QT5_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" Qt5Core >= 5.0.0 \""; } >&5
-+  ($PKG_CONFIG --exists --print-errors " Qt5Core >= 5.0.0 ") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_QT5_LIBS=`$PKG_CONFIG --libs " Qt5Core >= 5.0.0 " 2>/dev/null`
-+		      test "x$?" != "x0" && pkg_failed=yes
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        QT5_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " Qt5Core >= 5.0.0 " 2>&1`
-+        else
-+	        QT5_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " Qt5Core >= 5.0.0 " 2>&1`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$QT5_PKG_ERRORS" >&5
-+
-+	as_fn_error $? "Package requirements ( Qt5Core >= 5.0.0 ) were not met:
-+
-+$QT5_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables QT5_CFLAGS
-+and QT5_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details." "$LINENO" 5
-+elif test $pkg_failed = untried; then
-+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables QT5_CFLAGS
-+and QT5_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details" "$LINENO" 5; }
-+else
-+	QT5_CFLAGS=$pkg_cv_QT5_CFLAGS
-+	QT5_LIBS=$pkg_cv_QT5_LIBS
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+fi
-+
-+
-+    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+	save_CPPFLAGS="$CPPFLAGS"
-+	CPPFLAGS="$CPPFLAGS $QT5_CFLAGS"
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt works without -fPIC" >&5
-+$as_echo_n "checking whether Qt works without -fPIC... " >&6; }
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <QtCore>
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+else
-+
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt works with -fPIC" >&5
-+$as_echo_n "checking whether Qt works with -fPIC... " >&6; }
-+			CPPFLAGS="$CPPFLAGS -fPIC"
-+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <QtCore>
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
-+
-+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+					QT5_CFLAGS="$QT5_CFLAGS -fPIC"
-+
-+else
-+
-+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+					as_fn_error $? "Couldn't compile Qt without -fPIC nor with -fPIC" "$LINENO" 5
-+
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
-+
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
-+	CPPFLAGS="$save_CPPFLAGS"
-+    ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+
-+        QT5_PREFIX="`$PKG_CONFIG --variable=host_bins Qt5Core`"
-+        for ac_prog in moc-qt5 moc
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_MOC_QT5+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $MOC_QT5 in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_MOC_QT5="$MOC_QT5" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $QT5_PREFIX
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_MOC_QT5="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+MOC_QT5=$ac_cv_path_MOC_QT5
-+if test -n "$MOC_QT5"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC_QT5" >&5
-+$as_echo "$MOC_QT5" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$MOC_QT5" && break
-+done
-+test -n "$MOC_QT5" || MOC_QT5="no"
-+
-+        if test "$MOC_QT5" = no; then
-+            as_fn_error $? "Could not find QT5 moc" "$LINENO" 5
-+        fi
-+
-+fi
-+ if test "x$HAVE_QT5" = "xyes"; then
-+  HAVE_QT5_TRUE=
-+  HAVE_QT5_FALSE='#'
-+else
-+  HAVE_QT5_TRUE='#'
-+  HAVE_QT5_FALSE=
-+fi
-+
-+
-+#
- # Check for GTK+ 2.0
- #
- # Check whether --enable-gtk was given.
-@@ -25878,6 +26117,10 @@
-   as_fn_error $? "conditional \"HAVE_QT4\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${HAVE_QT5_TRUE}" && test -z "${HAVE_QT5_FALSE}"; then
-+  as_fn_error $? "conditional \"HAVE_QT5\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${HAVE_GTK_TRUE}" && test -z "${HAVE_GTK_FALSE}"; then
-   as_fn_error $? "conditional \"HAVE_GTK\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
-@@ -28556,6 +28799,7 @@
-     Enable python-dbus:                        ${HAVE_PYTHON_DBUS}
-     Enable QT3:                                ${HAVE_QT3}
-     Enable QT4:                                ${HAVE_QT4}
-+    Enable QT5:                                ${HAVE_QT5}
-     Enable Mono:                               ${HAVE_MONO}
-     Enable Monodoc:                            ${HAVE_MONODOC}
-     Distribution/OS:                           ${with_distro}
-@@ -28625,6 +28869,7 @@
-     Building avahi-discover-standalone: ${HAVE_GTK2OR3}
-     Building libavahi-qt3:              ${HAVE_QT3}
-     Building libavahi-qt4:              ${HAVE_QT4}
-+    Building libavahi-qt5:              ${HAVE_QT5}
-     Building avahi-sharp:               ${HAVE_MONO}
-     Building avahi-compat-libdns_sd:    ${ENABLE_COMPAT_LIBDNS_SD}
-     Building avahi-compat-howl:         ${ENABLE_COMPAT_HOWL}

Property changes on: net/avahi-app/files/patch-configure
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: net/avahi-app/pkg-plist
===================================================================
--- net/avahi-app/pkg-plist	(révision 558234)
+++ net/avahi-app/pkg-plist	(copie de travail)
@@ -66,30 +66,28 @@
 include/avahi-gobject/ga-record-browser.h
 include/avahi-gobject/ga-service-browser.h
 include/avahi-gobject/ga-service-resolver.h
+include/avahi-libevent/libevent-watch.h
 lib/avahi/.keep
 lib/girepository-1.0/Avahi-0.6.typelib
 lib/girepository-1.0/AvahiCore-0.6.typelib
-lib/libavahi-client.a
 lib/libavahi-client.so
 lib/libavahi-client.so.3
 lib/libavahi-client.so.3.2.9
-lib/libavahi-common.a
 lib/libavahi-common.so
 lib/libavahi-common.so.3
-lib/libavahi-common.so.3.5.3
-lib/libavahi-core.a
+lib/libavahi-common.so.3.5.4
 lib/libavahi-core.so
 lib/libavahi-core.so.7
-lib/libavahi-core.so.7.0.2
-lib/libavahi-glib.a
+lib/libavahi-core.so.7.1.0
 lib/libavahi-glib.so
 lib/libavahi-glib.so.1
 lib/libavahi-glib.so.1.0.2
-lib/libavahi-gobject.a
 lib/libavahi-gobject.so
 lib/libavahi-gobject.so.0
 lib/libavahi-gobject.so.0.0.5
-lib/libhowl.a
+lib/libavahi-libevent.so
+lib/libavahi-libevent.so.1
+lib/libavahi-libevent.so.1.0.0
 lib/libhowl.so
 lib/libhowl.so.0
 lib/libhowl.so.0.0.0
@@ -98,6 +96,7 @@
 libdata/pkgconfig/avahi-core.pc
 libdata/pkgconfig/avahi-glib.pc
 libdata/pkgconfig/avahi-gobject.pc
+libdata/pkgconfig/avahi-libevent.pc
 man/man1/avahi-browse-domains.1.gz
 man/man1/avahi-browse.1.gz
 man/man1/avahi-publish-address.1.gz
Index: net/avahi-autoipd/Makefile
===================================================================
--- net/avahi-autoipd/Makefile	(révision 558234)
+++ net/avahi-autoipd/Makefile	(copie de travail)
@@ -9,7 +9,8 @@
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	IPv4LL network address configuration daemon
 
-LIB_DEPENDS=	libavahi-common.so:net/avahi-app
+LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
+		libdaemon.so:devel/libdaemon
 
 USERS=		avahi-autoipd
 GROUPS=		${USERS}
Index: net/avahi-gtk/Makefile
===================================================================
--- net/avahi-gtk/Makefile	(révision 558234)
+++ net/avahi-gtk/Makefile	(copie de travail)
@@ -1,7 +1,7 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-gtk
 
@@ -11,7 +11,8 @@
 LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
-		libgdbm.so:databases/gdbm
+		libgdbm.so:databases/gdbm \
+		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	avahi-header>=0.6:net/avahi-header
 
 MASTERDIR=	${.CURDIR}/../avahi-app
@@ -23,25 +24,18 @@
 AVAHI_SLAVE=	gtk
 AVAHI_PKGCONFIG=avahi-ui.pc
 
-MANPAGES=	bssh.1
+USE_GNOME+=	atk cairo gdkpixbuf2 gtk20 pango
 
-USE_GNOME+=	cairo gdkpixbuf2 libglade2
-
 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
+	@${DO_MAKE_BUILD} -C ${WRKSRC}/avahi-ui libavahi-ui.la
 
-post-build:
-	@(cd ${WRKSRC}/avahi-discover-standalone && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+do-install:
+	@(cd ${WRKSRC}/avahi-ui; ${MAKE_CMD} ${MAKE_ARGS} install-libLTLIBRARIES)
 
 post-install:
-	@(cd ${WRKSRC}/avahi-discover-standalone && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-	${LN} -sf bssh.1 ${STAGEDIR}${MANPREFIX}/man/man1/bvnc.1
-	${LN} -sf bssh.1 ${STAGEDIR}${MANPREFIX}/man/man1/bshell.1
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libavahi-ui.so.0
 
 .include "${MASTERDIR}/Makefile"
Index: net/avahi-gtk/pkg-plist
===================================================================
--- net/avahi-gtk/pkg-plist	(révision 558234)
+++ net/avahi-gtk/pkg-plist	(copie de travail)
@@ -1,15 +1,4 @@
-bin/avahi-discover-standalone
-bin/bshell
-bin/bssh
-bin/bvnc
-lib/libavahi-ui.a
 lib/libavahi-ui.so
 lib/libavahi-ui.so.0
 lib/libavahi-ui.so.0.1.4
 libdata/pkgconfig/avahi-ui.pc
-man/man1/bshell.1.gz
-man/man1/bssh.1.gz
-man/man1/bvnc.1.gz
-share/applications/bssh.desktop
-share/applications/bvnc.desktop
-%%DATADIR%%/interfaces/avahi-discover.ui
Index: net/avahi-gtk3/Makefile
===================================================================
--- net/avahi-gtk3/Makefile	(révision 558234)
+++ net/avahi-gtk3/Makefile	(copie de travail)
@@ -1,7 +1,7 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-gtk3
 
@@ -9,8 +9,9 @@
 COMMENT=	Gtk+ 3 library to the Avahi mDNS system
 
 LIB_DEPENDS=	libavahi-common.so:net/avahi-app \
-		libgdbm.so:databases/gdbm
-RUN_DEPENDS=	avahi-header>=0.7:net/avahi-header
+		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
@@ -28,8 +29,14 @@
 	${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-ui; ${MAKE_CMD} ${MAKE_ARGS} install-libLTLIBRARIES)
+	@(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"
Index: net/avahi-gtk3/pkg-plist
===================================================================
--- net/avahi-gtk3/pkg-plist	(révision 558234)
+++ net/avahi-gtk3/pkg-plist	(copie de travail)
@@ -1,5 +1,11 @@
-lib/libavahi-ui-gtk3.a
+bin/avahi-discover-standalone
+bin/bshell
+bin/bssh
+bin/bvnc
 lib/libavahi-ui-gtk3.so
 lib/libavahi-ui-gtk3.so.0
 lib/libavahi-ui-gtk3.so.0.1.4
 libdata/pkgconfig/avahi-ui-gtk3.pc
+share/applications/bssh.desktop
+share/applications/bvnc.desktop
+%%DATADIR%%/interfaces/avahi-discover.ui
Index: net/avahi-libdns/pkg-plist
===================================================================
--- net/avahi-libdns/pkg-plist	(révision 558234)
+++ net/avahi-libdns/pkg-plist	(copie de travail)
@@ -1,5 +1,4 @@
 include/avahi-compat-libdns_sd/dns_sd.h
-lib/libdns_sd.a
 lib/libdns_sd.so
 lib/libdns_sd.so.1
 lib/libdns_sd.so.1.0.0
Index: net/avahi-qt5/Makefile
===================================================================
--- net/avahi-qt5/Makefile	(révision 558234)
+++ net/avahi-qt5/Makefile	(copie de travail)
@@ -1,7 +1,7 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	net
 PKGNAMESUFFIX=	-qt5
 
Index: net/avahi-qt5/pkg-plist
===================================================================
--- net/avahi-qt5/pkg-plist	(révision 558234)
+++ net/avahi-qt5/pkg-plist	(copie de travail)
@@ -1,5 +1,4 @@
 include/avahi-qt5/qt-watch.h
-lib/libavahi-qt5.a
 lib/libavahi-qt5.so
 lib/libavahi-qt5.so.1
 lib/libavahi-qt5.so.1.0.2