CVS commit: pkgsrc/net/avahi

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Sun Oct 27 14:46:09 UTC 2019

Modified Files:
        pkgsrc/net/avahi: Makefile PLIST buildlink3.mk options.mk

Log Message:
avahi: Remove the qt (disabled by default) option

qt4 is EOL.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 pkgsrc/net/avahi/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/avahi/PLIST
cvs rdiff -u -r1.40 -r1.41 pkgsrc/net/avahi/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/avahi/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/avahi/Makefile
diff -u pkgsrc/net/avahi/Makefile:1.86 pkgsrc/net/avahi/Makefile:1.87
--- pkgsrc/net/avahi/Makefile:1.86      Sun Jul 21 22:24:09 2019
+++ pkgsrc/net/avahi/Makefile   Sun Oct 27 14:46:09 2019
@@ -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 
 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

Index: pkgsrc/net/avahi/PLIST
diff -u pkgsrc/net/avahi/PLIST:1.14 pkgsrc/net/avahi/PLIST:1.15
--- pkgsrc/net/avahi/PLIST:1.14 Mon Jan  1 22:29:46 2018
+++ pkgsrc/net/avahi/PLIST      Sun Oct 27 14:46:09 2019
@@ -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

Index: pkgsrc/net/avahi/buildlink3.mk
diff -u pkgsrc/net/avahi/buildlink3.mk:1.40 pkgsrc/net/avahi/buildlink3.mk:1.41
--- pkgsrc/net/avahi/buildlink3.mk:1.40 Sun Jul 21 22:24:09 2019
+++ pkgsrc/net/avahi/buildlink3.mk      Sun Oct 27 14:46:09 2019
@@ -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

Index: pkgsrc/net/avahi/options.mk
diff -u pkgsrc/net/avahi/options.mk:1.13 pkgsrc/net/avahi/options.mk:1.14
--- pkgsrc/net/avahi/options.mk:1.13    Mon Sep  2 13:19:49 2019
+++ pkgsrc/net/avahi/options.mk Sun Oct 27 14:46:09 2019
@@ -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
 ###