From owner-svn-ports-head@freebsd.org Thu Dec 17 10:52:14 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 37BEF4B38CA; Thu, 17 Dec 2020 10:52:14 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CxTMy17p6z3GbV; Thu, 17 Dec 2020 10:52:14 +0000 (UTC) (envelope-from rene@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 19E731725D; Thu, 17 Dec 2020 10:52:14 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BHAqEDV037526; Thu, 17 Dec 2020 10:52:14 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BHAqDCS037521; Thu, 17 Dec 2020 10:52:13 GMT (envelope-from rene@FreeBSD.org) Message-Id: <202012171052.0BHAqDCS037521@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Thu, 17 Dec 2020 10:52:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558281 - in head/net/avahi-app: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: in head/net/avahi-app: . files X-SVN-Commit-Revision: 558281 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2020 10:52:14 -0000 Author: rene Date: Thu Dec 17 10:52:12 2020 New Revision: 558281 URL: https://svnweb.freebsd.org/changeset/ports/558281 Log: Update the Avahi ports to version 0.8 This switches the preferred GTK bindings to GTK3 and enable the GTK options in the metaport. This commit also switches the Python interface to Python3, thereby un-deprecating net/py-avahi. PR: 250354 Submitted by: Olivier Duchateu Reviewed by: Greg V (earlier PR) Added: head/net/avahi-app/files/build-db (contents, props changed) Deleted: head/net/avahi-app/files/Makefile.am head/net/avahi-app/files/acinclude.m4 head/net/avahi-app/files/avahi-qt_Makefile.am head/net/avahi-app/files/configure.ac head/net/avahi-app/files/org.freedesktop.Avahi.service head/net/avahi-app/files/patch-avahi-daemon_main.c head/net/avahi-app/files/patch-avahi-qt_qt-watch.cpp head/net/avahi-app/files/patch-common_qt5-pie.m4 head/net/avahi-app/files/patch-configure Modified: head/net/avahi-app/Makefile head/net/avahi-app/distinfo head/net/avahi-app/files/patch-avahi-qt_Makefile.in head/net/avahi-app/pkg-plist Modified: head/net/avahi-app/Makefile ============================================================================== --- head/net/avahi-app/Makefile Thu Dec 17 10:47:28 2020 (r558280) +++ head/net/avahi-app/Makefile Thu Dec 17 10:52:12 2020 (r558281) @@ -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 @@ 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 + 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+=--enable-autoipd 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 @@ avahi-post-patch: ${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 @@ avahi-pre-su-install: 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 @@ avahi-post-install: .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 Modified: head/net/avahi-app/distinfo ============================================================================== --- head/net/avahi-app/distinfo Thu Dec 17 10:47:28 2020 (r558280) +++ head/net/avahi-app/distinfo Thu Dec 17 10:52:12 2020 (r558281) @@ -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 Added: head/net/avahi-app/files/build-db ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/avahi-app/files/build-db Thu Dec 17 10:52:12 2020 (r558281) @@ -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() Modified: head/net/avahi-app/files/patch-avahi-qt_Makefile.in ============================================================================== --- head/net/avahi-app/files/patch-avahi-qt_Makefile.in Thu Dec 17 10:47:28 2020 (r558280) +++ head/net/avahi-app/files/patch-avahi-qt_Makefile.in Thu Dec 17 10:52:12 2020 (r558281) @@ -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,211 +36,21 @@ @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) -@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. Modified: head/net/avahi-app/pkg-plist ============================================================================== --- head/net/avahi-app/pkg-plist Thu Dec 17 10:47:28 2020 (r558280) +++ head/net/avahi-app/pkg-plist Thu Dec 17 10:52:12 2020 (r558281) @@ -66,30 +66,28 @@ include/avahi-gobject/ga-error.h 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-compat-howl.pc 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