Fri Jan 8 14:08:35 2021 UTC ()
avahi: Split off package into *-ui variant for the GTK UIs.

thou shalt not add a confusing amount of PKG_OPTIONS to a library.


(nia)
diff -r1.1369 -r1.1370 pkgsrc/net/Makefile
diff -r1.98 -r1.99 pkgsrc/net/avahi/Makefile
diff -r0 -r1.1 pkgsrc/net/avahi/Makefile.common
diff -r1.19 -r1.20 pkgsrc/net/avahi/PLIST
diff -r1.2 -r0 pkgsrc/net/avahi/PLIST.howl
diff -r1.3 -r0 pkgsrc/net/avahi/PLIST.pygdbm
diff -r1.7 -r0 pkgsrc/net/avahi/PLIST.python
diff -r1.46 -r1.47 pkgsrc/net/avahi/buildlink3.mk
diff -r1.17 -r0 pkgsrc/net/avahi/options.mk
diff -r0 -r1.1 pkgsrc/net/avahi-ui/DESCR
diff -r0 -r1.1 pkgsrc/net/avahi-ui/Makefile
diff -r0 -r1.1 pkgsrc/net/avahi-ui/PLIST
diff -r0 -r1.1 pkgsrc/net/avahi-ui/buildlink3.mk
cvs diff -r1.1369 -r1.1370 pkgsrc/net/Makefile (expand / switch to unified diff)

--- pkgsrc/net/Makefile 2021/01/01 16:36:41 1.1369
+++ pkgsrc/net/Makefile 2021/01/08 14:08:35 1.1370
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1369 2021/01/01 16:36:41 nia Exp $ 1# $NetBSD: Makefile,v 1.1370 2021/01/08 14:08:35 nia Exp $
2# 2#
3 3
4COMMENT= Networking tools 4COMMENT= Networking tools
5 5
6SUBDIR+= 3proxy 6SUBDIR+= 3proxy
7SUBDIR+= 6tunnel 7SUBDIR+= 6tunnel
8SUBDIR+= DarwinStreamingServer 8SUBDIR+= DarwinStreamingServer
9SUBDIR+= GeoIP 9SUBDIR+= GeoIP
10SUBDIR+= Geomyidae 10SUBDIR+= Geomyidae
11SUBDIR+= IglooFTP 11SUBDIR+= IglooFTP
12SUBDIR+= LaBrea 12SUBDIR+= LaBrea
13SUBDIR+= ORBit2 13SUBDIR+= ORBit2
14SUBDIR+= R-pbdZMQ 14SUBDIR+= R-pbdZMQ
@@ -25,26 +25,27 @@ SUBDIR+= airportbasestationconfig @@ -25,26 +25,27 @@ SUBDIR+= airportbasestationconfig
25SUBDIR+= airportmodemutility 25SUBDIR+= airportmodemutility
26SUBDIR+= amazon-ecs-cli 26SUBDIR+= amazon-ecs-cli
27SUBDIR+= amule 27SUBDIR+= amule
28SUBDIR+= aoe-vblade 28SUBDIR+= aoe-vblade
29SUBDIR+= apollo 29SUBDIR+= apollo
30SUBDIR+= argus 30SUBDIR+= argus
31SUBDIR+= aria2 31SUBDIR+= aria2
32SUBDIR+= arp-scan 32SUBDIR+= arp-scan
33SUBDIR+= arpd 33SUBDIR+= arpd
34SUBDIR+= arping 34SUBDIR+= arping
35SUBDIR+= arpwatch 35SUBDIR+= arpwatch
36SUBDIR+= autonet 36SUBDIR+= autonet
37SUBDIR+= avahi 37SUBDIR+= avahi
 38SUBDIR+= avahi-ui
38SUBDIR+= awhois 39SUBDIR+= awhois
39SUBDIR+= aws-sdk-go 40SUBDIR+= aws-sdk-go
40SUBDIR+= balance 41SUBDIR+= balance
41SUBDIR+= bandcamp-dl 42SUBDIR+= bandcamp-dl
42SUBDIR+= barnyard 43SUBDIR+= barnyard
43SUBDIR+= batchftp 44SUBDIR+= batchftp
44SUBDIR+= bbk_cli 45SUBDIR+= bbk_cli
45SUBDIR+= bftpd 46SUBDIR+= bftpd
46SUBDIR+= bind911 47SUBDIR+= bind911
47SUBDIR+= bind916 48SUBDIR+= bind916
48SUBDIR+= bing 49SUBDIR+= bing
49SUBDIR+= bird 50SUBDIR+= bird
50SUBDIR+= bird6 51SUBDIR+= bird6
cvs diff -r1.98 -r1.99 pkgsrc/net/avahi/Makefile (expand / switch to unified diff)

--- pkgsrc/net/avahi/Makefile 2020/12/04 20:45:32 1.98
+++ pkgsrc/net/avahi/Makefile 2021/01/08 14:08:35 1.99
@@ -1,114 +1,44 @@ @@ -1,114 +1,44 @@
1# $NetBSD: Makefile,v 1.98 2020/12/04 20:45:32 nia Exp $ 1# $NetBSD: Makefile,v 1.99 2021/01/08 14:08:35 nia Exp $
 2
 3.include "Makefile.common"
2 4
3DISTNAME= avahi-0.8 
4PKGREVISION= 3 5PKGREVISION= 3
5CATEGORIES= net 
6MASTER_SITES= ${MASTER_SITE_GITHUB:=lathiat/avahi/releases/download/v${PKGVERSION_NOREV}/} 
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://avahi.org/ 
10COMMENT= Facilitate service discovery on a local network 8COMMENT= Facilitate service discovery on a local network
11LICENSE= gnu-lgpl-v2.1 
12 
13EXTRACT_USING= bsdtar 
14 9
15GNU_CONFIGURE= YES 10CONFIGURE_ARGS+= --disable-gtk3
16USE_LIBTOOL= YES 
17USE_PKGINSTALL= YES 
18USE_PKGLOCALEDIR= YES 
19USE_TOOLS+= pkg-config gmake msgfmt xgettext 
20 
21# Requires --desktop in msgfmt. 
22_TOOLS_USE_PKGSRC.msgfmt= yes 
23 
24CONFIGURE_ARGS+= --disable-gtk 
25 
26PKGCONFIG_OVERRIDE+= avahi-client.pc.in 
27PKGCONFIG_OVERRIDE+= avahi-compat-howl.pc.in 
28PKGCONFIG_OVERRIDE+= avahi-compat-libdns_sd.pc.in 
29PKGCONFIG_OVERRIDE+= avahi-core.pc.in 
30PKGCONFIG_OVERRIDE+= avahi-glib.pc.in 
31PKGCONFIG_OVERRIDE+= avahi-gobject.pc.in 
32PKGCONFIG_OVERRIDE+= avahi-libevent.pc.in 
33PKGCONFIG_OVERRIDE+= avahi-qt3.pc.in 
34PKGCONFIG_OVERRIDE+= avahi-qt4.pc.in 
35PKGCONFIG_OVERRIDE+= avahi-qt5.pc.in 
36PKGCONFIG_OVERRIDE+= avahi-sharp.pc.in 
37PKGCONFIG_OVERRIDE+= avahi-ui-gtk3.pc.in 
38PKGCONFIG_OVERRIDE+= avahi-ui-sharp.pc.in 
39PKGCONFIG_OVERRIDE+= avahi-ui.pc.in 
40 
41AVAHI_USER= avahi 
42AVAHI_GROUP= avahi 
43RCD_SCRIPTS= avahidaemon 
44BUILD_DEFS+= VARBASE PKG_SYSCONFBASE 
45PLIST_SRC= ${PKGDIR}/PLIST 
46PKG_SYSCONFSUBDIR= avahi 
47USE_LANGUAGES= c99 c++ 
48 11
49PKG_USERS= ${AVAHI_USER}:${AVAHI_GROUP} 12PKG_USERS= ${AVAHI_USER}:${AVAHI_GROUP}
50PKG_GROUPS= ${AVAHI_GROUP} 13PKG_GROUPS= ${AVAHI_GROUP}
51PKG_GECOS.${AVAHI_USER}= Avahi user 14PKG_GECOS.${AVAHI_USER}= Avahi user
52 15
53.include "options.mk" 16RCD_SCRIPTS= avahidaemon
54 
55CFLAGS.NetBSD+= -D_NETBSD_SOURCE 
56CPPFLAGS.SunOS+= -D_XOPEN_SOURCE=600 
57# Not yet reported upstream. 
58CPPFLAGS.Darwin+= -D__APPLE_USE_RFC_3542 
59 17
60PLIST_SRC+= ${PKGDIR}/PLIST.shared 18PLIST_SRC+= ${PKGDIR}/PLIST.shared
61 19
62CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-daemon.conf \ 20CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-daemon.conf \
63 ${PKG_SYSCONFDIR}/avahi-daemon.conf 21 ${PKG_SYSCONFDIR}/avahi-daemon.conf
64CONF_FILES+= ${PREFIX}/share/examples/avahi/hosts \ 22CONF_FILES+= ${PREFIX}/share/examples/avahi/hosts \
65 ${PKG_SYSCONFDIR}/hosts 23 ${PKG_SYSCONFDIR}/hosts
66CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-dnsconfd.action \ 24CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-dnsconfd.action \
67 ${PKG_SYSCONFDIR}/avahi-dnsconfd.action 25 ${PKG_SYSCONFDIR}/avahi-dnsconfd.action
68CONF_FILES+= ${PREFIX}/share/examples/avahi/services/sftp-ssh.service \ 26CONF_FILES+= ${PREFIX}/share/examples/avahi/services/sftp-ssh.service \
69 ${PKG_SYSCONFDIR}/services/sftp-ssh.service 27 ${PKG_SYSCONFDIR}/services/sftp-ssh.service
70CONF_FILES+= ${PREFIX}/share/examples/avahi/services/ssh.service \ 28CONF_FILES+= ${PREFIX}/share/examples/avahi/services/ssh.service \
71 ${PKG_SYSCONFDIR}/services/ssh.service 29 ${PKG_SYSCONFDIR}/services/ssh.service
72CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-dbus.conf \ 30CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-dbus.conf \
73 ${PKG_SYSCONFBASE}/dbus-1/system.d/avahi-dbus.conf 31 ${PKG_SYSCONFBASE}/dbus-1/system.d/avahi-dbus.conf
74 32
75CONFIGURE_ARGS+= --with-avahi-user=${AVAHI_USER} 
76CONFIGURE_ARGS+= --with-avahi-group=${AVAHI_GROUP} 
77CONFIGURE_ARGS+= --with-avahi_priv_access_group=${REAL_ROOT_GROUP} 
78CONFIGURE_ARGS+= --localstatedir=${VARBASE} 
79CONFIGURE_ARGS+= --with-dbus-system-socket=${VARBASE}/run/dbus/system_bus_socket 
80CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} 
81CONFIGURE_ARGS+= --disable-doxygen-doc 
82CONFIGURE_ARGS+= --disable-doxygen-dot 
83CONFIGURE_ARGS+= --disable-doxygen-html --disable-doxygen-xml 
84CONFIGURE_ARGS+= --disable-xmltoman 
85CONFIGURE_ARGS+= --disable-autoipd 
86CONFIGURE_ARGS+= --disable-libevent 
87CONFIGURE_ARGS+= --disable-qt3 
88CONFIGURE_ARGS+= --disable-qt4 
89CONFIGURE_ARGS+= --disable-qt5 
90CONFIGURE_ARGS+= --disable-pygobject 
91CONFIGURE_ARGS+= --with-distro=none 
92 
93INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples 
94INSTALL_MAKE_FLAGS+= dbusservicedir=${PREFIX}/share/examples/avahi 
95 
96INSTALLATION_DIRS+= share/doc/avahi 33INSTALLATION_DIRS+= share/doc/avahi
97 34
98MAKE_DIRS+= ${PKG_SYSCONFDIR}/services 35MAKE_DIRS+= ${PKG_SYSCONFDIR}/services
99 36
100post-install: 37post-install:
101 ${INSTALL_DATA} ${WRKSRC}/docs/HACKING ${DESTDIR}${PREFIX}/share/doc/avahi 38 ${INSTALL_DATA} ${WRKSRC}/docs/HACKING ${DESTDIR}${PREFIX}/share/doc/avahi
102 ${INSTALL_DATA} ${WRKSRC}/docs/INSTALL ${DESTDIR}${PREFIX}/share/doc/avahi 39 ${INSTALL_DATA} ${WRKSRC}/docs/INSTALL ${DESTDIR}${PREFIX}/share/doc/avahi
103 ${INSTALL_DATA} ${WRKSRC}/docs/NEWS ${DESTDIR}${PREFIX}/share/doc/avahi 40 ${INSTALL_DATA} ${WRKSRC}/docs/NEWS ${DESTDIR}${PREFIX}/share/doc/avahi
104 ${INSTALL_DATA} ${WRKSRC}/docs/README ${DESTDIR}${PREFIX}/share/doc/avahi 41 ${INSTALL_DATA} ${WRKSRC}/docs/README ${DESTDIR}${PREFIX}/share/doc/avahi
105 ${INSTALL_DATA} ${WRKSRC}/docs/TODO ${DESTDIR}${PREFIX}/share/doc/avahi 42 ${INSTALL_DATA} ${WRKSRC}/docs/TODO ${DESTDIR}${PREFIX}/share/doc/avahi
106 43
107.include "../../devel/gettext-lib/buildlink3.mk" 
108.include "../../devel/glib2/buildlink3.mk" 
109BUILDLINK_API_DEPENDS.libdaemon+= libdaemon>=0.14 
110.include "../../devel/libdaemon/buildlink3.mk" 
111.include "../../sysutils/dbus/buildlink3.mk" 
112.include "../../textproc/expat/buildlink3.mk" 
113.include "../../mk/pthread.buildlink3.mk" 
114.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/net/avahi/Makefile.common
# $NetBSD: Makefile.common,v 1.1 2021/01/08 14:08:35 nia Exp $
# used by net/avahi/Makefile
# used by net/avahi-ui/Makefile

DISTNAME=		avahi-0.8
CATEGORIES=		net
MASTER_SITES=		${MASTER_SITE_GITHUB:=lathiat/avahi/releases/download/v${PKGVERSION_NOREV}/}

HOMEPAGE=		https://avahi.org/
LICENSE=		gnu-lgpl-v2.1

PATCHDIR=		${.CURDIR}/../../net/avahi/patches
DISTINFO_FILE=		${.CURDIR}/../../net/avahi/distinfo

GNU_CONFIGURE=		YES
USE_LIBTOOL=		YES
USE_PKGINSTALL=		YES
USE_PKGLOCALEDIR=	YES
USE_TOOLS+=		pkg-config gmake msgfmt xgettext msgmerge

.include "../../mk/bsd.fast.prefs.mk"
.if ${OPSYS} == "NetBSD"
# Requires --desktop in msgfmt.
TOOLS_PLATFORM.msgfmt=
.endif

PKGCONFIG_OVERRIDE+=	avahi-client.pc.in
PKGCONFIG_OVERRIDE+=	avahi-compat-howl.pc.in
PKGCONFIG_OVERRIDE+=	avahi-compat-libdns_sd.pc.in
PKGCONFIG_OVERRIDE+=	avahi-core.pc.in
PKGCONFIG_OVERRIDE+=	avahi-glib.pc.in
PKGCONFIG_OVERRIDE+=	avahi-gobject.pc.in
PKGCONFIG_OVERRIDE+=	avahi-libevent.pc.in
PKGCONFIG_OVERRIDE+=	avahi-qt3.pc.in
PKGCONFIG_OVERRIDE+=	avahi-qt4.pc.in
PKGCONFIG_OVERRIDE+=	avahi-qt5.pc.in
PKGCONFIG_OVERRIDE+=	avahi-sharp.pc.in
PKGCONFIG_OVERRIDE+=	avahi-ui-gtk3.pc.in
PKGCONFIG_OVERRIDE+=	avahi-ui-sharp.pc.in
PKGCONFIG_OVERRIDE+=	avahi-ui.pc.in

AVAHI_USER?=		avahi
AVAHI_GROUP?=		avahi
BUILD_DEFS+=		VARBASE PKG_SYSCONFBASE
PLIST_SRC=		${PKGDIR}/PLIST
PKG_SYSCONFSUBDIR=	avahi
USE_LANGUAGES=		c99 c++

CFLAGS.NetBSD+=		-D_NETBSD_SOURCE
CPPFLAGS.SunOS+=	-D_XOPEN_SOURCE=600
# Not yet reported upstream.
CPPFLAGS.Darwin+=	-D__APPLE_USE_RFC_3542

CONFIGURE_ARGS+=	--with-avahi-user=${AVAHI_USER}
CONFIGURE_ARGS+=	--with-avahi-group=${AVAHI_GROUP}
CONFIGURE_ARGS+=	--with-avahi_priv_access_group=${REAL_ROOT_GROUP}
CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
CONFIGURE_ARGS+=	--with-dbus-system-socket=${VARBASE}/run/dbus/system_bus_socket
CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
CONFIGURE_ARGS+=	--disable-doxygen-doc
CONFIGURE_ARGS+=	--disable-doxygen-dot
CONFIGURE_ARGS+=	--disable-doxygen-html --disable-doxygen-xml
CONFIGURE_ARGS+=	--disable-xmltoman
CONFIGURE_ARGS+=	--disable-autoipd
CONFIGURE_ARGS+=	--disable-libevent
CONFIGURE_ARGS+=	--disable-qt3
CONFIGURE_ARGS+=	--disable-qt4
CONFIGURE_ARGS+=	--disable-qt5
CONFIGURE_ARGS+=	--disable-gtk
CONFIGURE_ARGS+=	--disable-mono
CONFIGURE_ARGS+=	--disable-pygobject
CONFIGURE_ARGS+=	--disable-python
CONFIGURE_ARGS+=	--with-distro=none

INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples
INSTALL_MAKE_FLAGS+=	dbusservicedir=${PREFIX}/share/examples/avahi

.include "../../databases/gdbm/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_API_DEPENDS.libdaemon+=	libdaemon>=0.14
.include "../../devel/libdaemon/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
cvs diff -r1.19 -r1.20 pkgsrc/net/avahi/PLIST (expand / switch to unified diff)

--- pkgsrc/net/avahi/PLIST 2020/09/29 10:56:56 1.19
+++ pkgsrc/net/avahi/PLIST 2021/01/08 14:08:35 1.20
@@ -1,27 +1,23 @@ @@ -1,27 +1,23 @@
1@comment $NetBSD: PLIST,v 1.19 2020/09/29 10:56:56 prlw1 Exp $ 1@comment $NetBSD: PLIST,v 1.20 2021/01/08 14:08:35 nia Exp $
2bin/avahi-browse 2bin/avahi-browse
3bin/avahi-browse-domains 3bin/avahi-browse-domains
4${PLIST.ui}bin/avahi-discover-standalone 
5bin/avahi-publish 4bin/avahi-publish
6bin/avahi-publish-address 5bin/avahi-publish-address
7bin/avahi-publish-service 6bin/avahi-publish-service
8bin/avahi-resolve 7bin/avahi-resolve
9bin/avahi-resolve-address 8bin/avahi-resolve-address
10bin/avahi-resolve-host-name 9bin/avahi-resolve-host-name
11bin/avahi-set-host-name 10bin/avahi-set-host-name
12${PLIST.ui}bin/bshell 
13${PLIST.ui}bin/bssh 
14${PLIST.ui}bin/bvnc 
15include/avahi-client/client.h 11include/avahi-client/client.h
16include/avahi-client/lookup.h 12include/avahi-client/lookup.h
17include/avahi-client/publish.h 13include/avahi-client/publish.h
18include/avahi-common/address.h 14include/avahi-common/address.h
19include/avahi-common/alternative.h 15include/avahi-common/alternative.h
20include/avahi-common/cdecl.h 16include/avahi-common/cdecl.h
21include/avahi-common/defs.h 17include/avahi-common/defs.h
22include/avahi-common/domain.h 18include/avahi-common/domain.h
23include/avahi-common/error.h 19include/avahi-common/error.h
24include/avahi-common/gccmacro.h 20include/avahi-common/gccmacro.h
25include/avahi-common/llist.h 21include/avahi-common/llist.h
26include/avahi-common/malloc.h 22include/avahi-common/malloc.h
27include/avahi-common/rlist.h 23include/avahi-common/rlist.h
@@ -34,93 +30,73 @@ include/avahi-core/core.h @@ -34,93 +30,73 @@ include/avahi-core/core.h
34include/avahi-core/log.h 30include/avahi-core/log.h
35include/avahi-core/lookup.h 31include/avahi-core/lookup.h
36include/avahi-core/publish.h 32include/avahi-core/publish.h
37include/avahi-core/rr.h 33include/avahi-core/rr.h
38include/avahi-glib/glib-malloc.h 34include/avahi-glib/glib-malloc.h
39include/avahi-glib/glib-watch.h 35include/avahi-glib/glib-watch.h
40include/avahi-gobject/ga-client.h 36include/avahi-gobject/ga-client.h
41include/avahi-gobject/ga-entry-group.h 37include/avahi-gobject/ga-entry-group.h
42include/avahi-gobject/ga-enums.h 38include/avahi-gobject/ga-enums.h
43include/avahi-gobject/ga-error.h 39include/avahi-gobject/ga-error.h
44include/avahi-gobject/ga-record-browser.h 40include/avahi-gobject/ga-record-browser.h
45include/avahi-gobject/ga-service-browser.h 41include/avahi-gobject/ga-service-browser.h
46include/avahi-gobject/ga-service-resolver.h 42include/avahi-gobject/ga-service-resolver.h
47${PLIST.ui}include/avahi-ui/avahi-ui.h 
48${PLIST.introspection}lib/girepository-1.0/Avahi-0.6.typelib 
49${PLIST.introspection}lib/girepository-1.0/AvahiCore-0.6.typelib 
50lib/libavahi-client.la 43lib/libavahi-client.la
51lib/libavahi-common.la 44lib/libavahi-common.la
52lib/libavahi-core.la 45lib/libavahi-core.la
53lib/libavahi-glib.la 46lib/libavahi-glib.la
54lib/libavahi-gobject.la 47lib/libavahi-gobject.la
55${PLIST.gtk3}lib/libavahi-ui-gtk3.la 
56${PLIST.mono}lib/mono/avahi-sharp/avahi-sharp.dll 
57${PLIST.mono}lib/mono/avahi-ui-sharp/avahi-ui-sharp.dll 
58${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.config 
60${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.mdb 
61${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.config 
63${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll.mdb 
64lib/pkgconfig/avahi-client.pc 48lib/pkgconfig/avahi-client.pc
65lib/pkgconfig/avahi-core.pc 49lib/pkgconfig/avahi-core.pc
66lib/pkgconfig/avahi-glib.pc 50lib/pkgconfig/avahi-glib.pc
67lib/pkgconfig/avahi-gobject.pc 51lib/pkgconfig/avahi-gobject.pc
68${PLIST.mono}lib/pkgconfig/avahi-sharp.pc 
69${PLIST.gtk3}lib/pkgconfig/avahi-ui-gtk3.pc 
70${PLIST.mono}lib/pkgconfig/avahi-ui-sharp.pc 
71man/man1/avahi-browse-domains.1 52man/man1/avahi-browse-domains.1
72man/man1/avahi-browse.1 53man/man1/avahi-browse.1
73man/man1/avahi-publish-address.1 54man/man1/avahi-publish-address.1
74man/man1/avahi-publish-service.1 55man/man1/avahi-publish-service.1
75man/man1/avahi-publish.1 56man/man1/avahi-publish.1
76man/man1/avahi-resolve-address.1 57man/man1/avahi-resolve-address.1
77man/man1/avahi-resolve-host-name.1 58man/man1/avahi-resolve-host-name.1
78man/man1/avahi-resolve.1 59man/man1/avahi-resolve.1
79man/man1/avahi-set-host-name.1 60man/man1/avahi-set-host-name.1
80man/man5/avahi-daemon.conf.5 61man/man5/avahi-daemon.conf.5
81man/man5/avahi.hosts.5 62man/man5/avahi.hosts.5
82man/man5/avahi.service.5 63man/man5/avahi.service.5
83man/man8/avahi-daemon.8 64man/man8/avahi-daemon.8
84man/man8/avahi-dnsconfd.8 65man/man8/avahi-dnsconfd.8
85man/man8/avahi-dnsconfd.action.8 66man/man8/avahi-dnsconfd.action.8
86sbin/avahi-daemon 67sbin/avahi-daemon
87sbin/avahi-dnsconfd 68sbin/avahi-dnsconfd
88${PLIST.ui}share/applications/bssh.desktop 
89${PLIST.ui}share/applications/bvnc.desktop 
90share/avahi/avahi-service.dtd 69share/avahi/avahi-service.dtd
91${PLIST.ui}share/avahi/interfaces/avahi-discover.ui 
92share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml 70share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
93share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml 71share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
94share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml 72share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
95share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml 73share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml
96share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml 74share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml
97share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml 75share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml
98share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml 76share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml
99share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml 77share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
100share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml 78share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
101share/doc/avahi/HACKING 79share/doc/avahi/HACKING
102share/doc/avahi/INSTALL 80share/doc/avahi/INSTALL
103share/doc/avahi/NEWS 81share/doc/avahi/NEWS
104share/doc/avahi/README 82share/doc/avahi/README
105share/doc/avahi/TODO 83share/doc/avahi/TODO
106share/examples/avahi/avahi-daemon.conf 84share/examples/avahi/avahi-daemon.conf
107share/examples/avahi/avahi-dbus.conf 85share/examples/avahi/avahi-dbus.conf
108share/examples/avahi/avahi-dnsconfd.action 86share/examples/avahi/avahi-dnsconfd.action
109share/examples/avahi/hosts 87share/examples/avahi/hosts
110share/examples/avahi/services/sftp-ssh.service 88share/examples/avahi/services/sftp-ssh.service
111share/examples/avahi/services/ssh.service 89share/examples/avahi/services/ssh.service
112${PLIST.introspection}share/gir-1.0/Avahi-0.6.gir 
113${PLIST.introspection}share/gir-1.0/AvahiCore-0.6.gir 
114share/locale/ach/LC_MESSAGES/avahi.mo 90share/locale/ach/LC_MESSAGES/avahi.mo
115share/locale/ar/LC_MESSAGES/avahi.mo 91share/locale/ar/LC_MESSAGES/avahi.mo
116share/locale/bg/LC_MESSAGES/avahi.mo 92share/locale/bg/LC_MESSAGES/avahi.mo
117share/locale/ca/LC_MESSAGES/avahi.mo 93share/locale/ca/LC_MESSAGES/avahi.mo
118share/locale/cs/LC_MESSAGES/avahi.mo 94share/locale/cs/LC_MESSAGES/avahi.mo
119share/locale/da/LC_MESSAGES/avahi.mo 95share/locale/da/LC_MESSAGES/avahi.mo
120share/locale/de/LC_MESSAGES/avahi.mo 96share/locale/de/LC_MESSAGES/avahi.mo
121share/locale/el/LC_MESSAGES/avahi.mo 97share/locale/el/LC_MESSAGES/avahi.mo
122share/locale/en_AU/LC_MESSAGES/avahi.mo 98share/locale/en_AU/LC_MESSAGES/avahi.mo
123share/locale/en_CA/LC_MESSAGES/avahi.mo 99share/locale/en_CA/LC_MESSAGES/avahi.mo
124share/locale/en_GB/LC_MESSAGES/avahi.mo 100share/locale/en_GB/LC_MESSAGES/avahi.mo
125share/locale/en_NZ/LC_MESSAGES/avahi.mo 101share/locale/en_NZ/LC_MESSAGES/avahi.mo
126share/locale/eo/LC_MESSAGES/avahi.mo 102share/locale/eo/LC_MESSAGES/avahi.mo
File Deleted: pkgsrc/net/avahi/Attic/PLIST.howl
File Deleted: pkgsrc/net/avahi/Attic/PLIST.pygdbm
File Deleted: pkgsrc/net/avahi/Attic/PLIST.python
cvs diff -r1.46 -r1.47 pkgsrc/net/avahi/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/net/avahi/buildlink3.mk 2020/09/29 10:56:56 1.46
+++ pkgsrc/net/avahi/buildlink3.mk 2021/01/08 14:08:35 1.47
@@ -1,41 +1,18 @@ @@ -1,41 +1,18 @@
1# $NetBSD: buildlink3.mk,v 1.46 2020/09/29 10:56:56 prlw1 Exp $ 1# $NetBSD: buildlink3.mk,v 1.47 2021/01/08 14:08:35 nia 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.32nb25 9BUILDLINK_ABI_DEPENDS.avahi+= avahi>=0.6.32nb25
10BUILDLINK_PKGSRCDIR.avahi?= ../../net/avahi 10BUILDLINK_PKGSRCDIR.avahi?= ../../net/avahi
11 11
12pkgbase := avahi 
13.include "../../mk/pkg-build-options.mk" 
14 
15.if ${PKG_BUILD_OPTIONS.avahi:Mgdbm} 
16. include "../../databases/gdbm/buildlink3.mk" 
17.endif 
18 
19.if ${PKG_BUILD_OPTIONS.avahi:Mgtk3} 
20.include "../../x11/gtk3/buildlink3.mk" 
21.endif 
22 
23.if ${PKG_BUILD_OPTIONS.avahi:Mintrospection} 
24.include "../../devel/gobject-introspection/buildlink3.mk" 
25.endif 
26 
27.if ${PKG_BUILD_OPTIONS.avahi:Mmono} 
28.include "../../x11/gtk-sharp/buildlink3.mk" 
29.endif 
30 
31.if ${PKG_BUILD_OPTIONS.avahi:Mpython} 
32.include "../../lang/python/application.mk" 
33.endif 
34 
35.include "../../devel/gettext-lib/buildlink3.mk" 12.include "../../devel/gettext-lib/buildlink3.mk"
36.include "../../devel/glib2/buildlink3.mk" 13.include "../../devel/glib2/buildlink3.mk"
37.include "../../sysutils/dbus/buildlink3.mk" 14.include "../../sysutils/dbus/buildlink3.mk"
38.include "../../mk/pthread.buildlink3.mk" 15.include "../../mk/pthread.buildlink3.mk"
39.endif # AVAHI_BUILDLINK3_MK 16.endif # AVAHI_BUILDLINK3_MK
40 17
41BUILDLINK_TREE+= -avahi 18BUILDLINK_TREE+= -avahi
File Deleted: pkgsrc/net/avahi/Attic/options.mk
File Added: pkgsrc/net/avahi-ui/DESCR
Avahi is an implementation of the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing.

This package contains graphical user interfaces for Avahi.
File Added: pkgsrc/net/avahi-ui/Makefile
# $NetBSD: Makefile,v 1.1 2021/01/08 14:08:35 nia Exp $

.include "../../net/avahi/Makefile.common"

PKGNAME=	${DISTNAME:S/avahi-/avahi-ui-/g}

MAINTAINER=	pkgsrc-users@NetBSD.org
COMMENT=	Facilitate service discovery on a local network (GUI)

BUILD_DIRS+=	avahi-common avahi-client avahi-glib avahi-ui
INSTALL_DIRS+=	avahi-ui

CONFIGURE_ARGS+=	--enable-gtk3

INSTALLATION_DIRS+=	lib/pkgconfig

PKGCONFIG_OVERRIDE_STAGE=	pre-install
PKGCONFIG_OVERRIDE+=		avahi-ui-gtk3.pc

pre-install:
	cd ${WRKSRC} && ${MAKE_ENV} ${GMAKE} avahi-ui-gtk3.pc

post-install:
	${INSTALL_DATA} ${WRKSRC}/avahi-ui-gtk3.pc \
	    ${DESTDIR}${PREFIX}/lib/pkgconfig

.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/gtk3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/net/avahi-ui/PLIST
@comment $NetBSD: PLIST,v 1.1 2021/01/08 14:08:35 nia Exp $
bin/bshell
bin/bssh
bin/bvnc
include/avahi-ui/avahi-ui.h
lib/libavahi-ui-gtk3.la
lib/pkgconfig/avahi-ui-gtk3.pc
share/applications/bssh.desktop
share/applications/bvnc.desktop
File Added: pkgsrc/net/avahi-ui/buildlink3.mk
# $NetBSD: buildlink3.mk,v 1.1 2021/01/08 14:08:35 nia Exp $

BUILDLINK_TREE+=	avahi-ui

.if !defined(AVAHI_UI_BUILDLINK3_MK)
AVAHI_UI_BUILDLINK3_MK:=

BUILDLINK_API_DEPENDS.avahi-ui+=	avahi-ui>=0.8
BUILDLINK_PKGSRCDIR.avahi-ui?=	../../net/avahi-ui

.include "../../x11/gtk3/buildlink3.mk"
.include "../../net/avahi/buildlink3.mk"
.endif	# AVAHI_UI_BUILDLINK3_MK

BUILDLINK_TREE+=	-avahi-ui