Sun Oct 27 14:46:09 2019 UTC ()
avahi: Remove the qt (disabled by default) option
qt4 is EOL.
(kamil)
diff -r1.86 -r1.87 pkgsrc/net/avahi/Makefile
diff -r1.14 -r1.15 pkgsrc/net/avahi/PLIST
diff -r1.40 -r1.41 pkgsrc/net/avahi/buildlink3.mk
diff -r1.13 -r1.14 pkgsrc/net/avahi/options.mk
--- pkgsrc/net/avahi/Makefile 2019/07/21 22:24:09 1.86
+++ pkgsrc/net/avahi/Makefile 2019/10/27 14:46:09 1.87
@@ -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-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
--- pkgsrc/net/avahi/PLIST 2018/01/01 22:29:46 1.14
+++ pkgsrc/net/avahi/PLIST 2019/10/27 14:46:09 1.15
@@ -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-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-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-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
--- pkgsrc/net/avahi/buildlink3.mk 2019/07/21 22:24:09 1.40
+++ pkgsrc/net/avahi/buildlink3.mk 2019/10/27 14:46:09 1.41
@@ -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
@@ -30,10 +30,6 @@
.if !empty(PKG_BUILD_OPTIONS.avahi:Mmono)
.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)
--- pkgsrc/net/avahi/Attic/options.mk 2019/09/02 13:19:49 1.13
+++ pkgsrc/net/avahi/Attic/options.mk 2019/10/27 14:46:09 1.14
@@ -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"
@@ -57,13 +57,6 @@
PLIST.mono= yes
.else
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
###