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
cvs diff -r1.86 -r1.87 pkgsrc/net/avahi/Makefile (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.86 2019/07/21 22:24:09 wiz Exp $ 1# $NetBSD: Makefile,v 1.87 2019/10/27 14:46:09 kamil Exp $
2 2
3DISTNAME= avahi-0.6.32 3DISTNAME= avahi-0.6.32
4PKGREVISION= 19 4PKGREVISION= 19
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= https://github.com/lathiat/avahi/releases/download/v${PKGVERSION_NOREV}/ 6MASTER_SITES= https://github.com/lathiat/avahi/releases/download/v${PKGVERSION_NOREV}/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://avahi.org/ 9HOMEPAGE= http://avahi.org/
10COMMENT= Facilitate service discovery on a local network 10COMMENT= Facilitate service discovery on a local network
11LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
12 12
13EXTRACT_USING= bsdtar 13EXTRACT_USING= bsdtar
14 14
@@ -68,26 +68,27 @@ CONF_FILES+= ${PREFIX}/share/examples/a @@ -68,26 +68,27 @@ CONF_FILES+= ${PREFIX}/share/examples/a
68 68
69CONFIGURE_ARGS+= --with-avahi-user=${AVAHI_USER} 69CONFIGURE_ARGS+= --with-avahi-user=${AVAHI_USER}
70CONFIGURE_ARGS+= --with-avahi-group=${AVAHI_GROUP} 70CONFIGURE_ARGS+= --with-avahi-group=${AVAHI_GROUP}
71CONFIGURE_ARGS+= --with-avahi_priv_access_group=${REAL_ROOT_GROUP} 71CONFIGURE_ARGS+= --with-avahi_priv_access_group=${REAL_ROOT_GROUP}
72CONFIGURE_ARGS+= --localstatedir=${VARBASE} 72CONFIGURE_ARGS+= --localstatedir=${VARBASE}
73CONFIGURE_ARGS+= --with-dbus-system-socket=${VARBASE}/run/dbus/system_bus_socket 73CONFIGURE_ARGS+= --with-dbus-system-socket=${VARBASE}/run/dbus/system_bus_socket
74CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} 74CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
75CONFIGURE_ARGS+= --disable-doxygen-doc 75CONFIGURE_ARGS+= --disable-doxygen-doc
76CONFIGURE_ARGS+= --disable-doxygen-dot 76CONFIGURE_ARGS+= --disable-doxygen-dot
77CONFIGURE_ARGS+= --disable-doxygen-html --disable-doxygen-xml 77CONFIGURE_ARGS+= --disable-doxygen-html --disable-doxygen-xml
78CONFIGURE_ARGS+= --disable-xmltoman 78CONFIGURE_ARGS+= --disable-xmltoman
79CONFIGURE_ARGS+= --disable-autoipd 79CONFIGURE_ARGS+= --disable-autoipd
80CONFIGURE_ARGS+= --disable-qt3 80CONFIGURE_ARGS+= --disable-qt3
 81CONFIGURE_ARGS+= --disable-qt4
81CONFIGURE_ARGS+= --with-distro=none 82CONFIGURE_ARGS+= --with-distro=none
82 83
83INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples 84INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
84INSTALL_MAKE_FLAGS+= dbusservicedir=${PREFIX}/share/examples/avahi 85INSTALL_MAKE_FLAGS+= dbusservicedir=${PREFIX}/share/examples/avahi
85 86
86INSTALLATION_DIRS+= share/doc/avahi 87INSTALLATION_DIRS+= share/doc/avahi
87 88
88MAKE_DIRS+= ${PKG_SYSCONFDIR}/services 89MAKE_DIRS+= ${PKG_SYSCONFDIR}/services
89 90
90post-install: 91post-install:
91 ${INSTALL_DATA} ${WRKSRC}/docs/HACKING ${DESTDIR}${PREFIX}/share/doc/avahi 92 ${INSTALL_DATA} ${WRKSRC}/docs/HACKING ${DESTDIR}${PREFIX}/share/doc/avahi
92 ${INSTALL_DATA} ${WRKSRC}/docs/INSTALL ${DESTDIR}${PREFIX}/share/doc/avahi 93 ${INSTALL_DATA} ${WRKSRC}/docs/INSTALL ${DESTDIR}${PREFIX}/share/doc/avahi
93 ${INSTALL_DATA} ${WRKSRC}/docs/NEWS ${DESTDIR}${PREFIX}/share/doc/avahi 94 ${INSTALL_DATA} ${WRKSRC}/docs/NEWS ${DESTDIR}${PREFIX}/share/doc/avahi
cvs diff -r1.14 -r1.15 pkgsrc/net/avahi/PLIST (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.14 2018/01/01 22:29:46 rillig Exp $ 1@comment $NetBSD: PLIST,v 1.15 2019/10/27 14:46:09 kamil Exp $
2bin/avahi-browse 2bin/avahi-browse
3bin/avahi-browse-domains 3bin/avahi-browse-domains
4${PLIST.ui}bin/avahi-discover-standalone 4${PLIST.ui}bin/avahi-discover-standalone
5bin/avahi-publish 5bin/avahi-publish
6bin/avahi-publish-address 6bin/avahi-publish-address
7bin/avahi-publish-service 7bin/avahi-publish-service
8bin/avahi-resolve 8bin/avahi-resolve
9bin/avahi-resolve-address 9bin/avahi-resolve-address
10bin/avahi-resolve-host-name 10bin/avahi-resolve-host-name
11bin/avahi-set-host-name 11bin/avahi-set-host-name
12${PLIST.ui}bin/bshell 12${PLIST.ui}bin/bshell
13${PLIST.ui}bin/bssh 13${PLIST.ui}bin/bssh
14${PLIST.ui}bin/bvnc 14${PLIST.ui}bin/bvnc
@@ -34,51 +34,48 @@ include/avahi-core/core.h @@ -34,51 +34,48 @@ include/avahi-core/core.h
34include/avahi-core/log.h 34include/avahi-core/log.h
35include/avahi-core/lookup.h 35include/avahi-core/lookup.h
36include/avahi-core/publish.h 36include/avahi-core/publish.h
37include/avahi-core/rr.h 37include/avahi-core/rr.h
38include/avahi-glib/glib-malloc.h 38include/avahi-glib/glib-malloc.h
39include/avahi-glib/glib-watch.h 39include/avahi-glib/glib-watch.h
40include/avahi-gobject/ga-client.h 40include/avahi-gobject/ga-client.h
41include/avahi-gobject/ga-entry-group.h 41include/avahi-gobject/ga-entry-group.h
42include/avahi-gobject/ga-enums.h 42include/avahi-gobject/ga-enums.h
43include/avahi-gobject/ga-error.h 43include/avahi-gobject/ga-error.h
44include/avahi-gobject/ga-record-browser.h 44include/avahi-gobject/ga-record-browser.h
45include/avahi-gobject/ga-service-browser.h 45include/avahi-gobject/ga-service-browser.h
46include/avahi-gobject/ga-service-resolver.h 46include/avahi-gobject/ga-service-resolver.h
47${PLIST.qt}include/avahi-qt4/qt-watch.h 
48${PLIST.gtk2}include/avahi-ui/avahi-ui.h 47${PLIST.gtk2}include/avahi-ui/avahi-ui.h
49${PLIST.introspection}lib/girepository-1.0/Avahi-0.6.typelib 48${PLIST.introspection}lib/girepository-1.0/Avahi-0.6.typelib
50${PLIST.introspection}lib/girepository-1.0/AvahiCore-0.6.typelib 49${PLIST.introspection}lib/girepository-1.0/AvahiCore-0.6.typelib
51lib/libavahi-client.la 50lib/libavahi-client.la
52lib/libavahi-common.la 51lib/libavahi-common.la
53lib/libavahi-core.la 52lib/libavahi-core.la
54lib/libavahi-glib.la 53lib/libavahi-glib.la
55lib/libavahi-gobject.la 54lib/libavahi-gobject.la
56${PLIST.qt}lib/libavahi-qt4.la 
57${PLIST.gtk3}lib/libavahi-ui-gtk3.la 55${PLIST.gtk3}lib/libavahi-ui-gtk3.la
58${PLIST.gtk2}lib/libavahi-ui.la 56${PLIST.gtk2}lib/libavahi-ui.la
59${PLIST.mono}lib/mono/avahi-sharp/avahi-sharp.dll 57${PLIST.mono}lib/mono/avahi-sharp/avahi-sharp.dll
60${PLIST.mono}lib/mono/avahi-ui-sharp/avahi-ui-sharp.dll 58${PLIST.mono}lib/mono/avahi-ui-sharp/avahi-ui-sharp.dll
61${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll 59${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll
62${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.config 60${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.config
63${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.mdb 61${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.mdb
64${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll 62${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll
65${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll.config 63${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll.config
66${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll.mdb 64${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll.mdb
67lib/pkgconfig/avahi-client.pc 65lib/pkgconfig/avahi-client.pc
68lib/pkgconfig/avahi-core.pc 66lib/pkgconfig/avahi-core.pc
69lib/pkgconfig/avahi-glib.pc 67lib/pkgconfig/avahi-glib.pc
70lib/pkgconfig/avahi-gobject.pc 68lib/pkgconfig/avahi-gobject.pc
71${PLIST.qt}lib/pkgconfig/avahi-qt4.pc 
72${PLIST.mono}lib/pkgconfig/avahi-sharp.pc 69${PLIST.mono}lib/pkgconfig/avahi-sharp.pc
73${PLIST.gtk3}lib/pkgconfig/avahi-ui-gtk3.pc 70${PLIST.gtk3}lib/pkgconfig/avahi-ui-gtk3.pc
74${PLIST.mono}lib/pkgconfig/avahi-ui-sharp.pc 71${PLIST.mono}lib/pkgconfig/avahi-ui-sharp.pc
75${PLIST.gtk2}lib/pkgconfig/avahi-ui.pc 72${PLIST.gtk2}lib/pkgconfig/avahi-ui.pc
76man/man1/avahi-browse-domains.1 73man/man1/avahi-browse-domains.1
77man/man1/avahi-browse.1 74man/man1/avahi-browse.1
78man/man1/avahi-publish-address.1 75man/man1/avahi-publish-address.1
79man/man1/avahi-publish-service.1 76man/man1/avahi-publish-service.1
80man/man1/avahi-publish.1 77man/man1/avahi-publish.1
81man/man1/avahi-resolve-address.1 78man/man1/avahi-resolve-address.1
82man/man1/avahi-resolve-host-name.1 79man/man1/avahi-resolve-host-name.1
83man/man1/avahi-resolve.1 80man/man1/avahi-resolve.1
84man/man1/avahi-set-host-name.1 81man/man1/avahi-set-host-name.1
cvs diff -r1.40 -r1.41 pkgsrc/net/avahi/buildlink3.mk (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.40 2019/07/21 22:24:09 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.41 2019/10/27 14:46:09 kamil Exp $
2 2
3BUILDLINK_TREE+= avahi 3BUILDLINK_TREE+= avahi
4 4
5.if !defined(AVAHI_BUILDLINK3_MK) 5.if !defined(AVAHI_BUILDLINK3_MK)
6AVAHI_BUILDLINK3_MK:= 6AVAHI_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.avahi+= avahi>=0.6.23 8BUILDLINK_API_DEPENDS.avahi+= avahi>=0.6.23
9BUILDLINK_ABI_DEPENDS.avahi+= avahi>=0.6.32nb19 9BUILDLINK_ABI_DEPENDS.avahi+= avahi>=0.6.32nb19
10BUILDLINK_PKGSRCDIR.avahi?= ../../net/avahi 10BUILDLINK_PKGSRCDIR.avahi?= ../../net/avahi
11 11
12pkgbase := avahi 12pkgbase := avahi
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14 14
@@ -22,28 +22,24 @@ pkgbase := avahi @@ -22,28 +22,24 @@ pkgbase := avahi
22 22
23.if !empty(PKG_BUILD_OPTIONS.avahi:Mgtk3) 23.if !empty(PKG_BUILD_OPTIONS.avahi:Mgtk3)
24.include "../../x11/gtk3/buildlink3.mk" 24.include "../../x11/gtk3/buildlink3.mk"
25.endif 25.endif
26 26
27.if !empty(PKG_BUILD_OPTIONS.avahi:Mintrospection) 27.if !empty(PKG_BUILD_OPTIONS.avahi:Mintrospection)
28.include "../../devel/gobject-introspection/buildlink3.mk" 28.include "../../devel/gobject-introspection/buildlink3.mk"
29.endif 29.endif
30 30
31.if !empty(PKG_BUILD_OPTIONS.avahi:Mmono) 31.if !empty(PKG_BUILD_OPTIONS.avahi:Mmono)
32.include "../../x11/gtk-sharp/buildlink3.mk" 32.include "../../x11/gtk-sharp/buildlink3.mk"
33.endif 33.endif
34 34
35.if !empty(PKG_BUILD_OPTIONS.avahi:Mqt) 
36.include "../../x11/qt4-libs/buildlink3.mk" 
37.endif 
38 
39.if !empty(PKG_BUILD_OPTIONS.avahi:Mpython) 35.if !empty(PKG_BUILD_OPTIONS.avahi:Mpython)
40.include "../../lang/python/application.mk" 36.include "../../lang/python/application.mk"
41.endif 37.endif
42 38
43.include "../../devel/gettext-lib/buildlink3.mk" 39.include "../../devel/gettext-lib/buildlink3.mk"
44.include "../../devel/glib2/buildlink3.mk" 40.include "../../devel/glib2/buildlink3.mk"
45.include "../../sysutils/dbus/buildlink3.mk" 41.include "../../sysutils/dbus/buildlink3.mk"
46.include "../../mk/pthread.buildlink3.mk" 42.include "../../mk/pthread.buildlink3.mk"
47.endif # AVAHI_BUILDLINK3_MK 43.endif # AVAHI_BUILDLINK3_MK
48 44
49BUILDLINK_TREE+= -avahi 45BUILDLINK_TREE+= -avahi
cvs diff -r1.13 -r1.14 pkgsrc/net/avahi/Attic/options.mk (expand / switch to unified diff)

--- 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,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: options.mk,v 1.13 2019/09/02 13:19:49 adam Exp $ 1# $NetBSD: options.mk,v 1.14 2019/10/27 14:46:09 kamil Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.avahi 3PKG_OPTIONS_VAR= PKG_OPTIONS.avahi
4PKG_SUPPORTED_OPTIONS= avahi-howl gdbm introspection gtk2 gtk3 mono python 4PKG_SUPPORTED_OPTIONS= avahi-howl gdbm introspection gtk2 gtk3 mono python
5PKG_SUPPORTED_OPTIONS+= qt tests 5PKG_SUPPORTED_OPTIONS+= tests
6PKG_SUGGESTED_OPTIONS+= gtk2 6PKG_SUGGESTED_OPTIONS+= gtk2
7PLIST_VARS+= introspection gtk2 gtk3 mono qt ui 7PLIST_VARS+= introspection gtk2 gtk3 mono ui
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11### 11###
12### Enable compatibility layer for HOWL 12### Enable compatibility layer for HOWL
13### 13###
14.if !empty(PKG_OPTIONS:Mavahi-howl) 14.if !empty(PKG_OPTIONS:Mavahi-howl)
15CONFIGURE_ARGS+= --enable-compat-howl 15CONFIGURE_ARGS+= --enable-compat-howl
16PLIST_SRC+= ${PKGDIR}/PLIST.howl 16PLIST_SRC+= ${PKGDIR}/PLIST.howl
17.endif 17.endif
18 18
19### 19###
20### Enable gdbm support 20### Enable gdbm support
@@ -49,33 +49,26 @@ PLIST.introspection= yes @@ -49,33 +49,26 @@ PLIST.introspection= yes
49.else 49.else
50CONFIGURE_ARGS+= --enable-introspection=no 50CONFIGURE_ARGS+= --enable-introspection=no
51.endif 51.endif
52 52
53.if !empty(PKG_OPTIONS:Mmono) 53.if !empty(PKG_OPTIONS:Mmono)
54.include "../../x11/gtk-sharp/buildlink3.mk" 54.include "../../x11/gtk-sharp/buildlink3.mk"
55.include "../../lang/mono2/buildlink3.mk" 55.include "../../lang/mono2/buildlink3.mk"
56CONFIGURE_ARGS+= --disable-monodoc # XXX broken 56CONFIGURE_ARGS+= --disable-monodoc # XXX broken
57PLIST.mono= yes 57PLIST.mono= yes
58.else 58.else
59CONFIGURE_ARGS+= --disable-mono --disable-monodoc 59CONFIGURE_ARGS+= --disable-mono --disable-monodoc
60.endif 60.endif
61 61
62.if !empty(PKG_OPTIONS:Mqt) 
63.include "../../x11/qt4-libs/buildlink3.mk" 
64PLIST.qt= yes 
65.else 
66CONFIGURE_ARGS+= --disable-qt4 
67.endif 
68 
69### 62###
70### Enable python support 63### Enable python support
71### 64###
72.if !empty(PKG_OPTIONS:Mpython) 65.if !empty(PKG_OPTIONS:Mpython)
73PY_PATCHPLIST= yes 66PY_PATCHPLIST= yes
74PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 67PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
75. include "../../lang/python/application.mk" 68. include "../../lang/python/application.mk"
76REPLACE_PYTHON+= avahi-python/avahi-discover/__init__.py 69REPLACE_PYTHON+= avahi-python/avahi-discover/__init__.py
77. include "../../lang/python/extension.mk" 70. include "../../lang/python/extension.mk"
78. include "../../sysutils/py-dbus/buildlink3.mk" 71. include "../../sysutils/py-dbus/buildlink3.mk"
79. include "../../x11/py-gtk2/buildlink3.mk" 72. include "../../x11/py-gtk2/buildlink3.mk"
80DEPENDS+= ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2 73DEPENDS+= ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2
81DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 74DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat