avahi: Split off package into *-ui variant for the GTK UIs.

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

8 files changed, 92 insertions, 237 deletions

diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 1d95a109302..8bc488f8949 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,61 +1,19 @@
-# $NetBSD: Makefile,v 1.98 2020/12/04 20:45:32 nia Exp $
+# $NetBSD: Makefile,v 1.99 2021/01/08 14:08:35 nia Exp $
+
+.include "Makefile.common"
 
-DISTNAME=		avahi-0.8
 PKGREVISION=		3
-CATEGORIES=		net
-MASTER_SITES=		${MASTER_SITE_GITHUB:=lathiat/avahi/releases/download/v${PKGVERSION_NOREV}/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		https://avahi.org/
 COMMENT=		Facilitate service discovery on a local network
-LICENSE=		gnu-lgpl-v2.1
-
-EXTRACT_USING=		bsdtar
-
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-USE_PKGINSTALL=		YES
-USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		pkg-config gmake msgfmt xgettext
 
-# Requires --desktop in msgfmt.
-_TOOLS_USE_PKGSRC.msgfmt=	yes
-
-CONFIGURE_ARGS+=	--disable-gtk
-
-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
-RCD_SCRIPTS=		avahidaemon
-BUILD_DEFS+=		VARBASE PKG_SYSCONFBASE
-PLIST_SRC=		${PKGDIR}/PLIST
-PKG_SYSCONFSUBDIR=	avahi
-USE_LANGUAGES=		c99 c++
+CONFIGURE_ARGS+=	--disable-gtk3
 
 PKG_USERS=		${AVAHI_USER}:${AVAHI_GROUP}
 PKG_GROUPS=		${AVAHI_GROUP}
 PKG_GECOS.${AVAHI_USER}=	Avahi user
 
-.include "options.mk"
-
-CFLAGS.NetBSD+=		-D_NETBSD_SOURCE
-CPPFLAGS.SunOS+=	-D_XOPEN_SOURCE=600
-# Not yet reported upstream.
-CPPFLAGS.Darwin+=	-D__APPLE_USE_RFC_3542
+RCD_SCRIPTS=		avahidaemon
 
 PLIST_SRC+=		${PKGDIR}/PLIST.shared
 
@@ -72,27 +30,6 @@ CONF_FILES+=		${PREFIX}/share/examples/avahi/services/ssh.service \
 CONF_FILES+=		${PREFIX}/share/examples/avahi/avahi-dbus.conf \
 			${PKG_SYSCONFBASE}/dbus-1/system.d/avahi-dbus.conf
 
-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-pygobject
-CONFIGURE_ARGS+=	--with-distro=none
-
-INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples
-INSTALL_MAKE_FLAGS+=	dbusservicedir=${PREFIX}/share/examples/avahi
-
 INSTALLATION_DIRS+=	share/doc/avahi
 
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/services
@@ -104,11 +41,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/README ${DESTDIR}${PREFIX}/share/doc/avahi
 	${INSTALL_DATA} ${WRKSRC}/docs/TODO ${DESTDIR}${PREFIX}/share/doc/avahi
 
-.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"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/avahi/Makefile.common b/net/avahi/Makefile.common
new file mode 100644
index 00000000000..0e109442355
--- /dev/null
+++ b/net/avahi/Makefile.common
@@ -0,0 +1,85 @@
+# $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"
diff --git a/net/avahi/PLIST b/net/avahi/PLIST
index 2894f49f8dd..c7891972aa2 100644
--- a/net/avahi/PLIST
+++ b/net/avahi/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.19 2020/09/29 10:56:56 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.20 2021/01/08 14:08:35 nia Exp $
 bin/avahi-browse
 bin/avahi-browse-domains
-${PLIST.ui}bin/avahi-discover-standalone
 bin/avahi-publish
 bin/avahi-publish-address
 bin/avahi-publish-service
@@ -9,9 +8,6 @@ bin/avahi-resolve
 bin/avahi-resolve-address
 bin/avahi-resolve-host-name
 bin/avahi-set-host-name
-${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,30 +40,15 @@ 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
-${PLIST.ui}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
-${PLIST.gtk3}lib/libavahi-ui-gtk3.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
-${PLIST.mono}lib/pkgconfig/avahi-sharp.pc
-${PLIST.gtk3}lib/pkgconfig/avahi-ui-gtk3.pc
-${PLIST.mono}lib/pkgconfig/avahi-ui-sharp.pc
 man/man1/avahi-browse-domains.1
 man/man1/avahi-browse.1
 man/man1/avahi-publish-address.1
@@ -85,10 +66,7 @@ man/man8/avahi-dnsconfd.8
 man/man8/avahi-dnsconfd.action.8
 sbin/avahi-daemon
 sbin/avahi-dnsconfd
-${PLIST.ui}share/applications/bssh.desktop
-${PLIST.ui}share/applications/bvnc.desktop
 share/avahi/avahi-service.dtd
-${PLIST.ui}share/avahi/interfaces/avahi-discover.ui
 share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
 share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
 share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
@@ -109,8 +87,6 @@ share/examples/avahi/avahi-dnsconfd.action
 share/examples/avahi/hosts
 share/examples/avahi/services/sftp-ssh.service
 share/examples/avahi/services/ssh.service
-${PLIST.introspection}share/gir-1.0/Avahi-0.6.gir
-${PLIST.introspection}share/gir-1.0/AvahiCore-0.6.gir
 share/locale/ach/LC_MESSAGES/avahi.mo
 share/locale/ar/LC_MESSAGES/avahi.mo
 share/locale/bg/LC_MESSAGES/avahi.mo
diff --git a/net/avahi/PLIST.howl b/net/avahi/PLIST.howl
deleted file mode 100644
index 70f5a69f8f0..00000000000
--- a/net/avahi/PLIST.howl
+++ /dev/null
@@ -1,22 +0,0 @@
-@comment $NetBSD: PLIST.howl,v 1.2 2009/06/14 18:09:21 joerg Exp $
-include/avahi-compat-howl/corby/buffer.h
-include/avahi-compat-howl/corby/channel.h
-include/avahi-compat-howl/corby/corby.h
-include/avahi-compat-howl/corby/message.h
-include/avahi-compat-howl/corby/object.h
-include/avahi-compat-howl/corby/orb.h
-include/avahi-compat-howl/discovery/discovery.h
-include/avahi-compat-howl/discovery/text_record.h
-include/avahi-compat-howl/howl.h
-include/avahi-compat-howl/rendezvous/rendezvous.h
-include/avahi-compat-howl/rendezvous/text_record.h
-include/avahi-compat-howl/salt/address.h
-include/avahi-compat-howl/salt/debug.h
-include/avahi-compat-howl/salt/interface.h
-include/avahi-compat-howl/salt/platform.h
-include/avahi-compat-howl/salt/salt.h
-include/avahi-compat-howl/salt/signal.h
-include/avahi-compat-howl/salt/socket.h
-include/avahi-compat-howl/salt/time.h
-lib/libhowl.la
-lib/pkgconfig/avahi-compat-howl.pc
diff --git a/net/avahi/PLIST.pygdbm b/net/avahi/PLIST.pygdbm
deleted file mode 100644
index 6eec3b6383f..00000000000
--- a/net/avahi/PLIST.pygdbm
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.pygdbm,v 1.3 2010/07/24 13:42:12 obache Exp $
-bin/avahi-discover
-lib/avahi/service-types.db
-${PYSITELIB}/avahi/ServiceTypeDatabase.py
-${PYSITELIB}/avahi_discover/__init__.py
-${PYSITELIB}/avahi_discover/__init__.pyc
-${PYSITELIB}/avahi_discover/__init__.pyo
-share/applications/avahi-discover.desktop
diff --git a/net/avahi/PLIST.python b/net/avahi/PLIST.python
deleted file mode 100644
index 4efd5d817d3..00000000000
--- a/net/avahi/PLIST.python
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST.python,v 1.7 2020/09/29 10:56:56 prlw1 Exp $
-${PYSITELIB}/avahi/__init__.py
-${PYSITELIB}/avahi/__init__.pyc
-${PYSITELIB}/avahi/__init__.pyo
-bin/avahi-bookmarks
-man/man1/avahi-bookmarks.1
diff --git a/net/avahi/buildlink3.mk b/net/avahi/buildlink3.mk
index aa624d0a79a..4dafc2e4d69 100644
--- a/net/avahi/buildlink3.mk
+++ b/net/avahi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.46 2020/09/29 10:56:56 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.47 2021/01/08 14:08:35 nia Exp $
 
 BUILDLINK_TREE+=	avahi
 
@@ -9,29 +9,6 @@ BUILDLINK_API_DEPENDS.avahi+=	avahi>=0.6.23
 BUILDLINK_ABI_DEPENDS.avahi+=	avahi>=0.6.32nb25
 BUILDLINK_PKGSRCDIR.avahi?=	../../net/avahi
 
-pkgbase := avahi
-.include "../../mk/pkg-build-options.mk"
-
-.if ${PKG_BUILD_OPTIONS.avahi:Mgdbm}
-.  include "../../databases/gdbm/buildlink3.mk"
-.endif
-
-.if ${PKG_BUILD_OPTIONS.avahi:Mgtk3}
-.include "../../x11/gtk3/buildlink3.mk"
-.endif
-
-.if ${PKG_BUILD_OPTIONS.avahi:Mintrospection}
-.include "../../devel/gobject-introspection/buildlink3.mk"
-.endif
-
-.if ${PKG_BUILD_OPTIONS.avahi:Mmono}
-.include "../../x11/gtk-sharp/buildlink3.mk"
-.endif
-
-.if ${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"
diff --git a/net/avahi/options.mk b/net/avahi/options.mk
deleted file mode 100644
index 5c194e19e72..00000000000
--- a/net/avahi/options.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-# $NetBSD: options.mk,v 1.17 2020/03/23 15:56:55 wiz Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.avahi
-PKG_SUPPORTED_OPTIONS=	avahi-howl gdbm introspection gtk3 mono python
-PKG_SUPPORTED_OPTIONS+=	tests
-PKG_SUGGESTED_OPTIONS+=	gtk3
-PLIST_VARS+=		introspection gtk3 mono ui
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Enable compatibility layer for HOWL
-###
-.if !empty(PKG_OPTIONS:Mavahi-howl)
-CONFIGURE_ARGS+=	--enable-compat-howl
-PLIST_SRC+=		${PKGDIR}/PLIST.howl
-.endif
-
-###
-### Enable gdbm support
-###
-.if !empty(PKG_OPTIONS:Mgdbm)
-.  include "../../databases/gdbm/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-gdbm
-.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
-
-###
-### Enable python support
-###
-.if !empty(PKG_OPTIONS:Mpython)
-PY_PATCHPLIST=		yes
-.  include "../../lang/python/application.mk"
-REPLACE_PYTHON+=	avahi-python/avahi-discover/__init__.py
-.  include "../../lang/python/extension.mk"
-.  include "../../sysutils/py-dbus/buildlink3.mk"
-DEPENDS+=		${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2
-DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-### If python and gdbm are enabled we need py-gdbm as well
-.  if !empty(PKG_OPTIONS:Mgdbm)
-DEPENDS+=		${PYPKGPREFIX}-gdbm-[0-9]*:../../databases/py-gdbm
-PLIST_SRC+=		${PKGDIR}/PLIST.pygdbm
-.  endif
-PLIST_SRC+=		${PKGDIR}/PLIST.python
-.else
-CONFIGURE_ARGS+=	--disable-python
-CONFIGURE_ARGS+=	--disable-python-dbus
-.endif
-
-.if !empty(PKG_OPTIONS:Mtests)
-CONFIGURE_ARGS+=	--enable-tests
-.endif