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

8 files changed, 141 insertions, 37 deletions

diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index fc437fc6c85..6150475b024 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2013/02/16 11:19:00 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2013/04/21 00:58:46 rodent Exp $
 
 DISTNAME=		avahi-0.6.31
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		net
 MASTER_SITES=		http://avahi.org/download/
 
@@ -71,17 +71,11 @@ 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-gtk3
-CONFIGURE_ARGS+=	--disable-qt3
-CONFIGURE_ARGS+=	--disable-qt4
-CONFIGURE_ARGS+=	--disable-mono
-CONFIGURE_ARGS+=	--disable-monodoc
 CONFIGURE_ARGS+=	--disable-doxygen-doc
 CONFIGURE_ARGS+=	--disable-doxygen-dot
-CONFIGURE_ARGS+=	--disable-doxygen-html
+CONFIGURE_ARGS+=	--disable-doxygen-html --disable-doxygen-xml
 CONFIGURE_ARGS+=	--disable-xmltoman
 CONFIGURE_ARGS+=	--disable-autoipd
-CONFIGURE_ARGS+=	--enable-tests
 CONFIGURE_ARGS+=	--with-distro=none
 
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples
@@ -103,9 +97,6 @@ post-install:
 BUILDLINK_API_DEPENDS.libdaemon+=	libdaemon>=0.14
 .include "../../devel/libdaemon/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/expat/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.14.0
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/avahi/PLIST b/net/avahi/PLIST
index 573b84d3d40..9278c991cb9 100644
--- a/net/avahi/PLIST
+++ b/net/avahi/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2011/05/14 13:04:04 obache Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/04/21 00:58:46 rodent Exp $
 bin/avahi-browse
 bin/avahi-browse-domains
-bin/avahi-discover-standalone
+${PLIST.ui}bin/avahi-discover-standalone
 bin/avahi-publish
 bin/avahi-publish-address
 bin/avahi-publish-service
@@ -9,9 +9,9 @@ bin/avahi-resolve
 bin/avahi-resolve-address
 bin/avahi-resolve-host-name
 bin/avahi-set-host-name
-bin/bshell
-bin/bssh
-bin/bvnc
+${PLIST.ui}bin/bshell
+${PLIST.ui}bin/bssh
+${PLIST.ui}bin/bvnc
 include/avahi-client/client.h
 include/avahi-client/lookup.h
 include/avahi-client/publish.h
@@ -44,18 +44,38 @@ 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
-include/avahi-ui/avahi-ui.h
+${PLIST.qt3}include/avahi-qt3/qt-watch.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
 lib/libavahi-client.la
 lib/libavahi-common.la
 lib/libavahi-core.la
 lib/libavahi-glib.la
 lib/libavahi-gobject.la
-lib/libavahi-ui.la
+${PLIST.qt3}lib/libavahi-qt3.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
+${PLIST.mono}lib/mono/avahi-ui-sharp/avahi-ui-sharp.dll
+${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll
+${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.config
+${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.mdb
+${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll
+${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll.config
+${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll.mdb
 lib/pkgconfig/avahi-client.pc
 lib/pkgconfig/avahi-core.pc
 lib/pkgconfig/avahi-glib.pc
 lib/pkgconfig/avahi-gobject.pc
-lib/pkgconfig/avahi-ui.pc
+${PLIST.qt3}lib/pkgconfig/avahi-qt3.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
+${PLIST.gtk2}lib/pkgconfig/avahi-ui.pc
 man/man1/avahi-browse-domains.1
 man/man1/avahi-browse.1
 man/man1/avahi-publish-address.1
@@ -65,8 +85,8 @@ man/man1/avahi-resolve-address.1
 man/man1/avahi-resolve-host-name.1
 man/man1/avahi-resolve.1
 man/man1/avahi-set-host-name.1
-man/man1/bssh.1
-man/man1/bvnc.1
+${PLIST.ui}man/man1/bssh.1
+${PLIST.ui}man/man1/bvnc.1
 man/man5/avahi-daemon.conf.5
 man/man5/avahi.hosts.5
 man/man5/avahi.service.5
@@ -75,10 +95,10 @@ man/man8/avahi-dnsconfd.8
 man/man8/avahi-dnsconfd.action.8
 sbin/avahi-daemon
 sbin/avahi-dnsconfd
-share/applications/bssh.desktop
-share/applications/bvnc.desktop
+${PLIST.ui}share/applications/bssh.desktop
+${PLIST.ui}share/applications/bvnc.desktop
 share/avahi/avahi-service.dtd
-share/avahi/interfaces/avahi-discover.ui
+${PLIST.ui}share/avahi/interfaces/avahi-discover.ui
 share/avahi/service-types
 share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
 share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
@@ -101,6 +121,8 @@ share/examples/avahi/hosts
 share/examples/avahi/services/sftp-ssh.service
 share/examples/avahi/services/ssh.service
 share/examples/rc.d/avahidaemon
+${PLIST.introspection}share/gir-1.0/Avahi-0.6.gir
+${PLIST.introspection}share/gir-1.0/AvahiCore-0.6.gir
 share/locale/bg/LC_MESSAGES/avahi.mo
 share/locale/ca/LC_MESSAGES/avahi.mo
 share/locale/cs/LC_MESSAGES/avahi.mo
diff --git a/net/avahi/buildlink3.mk b/net/avahi/buildlink3.mk
index 348504b7065..50304d04ee7 100644
--- a/net/avahi/buildlink3.mk
+++ b/net/avahi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2013/02/16 11:19:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2013/04/21 00:58:46 rodent Exp $
 
 BUILDLINK_TREE+=	avahi
 
@@ -15,9 +15,39 @@ pkgbase := avahi
 .if !empty(PKG_BUILD_OPTIONS.avahi:Mgdbm)
 .  include "../../databases/gdbm/buildlink3.mk"
 .endif
+
+.if !empty(PKG_BUILD_OPTIONS.avahi:Mgtk2)
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.avahi:Mgtk3)
+.include "../../x11/gtk3/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.avahi:Mintrospection)
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.avahi:Mmono)
+.include "../../x11/gtk-sharp/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.avahi:Mqt3)
+.include "../../x11/qt3-libs/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
+
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .endif # AVAHI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-avahi
diff --git a/net/avahi/distinfo b/net/avahi/distinfo
index ee2d60e9bd8..11d79f3178e 100644
--- a/net/avahi/distinfo
+++ b/net/avahi/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2012/04/22 15:59:01 wiz Exp $
+$NetBSD: distinfo,v 1.12 2013/04/21 00:58:46 rodent Exp $
 
 SHA1 (avahi-0.6.31.tar.gz) = 7e05bd78572c9088b03b1207a0ad5aba38490684
 RMD160 (avahi-0.6.31.tar.gz) = 122f553ee2d43cdd0185540a63a8e1f587bdb08e
 Size (avahi-0.6.31.tar.gz) = 1268686 bytes
-SHA1 (patch-aa) = 9d48b8358ed5dac5edb379c998d1c907feaf76ed
-SHA1 (patch-ab) = 49110f3c5502a56448ca6ee4412130299697f255
+SHA1 (patch-aa) = 95b883bf14dd1852cdf0ea8a364c57717eebb03f
+SHA1 (patch-ab) = e230ea9d57f40915469486faf4ffaf90ea3ebac3
 SHA1 (patch-ah) = 4b3ffdb927daef8c939527fd5c5893f9f88b3ff3
-SHA1 (patch-ai) = 406b314c8105e28cffb83a92bb80f2dc1b264c3f
+SHA1 (patch-ai) = 48c5fca5683323a30dc646e5eafb1834e7bedaeb
diff --git a/net/avahi/options.mk b/net/avahi/options.mk
index 0e80d725a93..ad74ac36291 100644
--- a/net/avahi/options.mk
+++ b/net/avahi/options.mk
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.2 2010/07/24 13:42:12 obache Exp $
+# $NetBSD: options.mk,v 1.3 2013/04/21 00:58:46 rodent Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.avahi
-
-PKG_SUPPORTED_OPTIONS=	avahi-howl gdbm python
+PKG_SUPPORTED_OPTIONS=	avahi-howl gdbm introspection gtk2 gtk3 mono python qt3
+PKG_SUPPORTED_OPTIONS+=	qt tests
+PKG_SUGGESTED_OPTIONS+=	gtk2
+PLIST_VARS+=		introspection gtk2 gtk3 mono qt3 qt ui
 
 .include "../../mk/bsd.options.mk"
 
@@ -23,12 +25,61 @@ PLIST_SRC+=		${PKGDIR}/PLIST.howl
 CONFIGURE_ARGS+=	--disable-gdbm
 .endif
 
+.if !empty(PKG_OPTIONS:Mgtk2)
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.14.0
+.include "../../x11/gtk2/buildlink3.mk"
+PLIST.gtk2=		yes
+PLIST.ui=		yes
+.else
+CONFIGURE_ARGS+=	--disable-gtk
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk3)
+.include "../../x11/gtk3/buildlink3.mk"
+PLIST.gtk3=		yes
+PLIST.ui=		yes
+.else
+CONFIGURE_ARGS+=	--disable-gtk3
+.endif
+
+.if !empty(PKG_OPTIONS:Mintrospection)
+.include "../../devel/gobject-introspection/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-introspection=yes
+PLIST.introspection=	yes
+.else
+CONFIGURE_ARGS+=	--enable-introspection=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mmono)
+.include "../../x11/gtk-sharp/buildlink3.mk"
+.include "../../lang/mono/buildlink3.mk"
+CONFIGURE_ARGS+=	--disable-monodoc # XXX broken
+PLIST.mono=		yes
+.else
+CONFIGURE_ARGS+=	--disable-mono --disable-monodoc
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt3)
+.include "../../x11/qt3-libs/buildlink3.mk"
+PLIST.qt3=		yes
+.else
+CONFIGURE_ARGS+=	--disable-qt3
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt)
+.include "../../x11/qt4-libs/buildlink3.mk"
+PLIST.qt=		yes
+.else
+CONFIGURE_ARGS+=	--disable-qt4
+.endif
+
 ###
 ### Enable python support
 ###
 .if !empty(PKG_OPTIONS:Mpython)
 .  include "../../lang/python/application.mk"
 PY_PATCHPLIST=		yes
+REPLACE_PYTHON+=	avahi-python/avahi-discover/__init__.py
 .  include "../../lang/python/extension.mk"
 .  include "../../sysutils/py-dbus/buildlink3.mk"
 .  include "../../x11/py-gtk2/buildlink3.mk"
@@ -45,3 +96,7 @@ CONFIGURE_ARGS+=	--disable-python
 CONFIGURE_ARGS+=	--disable-python-dbus
 CONFIGURE_ARGS+=	--disable-pygtk
 .endif
+
+.if !empty(PKG_OPTIONS:Mtests)
+CONFIGURE_ARGS+=	--enable-tests
+.endif
diff --git a/net/avahi/patches/patch-aa b/net/avahi/patches/patch-aa
index 90355d4c7ca..6bf4a24b452 100644
--- a/net/avahi/patches/patch-aa
+++ b/net/avahi/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2010/07/24 13:42:12 obache Exp $
+$NetBSD: patch-aa,v 1.3 2013/04/21 00:58:47 rodent Exp $
+
+Add NetBSD support.
 
 --- avahi-core/iface-pfroute.c.orig	2010-06-26 00:14:35.000000000 +0000
 +++ avahi-core/iface-pfroute.c
diff --git a/net/avahi/patches/patch-ab b/net/avahi/patches/patch-ab
index a87d4640f19..61102fdedc5 100644
--- a/net/avahi/patches/patch-ab
+++ b/net/avahi/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2012/04/22 15:59:02 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2013/04/21 00:58:47 rodent Exp $
+
+Build with -lintl.
 
 --- avahi-common/Makefile.in.orig	2012-02-14 22:36:35.000000000 +0000
 +++ avahi-common/Makefile.in
diff --git a/net/avahi/patches/patch-ai b/net/avahi/patches/patch-ai
index 885e8d1405b..c08d68f6dfe 100644
--- a/net/avahi/patches/patch-ai
+++ b/net/avahi/patches/patch-ai
@@ -1,4 +1,6 @@
-$NetBSD: patch-ai,v 1.2 2010/07/24 13:42:12 obache Exp $
+$NetBSD: patch-ai,v 1.3 2013/04/21 00:58:47 rodent Exp $
+
+Check lower bounds on port.
 
 --- avahi-core/server.c.orig	2010-06-29 18:51:53.000000000 +0000
 +++ avahi-core/server.c