avahi: Remove the qt (disabled by default) option

qt4 is EOL.

4 files changed, 7 insertions, 20 deletions

diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 85d4878c14d..6acf74c1d14 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2019/07/21 22:24:09 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2019/10/27 14:46:09 kamil Exp $
 
 DISTNAME=		avahi-0.6.32
 PKGREVISION=		19
@@ -78,6 +78,7 @@ CONFIGURE_ARGS+=	--disable-doxygen-html --disable-doxygen-xml
 CONFIGURE_ARGS+=	--disable-xmltoman
 CONFIGURE_ARGS+=	--disable-autoipd
 CONFIGURE_ARGS+=	--disable-qt3
+CONFIGURE_ARGS+=	--disable-qt4
 CONFIGURE_ARGS+=	--with-distro=none
 
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples
diff --git a/net/avahi/PLIST b/net/avahi/PLIST
index 873cf36fe04..36066bf8343 100644
--- a/net/avahi/PLIST
+++ b/net/avahi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2018/01/01 22:29:46 rillig Exp $
+@comment $NetBSD: PLIST,v 1.15 2019/10/27 14:46:09 kamil Exp $
 bin/avahi-browse
 bin/avahi-browse-domains
 ${PLIST.ui}bin/avahi-discover-standalone
@@ -44,7 +44,6 @@ 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
-${PLIST.qt}include/avahi-qt4/qt-watch.h
 ${PLIST.gtk2}include/avahi-ui/avahi-ui.h
 ${PLIST.introspection}lib/girepository-1.0/Avahi-0.6.typelib
 ${PLIST.introspection}lib/girepository-1.0/AvahiCore-0.6.typelib
@@ -53,7 +52,6 @@ lib/libavahi-common.la
 lib/libavahi-core.la
 lib/libavahi-glib.la
 lib/libavahi-gobject.la
-${PLIST.qt}lib/libavahi-qt4.la
 ${PLIST.gtk3}lib/libavahi-ui-gtk3.la
 ${PLIST.gtk2}lib/libavahi-ui.la
 ${PLIST.mono}lib/mono/avahi-sharp/avahi-sharp.dll
@@ -68,7 +66,6 @@ lib/pkgconfig/avahi-client.pc
 lib/pkgconfig/avahi-core.pc
 lib/pkgconfig/avahi-glib.pc
 lib/pkgconfig/avahi-gobject.pc
-${PLIST.qt}lib/pkgconfig/avahi-qt4.pc
 ${PLIST.mono}lib/pkgconfig/avahi-sharp.pc
 ${PLIST.gtk3}lib/pkgconfig/avahi-ui-gtk3.pc
 ${PLIST.mono}lib/pkgconfig/avahi-ui-sharp.pc
diff --git a/net/avahi/buildlink3.mk b/net/avahi/buildlink3.mk
index 25d9edc927f..2b798600355 100644
--- a/net/avahi/buildlink3.mk
+++ b/net/avahi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.40 2019/07/21 22:24:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.41 2019/10/27 14:46:09 kamil Exp $
 
 BUILDLINK_TREE+=	avahi
 
@@ -32,10 +32,6 @@ pkgbase := avahi
 .include "../../x11/gtk-sharp/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.avahi:Mqt)
-.include "../../x11/qt4-libs/buildlink3.mk"
-.endif
-
 .if !empty(PKG_BUILD_OPTIONS.avahi:Mpython)
 .include "../../lang/python/application.mk"
 .endif
diff --git a/net/avahi/options.mk b/net/avahi/options.mk
index 54a4009e8a2..019fbd9c2cf 100644
--- a/net/avahi/options.mk
+++ b/net/avahi/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.13 2019/09/02 13:19:49 adam Exp $
+# $NetBSD: options.mk,v 1.14 2019/10/27 14:46:09 kamil Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.avahi
 PKG_SUPPORTED_OPTIONS=	avahi-howl gdbm introspection gtk2 gtk3 mono python
-PKG_SUPPORTED_OPTIONS+=	qt tests
+PKG_SUPPORTED_OPTIONS+=	tests
 PKG_SUGGESTED_OPTIONS+=	gtk2
-PLIST_VARS+=		introspection gtk2 gtk3 mono qt ui
+PLIST_VARS+=		introspection gtk2 gtk3 mono ui
 
 .include "../../mk/bsd.options.mk"
 
@@ -59,13 +59,6 @@ PLIST.mono=		yes
 CONFIGURE_ARGS+=	--disable-mono --disable-monodoc
 .endif
 
-.if !empty(PKG_OPTIONS:Mqt)
-.include "../../x11/qt4-libs/buildlink3.mk"
-PLIST.qt=		yes
-.else
-CONFIGURE_ARGS+=	--disable-qt4
-.endif
-
 ###
 ### Enable python support
 ###