Mon Mar 23 09:22:08 2020 UTC ()
avahi: Switch to gtk3 and avoid needing Python 2

Fix PLISTs to accomodate these things.

Bump PKGREVISION


(nia)
diff -r1.90 -r1.91 pkgsrc/net/avahi/Makefile
diff -r1.15 -r1.16 pkgsrc/net/avahi/PLIST
diff -r1.15 -r1.16 pkgsrc/net/avahi/options.mk
diff -r1.4 -r1.5 pkgsrc/net/avahi/PLIST.python
cvs diff -r1.90 -r1.91 pkgsrc/net/avahi/Makefile (expand / switch to unified diff)

--- pkgsrc/net/avahi/Makefile 2020/03/10 22:08:56 1.90
+++ pkgsrc/net/avahi/Makefile 2020/03/23 09:22:07 1.91
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.90 2020/03/10 22:08:56 wiz Exp $ 1# $NetBSD: Makefile,v 1.91 2020/03/23 09:22:07 nia Exp $
2 2
3DISTNAME= avahi-0.6.32 3DISTNAME= avahi-0.6.32
4PKGREVISION= 21 4PKGREVISION= 22
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= https://avahi.org/ 9HOMEPAGE= https://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
15GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
16USE_LIBTOOL= YES 16USE_LIBTOOL= YES
17USE_PKGINSTALL= YES 17USE_PKGINSTALL= YES
@@ -69,26 +69,27 @@ CONF_FILES+= ${PREFIX}/share/examples/a @@ -69,26 +69,27 @@ CONF_FILES+= ${PREFIX}/share/examples/a
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+= --disable-qt4
 82CONFIGURE_ARGS+= --disable-pygtk
82CONFIGURE_ARGS+= --with-distro=none 83CONFIGURE_ARGS+= --with-distro=none
83 84
84INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples 85INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
85INSTALL_MAKE_FLAGS+= dbusservicedir=${PREFIX}/share/examples/avahi 86INSTALL_MAKE_FLAGS+= dbusservicedir=${PREFIX}/share/examples/avahi
86 87
87INSTALLATION_DIRS+= share/doc/avahi 88INSTALLATION_DIRS+= share/doc/avahi
88 89
89MAKE_DIRS+= ${PKG_SYSCONFDIR}/services 90MAKE_DIRS+= ${PKG_SYSCONFDIR}/services
90 91
91post-install: 92post-install:
92 ${INSTALL_DATA} ${WRKSRC}/docs/HACKING ${DESTDIR}${PREFIX}/share/doc/avahi 93 ${INSTALL_DATA} ${WRKSRC}/docs/HACKING ${DESTDIR}${PREFIX}/share/doc/avahi
93 ${INSTALL_DATA} ${WRKSRC}/docs/INSTALL ${DESTDIR}${PREFIX}/share/doc/avahi 94 ${INSTALL_DATA} ${WRKSRC}/docs/INSTALL ${DESTDIR}${PREFIX}/share/doc/avahi
94 ${INSTALL_DATA} ${WRKSRC}/docs/NEWS ${DESTDIR}${PREFIX}/share/doc/avahi 95 ${INSTALL_DATA} ${WRKSRC}/docs/NEWS ${DESTDIR}${PREFIX}/share/doc/avahi
cvs diff -r1.15 -r1.16 pkgsrc/net/avahi/PLIST (expand / switch to unified diff)

--- pkgsrc/net/avahi/PLIST 2019/10/27 14:46:09 1.15
+++ pkgsrc/net/avahi/PLIST 2020/03/23 09:22:07 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.15 2019/10/27 14:46:09 kamil Exp $ 1@comment $NetBSD: PLIST,v 1.16 2020/03/23 09:22:07 nia 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,27 +34,27 @@ include/avahi-core/core.h @@ -34,27 +34,27 @@ 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.gtk2}include/avahi-ui/avahi-ui.h 47${PLIST.ui}include/avahi-ui/avahi-ui.h
48${PLIST.introspection}lib/girepository-1.0/Avahi-0.6.typelib 48${PLIST.introspection}lib/girepository-1.0/Avahi-0.6.typelib
49${PLIST.introspection}lib/girepository-1.0/AvahiCore-0.6.typelib 49${PLIST.introspection}lib/girepository-1.0/AvahiCore-0.6.typelib
50lib/libavahi-client.la 50lib/libavahi-client.la
51lib/libavahi-common.la 51lib/libavahi-common.la
52lib/libavahi-core.la 52lib/libavahi-core.la
53lib/libavahi-glib.la 53lib/libavahi-glib.la
54lib/libavahi-gobject.la 54lib/libavahi-gobject.la
55${PLIST.gtk3}lib/libavahi-ui-gtk3.la 55${PLIST.gtk3}lib/libavahi-ui-gtk3.la
56${PLIST.gtk2}lib/libavahi-ui.la 56${PLIST.gtk2}lib/libavahi-ui.la
57${PLIST.mono}lib/mono/avahi-sharp/avahi-sharp.dll 57${PLIST.mono}lib/mono/avahi-sharp/avahi-sharp.dll
58${PLIST.mono}lib/mono/avahi-ui-sharp/avahi-ui-sharp.dll 58${PLIST.mono}lib/mono/avahi-ui-sharp/avahi-ui-sharp.dll
59${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
60${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
@@ -69,28 +69,28 @@ lib/pkgconfig/avahi-gobject.pc @@ -69,28 +69,28 @@ lib/pkgconfig/avahi-gobject.pc
69${PLIST.mono}lib/pkgconfig/avahi-sharp.pc 69${PLIST.mono}lib/pkgconfig/avahi-sharp.pc
70${PLIST.gtk3}lib/pkgconfig/avahi-ui-gtk3.pc 70${PLIST.gtk3}lib/pkgconfig/avahi-ui-gtk3.pc
71${PLIST.mono}lib/pkgconfig/avahi-ui-sharp.pc 71${PLIST.mono}lib/pkgconfig/avahi-ui-sharp.pc
72${PLIST.gtk2}lib/pkgconfig/avahi-ui.pc 72${PLIST.gtk2}lib/pkgconfig/avahi-ui.pc
73man/man1/avahi-browse-domains.1 73man/man1/avahi-browse-domains.1
74man/man1/avahi-browse.1 74man/man1/avahi-browse.1
75man/man1/avahi-publish-address.1 75man/man1/avahi-publish-address.1
76man/man1/avahi-publish-service.1 76man/man1/avahi-publish-service.1
77man/man1/avahi-publish.1 77man/man1/avahi-publish.1
78man/man1/avahi-resolve-address.1 78man/man1/avahi-resolve-address.1
79man/man1/avahi-resolve-host-name.1 79man/man1/avahi-resolve-host-name.1
80man/man1/avahi-resolve.1 80man/man1/avahi-resolve.1
81man/man1/avahi-set-host-name.1 81man/man1/avahi-set-host-name.1
82${PLIST.ui}man/man1/bssh.1 82${PLIST.gtk2}man/man1/bssh.1
83${PLIST.ui}man/man1/bvnc.1 83${PLIST.gtk2}man/man1/bvnc.1
84man/man5/avahi-daemon.conf.5 84man/man5/avahi-daemon.conf.5
85man/man5/avahi.hosts.5 85man/man5/avahi.hosts.5
86man/man5/avahi.service.5 86man/man5/avahi.service.5
87man/man8/avahi-daemon.8 87man/man8/avahi-daemon.8
88man/man8/avahi-dnsconfd.8 88man/man8/avahi-dnsconfd.8
89man/man8/avahi-dnsconfd.action.8 89man/man8/avahi-dnsconfd.action.8
90sbin/avahi-daemon 90sbin/avahi-daemon
91sbin/avahi-dnsconfd 91sbin/avahi-dnsconfd
92${PLIST.ui}share/applications/bssh.desktop 92${PLIST.ui}share/applications/bssh.desktop
93${PLIST.ui}share/applications/bvnc.desktop 93${PLIST.ui}share/applications/bvnc.desktop
94share/avahi/avahi-service.dtd 94share/avahi/avahi-service.dtd
95${PLIST.ui}share/avahi/interfaces/avahi-discover.ui 95${PLIST.ui}share/avahi/interfaces/avahi-discover.ui
96share/avahi/service-types 96share/avahi/service-types
cvs diff -r1.15 -r1.16 pkgsrc/net/avahi/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/net/avahi/Attic/options.mk 2020/01/26 12:36:34 1.15
+++ pkgsrc/net/avahi/Attic/options.mk 2020/03/23 09:22:07 1.16
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: options.mk,v 1.15 2020/01/26 12:36:34 nia Exp $ 1# $NetBSD: options.mk,v 1.16 2020/03/23 09:22:07 nia 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+= tests 5PKG_SUPPORTED_OPTIONS+= tests
6PKG_SUGGESTED_OPTIONS+= gtk2 6PKG_SUGGESTED_OPTIONS+= gtk3
7PLIST_VARS+= introspection gtk2 gtk3 mono 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###
@@ -54,36 +54,33 @@ CONFIGURE_ARGS+= --enable-introspection= @@ -54,36 +54,33 @@ CONFIGURE_ARGS+= --enable-introspection=
54.include "../../x11/gtk-sharp/buildlink3.mk" 54.include "../../x11/gtk-sharp/buildlink3.mk"
55.include "../../lang/mono/buildlink3.mk" 55.include "../../lang/mono/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### 62###
63### Enable python support 63### Enable python support
64### 64###
65.if !empty(PKG_OPTIONS:Mpython) 65.if !empty(PKG_OPTIONS:Mpython)
66PY_PATCHPLIST= yes 66PY_PATCHPLIST= yes
67PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 
68. include "../../lang/python/application.mk" 67. include "../../lang/python/application.mk"
69REPLACE_PYTHON+= avahi-python/avahi-discover/__init__.py 68REPLACE_PYTHON+= avahi-python/avahi-discover/__init__.py
70. include "../../lang/python/extension.mk" 69. include "../../lang/python/extension.mk"
71. include "../../sysutils/py-dbus/buildlink3.mk" 70. include "../../sysutils/py-dbus/buildlink3.mk"
72. include "../../x11/py-gtk2/buildlink3.mk" 
73DEPENDS+= ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2 71DEPENDS+= ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2
74DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 72DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
75### If python and gdbm are enabled we need py-gdbm as well 73### If python and gdbm are enabled we need py-gdbm as well
76. if !empty(PKG_OPTIONS:Mgdbm) 74. if !empty(PKG_OPTIONS:Mgdbm)
77DEPENDS+= ${PYPKGPREFIX}-gdbm-[0-9]*:../../databases/py-gdbm 75DEPENDS+= ${PYPKGPREFIX}-gdbm-[0-9]*:../../databases/py-gdbm
78PLIST_SRC+= ${PKGDIR}/PLIST.pygdbm 76PLIST_SRC+= ${PKGDIR}/PLIST.pygdbm
79. endif 77. endif
80PLIST_SRC+= ${PKGDIR}/PLIST.python 78PLIST_SRC+= ${PKGDIR}/PLIST.python
81.else 79.else
82CONFIGURE_ARGS+= --disable-python 80CONFIGURE_ARGS+= --disable-python
83CONFIGURE_ARGS+= --disable-python-dbus 81CONFIGURE_ARGS+= --disable-python-dbus
84CONFIGURE_ARGS+= --disable-pygtk 
85.endif 82.endif
86 83
87.if !empty(PKG_OPTIONS:Mtests) 84.if !empty(PKG_OPTIONS:Mtests)
88CONFIGURE_ARGS+= --enable-tests 85CONFIGURE_ARGS+= --enable-tests
89.endif 86.endif
cvs diff -r1.4 -r1.5 pkgsrc/net/avahi/Attic/PLIST.python (expand / switch to unified diff)

--- pkgsrc/net/avahi/Attic/PLIST.python 2010/07/24 13:42:12 1.4
+++ pkgsrc/net/avahi/Attic/PLIST.python 2020/03/23 09:22:07 1.5
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1@comment $NetBSD: PLIST.python,v 1.4 2010/07/24 13:42:12 obache Exp $ 1@comment $NetBSD: PLIST.python,v 1.5 2020/03/23 09:22:07 nia Exp $
2${PYSITELIB}/avahi/__init__.py 2${PYSITELIB}/avahi/__init__.py
3${PYSITELIB}/avahi/__init__.pyc 3${PYSITELIB}/avahi/__init__.pyc
4${PYSITELIB}/avahi/__init__.pyo 4${PYSITELIB}/avahi/__init__.pyo
5bin/avahi-bookmarks 5bin/avahi-bookmarks
6man/man1/avahi-bookmarks.1 6man/man1/avahi-bookmarks.1
7man/man1/avahi-discover.1