Sun Apr 21 00:58:47 2013 UTC ()
Support more PKG_OPTIONS for the net/avahi package. This enables the user
to build the avahi UI with GTK3, which is required for some packages like
libepc. Commented patches. Removed dependency on desktop.mk, as the file
doesn't have a MimeType key. Only PKG_OPTION enabled by default is gtk2.
Thus, you will notice no difference in this version and the last (unless
you start enabling options). Bump PKGREVISION. Resolves PR pkg/47483


(rodent)
diff -r1.39 -r1.40 pkgsrc/net/avahi/Makefile
diff -r1.6 -r1.7 pkgsrc/net/avahi/PLIST
diff -r1.18 -r1.19 pkgsrc/net/avahi/buildlink3.mk
diff -r1.11 -r1.12 pkgsrc/net/avahi/distinfo
diff -r1.2 -r1.3 pkgsrc/net/avahi/options.mk
diff -r1.2 -r1.3 pkgsrc/net/avahi/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/net/avahi/patches/patch-ai
diff -r1.3 -r1.4 pkgsrc/net/avahi/patches/patch-ab
cvs diff -r1.39 -r1.40 pkgsrc/net/avahi/Makefile (expand / switch to unified diff)

--- pkgsrc/net/avahi/Makefile 2013/02/16 11:19:00 1.39
+++ pkgsrc/net/avahi/Makefile 2013/04/21 00:58:46 1.40
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.39 2013/02/16 11:19:00 wiz Exp $ 1# $NetBSD: Makefile,v 1.40 2013/04/21 00:58:46 rodent Exp $
2 2
3DISTNAME= avahi-0.6.31 3DISTNAME= avahi-0.6.31
4PKGREVISION= 6 4PKGREVISION= 7
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://avahi.org/download/ 6MASTER_SITES= http://avahi.org/download/
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
13GNU_CONFIGURE= YES 13GNU_CONFIGURE= YES
14USE_LIBTOOL= YES 14USE_LIBTOOL= YES
15USE_PKGINSTALL= YES 15USE_PKGINSTALL= YES
16USE_PKGLOCALEDIR= YES 16USE_PKGLOCALEDIR= YES
17USE_TOOLS+= pkg-config gmake intltool msgfmt xgettext 17USE_TOOLS+= pkg-config gmake intltool msgfmt xgettext
@@ -61,51 +61,42 @@ CONF_FILES+= ${PREFIX}/share/examples/a @@ -61,51 +61,42 @@ CONF_FILES+= ${PREFIX}/share/examples/a
61CONF_FILES+= ${PREFIX}/share/examples/avahi/services/sftp-ssh.service \ 61CONF_FILES+= ${PREFIX}/share/examples/avahi/services/sftp-ssh.service \
62 ${PKG_SYSCONFDIR}/services/sftp-ssh.service 62 ${PKG_SYSCONFDIR}/services/sftp-ssh.service
63CONF_FILES+= ${PREFIX}/share/examples/avahi/services/ssh.service \ 63CONF_FILES+= ${PREFIX}/share/examples/avahi/services/ssh.service \
64 ${PKG_SYSCONFDIR}/services/ssh.service 64 ${PKG_SYSCONFDIR}/services/ssh.service
65CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-dbus.conf \ 65CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-dbus.conf \
66 ${PKG_SYSCONFBASE}/dbus-1/system.d/avahi-dbus.conf 66 ${PKG_SYSCONFBASE}/dbus-1/system.d/avahi-dbus.conf
67 67
68CONFIGURE_ARGS+= --with-avahi-user=${AVAHI_USER} 68CONFIGURE_ARGS+= --with-avahi-user=${AVAHI_USER}
69CONFIGURE_ARGS+= --with-avahi-group=${AVAHI_GROUP} 69CONFIGURE_ARGS+= --with-avahi-group=${AVAHI_GROUP}
70CONFIGURE_ARGS+= --with-avahi_priv_access_group=${REAL_ROOT_GROUP} 70CONFIGURE_ARGS+= --with-avahi_priv_access_group=${REAL_ROOT_GROUP}
71CONFIGURE_ARGS+= --localstatedir=${VARBASE} 71CONFIGURE_ARGS+= --localstatedir=${VARBASE}
72CONFIGURE_ARGS+= --with-dbus-system-socket=${VARBASE}/run/dbus/system_bus_socket 72CONFIGURE_ARGS+= --with-dbus-system-socket=${VARBASE}/run/dbus/system_bus_socket
73CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} 73CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
74CONFIGURE_ARGS+= --disable-gtk3 
75CONFIGURE_ARGS+= --disable-qt3 
76CONFIGURE_ARGS+= --disable-qt4 
77CONFIGURE_ARGS+= --disable-mono 
78CONFIGURE_ARGS+= --disable-monodoc 
79CONFIGURE_ARGS+= --disable-doxygen-doc 74CONFIGURE_ARGS+= --disable-doxygen-doc
80CONFIGURE_ARGS+= --disable-doxygen-dot 75CONFIGURE_ARGS+= --disable-doxygen-dot
81CONFIGURE_ARGS+= --disable-doxygen-html 76CONFIGURE_ARGS+= --disable-doxygen-html --disable-doxygen-xml
82CONFIGURE_ARGS+= --disable-xmltoman 77CONFIGURE_ARGS+= --disable-xmltoman
83CONFIGURE_ARGS+= --disable-autoipd 78CONFIGURE_ARGS+= --disable-autoipd
84CONFIGURE_ARGS+= --enable-tests 
85CONFIGURE_ARGS+= --with-distro=none 79CONFIGURE_ARGS+= --with-distro=none
86 80
87INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples 81INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
88INSTALL_MAKE_FLAGS+= dbusservicedir=${PREFIX}/share/examples/avahi 82INSTALL_MAKE_FLAGS+= dbusservicedir=${PREFIX}/share/examples/avahi
89 83
90INSTALLATION_DIRS+= share/doc/avahi 84INSTALLATION_DIRS+= share/doc/avahi
91 85
92MAKE_DIRS+= ${PKG_SYSCONFDIR}/services 86MAKE_DIRS+= ${PKG_SYSCONFDIR}/services
93 87
94post-install: 88post-install:
95 ${INSTALL_DATA} ${WRKSRC}/docs/HACKING ${DESTDIR}${PREFIX}/share/doc/avahi 89 ${INSTALL_DATA} ${WRKSRC}/docs/HACKING ${DESTDIR}${PREFIX}/share/doc/avahi
96 ${INSTALL_DATA} ${WRKSRC}/docs/INSTALL ${DESTDIR}${PREFIX}/share/doc/avahi 90 ${INSTALL_DATA} ${WRKSRC}/docs/INSTALL ${DESTDIR}${PREFIX}/share/doc/avahi
97 ${INSTALL_DATA} ${WRKSRC}/docs/NEWS ${DESTDIR}${PREFIX}/share/doc/avahi 91 ${INSTALL_DATA} ${WRKSRC}/docs/NEWS ${DESTDIR}${PREFIX}/share/doc/avahi
98 ${INSTALL_DATA} ${WRKSRC}/docs/README ${DESTDIR}${PREFIX}/share/doc/avahi 92 ${INSTALL_DATA} ${WRKSRC}/docs/README ${DESTDIR}${PREFIX}/share/doc/avahi
99 ${INSTALL_DATA} ${WRKSRC}/docs/TODO ${DESTDIR}${PREFIX}/share/doc/avahi 93 ${INSTALL_DATA} ${WRKSRC}/docs/TODO ${DESTDIR}${PREFIX}/share/doc/avahi
100 94
101.include "../../devel/gettext-lib/buildlink3.mk" 95.include "../../devel/gettext-lib/buildlink3.mk"
102.include "../../devel/glib2/buildlink3.mk" 96.include "../../devel/glib2/buildlink3.mk"
103BUILDLINK_API_DEPENDS.libdaemon+= libdaemon>=0.14 97BUILDLINK_API_DEPENDS.libdaemon+= libdaemon>=0.14
104.include "../../devel/libdaemon/buildlink3.mk" 98.include "../../devel/libdaemon/buildlink3.mk"
105.include "../../sysutils/dbus/buildlink3.mk" 99.include "../../sysutils/dbus/buildlink3.mk"
106.include "../../sysutils/desktop-file-utils/desktopdb.mk" 
107.include "../../textproc/expat/buildlink3.mk" 100.include "../../textproc/expat/buildlink3.mk"
108BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.14.0 
109.include "../../x11/gtk2/buildlink3.mk" 
110.include "../../mk/pthread.buildlink3.mk" 101.include "../../mk/pthread.buildlink3.mk"
111.include "../../mk/bsd.pkg.mk" 102.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/net/avahi/PLIST (expand / switch to unified diff)

--- pkgsrc/net/avahi/PLIST 2011/05/14 13:04:04 1.6
+++ pkgsrc/net/avahi/PLIST 2013/04/21 00:58:46 1.7
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1@comment $NetBSD: PLIST,v 1.6 2011/05/14 13:04:04 obache Exp $ 1@comment $NetBSD: PLIST,v 1.7 2013/04/21 00:58:46 rodent Exp $
2bin/avahi-browse 2bin/avahi-browse
3bin/avahi-browse-domains 3bin/avahi-browse-domains
4bin/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
12bin/bshell 12${PLIST.ui}bin/bshell
13bin/bssh 13${PLIST.ui}bin/bssh
14bin/bvnc 14${PLIST.ui}bin/bvnc
15include/avahi-client/client.h 15include/avahi-client/client.h
16include/avahi-client/lookup.h 16include/avahi-client/lookup.h
17include/avahi-client/publish.h 17include/avahi-client/publish.h
18include/avahi-common/address.h 18include/avahi-common/address.h
19include/avahi-common/alternative.h 19include/avahi-common/alternative.h
20include/avahi-common/cdecl.h 20include/avahi-common/cdecl.h
21include/avahi-common/defs.h 21include/avahi-common/defs.h
22include/avahi-common/domain.h 22include/avahi-common/domain.h
23include/avahi-common/error.h 23include/avahi-common/error.h
24include/avahi-common/gccmacro.h 24include/avahi-common/gccmacro.h
25include/avahi-common/llist.h 25include/avahi-common/llist.h
26include/avahi-common/malloc.h 26include/avahi-common/malloc.h
27include/avahi-common/rlist.h 27include/avahi-common/rlist.h
@@ -34,83 +34,105 @@ include/avahi-core/core.h @@ -34,83 +34,105 @@ 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
47include/avahi-ui/avahi-ui.h 47${PLIST.qt3}include/avahi-qt3/qt-watch.h
 48${PLIST.qt}include/avahi-qt4/qt-watch.h
 49${PLIST.gtk2}include/avahi-ui/avahi-ui.h
 50${PLIST.introspection}lib/girepository-1.0/Avahi-0.6.typelib
 51${PLIST.introspection}lib/girepository-1.0/AvahiCore-0.6.typelib
48lib/libavahi-client.la 52lib/libavahi-client.la
49lib/libavahi-common.la 53lib/libavahi-common.la
50lib/libavahi-core.la 54lib/libavahi-core.la
51lib/libavahi-glib.la 55lib/libavahi-glib.la
52lib/libavahi-gobject.la 56lib/libavahi-gobject.la
53lib/libavahi-ui.la 57${PLIST.qt3}lib/libavahi-qt3.la
 58${PLIST.qt}lib/libavahi-qt4.la
 59${PLIST.gtk3}lib/libavahi-ui-gtk3.la
 60${PLIST.gtk2}lib/libavahi-ui.la
 61${PLIST.mono}lib/mono/avahi-sharp/avahi-sharp.dll
 62${PLIST.mono}lib/mono/avahi-ui-sharp/avahi-ui-sharp.dll
 63${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll
 64${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.config
 65${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.mdb
 66${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll
 67${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll.config
 68${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll.mdb
54lib/pkgconfig/avahi-client.pc 69lib/pkgconfig/avahi-client.pc
55lib/pkgconfig/avahi-core.pc 70lib/pkgconfig/avahi-core.pc
56lib/pkgconfig/avahi-glib.pc 71lib/pkgconfig/avahi-glib.pc
57lib/pkgconfig/avahi-gobject.pc 72lib/pkgconfig/avahi-gobject.pc
58lib/pkgconfig/avahi-ui.pc 73${PLIST.qt3}lib/pkgconfig/avahi-qt3.pc
 74${PLIST.qt}lib/pkgconfig/avahi-qt4.pc
 75${PLIST.mono}lib/pkgconfig/avahi-sharp.pc
 76${PLIST.gtk3}lib/pkgconfig/avahi-ui-gtk3.pc
 77${PLIST.mono}lib/pkgconfig/avahi-ui-sharp.pc
 78${PLIST.gtk2}lib/pkgconfig/avahi-ui.pc
59man/man1/avahi-browse-domains.1 79man/man1/avahi-browse-domains.1
60man/man1/avahi-browse.1 80man/man1/avahi-browse.1
61man/man1/avahi-publish-address.1 81man/man1/avahi-publish-address.1
62man/man1/avahi-publish-service.1 82man/man1/avahi-publish-service.1
63man/man1/avahi-publish.1 83man/man1/avahi-publish.1
64man/man1/avahi-resolve-address.1 84man/man1/avahi-resolve-address.1
65man/man1/avahi-resolve-host-name.1 85man/man1/avahi-resolve-host-name.1
66man/man1/avahi-resolve.1 86man/man1/avahi-resolve.1
67man/man1/avahi-set-host-name.1 87man/man1/avahi-set-host-name.1
68man/man1/bssh.1 88${PLIST.ui}man/man1/bssh.1
69man/man1/bvnc.1 89${PLIST.ui}man/man1/bvnc.1
70man/man5/avahi-daemon.conf.5 90man/man5/avahi-daemon.conf.5
71man/man5/avahi.hosts.5 91man/man5/avahi.hosts.5
72man/man5/avahi.service.5 92man/man5/avahi.service.5
73man/man8/avahi-daemon.8 93man/man8/avahi-daemon.8
74man/man8/avahi-dnsconfd.8 94man/man8/avahi-dnsconfd.8
75man/man8/avahi-dnsconfd.action.8 95man/man8/avahi-dnsconfd.action.8
76sbin/avahi-daemon 96sbin/avahi-daemon
77sbin/avahi-dnsconfd 97sbin/avahi-dnsconfd
78share/applications/bssh.desktop 98${PLIST.ui}share/applications/bssh.desktop
79share/applications/bvnc.desktop 99${PLIST.ui}share/applications/bvnc.desktop
80share/avahi/avahi-service.dtd 100share/avahi/avahi-service.dtd
81share/avahi/interfaces/avahi-discover.ui 101${PLIST.ui}share/avahi/interfaces/avahi-discover.ui
82share/avahi/service-types 102share/avahi/service-types
83share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml 103share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
84share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml 104share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
85share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml 105share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
86share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml 106share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml
87share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml 107share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml
88share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml 108share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml
89share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml 109share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml
90share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml 110share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml
91share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml 111share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml
92share/doc/avahi/HACKING 112share/doc/avahi/HACKING
93share/doc/avahi/INSTALL 113share/doc/avahi/INSTALL
94share/doc/avahi/NEWS 114share/doc/avahi/NEWS
95share/doc/avahi/README 115share/doc/avahi/README
96share/doc/avahi/TODO 116share/doc/avahi/TODO
97share/examples/avahi/avahi-daemon.conf 117share/examples/avahi/avahi-daemon.conf
98share/examples/avahi/avahi-dbus.conf 118share/examples/avahi/avahi-dbus.conf
99share/examples/avahi/avahi-dnsconfd.action 119share/examples/avahi/avahi-dnsconfd.action
100share/examples/avahi/hosts 120share/examples/avahi/hosts
101share/examples/avahi/services/sftp-ssh.service 121share/examples/avahi/services/sftp-ssh.service
102share/examples/avahi/services/ssh.service 122share/examples/avahi/services/ssh.service
103share/examples/rc.d/avahidaemon 123share/examples/rc.d/avahidaemon
 124${PLIST.introspection}share/gir-1.0/Avahi-0.6.gir
 125${PLIST.introspection}share/gir-1.0/AvahiCore-0.6.gir
104share/locale/bg/LC_MESSAGES/avahi.mo 126share/locale/bg/LC_MESSAGES/avahi.mo
105share/locale/ca/LC_MESSAGES/avahi.mo 127share/locale/ca/LC_MESSAGES/avahi.mo
106share/locale/cs/LC_MESSAGES/avahi.mo 128share/locale/cs/LC_MESSAGES/avahi.mo
107share/locale/da/LC_MESSAGES/avahi.mo 129share/locale/da/LC_MESSAGES/avahi.mo
108share/locale/de/LC_MESSAGES/avahi.mo 130share/locale/de/LC_MESSAGES/avahi.mo
109share/locale/el/LC_MESSAGES/avahi.mo 131share/locale/el/LC_MESSAGES/avahi.mo
110share/locale/en_AU/LC_MESSAGES/avahi.mo 132share/locale/en_AU/LC_MESSAGES/avahi.mo
111share/locale/en_CA/LC_MESSAGES/avahi.mo 133share/locale/en_CA/LC_MESSAGES/avahi.mo
112share/locale/en_GB/LC_MESSAGES/avahi.mo 134share/locale/en_GB/LC_MESSAGES/avahi.mo
113share/locale/en_NZ/LC_MESSAGES/avahi.mo 135share/locale/en_NZ/LC_MESSAGES/avahi.mo
114share/locale/es/LC_MESSAGES/avahi.mo 136share/locale/es/LC_MESSAGES/avahi.mo
115share/locale/fi/LC_MESSAGES/avahi.mo 137share/locale/fi/LC_MESSAGES/avahi.mo
116share/locale/fo/LC_MESSAGES/avahi.mo 138share/locale/fo/LC_MESSAGES/avahi.mo
cvs diff -r1.18 -r1.19 pkgsrc/net/avahi/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/net/avahi/buildlink3.mk 2013/02/16 11:19:00 1.18
+++ pkgsrc/net/avahi/buildlink3.mk 2013/04/21 00:58:46 1.19
@@ -1,23 +1,53 @@ @@ -1,23 +1,53 @@
1# $NetBSD: buildlink3.mk,v 1.18 2013/02/16 11:19:00 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.19 2013/04/21 00:58:46 rodent 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.31nb6 9BUILDLINK_ABI_DEPENDS.avahi+= avahi>=0.6.31nb6
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
15.if !empty(PKG_BUILD_OPTIONS.avahi:Mgdbm) 15.if !empty(PKG_BUILD_OPTIONS.avahi:Mgdbm)
16. include "../../databases/gdbm/buildlink3.mk" 16. include "../../databases/gdbm/buildlink3.mk"
17.endif 17.endif
 18
 19.if !empty(PKG_BUILD_OPTIONS.avahi:Mgtk2)
 20.include "../../x11/gtk2/buildlink3.mk"
 21.endif
 22
 23.if !empty(PKG_BUILD_OPTIONS.avahi:Mgtk3)
 24.include "../../x11/gtk3/buildlink3.mk"
 25.endif
 26
 27.if !empty(PKG_BUILD_OPTIONS.avahi:Mintrospection)
 28.include "../../devel/gobject-introspection/buildlink3.mk"
 29.endif
 30
 31.if !empty(PKG_BUILD_OPTIONS.avahi:Mmono)
 32.include "../../x11/gtk-sharp/buildlink3.mk"
 33.endif
 34
 35.if !empty(PKG_BUILD_OPTIONS.avahi:Mqt3)
 36.include "../../x11/qt3-libs/buildlink3.mk"
 37.endif
 38
 39.if !empty(PKG_BUILD_OPTIONS.avahi:Mqt)
 40.include "../../x11/qt4-libs/buildlink3.mk"
 41.endif
 42
 43.if !empty(PKG_BUILD_OPTIONS.avahi:Mpython)
 44.include "../../lang/python/application.mk"
 45.endif
 46
 47.include "../../devel/gettext-lib/buildlink3.mk"
18.include "../../devel/glib2/buildlink3.mk" 48.include "../../devel/glib2/buildlink3.mk"
19.include "../../sysutils/dbus/buildlink3.mk" 49.include "../../sysutils/dbus/buildlink3.mk"
20.include "../../x11/gtk2/buildlink3.mk" 50.include "../../mk/pthread.buildlink3.mk"
21.endif # AVAHI_BUILDLINK3_MK 51.endif # AVAHI_BUILDLINK3_MK
22 52
23BUILDLINK_TREE+= -avahi 53BUILDLINK_TREE+= -avahi
cvs diff -r1.11 -r1.12 pkgsrc/net/avahi/distinfo (expand / switch to unified diff)

--- pkgsrc/net/avahi/distinfo 2012/04/22 15:59:01 1.11
+++ pkgsrc/net/avahi/distinfo 2013/04/21 00:58:46 1.12
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.11 2012/04/22 15:59:01 wiz Exp $ 1$NetBSD: distinfo,v 1.12 2013/04/21 00:58:46 rodent Exp $
2 2
3SHA1 (avahi-0.6.31.tar.gz) = 7e05bd78572c9088b03b1207a0ad5aba38490684 3SHA1 (avahi-0.6.31.tar.gz) = 7e05bd78572c9088b03b1207a0ad5aba38490684
4RMD160 (avahi-0.6.31.tar.gz) = 122f553ee2d43cdd0185540a63a8e1f587bdb08e 4RMD160 (avahi-0.6.31.tar.gz) = 122f553ee2d43cdd0185540a63a8e1f587bdb08e
5Size (avahi-0.6.31.tar.gz) = 1268686 bytes 5Size (avahi-0.6.31.tar.gz) = 1268686 bytes
6SHA1 (patch-aa) = 9d48b8358ed5dac5edb379c998d1c907feaf76ed 6SHA1 (patch-aa) = 95b883bf14dd1852cdf0ea8a364c57717eebb03f
7SHA1 (patch-ab) = 49110f3c5502a56448ca6ee4412130299697f255 7SHA1 (patch-ab) = e230ea9d57f40915469486faf4ffaf90ea3ebac3
8SHA1 (patch-ah) = 4b3ffdb927daef8c939527fd5c5893f9f88b3ff3 8SHA1 (patch-ah) = 4b3ffdb927daef8c939527fd5c5893f9f88b3ff3
9SHA1 (patch-ai) = 406b314c8105e28cffb83a92bb80f2dc1b264c3f 9SHA1 (patch-ai) = 48c5fca5683323a30dc646e5eafb1834e7bedaeb
cvs diff -r1.2 -r1.3 pkgsrc/net/avahi/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/net/avahi/Attic/options.mk 2010/07/24 13:42:12 1.2
+++ pkgsrc/net/avahi/Attic/options.mk 2013/04/21 00:58:46 1.3
@@ -1,47 +1,102 @@ @@ -1,47 +1,102 @@
1# $NetBSD: options.mk,v 1.2 2010/07/24 13:42:12 obache Exp $ 1# $NetBSD: options.mk,v 1.3 2013/04/21 00:58:46 rodent Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.avahi 3PKG_OPTIONS_VAR= PKG_OPTIONS.avahi
4 4PKG_SUPPORTED_OPTIONS= avahi-howl gdbm introspection gtk2 gtk3 mono python qt3
5PKG_SUPPORTED_OPTIONS= avahi-howl gdbm python 5PKG_SUPPORTED_OPTIONS+= qt tests
 6PKG_SUGGESTED_OPTIONS+= gtk2
 7PLIST_VARS+= introspection gtk2 gtk3 mono qt3 qt ui
6 8
7.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
8 10
9### 11###
10### Enable compatibility layer for HOWL 12### Enable compatibility layer for HOWL
11### 13###
12.if !empty(PKG_OPTIONS:Mavahi-howl) 14.if !empty(PKG_OPTIONS:Mavahi-howl)
13CONFIGURE_ARGS+= --enable-compat-howl 15CONFIGURE_ARGS+= --enable-compat-howl
14PLIST_SRC+= ${PKGDIR}/PLIST.howl 16PLIST_SRC+= ${PKGDIR}/PLIST.howl
15.endif 17.endif
16 18
17### 19###
18### Enable gdbm support 20### Enable gdbm support
19### 21###
20.if !empty(PKG_OPTIONS:Mgdbm) 22.if !empty(PKG_OPTIONS:Mgdbm)
21. include "../../databases/gdbm/buildlink3.mk" 23. include "../../databases/gdbm/buildlink3.mk"
22.else 24.else
23CONFIGURE_ARGS+= --disable-gdbm 25CONFIGURE_ARGS+= --disable-gdbm
24.endif 26.endif
25 27
 28.if !empty(PKG_OPTIONS:Mgtk2)
 29BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.14.0
 30.include "../../x11/gtk2/buildlink3.mk"
 31PLIST.gtk2= yes
 32PLIST.ui= yes
 33.else
 34CONFIGURE_ARGS+= --disable-gtk
 35.endif
 36
 37.if !empty(PKG_OPTIONS:Mgtk3)
 38.include "../../x11/gtk3/buildlink3.mk"
 39PLIST.gtk3= yes
 40PLIST.ui= yes
 41.else
 42CONFIGURE_ARGS+= --disable-gtk3
 43.endif
 44
 45.if !empty(PKG_OPTIONS:Mintrospection)
 46.include "../../devel/gobject-introspection/buildlink3.mk"
 47CONFIGURE_ARGS+= --enable-introspection=yes
 48PLIST.introspection= yes
 49.else
 50CONFIGURE_ARGS+= --enable-introspection=no
 51.endif
 52
 53.if !empty(PKG_OPTIONS:Mmono)
 54.include "../../x11/gtk-sharp/buildlink3.mk"
 55.include "../../lang/mono/buildlink3.mk"
 56CONFIGURE_ARGS+= --disable-monodoc # XXX broken
 57PLIST.mono= yes
 58.else
 59CONFIGURE_ARGS+= --disable-mono --disable-monodoc
 60.endif
 61
 62.if !empty(PKG_OPTIONS:Mqt3)
 63.include "../../x11/qt3-libs/buildlink3.mk"
 64PLIST.qt3= yes
 65.else
 66CONFIGURE_ARGS+= --disable-qt3
 67.endif
 68
 69.if !empty(PKG_OPTIONS:Mqt)
 70.include "../../x11/qt4-libs/buildlink3.mk"
 71PLIST.qt= yes
 72.else
 73CONFIGURE_ARGS+= --disable-qt4
 74.endif
 75
26### 76###
27### Enable python support 77### Enable python support
28### 78###
29.if !empty(PKG_OPTIONS:Mpython) 79.if !empty(PKG_OPTIONS:Mpython)
30. include "../../lang/python/application.mk" 80. include "../../lang/python/application.mk"
31PY_PATCHPLIST= yes 81PY_PATCHPLIST= yes
 82REPLACE_PYTHON+= avahi-python/avahi-discover/__init__.py
32. include "../../lang/python/extension.mk" 83. include "../../lang/python/extension.mk"
33. include "../../sysutils/py-dbus/buildlink3.mk" 84. include "../../sysutils/py-dbus/buildlink3.mk"
34. include "../../x11/py-gtk2/buildlink3.mk" 85. include "../../x11/py-gtk2/buildlink3.mk"
35DEPENDS+= ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2 86DEPENDS+= ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2
36DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 87DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
37### If python and gdbm are enabled we need py-gdbm as well 88### If python and gdbm are enabled we need py-gdbm as well
38. if !empty(PKG_OPTIONS:Mgdbm) 89. if !empty(PKG_OPTIONS:Mgdbm)
39DEPENDS+= ${PYPKGPREFIX}-gdbm-[0-9]*:../../databases/py-gdbm 90DEPENDS+= ${PYPKGPREFIX}-gdbm-[0-9]*:../../databases/py-gdbm
40PLIST_SRC+= ${PKGDIR}/PLIST.pygdbm 91PLIST_SRC+= ${PKGDIR}/PLIST.pygdbm
41. endif 92. endif
42PLIST_SRC+= ${PKGDIR}/PLIST.python 93PLIST_SRC+= ${PKGDIR}/PLIST.python
43.else 94.else
44CONFIGURE_ARGS+= --disable-python 95CONFIGURE_ARGS+= --disable-python
45CONFIGURE_ARGS+= --disable-python-dbus 96CONFIGURE_ARGS+= --disable-python-dbus
46CONFIGURE_ARGS+= --disable-pygtk 97CONFIGURE_ARGS+= --disable-pygtk
47.endif 98.endif
 99
 100.if !empty(PKG_OPTIONS:Mtests)
 101CONFIGURE_ARGS+= --enable-tests
 102.endif
cvs diff -r1.2 -r1.3 pkgsrc/net/avahi/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/avahi/patches/patch-aa 2010/07/24 13:42:12 1.2
+++ pkgsrc/net/avahi/patches/patch-aa 2013/04/21 00:58:47 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.2 2010/07/24 13:42:12 obache Exp $ 1$NetBSD: patch-aa,v 1.3 2013/04/21 00:58:47 rodent Exp $
 2
 3Add NetBSD support.
2 4
3--- avahi-core/iface-pfroute.c.orig 2010-06-26 00:14:35.000000000 +0000 5--- avahi-core/iface-pfroute.c.orig 2010-06-26 00:14:35.000000000 +0000
4+++ avahi-core/iface-pfroute.c 6+++ avahi-core/iface-pfroute.c
5@@ -46,6 +46,13 @@ 7@@ -46,6 +46,13 @@
6 #include "iface-pfroute.h" 8 #include "iface-pfroute.h"
7 #include "util.h" 9 #include "util.h"
8  10
9+#ifdef __NetBSD__ 11+#ifdef __NetBSD__
10+#define lifreq if_laddrreq 12+#define lifreq if_laddrreq
11+#define lifr_addr iflr_addr 13+#define lifr_addr iflr_addr
12+#define lifr_flags iflr_flags 14+#define lifr_flags iflr_flags
13+#define SIOCGLIFFLAGS SIOCGIFFLAGS 15+#define SIOCGLIFFLAGS SIOCGIFFLAGS
14+#endif 16+#endif
cvs diff -r1.2 -r1.3 pkgsrc/net/avahi/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/net/avahi/patches/patch-ai 2010/07/24 13:42:12 1.2
+++ pkgsrc/net/avahi/patches/patch-ai 2013/04/21 00:58:47 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ai,v 1.2 2010/07/24 13:42:12 obache Exp $ 1$NetBSD: patch-ai,v 1.3 2013/04/21 00:58:47 rodent Exp $
 2
 3Check lower bounds on port.
2 4
3--- avahi-core/server.c.orig 2010-06-29 18:51:53.000000000 +0000 5--- avahi-core/server.c.orig 2010-06-29 18:51:53.000000000 +0000
4+++ avahi-core/server.c 6+++ avahi-core/server.c
5@@ -903,6 +903,11 @@ static void dispatch_packet(AvahiServer  7@@ -903,6 +903,11 @@ static void dispatch_packet(AvahiServer
6 return; 8 return;
7 } 9 }
8  10
9+ if (port <= 0) { 11+ if (port <= 0) {
10+ avahi_log_warn("Received packet from invalid source port."); 12+ avahi_log_warn("Received packet from invalid source port.");
11+ return; 13+ return;
12+ } 14+ }
13+ 15+
14 if (avahi_address_is_ipv4_in_ipv6(src_address)) 16 if (avahi_address_is_ipv4_in_ipv6(src_address))
cvs diff -r1.3 -r1.4 pkgsrc/net/avahi/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/avahi/patches/patch-ab 2012/04/22 15:59:02 1.3
+++ pkgsrc/net/avahi/patches/patch-ab 2013/04/21 00:58:47 1.4
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ab,v 1.3 2012/04/22 15:59:02 wiz Exp $ 1$NetBSD: patch-ab,v 1.4 2013/04/21 00:58:47 rodent Exp $
 2
 3Build with -lintl.
2 4
3--- avahi-common/Makefile.in.orig 2012-02-14 22:36:35.000000000 +0000 5--- avahi-common/Makefile.in.orig 2012-02-14 22:36:35.000000000 +0000
4+++ avahi-common/Makefile.in 6+++ avahi-common/Makefile.in
5@@ -639,7 +639,7 @@ clean-libLTLIBRARIES: 7@@ -639,7 +639,7 @@ clean-libLTLIBRARIES:
6 rm -f "$${dir}/so_locations"; \ 8 rm -f "$${dir}/so_locations"; \
7 done 9 done
8 libavahi-common.la: $(libavahi_common_la_OBJECTS) $(libavahi_common_la_DEPENDENCIES) $(EXTRA_libavahi_common_la_DEPENDENCIES)  10 libavahi-common.la: $(libavahi_common_la_OBJECTS) $(libavahi_common_la_DEPENDENCIES) $(EXTRA_libavahi_common_la_DEPENDENCIES)
9- $(AM_V_CCLD)$(libavahi_common_la_LINK) -rpath $(libdir) $(libavahi_common_la_OBJECTS) $(libavahi_common_la_LIBADD) $(LIBS) 11- $(AM_V_CCLD)$(libavahi_common_la_LINK) -rpath $(libdir) $(libavahi_common_la_OBJECTS) $(libavahi_common_la_LIBADD) $(LIBS)
10+ $(AM_V_CCLD)$(libavahi_common_la_LINK) -rpath $(libdir) $(libavahi_common_la_OBJECTS) $(libavahi_common_la_LIBADD) $(LIBS) $(INTLLIBS) 12+ $(AM_V_CCLD)$(libavahi_common_la_LINK) -rpath $(libdir) $(libavahi_common_la_OBJECTS) $(libavahi_common_la_LIBADD) $(LIBS) $(INTLLIBS)
11  13
12 clean-noinstPROGRAMS: 14 clean-noinstPROGRAMS:
13 @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ 15 @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \